From 592039f9ede5cfe8e4baa42405e6a5099e6a562e Mon Sep 17 00:00:00 2001
From: Mike McLaughlin <mikem@microsoft.com>
Date: Tue, 23 Apr 2024 23:56:34 -0700
Subject: [PATCH] Fix SOS unit tests dump generation fixture (#4636)

---
 eng/Versions.props                            |  6 --
 .../Windows/Debugger.Tests.Config.txt         |  1 +
 .../SOS.UnitTests/DumpGenerationFixture.cs    | 55 ++++++++++++-------
 3 files changed, 37 insertions(+), 25 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index bf2bab28bf..b1c1e61a66 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -119,16 +119,10 @@
   </PropertyGroup>
   <ItemGroup Condition="!$(InternalReleaseTesting)">
     <RuntimeTestVersions Include="Latest">
-      <!--
       <RuntimeDownload>$(VSRedistCommonNetCoreSharedFrameworkx6490Version)</RuntimeDownload>
       <Runtime>$(MicrosoftNETCoreAppRuntimewinx64Version)</Runtime>
       <AspNetDownload>$(MicrosoftAspNetCoreAppRefInternalVersion)</AspNetDownload>
       <AspNet>$(MicrosoftAspNetCoreAppRefVersion)</AspNet>
--->
-      <RuntimeDownload>9.0.0-preview.4.24218.7</RuntimeDownload>
-      <Runtime>9.0.0-preview.4.24218.7</Runtime>
-      <AspNetDownload>9.0.0-preview.4.24218.1</AspNetDownload>
-      <AspNet>9.0.0-preview.4.24218.1</AspNet>
       <TargetFramework>net9.0</TargetFramework>
     </RuntimeTestVersions>
     <RuntimeTestVersions Include="Servicing1">
diff --git a/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt
index 012780602c..7a46c13e08 100644
--- a/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt
+++ b/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt
@@ -21,6 +21,7 @@
   <LogDir>$(RootBinDir)\TestResults\$(TargetConfiguration)\sos.unittests_$(Timestamp)</LogDir>
   <DumpDir>$(RootBinDir)\tmp\$(TargetConfiguration)\dumps</DumpDir>
   <CDBHelperExtension>$(InstallDir)\runcommand.dll</CDBHelperExtension>
+  <MicrosoftNETCoreAppPath>$(DotNetRoot)\shared\Microsoft.NETCore.App\</MicrosoftNETCoreAppPath>
 
   <SetHostExe>true</SetHostExe>
   <SetFxVersion>true</SetFxVersion>
diff --git a/src/SOS/SOS.UnitTests/DumpGenerationFixture.cs b/src/SOS/SOS.UnitTests/DumpGenerationFixture.cs
index 6eef51886a..f4c80e063b 100644
--- a/src/SOS/SOS.UnitTests/DumpGenerationFixture.cs
+++ b/src/SOS/SOS.UnitTests/DumpGenerationFixture.cs
@@ -34,39 +34,56 @@ public DumpGenerationFixture()
             {
             }
 
-            // Create a unique list of all the runtime paths used by the tests
+            // Create a unique list of all the installed test runtime paths
             HashSet<string> paths = new();
             foreach (TestConfiguration config in TestRunConfiguration.Instance.Configurations)
             {
-                if (config.IsNETCore && config.RuntimeFrameworkVersionMajor >= 8)
+                // Enumerate configs until we see this property
+                if (config.AllSettings.TryGetValue("MicrosoftNETCoreAppPath", out string path))
                 {
-                    string path = config.RuntimeSymbolsPath;
                     if (!string.IsNullOrEmpty(path))
                     {
-                        paths.Add(path);
+                        path = TestConfiguration.MakeCanonicalPath(path);
+                        try
+                        {
+                            foreach (string directory in Directory.GetDirectories(path))
+                            {
+                                if (Path.GetFileName(directory).StartsWith("9"))
+                                {
+                                    paths.Add(directory);
+                                }
+                            }
+                        }
+                        catch (Exception ex) when (ex is IOException or UnauthorizedAccessException)
+                        {
+                        }
+                        break;
                     }
                 }
             }
 
-            // Now try to create the keys for the older Windows versions 
-            try
+            if (paths.Count > 0)
             {
-                using RegistryKey auxiliaryKey = Registry.LocalMachine.CreateSubKey(_auxiliaryNode, writable: true);
-                using RegistryKey knownKey = Registry.LocalMachine.CreateSubKey(_knownNode, writable: true);
+                // Now try to create the keys for the older Windows versions 
+                try
+                {
+                    using RegistryKey auxiliaryKey = Registry.LocalMachine.CreateSubKey(_auxiliaryNode, writable: true);
+                    using RegistryKey knownKey = Registry.LocalMachine.CreateSubKey(_knownNode, writable: true);
 
-                foreach (string path in paths)
+                    foreach (string path in paths)
+                    {
+                        string dacPath = Path.Combine(path, "mscordaccore.dll");
+                        string runtimePath = Path.Combine(path, "coreclr.dll");
+                        knownKey.SetValue(dacPath, 0, RegistryValueKind.DWord);
+                        auxiliaryKey.SetValue(runtimePath, dacPath, RegistryValueKind.String);
+                    }
+
+                    // Save the paths after writing them successfully to registry
+                    _paths = paths;
+                }
+                catch (Exception ex) when (ex is UnauthorizedAccessException)
                 {
-                    string dacPath = Path.Combine(path, "mscordaccore.dll");
-                    string runtimePath = Path.Combine(path, "coreclr.dll");
-                    knownKey.SetValue(dacPath, 0, RegistryValueKind.DWord);
-                    auxiliaryKey.SetValue(runtimePath, dacPath, RegistryValueKind.String);
                 }
-
-                // Save the paths after writing them successfully to registry
-               _paths = paths;
-            }
-            catch (Exception ex) when (ex is UnauthorizedAccessException)
-            {
             }
         }
     }