Enable building on arm64 (#1300)

* Enable building on arm64 This change allows source-build to be cloned and built on arm64 machines. It shouldn't affect cross compilation at all, however. I have tested this on RHEL 8 aarch64. This change includes backports of the following pull-requests which have been merged into their respective master branches: - dotnet/aspnetcore#14790 - dotnet/aspnetcore#15354 - dotnet/installer#4102 - dotnet/core-setup#8468 - dotnet/corefx#40453 There's a number of existing build configuration that are conditionalized on arm64, such as setting up a root file system. Those they are actually only meant to be invoked when cross-compiling for arm64 (on x86_64). This commit modifies those conditions to not apply when building on an arm64 machine. * Patch fixup.
dotnet · Nov 24, 2019 · c31a03e · c31a03e
1 parent e78695f
commit c31a03e
Show file tree

Hide file tree

Showing 25 changed files with 493 additions and 108 deletions.
diff --git a/build-source-tarball.sh b/build-source-tarball.sh
@@ -12,6 +12,32 @@ if [ -z "${1:-}" ]; then
     exit 1
 fi
 
+# Use uname to determine what the CPU is.
+cpuname=$(uname -p)
+# Some Linux platforms report unknown for platform, but the arch for machine.
+if [[ "$cpuname" == "unknown" ]]; then
+  cpuname=$(uname -m)
+fi
+
+case $cpuname in
+  aarch64)
+    targetArchitecture=arm64
+    ;;
+  amd64|x86_64)
+    targetArchitecture=x64
+    ;;
+  armv7l)
+    targetArchitecture=arm
+    ;;
+  i686)
+    targetArchitecture=x86
+    ;;
+  *)
+    echo "Unknown CPU $cpuname detected, treating it as x64"
+    targetArchitecture=x64
+    ;;
+esac
+
 TARBALL_ROOT=$1
 shift
 
@@ -217,28 +243,28 @@ cp $SCRIPT_ROOT/support/tarball/build.sh $TARBALL_ROOT/build.sh
 mkdir -p $TARBALL_ROOT/packages/prebuilt
 mkdir -p $TARBALL_ROOT/packages/source-built
 find $SCRIPT_ROOT/packages/restored/ -name '*.nupkg' -exec cp {} $TARBALL_ROOT/packages/prebuilt/ \;
-find $SCRIPT_ROOT/bin/obj/x64/Release/nuget-packages -name '*.nupkg' -exec cp {} $TARBALL_ROOT/packages/prebuilt/ \;
+find $SCRIPT_ROOT/bin/obj/$targetArchitecture/Release/nuget-packages -name '*.nupkg' -exec cp {} $TARBALL_ROOT/packages/prebuilt/ \;
 
 # Copy reference-packages from bin dir to reference-packages directory.
 # See corresponding change in dir.props to change ReferencePackagesBasePath conditionally in offline build.
 mkdir -p $TARBALL_ROOT/packages/reference
-cp -r $SCRIPT_ROOT/bin/obj/x64/Release/reference-packages/source $TARBALL_ROOT/packages/reference/source
-cp -r $SCRIPT_ROOT/bin/obj/x64/Release/reference-packages/staging $TARBALL_ROOT/packages/reference/staging
+cp -r $SCRIPT_ROOT/bin/obj/$targetArchitecture/Release/reference-packages/source $TARBALL_ROOT/packages/reference/source
+cp -r $SCRIPT_ROOT/bin/obj/$targetArchitecture/Release/reference-packages/staging $TARBALL_ROOT/packages/reference/staging
 
 # Copy tarballs to ./packages/archive directory
 mkdir -p $TARBALL_ROOT/packages/archive
-cp -r $SCRIPT_ROOT/bin/obj/x64/Release/external-tarballs/*.tar.gz $TARBALL_ROOT/packages/archive/
+cp -r $SCRIPT_ROOT/bin/obj/$targetArchitecture/Release/external-tarballs/*.tar.gz $TARBALL_ROOT/packages/archive/
 
 # Copy generated source from bin to src/generatedSrc
-cp -r $SCRIPT_ROOT/bin/obj/x64/Release/generatedSrc $TARBALL_ROOT/src/generatedSrc
+cp -r $SCRIPT_ROOT/bin/obj/$targetArchitecture/Release/generatedSrc $TARBALL_ROOT/src/generatedSrc
 
 if [ -e $SCRIPT_ROOT/testing-smoke/smoke-test-packages ]; then
     cp -rf $SCRIPT_ROOT/testing-smoke/smoke-test-packages $TARBALL_ROOT/packages
 fi
 
 echo 'Removing source-built packages from tarball prebuilts...'
 
-for built_package in $(find $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/ -name '*.nupkg' | tr '[:upper:]' '[:lower:]')
+for built_package in $(find $SCRIPT_ROOT/bin/obj/$targetArchitecture/Release/blob-feed/packages/ -name '*.nupkg' | tr '[:upper:]' '[:lower:]')
 do
     if [ -e $TARBALL_ROOT/packages/prebuilt/$(basename $built_package) ]; then
         rm $TARBALL_ROOT/packages/prebuilt/$(basename $built_package)
@@ -251,16 +277,16 @@ done
 echo 'Copying source-built packages to tarball to replace packages needed before they are built...'
 mkdir -p $TARBALL_ROOT/packages/source-built
 cp -r $SCRIPT_ROOT/Tools/source-built/coreclr-tools $TARBALL_ROOT/packages/source-built/
-cp $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/*Arcade*.nupkg $TARBALL_ROOT/packages/source-built/
-cp $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/*SourceLink*.nupkg $TARBALL_ROOT/packages/source-built/
-cp $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/*Build*Tasks*.nupkg $TARBALL_ROOT/packages/source-built/
-cp $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/runtime*.nupkg $TARBALL_ROOT/packages/source-built/
-cp $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/*DotNetHost*.nupkg $TARBALL_ROOT/packages/source-built/
-cp $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/*DotNetAppHost*.nupkg $TARBALL_ROOT/packages/source-built/
+cp $SCRIPT_ROOT/bin/obj/$targetArchitecture/Release/blob-feed/packages/*Arcade*.nupkg $TARBALL_ROOT/packages/source-built/
+cp $SCRIPT_ROOT/bin/obj/$targetArchitecture/Release/blob-feed/packages/*SourceLink*.nupkg $TARBALL_ROOT/packages/source-built/
+cp $SCRIPT_ROOT/bin/obj/$targetArchitecture/Release/blob-feed/packages/*Build*Tasks*.nupkg $TARBALL_ROOT/packages/source-built/
+cp $SCRIPT_ROOT/bin/obj/$targetArchitecture/Release/blob-feed/packages/runtime*.nupkg $TARBALL_ROOT/packages/source-built/
+cp $SCRIPT_ROOT/bin/obj/$targetArchitecture/Release/blob-feed/packages/*DotNetHost*.nupkg $TARBALL_ROOT/packages/source-built/
+cp $SCRIPT_ROOT/bin/obj/$targetArchitecture/Release/blob-feed/packages/*DotNetAppHost*.nupkg $TARBALL_ROOT/packages/source-built/
 
 # Setup package version props to include both source-built and running PackageVersions.props
-mkdir --parents $TARBALL_ROOT/bin/obj/x64/Release/
-cp $SCRIPT_ROOT/support/tarball/PackageVersions.props $TARBALL_ROOT/bin/obj/x64/Release/
+mkdir --parents $TARBALL_ROOT/bin/obj/$targetArchitecture/Release/
+cp $SCRIPT_ROOT/support/tarball/PackageVersions.props $TARBALL_ROOT/bin/obj/$targetArchitecture/Release/
 
 if [ $INCLUDE_LEAK_DETECTION -eq 1 ]; then
   echo 'Building leak detection MSBuild tasks...'
@@ -270,7 +296,7 @@ fi
 
 echo 'Removing reference-only packages from tarball prebuilts...'
 
-for ref_package in $(find $SCRIPT_ROOT/bin/obj/x64/Release/reference-packages/packages-to-delete/ -name '*.nupkg' | tr '[:upper:]' '[:lower:]')
+for ref_package in $(find $SCRIPT_ROOT/bin/obj/$targetArchitecture/Release/reference-packages/packages-to-delete/ -name '*.nupkg' | tr '[:upper:]' '[:lower:]')
 do
     if [ -e $TARBALL_ROOT/packages/prebuilt/$(basename $ref_package) ]; then
         rm $TARBALL_ROOT/packages/prebuilt/$(basename $ref_package)
@@ -328,7 +354,7 @@ fi
 echo 'Removing source-built, previously source-built packages and reference packages from il pkg src...'
 OLDIFS=$IFS
 
-allBuiltPkgs=(`ls $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/*.nupkg | xargs -n1 basename | tr '[:upper:]' '[:lower:]'`)
+allBuiltPkgs=(`ls $SCRIPT_ROOT/bin/obj/$targetArchitecture/Release/blob-feed/packages/*.nupkg | xargs -n1 basename | tr '[:upper:]' '[:lower:]'`)
 pushd $TARBALL_ROOT/packages/reference/staging/
 ilSrcPaths=(`find . -maxdepth 2 -mindepth 2`)
 popd

diff --git a/dir.props b/dir.props
@@ -2,6 +2,9 @@
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition="$(Configuration) == ''">Release</Configuration>
+
+    <BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
+    <Platform Condition="'$(Platform)' == '' AND '$(BuildArchitecture)' == 'arm64'">$(BuildArchitecture)</Platform>
     <Platform Condition="'$(Platform)' == ''">x64</Platform>
 
     <!-- true if we have bootstrapped buildtools (usually on an unsupported platform -->
@@ -201,7 +204,7 @@
     <ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimePackageVersion" Version="%24(MicrosoftNETCoreDotNetAppHostPackageVersion)" />
     <ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppRuntimeVersion" Version="%24(MicrosoftNETCoreDotNetAppHostPackageVersion)" />
     <ExtraPackageVersionPropsPackageInfo Include="MicrosoftNETCoreAppHostPackageVersion" Version="%24(MicrosoftNETCoreDotNetAppHostPackageVersion)" />
-    <ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimeLinuxX64PackageVersion)" />
+    <ExtraPackageVersionPropsPackageInfo Include="MicrosoftAspNetCoreAppRuntimePackageVersion" Version="%24(MicrosoftAspNetCoreAppRuntimeLinux$(Platform)PackageVersion)" />
     <!-- core-sdk uses this property for ASP.NET blob directory -->
     <ExtraPackageVersionPropsPackageInfo Include="VSRedistCommonAspNetCoreTargetingPackx6430PackageVersion" Version="$(aspnetcoreOutputPackageVersion)" />
     <!-- OSX needs the OSX version instead of Linux.  We don't have a lot of flexibility in how we output these properties so we're relying on the previous one being blank if the Linux version of the package is missing.  -->

diff --git a/patches/aspnetcore/0001-Don-t-call-dotnet-without-path.patch b/patches/aspnetcore/0001-Don-t-call-dotnet-without-path.patch
@@ -1,14 +1,14 @@
-From b7a4992bfa45d3b1c00e095b0b1e7d860b347b50 Mon Sep 17 00:00:00 2001
+From c9ceade354813f98ca291757e7d1657d0959ee4e Mon Sep 17 00:00:00 2001
 From: Chris Rummel <crummel@microsoft.com>
 Date: Wed, 23 Oct 2019 20:04:55 -0500
-Subject: [PATCH 01/10] Don't call dotnet without path
+Subject: [PATCH 01/13] Don't call dotnet without path
 
 ---
  eng/common/tools.sh | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/eng/common/tools.sh b/eng/common/tools.sh
-index 757d5b9..5a4cfeb 100755
+index 757d5b9ea4..5a4cfeb1f0 100755
 --- a/eng/common/tools.sh
 +++ b/eng/common/tools.sh
 @@ -340,9 +340,9 @@ function MSBuild {
@@ -25,5 +25,5 @@ index 757d5b9..5a4cfeb 100755
      local toolset_dir="${_InitializeToolset%/*}"
      local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll"
 -- 
-1.8.3.1
+2.18.0
 
diff --git a/patches/aspnetcore/0002-Use-non-portable-NETCoreAppRuntime-for-crossgen.patch b/patches/aspnetcore/0002-Use-non-portable-NETCoreAppRuntime-for-crossgen.patch
@@ -1,15 +1,15 @@
-From bec8be99172078645255a96cc012a1d2a95da8df Mon Sep 17 00:00:00 2001
+From 528f9457371651668d1923b27cdd5b761f8f2441 Mon Sep 17 00:00:00 2001
 From: dseefeld <dseefeld@microsoft.com>
 Date: Tue, 29 Oct 2019 18:19:03 +0000
-Subject: [PATCH 02/10] Use non-portable NETCoreAppRuntime for crossgen
+Subject: [PATCH 02/13] Use non-portable NETCoreAppRuntime for crossgen
 
 ---
  eng/Dependencies.props                                    | 1 +
  src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj | 6 ++++--
  2 files changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/eng/Dependencies.props b/eng/Dependencies.props
-index 2e11857..b49aee2 100644
+index 2e11857b1b..b49aee2a5c 100644
 --- a/eng/Dependencies.props
 +++ b/eng/Dependencies.props
 @@ -110,6 +110,7 @@ and are generated based on the last package release.
@@ -21,7 +21,7 @@ index 2e11857..b49aee2 100644
 
    <ItemGroup Label=".NET team dependencies (Non-source-build)" Condition="'$(DotNetBuildFromSource)' != 'true'">
 diff --git a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
-index 4c4298a..edad46b 100644
+index 4c4298a92d..edad46be14 100644
 --- a/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
 +++ b/src/Framework/src/Microsoft.AspNetCore.App.Runtime.csproj
 @@ -100,7 +100,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
@@ -45,5 +45,5 @@ index 4c4298a..edad46b 100644
      <ProjectReference Condition="'$(BuildIisNativeProjects)' == 'true' AND '$(BuildNative)' != 'false' AND '$(VCTargetsPath)' != ''" Include="$(RepoRoot)src\Servers\IIS\AspNetCoreModuleV2\InProcessRequestHandler\InProcessRequestHandler.vcxproj">
        <SetPlatform>Platform=$(TargetArchitecture)</SetPlatform>
 -- 
-1.8.3.1
+2.18.0
 
diff --git a/patches/aspnetcore/0003-Conditionally-set-PackAsToolShimRID.patch b/patches/aspnetcore/0003-Conditionally-set-PackAsToolShimRID.patch
@@ -1,14 +1,14 @@
-From f7b62cf3e579babe120deb06be418541c717388c Mon Sep 17 00:00:00 2001
+From 87371172f24562810552567b15890eefc9d57249 Mon Sep 17 00:00:00 2001
 From: dseefeld <dseefeld@microsoft.com>
 Date: Thu, 31 Oct 2019 20:38:26 +0000
-Subject: [PATCH 03/10] Conditionally set PackAsToolShimRID
+Subject: [PATCH 03/13] Conditionally set PackAsToolShimRID
 
 ---
  Directory.Build.targets | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Directory.Build.targets b/Directory.Build.targets
-index db3cea5..518b5e6 100644
+index db3cea59f1..518b5e6246 100644
 --- a/Directory.Build.targets
 +++ b/Directory.Build.targets
 @@ -46,7 +46,7 @@
@@ -21,5 +21,5 @@ index db3cea5..518b5e6 100644
      <PackAsToolShimRuntimeIdentifiers>win-x64;win-x86</PackAsToolShimRuntimeIdentifiers>
    </PropertyGroup>
 -- 
-1.8.3.1
+2.18.0
 
diff --git a/patches/aspnetcore/0004-Exclude-analyzer-for-source-build.patch b/patches/aspnetcore/0004-Exclude-analyzer-for-source-build.patch
@@ -1,14 +1,14 @@
-From ff7c8a971e21f847db4a9f762c6232a859aebbd1 Mon Sep 17 00:00:00 2001
+From bbd6cbebda9e08a49725b66d9130f76469479413 Mon Sep 17 00:00:00 2001
 From: adaggarwal <aditya.aggarwal@microsoft.com>
 Date: Thu, 14 Nov 2019 16:52:25 +0000
-Subject: [PATCH 04/10] Exclude analyzer for source-build
+Subject: [PATCH 04/13] Exclude analyzer for source-build
 
 ---
  Directory.Build.props | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Directory.Build.props b/Directory.Build.props
-index 2fe19bd..0bc8b25 100644
+index 2fe19bde83..0bc8b25ecc 100644
 --- a/Directory.Build.props
 +++ b/Directory.Build.props
 @@ -95,7 +95,7 @@
@@ -21,5 +21,5 @@ index 2fe19bd..0bc8b25 100644
    </ItemGroup>
 
 -- 
-1.8.3.1
+2.18.0
 
diff --git a/patches/aspnetcore/0005-Import-PackageVersions.props.patch b/patches/aspnetcore/0005-Import-PackageVersions.props.patch
@@ -1,17 +1,17 @@
-From 938dad01514f3a4d7bf8f5c8b976cee3d43cdae0 Mon Sep 17 00:00:00 2001
+From 2812263dd785904cf8edd68f258d78d82c3cea59 Mon Sep 17 00:00:00 2001
 From: adaggarwal <aditya.aggarwal@microsoft.com>
 Date: Thu, 14 Nov 2019 16:55:29 +0000
-Subject: [PATCH 05/10] Import PackageVersions.props
+Subject: [PATCH 05/13] Import PackageVersions.props
 
 ---
  eng/Versions.props | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/eng/Versions.props b/eng/Versions.props
-index fd988d1..71384d1 100644
+index a3e611aa4b..37797a5219 100644
 --- a/eng/Versions.props
 +++ b/eng/Versions.props
-@@ -264,6 +264,9 @@
+@@ -267,6 +267,9 @@
      <XunitExtensibilityExecutionPackageVersion>$(XunitVersion)</XunitExtensibilityExecutionPackageVersion>
      <MicrosoftDataSqlClientPackageVersion>1.0.19249.1</MicrosoftDataSqlClientPackageVersion>
    </PropertyGroup>
@@ -22,5 +22,5 @@ index fd988d1..71384d1 100644
    <PropertyGroup Label="Restore feeds">
      <!-- In an orchestrated build, this may be overridden to other Azure feeds. -->
 -- 
-1.8.3.1
+2.18.0
 
diff --git a/patches/aspnetcore/0006-Exclude-some-projects-from-source-build.patch b/patches/aspnetcore/0006-Exclude-some-projects-from-source-build.patch
@@ -1,14 +1,14 @@
-From 8de8ac124fdc61fef00c21aa9f4e03e1eeaa46f1 Mon Sep 17 00:00:00 2001
+From 494311a11525c9ca8ce44cff9d6de39802d1dbc6 Mon Sep 17 00:00:00 2001
 From: adaggarwal <aditya.aggarwal@microsoft.com>
 Date: Thu, 14 Nov 2019 16:57:39 +0000
-Subject: [PATCH 06/10] Exclude some projects from source-build
+Subject: [PATCH 06/13] Exclude some projects from source-build
 
 ---
  Directory.Build.props | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/Directory.Build.props b/Directory.Build.props
-index 0bc8b25..88411a3 100644
+index 0bc8b25ecc..88411a30b2 100644
 --- a/Directory.Build.props
 +++ b/Directory.Build.props
 @@ -18,9 +18,11 @@
@@ -24,5 +24,5 @@ index 0bc8b25..88411a3 100644
      <!--
        Following logic mimics core-setup approach as well as
 -- 
-1.8.3.1
+2.18.0
 
diff --git a/patches/aspnetcore/0007-Fix-version-number.patch b/patches/aspnetcore/0007-Fix-version-number.patch
@@ -1,10 +1,10 @@
-From 68980720c56f0a0b6d85189e77e11937e22a2119 Mon Sep 17 00:00:00 2001
+From e4b686cfdeeb4d921b3c6e5a63283eff8672856e Mon Sep 17 00:00:00 2001
 From: adaggarwal <aditya.aggarwal@microsoft.com>
 Date: Thu, 14 Nov 2019 17:27:30 +0000
-Subject: [PATCH 07/10] Fix version number
+Subject: [PATCH 07/13] Fix version number
 
 ---
- .../Web.JS/dist/Release/blazor.server.js           | Bin 214579 -> 214584 bytes
+ .../Web.JS/dist/Release/blazor.server.js      | Bin 214579 -> 214584 bytes
  1 file changed, 0 insertions(+), 0 deletions(-)
 
 diff --git a/src/Components/Web.JS/dist/Release/blazor.server.js b/src/Components/Web.JS/dist/Release/blazor.server.js
@@ -17,5 +17,5 @@ delta 24
 fcmdnd!@IeMx1oixg=q`3wi`!EYMD}Ptfn;pZdwQU
 
 -- 
-1.8.3.1
+2.18.0
 
diff --git a/patches/aspnetcore/0008-Remove-Yarn-dependency-not-used-in-source-build.patch b/patches/aspnetcore/0008-Remove-Yarn-dependency-not-used-in-source-build.patch
@@ -1,18 +1,18 @@
-From 78a5ac365ba2f82bec480ebba724cf5d60966a91 Mon Sep 17 00:00:00 2001
+From a0ae7e9b334c167943035dff556730d017baa760 Mon Sep 17 00:00:00 2001
 From: adaggarwal <aditya.aggarwal@microsoft.com>
 Date: Thu, 14 Nov 2019 17:34:41 +0000
-Subject: [PATCH 08/10] Remove Yarn dependency - not used in source-build
+Subject: [PATCH 08/13] Remove Yarn dependency - not used in source-build
 
 ---
- eng/targets/Npm.Common.targets                                         | 3 ---
- global.json                                                            | 1 -
- .../NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj          | 3 ---
- src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj | 3 ---
- src/Shared/E2ETesting/E2ETesting.targets                               | 3 ---
+ eng/targets/Npm.Common.targets                                 | 3 ---
+ global.json                                                    | 1 -
+ .../NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj  | 3 ---
+ .../SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj    | 3 ---
+ src/Shared/E2ETesting/E2ETesting.targets                       | 3 ---
  5 files changed, 13 deletions(-)
 
 diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets
-index 062a9d3..3f91b02 100644
+index 062a9d3a8f..3f91b02d42 100644
 --- a/eng/targets/Npm.Common.targets
 +++ b/eng/targets/Npm.Common.targets
 @@ -1,8 +1,5 @@
@@ -25,7 +25,7 @@ index 062a9d3..3f91b02 100644
      <NormalizedPackageId>$(PackageId.Replace('@','').Replace('/','-'))</NormalizedPackageId>
      <PackageFileName>$(NormalizedPackageId)-$(PackageVersion).tgz</PackageFileName>
 diff --git a/global.json b/global.json
-index 17454ad..2f5a03b 100644
+index 17454ad1bf..2f5a03b4b6 100644
 --- a/global.json
 +++ b/global.json
 @@ -24,7 +24,6 @@
@@ -37,7 +37,7 @@ index 17454ad..2f5a03b 100644
      "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19517.3"
    }
 diff --git a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
-index e67862e..29c3b8c 100644
+index e67862ea45..29c3b8c137 100644
 --- a/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
 +++ b/src/Middleware/NodeServices/src/Microsoft.AspNetCore.NodeServices.csproj
 @@ -16,9 +16,6 @@
@@ -51,7 +51,7 @@ index e67862e..29c3b8c 100644
      <Message Text="Running yarn install on $(MSBuildProjectFile)" Importance="High" />
      <Yarn Command="install --mutex network" />
 diff --git a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj
-index 3db479b..ad01493 100644
+index 3db479b01e..ad0149356f 100644
 --- a/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj
 +++ b/src/Middleware/SpaServices/src/Microsoft.AspNetCore.SpaServices.csproj
 @@ -20,9 +20,6 @@
@@ -65,7 +65,7 @@ index 3db479b..ad01493 100644
      <Message Text="Running yarn install on $(MSBuildProjectFile)" Importance="High" />
      <Yarn Command="install --mutex network" />
 diff --git a/src/Shared/E2ETesting/E2ETesting.targets b/src/Shared/E2ETesting/E2ETesting.targets
-index 500d910..2ccf1a4 100644
+index 500d910a30..2ccf1a431c 100644
 --- a/src/Shared/E2ETesting/E2ETesting.targets
 +++ b/src/Shared/E2ETesting/E2ETesting.targets
 @@ -1,7 +1,4 @@
@@ -77,5 +77,5 @@ index 500d910..2ccf1a4 100644
    <ItemGroup>
      <None Update="e2eTestSettings*.json">
 -- 
-1.8.3.1
+2.18.0