Enable building on arm64 #1300
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| From c9ceade354813f98ca291757e7d1657d0959ee4e Mon Sep 17 00:00:00 2001 | ||
| From: Chris Rummel <[email protected]> | ||
| Date: Wed, 23 Oct 2019 20:04:55 -0500 | ||
| 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 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" | ||
| -- | ||
| 2.18.0 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| From 528f9457371651668d1923b27cdd5b761f8f2441 Mon Sep 17 00:00:00 2001 | ||
| From: dseefeld <[email protected]> | ||
| Date: Tue, 29 Oct 2019 18:19:03 +0000 | ||
| 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 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 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> | ||
| -- | ||
| 2.18.0 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| From 87371172f24562810552567b15890eefc9d57249 Mon Sep 17 00:00:00 2001 | ||
| From: dseefeld <[email protected]> | ||
| Date: Thu, 31 Oct 2019 20:38:26 +0000 | ||
| 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 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> | ||
| -- | ||
| 2.18.0 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| From bbd6cbebda9e08a49725b66d9130f76469479413 Mon Sep 17 00:00:00 2001 | ||
| From: adaggarwal <[email protected]> | ||
| Date: Thu, 14 Nov 2019 16:52:25 +0000 | ||
| 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 2fe19bde83..0bc8b25ecc 100644 | ||
| --- a/Directory.Build.props | ||
| +++ b/Directory.Build.props | ||
| @@ -95,7 +95,7 @@ | ||
|
|
@@ -21,5 +21,5 @@ index 2fe19bd..0bc8b25 100644 | |
| </ItemGroup> | ||
|
|
||
| -- | ||
| 2.18.0 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| From 2812263dd785904cf8edd68f258d78d82c3cea59 Mon Sep 17 00:00:00 2001 | ||
| From: adaggarwal <[email protected]> | ||
| Date: Thu, 14 Nov 2019 16:55:29 +0000 | ||
| 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 a3e611aa4b..37797a5219 100644 | ||
| --- a/eng/Versions.props | ||
| +++ b/eng/Versions.props | ||
| @@ -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. --> | ||
| -- | ||
| 2.18.0 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| From 494311a11525c9ca8ce44cff9d6de39802d1dbc6 Mon Sep 17 00:00:00 2001 | ||
| From: adaggarwal <[email protected]> | ||
| Date: Thu, 14 Nov 2019 16:57:39 +0000 | ||
| 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 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 | ||
| -- | ||
| 2.18.0 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| From e4b686cfdeeb4d921b3c6e5a63283eff8672856e Mon Sep 17 00:00:00 2001 | ||
| From: adaggarwal <[email protected]> | ||
| Date: Thu, 14 Nov 2019 17:27:30 +0000 | ||
| Subject: [PATCH 07/13] Fix version number | ||
|
|
||
| --- | ||
| .../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 | ||
|
|
||
| -- | ||
| 2.18.0 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,18 @@ | ||
| From a0ae7e9b334c167943035dff556730d017baa760 Mon Sep 17 00:00:00 2001 | ||
| From: adaggarwal <[email protected]> | ||
| Date: Thu, 14 Nov 2019 17:34:41 +0000 | ||
| 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 --- | ||
| .../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 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 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 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 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 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"> | ||
| -- | ||
| 2.18.0 | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I got this chunk from here: dotnet/arcade#4132