Adding support for win arm64 builds

This commit is contained in:
sfoslund 2020-03-06 15:51:55 -08:00
parent 2805fe968a
commit 660fd7a768
3 changed files with 6 additions and 2 deletions

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:

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>

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>