From 0e7109c16e2685f92adf25143e61e317e017dca9 Mon Sep 17 00:00:00 2001
From: Sarah Oslund <sfoslund@microsoft.com>
Date: Mon, 30 Mar 2020 14:28:22 -0700
Subject: [PATCH] Adding crossgen support for win-arm64 builds

---
 src/redist/targets/Crossgen.targets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets
index 08f81dae7..b33431c73 100644
--- a/src/redist/targets/Crossgen.targets
+++ b/src/redist/targets/Crossgen.targets
@@ -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 -->