From: Mike McLaughlin <mikem@microsoft.com>
Date: Thu, 8 Apr 2021 23:37:38 +0000 (-0700)
Subject: Add single-file app SOS testing Part I (#2153)
X-Git-Tag: submit/tizen/20210909.063632~17^2~14
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8e50b3a2d647b841380dc0b12805e8912e7f8ec;p=platform%2Fcore%2Fdotnet%2Fdiagnostics.git

Add single-file app SOS testing Part I (#2153)

This PR gets ready for single-file app testing, but doesn't add the app yet
because the current SDK can't build them and the new SDKs break building
the cli built debuggees.

Also works around that the DAC GetPEFileName()/GetAssemblyName() APIs don't return
the module or assembly name.
---

diff --git a/src/Microsoft.Diagnostics.TestHelpers/BaseDebuggeeCompiler.cs b/src/Microsoft.Diagnostics.TestHelpers/BaseDebuggeeCompiler.cs
index 64ec40158..8545164c6 100644
--- a/src/Microsoft.Diagnostics.TestHelpers/BaseDebuggeeCompiler.cs
+++ b/src/Microsoft.Diagnostics.TestHelpers/BaseDebuggeeCompiler.cs
@@ -151,7 +151,7 @@ namespace Microsoft.Diagnostics.TestHelpers
 
         protected virtual string GetDebuggeeBinaryDirPath(string debuggeeProjectDirPath, string framework, string runtime)
         {
-            string debuggeeBinaryDirPath = null;
+            string debuggeeBinaryDirPath;
             if (runtime != null)
             {
                 debuggeeBinaryDirPath = Path.Combine(debuggeeProjectDirPath, "bin", "Debug", framework, runtime);
@@ -163,14 +163,14 @@ namespace Microsoft.Diagnostics.TestHelpers
             return debuggeeBinaryDirPath;
         }
 
-        protected static string GetDebuggeeBinaryDllPath(string debuggeeBinaryDirPath, string debuggeeName)
+        protected static string GetDebuggeeBinaryDllPath(TestConfiguration config, string debuggeeBinaryDirPath, string debuggeeName)
         {
-            return Path.Combine(debuggeeBinaryDirPath, debuggeeName + ".dll");
+            return config.IsNETCore ? Path.Combine(debuggeeBinaryDirPath, debuggeeName + (config.PublishSingleFile ? "" : ".dll")) : null;
         }
 
-        protected static string GetDebuggeeBinaryExePath(string debuggeeBinaryDirPath, string debuggeeName)
+        protected static string GetDebuggeeBinaryExePath(TestConfiguration config, string debuggeeBinaryDirPath, string debuggeeName)
         {
-            return Path.Combine(debuggeeBinaryDirPath, debuggeeName + ".exe");
+            return config.IsDesktop ? Path.Combine(debuggeeBinaryDirPath, debuggeeName + ".exe") : null;
         }
 
         protected static string GetLogPath(TestConfiguration config, string framework, string runtime, string debuggeeName)
diff --git a/src/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs b/src/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs
index 62ca520a7..e51c3be9d 100644
--- a/src/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs
+++ b/src/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 
 namespace Microsoft.Diagnostics.TestHelpers
@@ -33,6 +34,11 @@ namespace Microsoft.Diagnostics.TestHelpers
             {
                 buildProperties.Add("RuntimeIdentifier", runtimeIdentifier);
             }
+            if (config.PublishSingleFile)
+            {
+                Debug.Assert(runtimeIdentifier != null);
+                buildProperties.Add("PublishSingleFile", "true");
+            }
             string debugType = config.DebugType;
             if (debugType == null)
             {
@@ -64,8 +70,8 @@ namespace Microsoft.Diagnostics.TestHelpers
             string debuggeeSolutionDirPath = GetDebuggeeSolutionDirPath(dotNetRootBuildDirPath, debuggeeName);
             string debuggeeProjectDirPath = GetDebuggeeProjectDirPath(debuggeeSolutionDirPath, initialSourceDirPath, debuggeeName);
             string debuggeeBinaryDirPath = GetDebuggeeBinaryDirPath(debuggeeProjectDirPath, framework, runtimeIdentifier);
-            string debuggeeBinaryDllPath = config.IsNETCore ? GetDebuggeeBinaryDllPath(debuggeeBinaryDirPath, debuggeeName) : null;
-            string debuggeeBinaryExePath = config.IsDesktop ? GetDebuggeeBinaryExePath(debuggeeBinaryDirPath, debuggeeName) : null;
+            string debuggeeBinaryDllPath = GetDebuggeeBinaryDllPath(config, debuggeeBinaryDirPath, debuggeeName);
+            string debuggeeBinaryExePath = GetDebuggeeBinaryExePath(config, debuggeeBinaryDirPath, debuggeeName);
             string logPath = GetLogPath(config, framework, runtimeIdentifier, debuggeeName);
             return new CsprojBuildDebuggeeTestStep(dotNetPath,
                                                initialSourceDirPath,
diff --git a/src/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs b/src/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs
index f78930fe0..c5bb7ee9a 100644
--- a/src/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs
+++ b/src/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs
@@ -629,6 +629,14 @@ namespace Microsoft.Diagnostics.TestHelpers
             get { return GetValue("BuildProjectRuntime"); }
         }
 
+        /// <summary>
+        /// Returns "true" if build/run this cli debuggee as a single-file app
+        /// </summary>
+        public bool PublishSingleFile
+        {
+            get { return string.Equals(GetValue("PublishSingleFile"), "true", StringComparison.InvariantCultureIgnoreCase); }
+        }
+
         /// <summary>
         /// The version of the Microsoft.NETCore.App package to reference when running the debuggee (i.e. 
         /// using the dotnet cli --fx-version option).
@@ -711,7 +719,7 @@ namespace Microsoft.Diagnostics.TestHelpers
         /// </summary>
         public bool LogToConsole
         {
-            get { return bool.TryParse(GetValue("LogToConsole"), out bool b) && b; }
+            get { return string.Equals(GetValue("LogToConsole"), "true", StringComparison.InvariantCultureIgnoreCase); }
         }
 
         /// <summary>
diff --git a/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt
index c1bd8d982..60c10ec77 100644
--- a/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt
+++ b/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt
@@ -34,7 +34,7 @@
   <TestDotnetDumpCommandsWithRuntime21 Condition="'$(OS)' == 'Linux'">false</TestDotnetDumpCommandsWithRuntime21>
 
   <!-- Build the debuggee for this framework version but run it on latest -->
-  <BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '6')">net5.0</BuildProjectFrameworkLatest>
+  <BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '6')">net6.0</BuildProjectFrameworkLatest>
   <BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '5')">net5.0</BuildProjectFrameworkLatest>
   <BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '3.1')">netcoreapp3.1</BuildProjectFrameworkLatest>
   <BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '2.1')">netcoreapp2.1</BuildProjectFrameworkLatest>
@@ -45,8 +45,9 @@
   <CliPath>$(DotNetRoot)/dotnet</CliPath>
 
   <NuGetPackageFeeds>
-      myget.org dotnet-core=https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
-      nuget.org=https://www.nuget.org/api/v2/
+      dotnet6=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet6/nuget/v3/index.json;
+      dotnet-core=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
+      dotnet-public=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json
   </NuGetPackageFeeds>
 
   <Options>
@@ -73,7 +74,7 @@
       <SetHostRuntime>$(DotNetRoot)/shared/Microsoft.NETCore.App/$(RuntimeFrameworkVersion)</SetHostRuntime>
     </Option>
     <!--
-        SOS.StackAndOtherTests (cli because tested with embedded and portable PDBs)
+        SOS.StackAndOtherTests (cli because tested with embedded, portable PDBs and single-file)
       -->
     <Option>
       <DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
@@ -81,8 +82,12 @@
       <TestName>SOS.StackAndOtherTests</TestName>
       <Options>
         <Option Condition="'$(RuntimeVersionLatest)' != ''">
-          <BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
-          <RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
+          <Options>
+            <Option>
+              <BuildProjectFramework>$(BuildProjectFrameworkLatest)</BuildProjectFramework>
+              <RuntimeFrameworkVersion>$(RuntimeVersionLatest)</RuntimeFrameworkVersion>
+            </Option>
+          </Options>
         </Option>
         <Option Condition="'$(RuntimeVersion50)' != ''">
           <BuildProjectFramework>net5.0</BuildProjectFramework>
@@ -157,8 +162,10 @@
   <FrameworkVersion Condition="'$(FrameworkVersion)' == ''">$(RuntimeFrameworkVersion)</FrameworkVersion>
   <RuntimeSymbolsPath>$(DotNetRoot)/shared/Microsoft.NETCore.App/$(RuntimeFrameworkVersion)</RuntimeSymbolsPath>
   <LLDBHelperScript>$(ScriptRootDir)/lldbhelper.py</LLDBHelperScript>
-  <HostExe>$(DotNetRoot)/dotnet</HostExe>
-  <HostArgs>--fx-version $(FrameworkVersion)</HostArgs>
+
+  <!-- Single-file debuggees don't need the host -->
+  <HostExe Condition="'$(PublishSingleFile)' != 'true'">$(DotNetRoot)/dotnet</HostExe>
+  <HostArgs Condition="'$(PublishSingleFile)' != 'true'">--fx-version $(FrameworkVersion)</HostArgs>
 
   <Options>
     <Option Condition="$(OS) == Linux">
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 d866cd0f7..605845e21 100644
--- a/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt
+++ b/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt
@@ -36,7 +36,7 @@
   <TestDesktop Condition="'$(TargetArchitecture)' == 'arm64'">false</TestDesktop>
 
   <!-- Build the debuggee for this framework version but run it on latest -->
-  <BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '6')">net5.0</BuildProjectFrameworkLatest>
+  <BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '6')">net6.0</BuildProjectFrameworkLatest>
   <BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '5')">net5.0</BuildProjectFrameworkLatest>
   <BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '3.1')">netcoreapp3.1</BuildProjectFrameworkLatest>
   <BuildProjectFrameworkLatest Condition="StartsWith('$(RuntimeVersionLatest)', '2.1')">netcoreapp2.1</BuildProjectFrameworkLatest>
@@ -51,8 +51,9 @@
   <CliPath>$(DotNetRoot)\dotnet.exe</CliPath>
 
   <NuGetPackageFeeds>
-      myget.org dotnet-core=https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
-      nuget.org=https://www.nuget.org/api/v2/
+      dotnet6=https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet6/nuget/v3/index.json;
+      dotnet-core=https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
+      dotnet-public=https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json
   </NuGetPackageFeeds>
 
   <Options>
diff --git a/src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/CMakeLists.txt b/src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/CMakeLists.txt
index e866539fd..9584de7ac 100644
--- a/src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/CMakeLists.txt
+++ b/src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/CMakeLists.txt
@@ -34,3 +34,4 @@ target_link_libraries(DesktopClrHost ${DESKTOPCLRHOST_LIBRARY})
 
 install(TARGETS DesktopClrHost DESTINATION ${CLR_MANAGED_BINARY_DIR}/WebApp3/${CLR_BUILD_TYPE}/netcoreapp3.1)
 install(TARGETS DesktopClrHost DESTINATION ${CLR_MANAGED_BINARY_DIR}/WebApp3/${CLR_BUILD_TYPE}/net5.0)
+install(TARGETS DesktopClrHost DESTINATION ${CLR_MANAGED_BINARY_DIR}/WebApp3/${CLR_BUILD_TYPE}/net6.0)
diff --git a/src/SOS/SOS.UnitTests/Debuggees/Directory.Build.props b/src/SOS/SOS.UnitTests/Debuggees/Directory.Build.props
index 85e4a36a1..0c37abe08 100644
--- a/src/SOS/SOS.UnitTests/Debuggees/Directory.Build.props
+++ b/src/SOS/SOS.UnitTests/Debuggees/Directory.Build.props
@@ -6,5 +6,6 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsShippingAssembly>false</IsShippingAssembly>
     <Optimize>false</Optimize>
+    <BuildTargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</BuildTargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/src/SOS/SOS.UnitTests/Debuggees/DivZero/DivZero.csproj b/src/SOS/SOS.UnitTests/Debuggees/DivZero/DivZero.csproj
index bc1855771..03cd2f5e0 100644
--- a/src/SOS/SOS.UnitTests/Debuggees/DivZero/DivZero.csproj
+++ b/src/SOS/SOS.UnitTests/Debuggees/DivZero/DivZero.csproj
@@ -2,6 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">$(BuildTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/src/SOS/SOS.UnitTests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj b/src/SOS/SOS.UnitTests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj
index 55f2127be..03cd2f5e0 100644
--- a/src/SOS/SOS.UnitTests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj
+++ b/src/SOS/SOS.UnitTests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-	<OutputType>Exe</OutputType>
-	<TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
-	<TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <OutputType>Exe</OutputType>
+    <TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
+    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">$(BuildTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/SOS/SOS.UnitTests/Debuggees/GCPOH/GCPOH.csproj b/src/SOS/SOS.UnitTests/Debuggees/GCPOH/GCPOH.csproj
index bc1855771..03cd2f5e0 100644
--- a/src/SOS/SOS.UnitTests/Debuggees/GCPOH/GCPOH.csproj
+++ b/src/SOS/SOS.UnitTests/Debuggees/GCPOH/GCPOH.csproj
@@ -2,6 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">$(BuildTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/src/SOS/SOS.UnitTests/Debuggees/GCWhere/GCWhere.csproj b/src/SOS/SOS.UnitTests/Debuggees/GCWhere/GCWhere.csproj
index bc1855771..03cd2f5e0 100644
--- a/src/SOS/SOS.UnitTests/Debuggees/GCWhere/GCWhere.csproj
+++ b/src/SOS/SOS.UnitTests/Debuggees/GCWhere/GCWhere.csproj
@@ -2,6 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">$(BuildTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/src/SOS/SOS.UnitTests/Debuggees/LineNums/LineNums.csproj b/src/SOS/SOS.UnitTests/Debuggees/LineNums/LineNums.csproj
index 1cefe2ae3..c704adf49 100644
--- a/src/SOS/SOS.UnitTests/Debuggees/LineNums/LineNums.csproj
+++ b/src/SOS/SOS.UnitTests/Debuggees/LineNums/LineNums.csproj
@@ -3,6 +3,6 @@
     <OutputType>Exe</OutputType>
     <Optimize>true</Optimize>
     <TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">$(BuildTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/src/SOS/SOS.UnitTests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj b/src/SOS/SOS.UnitTests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj
index bc1855771..03cd2f5e0 100644
--- a/src/SOS/SOS.UnitTests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj
+++ b/src/SOS/SOS.UnitTests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj
@@ -2,6 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">$(BuildTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/src/SOS/SOS.UnitTests/Debuggees/Overflow/Overflow.csproj b/src/SOS/SOS.UnitTests/Debuggees/Overflow/Overflow.csproj
index bc1855771..03cd2f5e0 100644
--- a/src/SOS/SOS.UnitTests/Debuggees/Overflow/Overflow.csproj
+++ b/src/SOS/SOS.UnitTests/Debuggees/Overflow/Overflow.csproj
@@ -2,6 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">$(BuildTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/src/SOS/SOS.UnitTests/Debuggees/ReflectionTest/ReflectionTest.csproj b/src/SOS/SOS.UnitTests/Debuggees/ReflectionTest/ReflectionTest.csproj
index bc1855771..03cd2f5e0 100644
--- a/src/SOS/SOS.UnitTests/Debuggees/ReflectionTest/ReflectionTest.csproj
+++ b/src/SOS/SOS.UnitTests/Debuggees/ReflectionTest/ReflectionTest.csproj
@@ -2,6 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">$(BuildTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/src/SOS/SOS.UnitTests/Debuggees/SimpleThrow/SimpleThrow.csproj b/src/SOS/SOS.UnitTests/Debuggees/SimpleThrow/SimpleThrow.csproj
index bc1855771..03cd2f5e0 100644
--- a/src/SOS/SOS.UnitTests/Debuggees/SimpleThrow/SimpleThrow.csproj
+++ b/src/SOS/SOS.UnitTests/Debuggees/SimpleThrow/SimpleThrow.csproj
@@ -2,6 +2,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">$(BuildTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj b/src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj
index e3bda46d7..662b55034 100644
--- a/src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj
+++ b/src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">$(BuildTargetFrameworks)</TargetFrameworks>
     <DefineConstants Condition="'$(TargetFramework)' == 'net462'">$(DefineConstants);FULL_CLR</DefineConstants>
   </PropertyGroup>
 
diff --git a/src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj b/src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj
index d9dae21d5..01794bdad 100644
--- a/src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj
+++ b/src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildProjectFramework)' == '' and '$(OS)' != 'Windows_NT'">netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(BuildProjectFramework)' == '' and '$(OS)' == 'Windows_NT'">net462;netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildProjectFramework)' == '' and '$(OS)' != 'Windows_NT'">$(BuildTargetFrameworks)</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildProjectFramework)' == '' and '$(OS)' == 'Windows_NT'">net462;$(BuildTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj b/src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj
index 139b6f83f..e6fd811af 100644
--- a/src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj
+++ b/src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj
@@ -2,6 +2,6 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">$(BuildTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 </Project>
diff --git a/src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj b/src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj
index 381e9a2eb..1285b3532 100644
--- a/src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj
+++ b/src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework Condition="'$(BuildProjectFramework)' != ''">$(BuildProjectFramework)</TargetFramework>
-    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(BuildProjectFramework)' == ''">$(BuildTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/SOS/SOS.UnitTests/Debuggees/WebApp3/WebApp3.csproj b/src/SOS/SOS.UnitTests/Debuggees/WebApp3/WebApp3.csproj
index 6602bfa15..efd2369d3 100644
--- a/src/SOS/SOS.UnitTests/Debuggees/WebApp3/WebApp3.csproj
+++ b/src/SOS/SOS.UnitTests/Debuggees/WebApp3/WebApp3.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/SOS/SOS.UnitTests/SOSRunner.cs b/src/SOS/SOS.UnitTests/SOSRunner.cs
index 026c0cfba..7f29f0beb 100644
--- a/src/SOS/SOS.UnitTests/SOSRunner.cs
+++ b/src/SOS/SOS.UnitTests/SOSRunner.cs
@@ -483,10 +483,16 @@ public class SOSRunner : IDisposable
                     }
                     arguments.AppendFormat(@"--no-lldbinit -o ""settings set interpreter.prompt-on-quit false"" -o ""command script import {0}"" -o ""version""", lldbHelperScript);
 
+                    string debuggeeTarget = config.HostExe;
+                    if (string.IsNullOrWhiteSpace(debuggeeTarget))
+                    {
+                        debuggeeTarget = debuggeeConfig.BinaryExePath;
+                    }
+
                     // Load the dump or launch the debuggee process
                     if (action == DebuggerAction.LoadDump)
                     {
-                        initialCommands.Add($@"target create --core ""%DUMP_NAME%"" ""{config.HostExe}""");
+                        initialCommands.Add($@"target create --core ""%DUMP_NAME%"" ""{debuggeeTarget}""");
                     }
                     else
                     {
@@ -499,7 +505,10 @@ public class SOSRunner : IDisposable
                                 sb.AppendFormat(@" ""{0}""", arg);
                             }
                         }
-                        sb.AppendFormat(@" ""{0}""", debuggeeConfig.BinaryExePath);
+                        if (!string.IsNullOrWhiteSpace(config.HostExe))
+                        {
+                            sb.AppendFormat(@" ""{0}""", debuggeeConfig.BinaryExePath);
+                        }
                         if (!string.IsNullOrWhiteSpace(information.DebuggeeArguments))
                         {
                             string[] args = ReplaceVariables(variables, information.DebuggeeArguments).Trim().Split(' ');
@@ -508,7 +517,7 @@ public class SOSRunner : IDisposable
                                 sb.AppendFormat(@" ""{0}""", arg);
                             }
                         }
-                        initialCommands.Add($@"target create ""{config.HostExe}""");
+                        initialCommands.Add($@"target create ""{debuggeeTarget}""");
                         initialCommands.Add(sb.ToString());
                         initialCommands.Add("process launch -s");
 
@@ -1216,6 +1225,10 @@ public class SOSRunner : IDisposable
         {
             defines.Add("NETCORE_OR_DOTNETDUMP");
         }
+        if (_config.PublishSingleFile)
+        {
+            defines.Add("SINGLE_FILE_APP");
+        }
         return defines;
     }
 
diff --git a/src/SOS/Strike/strike.cpp b/src/SOS/Strike/strike.cpp
index ca7af6ba2..a564c93c9 100644
--- a/src/SOS/Strike/strike.cpp
+++ b/src/SOS/Strike/strike.cpp
@@ -15170,18 +15170,25 @@ static HRESULT DumpMDInfoBuffer(DWORD_PTR dwStartAddr, DWORD Flags, ULONG64 Esp,
     // If the dbgeng functions fail to get the module/assembly name, use the DAC API
     if (!bModuleNameWorked)
     {
-        if (g_sos->GetPEFileName(dmd.File, MAX_LONGPATH, wszNameBuffer, NULL) == S_OK)
+        wszNameBuffer[0] = W('\0');
+        if (FAILED(g_sos->GetPEFileName(dmd.File, MAX_LONGPATH, wszNameBuffer, NULL)) || wszNameBuffer[0] == W('\0'))
         {
-            if (wszNameBuffer[0] != W('\0'))
+            ToRelease<IXCLRDataModule> pModule;
+            if (SUCCEEDED(g_sos->GetModule(dmd.Address, &pModule)))
             {
-                WCHAR *pJustName = _wcsrchr(wszNameBuffer, GetTargetDirectorySeparatorW());
-                if (pJustName == NULL)
-                    pJustName = wszNameBuffer - 1;
-
-                DOAPPEND(pJustName + 1);
-                bModuleNameWorked = TRUE;
+                ULONG32 nameLen = 0;
+                pModule->GetFileName(MAX_LONGPATH, &nameLen, wszNameBuffer);
             }
         }
+        if (wszNameBuffer[0] != W('\0'))
+        {
+            WCHAR *pJustName = _wcsrchr(wszNameBuffer, GetTargetDirectorySeparatorW());
+            if (pJustName == NULL)
+                pJustName = wszNameBuffer - 1;
+
+            DOAPPEND(pJustName + 1);
+            bModuleNameWorked = TRUE;
+        }
     }
 
     // Under certain circumstances DacpMethodDescData::GetMethodDescName()
diff --git a/src/SOS/Strike/util.cpp b/src/SOS/Strike/util.cpp
index 7cb722b0e..e96899872 100644
--- a/src/SOS/Strike/util.cpp
+++ b/src/SOS/Strike/util.cpp
@@ -1575,38 +1575,44 @@ HRESULT FileNameForModule (DWORD_PTR pModuleAddr, __out_ecount (MAX_LONGPATH) WC
 *                                                                      *
 \**********************************************************************/
 // fileName should be at least MAX_LONGPATH
-HRESULT FileNameForModule (const DacpModuleData * const pModule, __out_ecount (MAX_LONGPATH) WCHAR *fileName)
+HRESULT FileNameForModule(const DacpModuleData* const pModuleData, __out_ecount(MAX_LONGPATH) WCHAR* fileName)
 {
-    fileName[0] = L'\0';
-    
+    fileName[0] = W('\0');
+
     HRESULT hr = S_OK;
-    CLRDATA_ADDRESS dwAddr = pModule->File;
+    CLRDATA_ADDRESS dwAddr = pModuleData->File;
     if (dwAddr == 0)
     {
         // TODO:  We have dynamic module
         return E_NOTIMPL;
     }
-    
+
     CLRDATA_ADDRESS base = 0;
     hr = g_sos->GetPEFileBase(dwAddr, &base);
     if (SUCCEEDED(hr))
     {
         hr = g_sos->GetPEFileName(dwAddr, MAX_LONGPATH, fileName, NULL);
-        if (SUCCEEDED(hr))
-        {
-            if (fileName[0] != W('\0'))
-                return hr; // done
-        }
+        if (SUCCEEDED(hr) && fileName[0] != W('\0'))
+            return hr; // done
+
 #ifndef FEATURE_PAL
         // Try the base *
         if (base)
         {
-            hr = DllsName((ULONG_PTR) base, fileName);
+            hr = DllsName((ULONG_PTR)base, fileName);
+            if (SUCCEEDED(hr) && fileName[0] != W('\0'))
+                return hr; // done
         }
 #endif // !FEATURE_PAL
     }
+
+    ToRelease<IXCLRDataModule> pModule;
+    if (SUCCEEDED(g_sos->GetModule(pModuleData->Address, &pModule)))
+    {
+        ULONG32 nameLen = 0;
+        hr = pModule->GetFileName(MAX_LONGPATH, &nameLen, fileName);
+    }
     
-    // If we got here, either DllsName worked, or we couldn't find a name
     return hr;
 }