Fix Windows x86 and arm build. (#1330)

Fix Windows x86 and arm build.

Enabled Windows x86 build in public CI to catch these kind of problems.

Add x86 3.1.5 runtime install to fix dotnet monitor tests

diagnostics.yml

@@ -94,11 +94,11 @@ stages:
               _BuildConfig: Release
               _BuildArch: x64
               _PublishArtifacts: bin
+            Build_Release_x86:
+              _BuildConfig: Release
+              _BuildArch: x86
+              _PublishArtifacts: bin/Windows_NT.x86.Release
             ${{ if ne(variables['System.TeamProject'], 'public') }}:
-              Build_Release_x86:
-                _BuildConfig: Release
-                _BuildArch: x86
-                _PublishArtifacts: bin/Windows_NT.x86.Release
               Build_Release_arm:
                 _BuildOnly: true
                 _BuildConfig: Release

eng/Versions.props

@@ -12,7 +12,7 @@
     <!-- Runtime versions to test -->
     <MicrosoftNETCoreApp21Version>2.1.18</MicrosoftNETCoreApp21Version>
     <MicrosoftAspNetCoreApp21Version>$(MicrosoftNETCoreApp21Version)</MicrosoftAspNetCoreApp21Version>
-    <MicrosoftNETCoreApp31Version>3.1.4</MicrosoftNETCoreApp31Version>
+    <MicrosoftNETCoreApp31Version>3.1.5</MicrosoftNETCoreApp31Version>
     <MicrosoftAspNetCoreApp31Version>$(MicrosoftNETCoreApp31Version)</MicrosoftAspNetCoreApp31Version>
     <!-- Latest shared runtime version updated by darc -->
     <MicrosoftNETCoreAppVersion>5.0.0-preview.8.20358.9</MicrosoftNETCoreAppVersion>

global.json

@@ -2,8 +2,11 @@
   "tools": {
     "dotnet": "5.0.100-preview.6.20310.4",
     "runtimes": {
-      "dotnet": [
-        "3.1.4"
+      "dotnet/x64": [
+        "3.1.5"
+      ],
+      "dotnet/x86": [
+        "3.1.5"
       ]
     }
   },

src/SOS/Strike/strike.cpp

@@ -1678,7 +1678,7 @@ HRESULT PrintALC(TADDR taObj)
         return S_OK;
     }
 
-    return PrintObj(assemblyLoadContext);
+    return PrintObj(TO_TADDR(assemblyLoadContext));
 }
 
 BOOL IndicesInRange (DWORD * indices, DWORD * lowerBounds, DWORD * bounds, DWORD rank)