mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #6740 from sfoslund/WinArm64Build

Browse source 
Add Win-arm64 Leg
This commit is contained in:
Sarah Oslund 2020-03-11 01:32:00 +08:00 committed by GitHub
commit 6f9a146a06
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.vsts-ci.yml
View file

@ -68,6 +68,10 @@ stages:
_BuildConfig: Release
_BuildArchitecture: arm
_DOTNET_CLI_UI_LANGUAGE: ''
Build_Release_arm64:
_BuildConfig: Release
_BuildArchitecture: arm64
_DOTNET_CLI_UI_LANGUAGE: ''
- template: /eng/build.yml
parameters:

2
src/redist/targets/Crossgen.targets
View file

@ -1,6 +1,6 @@
<Project>
<Target Name="CrossgenLayout"
Condition="'$(DISABLE_CROSSGEN)' == ''"
Condition="'$(DISABLE_CROSSGEN)' == '' and !('$(Architecture)' == 'arm64' and '$(OSName)' == 'win')"
DependsOnTargets="SetSdkBrandingInfo">
<PropertyGroup>

2
src/redist/targets/GenerateLayout.targets
View file

@ -283,7 +283,7 @@
<PropertyGroup>
<IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' AND '$(Architecture)' == 'arm'">false</IncludeWpfAndWinForms>
<IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' AND '$(OS)' == 'Windows_NT' ">true</IncludeWpfAndWinForms>
<IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' AND '$(OS)' == 'Windows_NT' AND '$(Architecture)' != 'arm64' ">true</IncludeWpfAndWinForms>
<IncludeWpfAndWinForms Condition=" '$(IncludeWpfAndWinForms)' == '' ">false</IncludeWpfAndWinForms>
</PropertyGroup>