Skip to content

Commit 05f58bb

Browse files
author
John Luo
committed
Build aspnetcore for win-arm64 (#19317)
* Build for win-arm64 * Missed file * Disable Selenium tests on arm64 * Include installers in the uploaded artifacts
1 parent 1b99352 commit 05f58bb

File tree

6 files changed

+39
-3
lines changed

6 files changed

+39
-3
lines changed

.azure/pipelines/ci.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,38 @@ stages:
250250
- name: Windows_arm_Packages
251251
path: artifacts/packages/
252252

253+
# Build Windows ARM64
254+
- template: jobs/default-build.yml
255+
parameters:
256+
codeSign: true
257+
jobName: Windows_64_build
258+
jobDisplayName: "Build: Windows ARM64"
259+
agentOs: Windows
260+
buildArgs:
261+
-arch arm64
262+
-sign
263+
-pack
264+
-noBuildNodeJS
265+
-noBuildJava
266+
/bl:artifacts/log/build.win-arm64.binlog
267+
/p:DotNetSignType=$(_SignType)
268+
/p:OnlyPackPlatformSpecificPackages=true
269+
/p:AssetManifestFileName=aspnetcore-win-arm64.xml
270+
$(_BuildArgs)
271+
$(_PublishArgs)
272+
$(_InternalRuntimeDownloadArgs)
273+
installNodeJs: false
274+
installJdk: false
275+
artifacts:
276+
- name: Windows_arm64_Logs
277+
path: artifacts/log/
278+
publishOnError: true
279+
includeForks: true
280+
- name: Windows_arm64_Packages
281+
path: artifacts/packages/
282+
- name: Windows_arm64_Installers
283+
path: artifacts/installers/
284+
253285
# Build MacOS
254286
- template: jobs/default-build.yml
255287
parameters:

Directory.Build.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
win-x64;
116116
win-x86;
117117
win-arm;
118+
win-arm64;
118119
osx-x64;
119120
linux-musl-x64;
120121
linux-musl-arm64;

build.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ param(
118118
[ValidateSet('Debug', 'Release')]
119119
$Configuration,
120120

121-
[ValidateSet('x64', 'x86', 'arm')]
121+
[ValidateSet('x64', 'x86', 'arm', 'arm64')]
122122
$Architecture = 'x64',
123123

124124
# A list of projects which should be built.
@@ -157,7 +157,7 @@ param(
157157

158158
# Other lifecycle targets
159159
[switch]$Help, # Show help
160-
160+
161161
# Optional arguments that enable downloading an internal
162162
# runtime or runtime from a non-default location
163163
[string]$DotNetRuntimeSourceFeed,

eng/Dependencies.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ and are generated based on the last package release.
107107
<LatestPackageReference Include="microsoft.netcore.app.runtime.win-x64" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
108108
<LatestPackageReference Include="microsoft.netcore.app.runtime.win-x86" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
109109
<LatestPackageReference Include="microsoft.netcore.app.runtime.win-arm" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
110+
<LatestPackageReference Include="microsoft.netcore.app.runtime.win-arm64" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
110111
<LatestPackageReference Include="microsoft.netcore.app.runtime.osx-x64" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
111112
<LatestPackageReference Include="microsoft.netcore.app.runtime.linux-x64" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />
112113
<LatestPackageReference Include="microsoft.netcore.app.runtime.linux-arm" Version="$(MicrosoftNETCoreAppRuntimeVersion)" />

eng/Signing.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,11 @@
9393
<_DotNetFilesToExclude Include="$(BaseRedistNetCorePath)win-x64\shared\Microsoft.NETCore.App\**\*.dll" CertificateName="None" />
9494
<_DotNetFilesToExclude Include="$(BaseRedistNetCorePath)win-x86\shared\Microsoft.NETCore.App\**\*.dll" CertificateName="None" />
9595
<_DotNetFilesToExclude Include="$(BaseRedistNetCorePath)win-arm\shared\Microsoft.NETCore.App\**\*.dll" CertificateName="None" />
96+
<_DotNetFilesToExclude Include="$(BaseRedistNetCorePath)win-arm64\shared\Microsoft.NETCore.App\**\*.dll" CertificateName="None" />
9697
<_DotNetFilesToExclude Include="$(BaseRedistNetCorePath)win-x64\host\**\*.dll" CertificateName="None" />
9798
<_DotNetFilesToExclude Include="$(BaseRedistNetCorePath)win-x86\host\**\*.dll" CertificateName="None" />
9899
<_DotNetFilesToExclude Include="$(BaseRedistNetCorePath)win-arm\host\**\*.dll" CertificateName="None" />
100+
<_DotNetFilesToExclude Include="$(BaseRedistNetCorePath)win-arm64\host\**\*.dll" CertificateName="None" />
99101
<_DotNetFilesToExclude Include="$(RedistNetCorePath)dotnet.exe" CertificateName="None" />
100102
<FileSignInfo Include="@(_DotNetFilesToExclude->'%(FileName)%(Extension)'->Distinct())" CertificateName="None" />
101103

src/Shared/E2ETesting/E2ETesting.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<DefaultItemExcludes>$(DefaultItemExcludes);node_modules\**</DefaultItemExcludes>
55
<SeleniumScreenShotsFolderPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsTestResultsDir)','$(MSBuildProjectName)'))</SeleniumScreenShotsFolderPath>
66
<SeleniumProcessTrackingFolder Condition="'$(SeleniumProcessTrackingFolder)' == ''">$([MSBuild]::EnsureTrailingSlash('$(RepoRoot)'))artifacts\tmp\selenium\</SeleniumProcessTrackingFolder>
7-
<SeleniumE2ETestsSupported Condition="'$(SeleniumE2ETestsSupported)' == '' and '$(TargetArchitecture)' != 'arm' and '$(OS)' == 'Windows_NT'">true</SeleniumE2ETestsSupported>
7+
<SeleniumE2ETestsSupported Condition="'$(SeleniumE2ETestsSupported)' == '' and '$(TargetArchitecture)' != 'arm' and '$(TargetArchitecture)' != 'arm64' and '$(OS)' == 'Windows_NT'">true</SeleniumE2ETestsSupported>
88

99
<!-- We want to enforce prerequisites when we build from the CI or within Visual Studio -->
1010
<EnforcedE2EBuildEnvironment Condition="'$(ContinuousIntegrationBuild)' == 'true' or '$(BuildingInsideVisualStudio)' == 'true'">true</EnforcedE2EBuildEnvironment>

0 commit comments

Comments
 (0)