diff --git a/Directory.Build.props b/Directory.Build.props
index a53af2f09f..1c44287295 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -94,7 +94,9 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <TargetArchitecture  Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
+    <HostArch>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture)</HostArch>
+    <TargetArchitecture Condition="'$(TargetArchitecture)' == '' AND '$(HostArch)' == 'Arm64'">arm64</TargetArchitecture>
+    <TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
     <Platform Condition="'$(Platform)'==''">$(TargetArchitecture)</Platform>
   </PropertyGroup>
   <!--
@@ -398,4 +400,4 @@
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
   </PropertyGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/eng/Versions.props b/eng/Versions.props
index 6459d2a6ce..4066bcf8a7 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -87,7 +87,7 @@
     <MicrosoftTargetingPackPrivateWinRTPackageVersion>1.0.5</MicrosoftTargetingPackPrivateWinRTPackageVersion>
     <MicrosoftDiaSymReaderNativePackageVersion>1.7.0</MicrosoftDiaSymReaderNativePackageVersion>
     <!-- Infrastructure and test-only. -->
-    <MicrosoftSourceLinkVersion>1.0.0-beta2-18618-05</MicrosoftSourceLinkVersion>
+    <MicrosoftSourceLinkVersion>1.0.0-beta2-19367-01</MicrosoftSourceLinkVersion>
   </PropertyGroup>
   <!--Package names-->
   <PropertyGroup>
diff --git a/src/pkg/packaging-tools/framework.dependency.targets b/src/pkg/packaging-tools/framework.dependency.targets
index a77fd888df..14160faaa4 100644
--- a/src/pkg/packaging-tools/framework.dependency.targets
+++ b/src/pkg/packaging-tools/framework.dependency.targets
@@ -217,7 +217,8 @@
     <PropertyGroup>
       <_crossDir Condition="'$(TargetArchitecture)' == 'arm' AND '$(OS)' == 'Windows_NT'">/x86_arm</_crossDir>
       <_crossDir Condition="'$(TargetArchitecture)' == 'arm' AND '$(OS)' != 'Windows_NT'">/x64_arm</_crossDir>
-      <_crossDir Condition="'$(TargetArchitecture)' == 'arm64'">/x64_arm64</_crossDir>
+      <!-- Only use x64_arm64 when cross compiling. Use normal executible when compiling on arm64 itself. -->
+      <_crossDir Condition="'$(TargetArchitecture)' == 'arm64' AND '$(HostArch)' != 'Arm64'">/x64_arm64</_crossDir>
     </PropertyGroup>
 
     <ItemGroup>
@@ -251,10 +252,26 @@
     </PropertyGroup>
 
     <PropertyGroup Condition="'@(_runtimeJIT)' != ''">
-      <_jitPath>%(_runtimeJIT.FullPath)</_jitPath>
+      <_runtimeJITFilterDir>$([System.IO.Path]::DirectorySeparatorChar)$(PackageRID)$([System.IO.Path]::DirectorySeparatorChar)</_runtimeJITFilterDir>
+    </PropertyGroup>
+
+    <!-- It is possible for _runtimeJIT to pick up 2 jit files:
+         one for cross compilation and one for native compilation. -->
+    <ItemGroup Condition="'@(_runtimeJIT)' != '' AND '$(_crossDir)' == ''">
+      <_filteredRuntimeJIT Include="%(_runtimeJIT.Identity)" Condition="'@(_runtimeJIT->Contains($(_runtimeJITFilterDir)))' == 'True'" />
+    </ItemGroup>
+
+    <PropertyGroup Condition="'@(_runtimeJIT)' != ''">
+      <_jitPath>%(_filteredRuntimeJIT.FullPath)</_jitPath>
       <_jitPath Condition="'$(_crossDir)' != ''">$(_jitPackageDir)runtimes$(_crossDir)/native/$(LibraryFilePrefix)clrjit$(LibraryFileExtension)</_jitPath>
     </PropertyGroup>
 
+    <Message Importance="high" Text="XXX ### *** === +++ This is PackageRID: $(PackageRID)"/>
+    <Message Importance="high" Text="XXX ### *** === +++ This is _runtimeJIT: @(_runtimeJIT)"/>
+    <Message Importance="high" Text="XXX ### *** === +++ This is _runtimeJITFilterDir: $(_runtimeJITFilterDir)"/>
+    <Message Importance="high" Text="XXX ### *** === +++ This is _filteredRuntimeJIT: @(_filteredRuntimeJIT)"/>
+    <Message Importance="high" Text="XXX ### *** === +++ This is _jitPath: $(_jitPath)"/>
+
     <PropertyGroup Condition="'@(_fxSystemRuntime)' != ''">
       <_fxLibDirectory>%(_fxSystemRuntime.RootDir)%(_fxSystemRuntime.Directory)</_fxLibDirectory>
     </PropertyGroup>