Merge pull request #6976 from sfoslund/WinArm64CrossGen

Adding crossgen support for win-arm64 builds
This commit is contained in:
Sarah Oslund 2020-03-31 11:01:40 -07:00 committed by GitHub
commit d355285fc2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,6 +1,6 @@
<Project>
<Target Name="CrossgenLayout"
Condition="'$(DISABLE_CROSSGEN)' == '' and !('$(Architecture)' == 'arm64' and '$(OSName)' == 'win')"
Condition="'$(DISABLE_CROSSGEN)' == ''"
DependsOnTargets="SetSdkBrandingInfo">
<PropertyGroup>
@ -17,6 +17,7 @@
<SharedFrameworkNameVersionPath>$(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedFrameworkNameVersionPath>
<DIASymReaderCrossgenFilter>*</DIASymReaderCrossgenFilter>
<DIASymReaderCrossgenFilter Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'win'">x86</DIASymReaderCrossgenFilter>
<DIASymReaderCrossgenFilter Condition="'$(Architecture)' == 'arm64' And '$(OSName)' == 'win'">amd64</DIASymReaderCrossgenFilter>
</PropertyGroup>
<!-- Download the runtime package with the crossgen executable in it -->