[main] Update dependencies from dotnet/installer (#3673)

* Update dependencies from https://github.com/dotnet/installer build 20230217.18

Microsoft.Dotnet.Sdk.Internal
 From Version 8.0.100-preview.2.23113.1 -> To Version 8.0.100-preview.2.23117.18

* Update 8.0 single-file

* Update runtime versions

* Update installer version

* Fix dcd command for .NET 8.0

diff --git a/.gitignore b/.gitignore
index 6c05f8d89c5dd955a89c622f168c7cf692ca47a4..74094e8ce1d56feae10c58e5c75487703ea76a86 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -52,6 +52,9 @@ launchSettings.json
 *.log
 *.scc
 
+# Visual Studio
+.vs/
+
 # Visual C++ cache files
 ipch/
 *.aps

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 575eb464cf1bfb2e3847e0da8de156b81c5442d8..ee3def24df73c599bdbb982a9e527b802a86d0ec 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -23,25 +23,25 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>ccfe6da198c5f05534863bbb1bff66e830e0c6ab</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.2.23113.1">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-preview.2.23124.7">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>0004325188fe0c920870901208d774c8e9ff6753</Sha>
+      <Sha>dc69610af915341dfcb759812ed46acc00e36ae4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.2.23107.2">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="8.0.0-preview.2.23124.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>cec7fbf64e63af88a9165cbbf14aa4ab6f8cc76d</Sha>
+      <Sha>a11fec5fad546a315b4565af534f9efccec010b9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.2.23107.2">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="8.0.0-preview.2.23124.5">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>cec7fbf64e63af88a9165cbbf14aa4ab6f8cc76d</Sha>
+      <Sha>a11fec5fad546a315b4565af534f9efccec010b9</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.2.23107.1">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.0-preview.2.23124.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>e71a4fb10d7ea6b502dd5efe7a8fcefa2b9c1550</Sha>
+      <Sha>9281022e56856094d2bade01908060a7536c3b75</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="8.0.0-preview.2.23107.1">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.0-preview.2.23124.2">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>e71a4fb10d7ea6b502dd5efe7a8fcefa2b9c1550</Sha>
+      <Sha>9281022e56856094d2bade01908060a7536c3b75</Sha>
     </Dependency>
     <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.23123.2">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
index ec3e341b743500003931a63daf8b09418cab5bd8..148e6bc4b235281be9d30782578f6fbcfc01d906 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -18,13 +18,13 @@
     <!-- Latest symstore version updated by darc -->
     <MicrosoftSymbolStoreVersion>1.0.412101</MicrosoftSymbolStoreVersion>
     <!-- Latest shared runtime version updated by darc -->
-    <VSRedistCommonNetCoreSharedFrameworkx6480Version>8.0.0-preview.2.23107.1</VSRedistCommonNetCoreSharedFrameworkx6480Version>
-    <MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.2.23107.1</MicrosoftNETCoreAppRuntimewinx64Version>
+    <VSRedistCommonNetCoreSharedFrameworkx6480Version>8.0.0-preview.2.23124.2</VSRedistCommonNetCoreSharedFrameworkx6480Version>
+    <MicrosoftNETCoreAppRuntimewinx64Version>8.0.0-preview.2.23124.2</MicrosoftNETCoreAppRuntimewinx64Version>
     <!-- Latest shared aspnetcore version updated by darc -->
-    <MicrosoftAspNetCoreAppRefInternalVersion>8.0.0-preview.2.23107.2</MicrosoftAspNetCoreAppRefInternalVersion>
-    <MicrosoftAspNetCoreAppRefVersion>8.0.0-preview.2.23107.2</MicrosoftAspNetCoreAppRefVersion>
+    <MicrosoftAspNetCoreAppRefInternalVersion>8.0.0-preview.2.23124.5</MicrosoftAspNetCoreAppRefInternalVersion>
+    <MicrosoftAspNetCoreAppRefVersion>8.0.0-preview.2.23124.5</MicrosoftAspNetCoreAppRefVersion>
     <!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
-    <MicrosoftDotnetSdkInternalVersion>8.0.100-preview.2.23113.1</MicrosoftDotnetSdkInternalVersion>
+    <MicrosoftDotnetSdkInternalVersion>8.0.100-preview.2.23124.7</MicrosoftDotnetSdkInternalVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Runtime versions to test -->
@@ -35,7 +35,7 @@
     <!-- The SDK runtime version used to build single-file apps (currently hardcoded) -->
     <SingleFileRuntime60Version>$(MicrosoftNETCoreApp60Version)</SingleFileRuntime60Version>
     <SingleFileRuntime70Version>$(MicrosoftNETCoreApp70Version)</SingleFileRuntime70Version>
-    <SingleFileRuntimeLatestVersion>8.0.0-preview.2.23107.1</SingleFileRuntimeLatestVersion>
+    <SingleFileRuntimeLatestVersion>8.0.0-preview.2.23124.2</SingleFileRuntimeLatestVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Opt-in/out repo features -->

diff --git a/src/Microsoft.Diagnostics.ExtensionCommands/ClrMDHelper.cs b/src/Microsoft.Diagnostics.ExtensionCommands/ClrMDHelper.cs
index 74dcadbc7770b9d1fa3717d78f937190f8d591a9..e194fe476286410e04b76c126d2d36608a756728 100644 (file)
--- a/src/Microsoft.Diagnostics.ExtensionCommands/ClrMDHelper.cs
+++ b/src/Microsoft.Diagnostics.ExtensionCommands/ClrMDHelper.cs
@@ -664,7 +664,7 @@ namespace Microsoft.Diagnostics.ExtensionCommands
 
             var cd = _heap.GetObject(address);
             if (!cd.IsValid)
-                throw new InvalidOperationException("Adress does not correspond to a ConcurrentDictionary");
+                throw new InvalidOperationException("Address does not correspond to a ConcurrentDictionary");
             var tables = cd.ReadObjectField(tablesFieldName);
             if (!tables.IsValid)
                 throw new InvalidOperationException($"ConcurrentDictionary does not own {tablesFieldName} attribute");
@@ -675,8 +675,21 @@ namespace Microsoft.Diagnostics.ExtensionCommands
 
             for (int i = 0; i < bucketsArray.Length; i++)
             {
-                var node = bucketsArray.GetObjectValue(i);
-                IAddressableTypedEntity keyField = null, valueField = null;
+                ClrObject node;
+                // This field is only in .NET 8 and above. Currently can't use "_clr.ClrInfo.Version.Major >= 8" because
+                // this version isn't the runtime version for single-file apps.
+                if (cd.Type?.GetFieldByName("_comparerIsDefaultForClasses") != null)
+                {
+                    // On .NET 8 or more, the array entry is a VolatileNode wrapper (struct)
+                    ClrValueType volatileNode = bucketsArray.GetStructValue(i);
+                    node = volatileNode.ReadObjectField("_node");
+                }
+                else
+                {
+                    // For older runtimes, the array entry is the Node object
+                    node = bucketsArray.GetObjectValue(i);
+                }
+                IAddressableTypedEntity keyField, valueField;
                 if (!node.IsNull && node.IsValid)
                 {
                     keyField = node.GetFieldFrom(keyFieldName);