diff --git a/Directory.Build.props b/Directory.Build.props
index b65a724102f5..b708ec7233bc 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -7,6 +7,12 @@
MIT
+
+ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())
+ x64
+ $(HostArch)
+
+
True
embedded
diff --git a/eng/Versions.props b/eng/Versions.props
index 344a325bf7ba..37e478e72da5 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -87,7 +87,7 @@
$(BuildTasksFeedToolVersion)
2.0.0
15.8.0
- 1.0.0-beta2-18618-05
+ 1.0.0-beta2-19367-01
diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets
index 8d3091307042..543a5ccc16e0 100644
--- a/src/redist/targets/Crossgen.targets
+++ b/src/redist/targets/Crossgen.targets
@@ -5,14 +5,14 @@
runtime.$(SharedFrameworkRid).microsoft.netcore.app
- <_crossDir Condition="'$(Architecture)' == 'arm64'">/x64_arm64
+ <_crossDir Condition="'$(Architecture)' == 'arm64' and '$(HostArch)' == 'x64'">/x64_arm64
<_crossDir Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'win'">/x86_arm
<_crossDir Condition="'$(Architecture)' == 'arm' And '$(OSName)' == 'linux'">/x64_arm
$(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/tools$(_crossDir)/crossgen$(ExeExtension)
- $(SharedFrameworkRid)
- x64_arm64
+ x64_arm64
x86_arm
x64_arm
+ $(SharedFrameworkRid)
$(NuGetPackageRoot)/$(RuntimeNETCoreAppPackageName)/$(MicrosoftNETCoreAppPackageVersion)/runtimes/$(LibCLRJitRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)
$(RedistLayoutPath)shared/$(SharedFrameworkName)/$(MicrosoftNETCoreAppPackageVersion)
*