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

This pull request updates the following dependencies

[marker]: <> (Begin:638f1194-0c1a-4d47-eb59-08d8e4d5099b)
## From https://github.com/dotnet/installer
- **Subscription**: 638f1194-0c1a-4d47-eb59-08d8e4d5099b
- **Build**: 20240415.2
- **Date Produced**: April 15, 2024 9:47:40 AM UTC
- **Commit**: 7380c301c1ce7d022dd365dd78c4004a2881edaf
- **Branch**: refs/heads/main

[DependencyUpdate]: <> (Begin)

- **Updates**:
- **Microsoft.Dotnet.Sdk.Internal**: [from 9.0.100-preview.3.24161.2 to
9.0.100-preview.4.24215.2][5]

[5]: https://github.com/dotnet/installer/compare/e911f5c82c...7380c301c1

[DependencyUpdate]: <> (End)

[marker]: <> (End:638f1194-0c1a-4d47-eb59-08d8e4d5099b)

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Mike McLaughlin <mikem@microsoft.com>

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 2ce2e0e383a46916b886d9345d933947531eacd5..63deab222102e4122b8a2b4d70968d6002026c54 100644 (file)
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -28,9 +28,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>ccfe6da198c5f05534863bbb1bff66e830e0c6ab</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.3.24161.2">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.4.24215.2">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>e911f5c82cc02aea96e227596e16c830d54cf03a</Sha>
+      <Sha>7380c301c1ce7d022dd365dd78c4004a2881edaf</Sha>
     </Dependency>
     <Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="9.0.0-preview.4.24216.3">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>

diff --git a/eng/Versions.props b/eng/Versions.props
index a06e01e97fa909c4f9d45b7edff5bfd16a0248cd..9b07d24c9fe5e1bc4800913d1e1e6aab19253a50 100644 (file)
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -22,7 +22,7 @@
     <MicrosoftAspNetCoreAppRefInternalVersion>9.0.0-preview.4.24216.3</MicrosoftAspNetCoreAppRefInternalVersion>
     <MicrosoftAspNetCoreAppRefVersion>9.0.0-preview.4.24216.3</MicrosoftAspNetCoreAppRefVersion>
     <!-- dotnet/installer: Testing version of the SDK. Needed for the signed & entitled host. -->
-    <MicrosoftDotnetSdkInternalVersion>9.0.100-preview.3.24161.2</MicrosoftDotnetSdkInternalVersion>
+    <MicrosoftDotnetSdkInternalVersion>9.0.100-preview.4.24215.2</MicrosoftDotnetSdkInternalVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Runtime versions to test -->
@@ -119,16 +119,16 @@
   </PropertyGroup>
   <ItemGroup Condition="!$(InternalReleaseTesting)">
     <RuntimeTestVersions Include="Latest">
-      <!--
+<!--
       <RuntimeDownload>$(VSRedistCommonNetCoreSharedFrameworkx6490Version)</RuntimeDownload>
       <Runtime>$(MicrosoftNETCoreAppRuntimewinx64Version)</Runtime>
       <AspNetDownload>$(MicrosoftAspNetCoreAppRefInternalVersion)</AspNetDownload>
       <AspNet>$(MicrosoftAspNetCoreAppRefVersion)</AspNet>
-      -->
-      <RuntimeDownload>9.0.0-preview.3.24160.3</RuntimeDownload>
-      <Runtime>9.0.0-preview.3.24160.3</Runtime>
-      <AspNetDownload>9.0.0-preview.3.24158.2</AspNetDownload>
-      <AspNet>9.0.0-preview.3.24158.2</AspNet>
+-->
+      <RuntimeDownload>9.0.0-preview.4.24211.4</RuntimeDownload>
+      <Runtime>9.0.0-preview.4.24211.4</Runtime>
+      <AspNetDownload>9.0.0-preview.4.24213.1</AspNetDownload>
+      <AspNet>9.0.0-preview.4.24213.1</AspNet>
       <TargetFramework>net9.0</TargetFramework>
     </RuntimeTestVersions>
     <RuntimeTestVersions Include="Servicing1">

diff --git a/src/SOS/SOS.UnitTests/DumpGenerationFixture.cs b/src/SOS/SOS.UnitTests/DumpGenerationFixture.cs
index 3f8cd398d06d48e23638ea50a197d153aee77ab0..6eef51886a64b7ebf50feb9a16c6d878509424f7 100644 (file)
--- a/src/SOS/SOS.UnitTests/DumpGenerationFixture.cs
+++ b/src/SOS/SOS.UnitTests/DumpGenerationFixture.cs
@@ -15,6 +15,8 @@ public class DumpGenerationFixture : IDisposable
     private static readonly string _nodePath = _root + @"Microsoft\Windows NT\CurrentVersion\";
     private static readonly string _auxiliaryNode = _nodePath + "MiniDumpAuxiliaryDlls";
     private static readonly string _knownNode = _nodePath + "KnownManagedDebuggingDlls";
+    private static readonly string _settingsNode = _nodePath + "MiniDumpSettings";
+    private static readonly string _disableCheckValue = "DisableAuxProviderSignatureCheck";
 
     private HashSet<string> _paths;
 
@@ -22,6 +24,16 @@ public class DumpGenerationFixture : IDisposable
     {
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
+            // Create the key for the newer Windows (11 or greater) 
+            try
+            {
+                using RegistryKey settingsKey = Registry.LocalMachine.CreateSubKey(_settingsNode, writable: true);
+                settingsKey.SetValue(_disableCheckValue, 1, RegistryValueKind.DWord);
+            }
+            catch (Exception ex) when (ex is UnauthorizedAccessException)
+            {
+            }
+
             // Create a unique list of all the runtime paths used by the tests
             HashSet<string> paths = new();
             foreach (TestConfiguration config in TestRunConfiguration.Instance.Configurations)
@@ -36,6 +48,7 @@ public class DumpGenerationFixture : IDisposable
                 }
             }
 
+            // Now try to create the keys for the older Windows versions 
             try
             {
                 using RegistryKey auxiliaryKey = Registry.LocalMachine.CreateSubKey(_auxiliaryNode, writable: true);
@@ -50,7 +63,7 @@ public class DumpGenerationFixture : IDisposable
                 }
 
                 // Save the paths after writing them successfully to registry
-                _paths = paths;
+               _paths = paths;
             }
             catch (Exception ex) when (ex is UnauthorizedAccessException)
             {

diff --git a/src/SOS/SOS.UnitTests/SOSRunner.cs b/src/SOS/SOS.UnitTests/SOSRunner.cs
index 4a6c815893e7011e1bf87966673719df4b8a9d3f..76fcfad6414ff7a436b2d7f4dde50a3baf94f0d5 100644 (file)
--- a/src/SOS/SOS.UnitTests/SOSRunner.cs
+++ b/src/SOS/SOS.UnitTests/SOSRunner.cs
@@ -320,6 +320,7 @@ public class SOSRunner : IDisposable
                 ProcessRunner processRunner = new ProcessRunner(exePath, ReplaceVariables(variables, arguments.ToString())).
                     WithEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0").
                     WithEnvironmentVariable("DOTNET_ROOT", config.DotNetRoot).
+                    WithEnvironmentVariable("DOTNET_LegacyExceptionHandling", "1").
                     WithRuntimeConfiguration("DbgEnableElfDumpOnMacOS", "1").
                     WithLog(new TestRunner.TestLogger(outputHelper.IndentedOutput)).
                     WithTimeout(TimeSpan.FromMinutes(10));
@@ -679,6 +680,7 @@ public class SOSRunner : IDisposable
             ProcessRunner processRunner = new ProcessRunner(debuggerPath, ReplaceVariables(variables, arguments.ToString())).
                 WithEnvironmentVariable("DOTNET_MULTILEVEL_LOOKUP", "0").
                 WithEnvironmentVariable("DOTNET_ROOT", config.DotNetRoot).
+                WithEnvironmentVariable("DOTNET_LegacyExceptionHandling", "1").
                 WithLog(scriptLogger).
                 WithTimeout(TimeSpan.FromMinutes(10));