From c3b6ce992fd487badf6e1dc8663aa281197fc722 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Thu, 30 Sep 2021 16:47:00 -0700
Subject: [PATCH 01/11] Add back the nethost archive.

This archive makes it a bit easier for developers to pull down nethost in a non-.NET environment (without NuGet). We had this in 3.1, but it was lost at some point between then and now with all of the large infrastructure changes.
---
 eng/Subsets.props                             |  5 ++-
 .../pkg/archives/Directory.Build.props        |  7 ++++
 .../pkg/archives/dotnet-nethost.proj          | 40 +++++++++++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 src/installer/pkg/archives/Directory.Build.props
 create mode 100644 src/installer/pkg/archives/dotnet-nethost.proj

diff --git a/eng/Subsets.props b/eng/Subsets.props
index 7113a4ac779e33..714949954d8ec3 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -120,7 +120,7 @@
     <SubsetName Include="Mono.WasmRuntime" Description="The WebAssembly runtime." />
     <SubsetName Include="Mono.MsCorDbi" Description="The implementation of ICorDebug interface." />
     <SubsetName Include="Mono.Workloads" OnDemand="true" Description="Builds the installers and the insertion metadata for Blazor workloads." />
-    
+
     <!-- Libs -->
     <SubsetName Include="Libs" Description="The libraries native part, refs and source assemblies, test infra and packages, but NOT the tests (use Libs.Tests to request those explicitly)" />
     <SubsetName Include="Libs.Native" Description="The native libraries used in the shared framework." />
@@ -259,7 +259,7 @@
   <ItemGroup Condition="$(_subset.Contains('+mono.corelib+'))">
     <ProjectToBuild Include="$(MonoProjectRoot)System.Private.CoreLib\System.Private.CoreLib.csproj" Category="mono" />
   </ItemGroup>
-  
+
   <ItemGroup Condition="$(_subset.Contains('+mono.workloads+'))">
     <ProjectToBuild Include="$(WorkloadsProjectRoot)\workloads.csproj" Category="mono" />
   </ItemGroup>
@@ -329,6 +329,7 @@
         <SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-host.proj" />
         <SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-hostfxr.proj" />
         <SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\sfx\installers\dotnet-runtime-deps\*.proj" />
+        <SharedFrameworkProjectToBuild Condition="'$(RuntimeFlavor)' == '$(PrimaryRuntimeFlavor)'" Include="$(InstallerProjectRoot)pkg\archives\dotnet-nethost.proj" />
         <SharedFrameworkProjectToBuild Condition="'$(MonoCrossAOTTargetOS)' != ''" Include="$(InstallerProjectRoot)pkg\sfx\Microsoft.NETCore.App\monocrossaot.sfxproj" Pack="true" />
       </ItemGroup>
       <ItemGroup>
diff --git a/src/installer/pkg/archives/Directory.Build.props b/src/installer/pkg/archives/Directory.Build.props
new file mode 100644
index 00000000000000..ff585b4b11c7f9
--- /dev/null
+++ b/src/installer/pkg/archives/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <EnsureRuntimeIdentifierSet>true</EnsureRuntimeIdentifierSet>
+  </PropertyGroup>
+
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
+</Project>
diff --git a/src/installer/pkg/archives/dotnet-nethost.proj b/src/installer/pkg/archives/dotnet-nethost.proj
new file mode 100644
index 00000000000000..66bf5c832d925a
--- /dev/null
+++ b/src/installer/pkg/archives/dotnet-nethost.proj
@@ -0,0 +1,40 @@
+<Project Sdk="Microsoft.Build.NoTargets">
+  <PropertyGroup>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Archives" Version="$(MicrosoftDotNetBuildTasksArchivesVersion)" />
+  </ItemGroup>
+
+
+  <Target Name="PublishToDisk">
+    <Error Condition="'$(OutputPath)' == ''" Text="Publishing to disk requires the OutputPath to be set to the root of the path to write to." />
+
+    <ItemGroup>
+      <FilesToPublish Include="$(DotNetHostBinDir)\$(LibPrefix)nethost$(LibSuffix)"
+            Destination="$(OutputPath)$(LibPrefix)nethost$(LibSuffix)" />
+      <FilesToPublish Include="$(DotNetHostBinDir)\$(LibPrefix)libnethost$(StaticLibSuffix)"
+            Destination="$(OutputPath)$(LibPrefix)libnethost$(StaticLibSuffix)" />
+      <FilesToPublish Condition="'$(TargetsWindows)' == 'true'"
+            Include="$(DotNetHostBinDir)\nethost.lib"
+            Destination="$(OutputPath)$(LibPrefix)nethost.lib" />
+      <FilesToPublish Include="$(DotNetHostBinDir)\nethost.h"
+            Destination="$(OutputPath)$(LibPrefix)nethost.h" />
+    </ItemGroup>
+
+    <Copy SourceFiles="@(FilesToPublish)"
+          DestinationFiles="%(FilesToPublish.Destination)" />
+  </Target>
+
+  <Target Name="PublishSymbolsToDisk">
+    <Error Condition="'$(SymbolsOutputPath)' == ''" Text="Publishing to disk requires the SymbolsOutputPath to be set to the root of the path to write to." />
+
+    <Copy SourceFiles="$(DotNetHostBinDir)\dotnet.pdb"
+          Condition="'$(TargetOS)' == 'windows'"
+          DestinationFolder="$(SymbolsOutputPath)" />
+
+    <Copy SourceFiles="$(DotNetHostBinDir)\dotnet$(SymbolsSuffix)"
+          Condition="'$(TargetOS)' != 'windows'"
+          DestinationFolder="$(SymbolsOutputPath)" />
+  </Target>
+</Project>

From e9b8c53cbfc9b3afffeb91ef2c5d5ba838bea72c Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Thu, 30 Sep 2021 17:16:40 -0700
Subject: [PATCH 02/11] Fix symbols copying.

---
 src/installer/pkg/archives/dotnet-nethost.proj | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/installer/pkg/archives/dotnet-nethost.proj b/src/installer/pkg/archives/dotnet-nethost.proj
index 66bf5c832d925a..e0c8710ba36777 100644
--- a/src/installer/pkg/archives/dotnet-nethost.proj
+++ b/src/installer/pkg/archives/dotnet-nethost.proj
@@ -29,12 +29,7 @@
   <Target Name="PublishSymbolsToDisk">
     <Error Condition="'$(SymbolsOutputPath)' == ''" Text="Publishing to disk requires the SymbolsOutputPath to be set to the root of the path to write to." />
 
-    <Copy SourceFiles="$(DotNetHostBinDir)\dotnet.pdb"
-          Condition="'$(TargetOS)' == 'windows'"
-          DestinationFolder="$(SymbolsOutputPath)" />
-
-    <Copy SourceFiles="$(DotNetHostBinDir)\dotnet$(SymbolsSuffix)"
-          Condition="'$(TargetOS)' != 'windows'"
+    <Copy SourceFiles="$(DotNetHostBinDir)\$(LibPrefix)nethost$(SymbolsSuffix);$(DotNetHostBinDir)\$(LibPrefix)libnethost$(SymbolsSuffix)"
           DestinationFolder="$(SymbolsOutputPath)" />
   </Target>
 </Project>

From 224755e09eb5a73627171aa82756ade51ae29734 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Thu, 30 Sep 2021 17:17:44 -0700
Subject: [PATCH 03/11] Create the symbols archive for nethost

---
 src/installer/pkg/archives/dotnet-nethost.proj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/installer/pkg/archives/dotnet-nethost.proj b/src/installer/pkg/archives/dotnet-nethost.proj
index e0c8710ba36777..b0c65b4cc0c690 100644
--- a/src/installer/pkg/archives/dotnet-nethost.proj
+++ b/src/installer/pkg/archives/dotnet-nethost.proj
@@ -1,5 +1,6 @@
 <Project Sdk="Microsoft.Build.NoTargets">
   <PropertyGroup>
+    <CreateSymbolsArchive>true</CreateSymbolsArchive>
   </PropertyGroup>
 
   <ItemGroup>

From b8ff86a15960d2c2de5de980f34bba9196d9ce97 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Fri, 1 Oct 2021 09:53:04 -0700
Subject: [PATCH 04/11] Update src/installer/pkg/archives/dotnet-nethost.proj

Co-authored-by: Juan Hoyos <19413848+hoyosjs@users.noreply.github.com>
---
 src/installer/pkg/archives/dotnet-nethost.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/installer/pkg/archives/dotnet-nethost.proj b/src/installer/pkg/archives/dotnet-nethost.proj
index b0c65b4cc0c690..6b0c77aa55c16a 100644
--- a/src/installer/pkg/archives/dotnet-nethost.proj
+++ b/src/installer/pkg/archives/dotnet-nethost.proj
@@ -15,7 +15,7 @@
       <FilesToPublish Include="$(DotNetHostBinDir)\$(LibPrefix)nethost$(LibSuffix)"
             Destination="$(OutputPath)$(LibPrefix)nethost$(LibSuffix)" />
       <FilesToPublish Include="$(DotNetHostBinDir)\$(LibPrefix)libnethost$(StaticLibSuffix)"
-            Destination="$(OutputPath)$(LibPrefix)libnethost$(StaticLibSuffix)" />
+            Destination="$(OutputPath)$(StaticLibPrefix)nethost$(StaticLibSuffix)" />
       <FilesToPublish Condition="'$(TargetsWindows)' == 'true'"
             Include="$(DotNetHostBinDir)\nethost.lib"
             Destination="$(OutputPath)$(LibPrefix)nethost.lib" />

From d2f2ac0e28c8c6b793729157c3896fef757cecb3 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Fri, 1 Oct 2021 10:38:00 -0700
Subject: [PATCH 05/11] Update src/installer/pkg/archives/dotnet-nethost.proj

Co-authored-by: Elinor Fung <elfung@microsoft.com>
---
 src/installer/pkg/archives/dotnet-nethost.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/installer/pkg/archives/dotnet-nethost.proj b/src/installer/pkg/archives/dotnet-nethost.proj
index 6b0c77aa55c16a..71b384439edb63 100644
--- a/src/installer/pkg/archives/dotnet-nethost.proj
+++ b/src/installer/pkg/archives/dotnet-nethost.proj
@@ -14,7 +14,7 @@
     <ItemGroup>
       <FilesToPublish Include="$(DotNetHostBinDir)\$(LibPrefix)nethost$(LibSuffix)"
             Destination="$(OutputPath)$(LibPrefix)nethost$(LibSuffix)" />
-      <FilesToPublish Include="$(DotNetHostBinDir)\$(LibPrefix)libnethost$(StaticLibSuffix)"
+      <FilesToPublish Include="$(DotNetHostBinDir)\$(StaticLibPrefix)nethost$(StaticLibSuffix)"
             Destination="$(OutputPath)$(StaticLibPrefix)nethost$(StaticLibSuffix)" />
       <FilesToPublish Condition="'$(TargetsWindows)' == 'true'"
             Include="$(DotNetHostBinDir)\nethost.lib"

From 43160c3fe3bbd8d8558e4e18e1701173e36421a3 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Fri, 1 Oct 2021 10:38:55 -0700
Subject: [PATCH 06/11] Update src/installer/pkg/archives/dotnet-nethost.proj

---
 src/installer/pkg/archives/dotnet-nethost.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/installer/pkg/archives/dotnet-nethost.proj b/src/installer/pkg/archives/dotnet-nethost.proj
index 71b384439edb63..8f9fffbfbbf531 100644
--- a/src/installer/pkg/archives/dotnet-nethost.proj
+++ b/src/installer/pkg/archives/dotnet-nethost.proj
@@ -30,7 +30,7 @@
   <Target Name="PublishSymbolsToDisk">
     <Error Condition="'$(SymbolsOutputPath)' == ''" Text="Publishing to disk requires the SymbolsOutputPath to be set to the root of the path to write to." />
 
-    <Copy SourceFiles="$(DotNetHostBinDir)\$(LibPrefix)nethost$(SymbolsSuffix);$(DotNetHostBinDir)\$(LibPrefix)libnethost$(SymbolsSuffix)"
+    <Copy SourceFiles="$(DotNetHostBinDir)\$(LibPrefix)nethost$(SymbolsSuffix);$(DotNetHostBinDir)\$(StaticLibPrefix)nethost$(SymbolsSuffix)"
           DestinationFolder="$(SymbolsOutputPath)" />
   </Target>
 </Project>

From d038f52a2d21c8f5b885521f0a6d6454d6b3b6ff Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Fri, 1 Oct 2021 11:32:52 -0700
Subject: [PATCH 07/11] Symbols are in the PDB folder.

---
 src/installer/pkg/archives/dotnet-nethost.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/installer/pkg/archives/dotnet-nethost.proj b/src/installer/pkg/archives/dotnet-nethost.proj
index 8f9fffbfbbf531..29d94d3dab59b5 100644
--- a/src/installer/pkg/archives/dotnet-nethost.proj
+++ b/src/installer/pkg/archives/dotnet-nethost.proj
@@ -30,7 +30,7 @@
   <Target Name="PublishSymbolsToDisk">
     <Error Condition="'$(SymbolsOutputPath)' == ''" Text="Publishing to disk requires the SymbolsOutputPath to be set to the root of the path to write to." />
 
-    <Copy SourceFiles="$(DotNetHostBinDir)\$(LibPrefix)nethost$(SymbolsSuffix);$(DotNetHostBinDir)\$(StaticLibPrefix)nethost$(SymbolsSuffix)"
+    <Copy SourceFiles="$(DotNetHostBinDir)\PDB\$(LibPrefix)nethost$(SymbolsSuffix);$(DotNetHostBinDir)\PDB\$(StaticLibPrefix)nethost$(SymbolsSuffix)"
           DestinationFolder="$(SymbolsOutputPath)" />
   </Target>
 </Project>

From 8898eadbbde9c144547f6e03f12bc173bb9a7c7b Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Fri, 1 Oct 2021 13:31:29 -0700
Subject: [PATCH 08/11] Fix symbol paths for xplat.

---
 src/installer/pkg/archives/dotnet-nethost.proj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/installer/pkg/archives/dotnet-nethost.proj b/src/installer/pkg/archives/dotnet-nethost.proj
index 29d94d3dab59b5..77d35c82794799 100644
--- a/src/installer/pkg/archives/dotnet-nethost.proj
+++ b/src/installer/pkg/archives/dotnet-nethost.proj
@@ -31,6 +31,10 @@
     <Error Condition="'$(SymbolsOutputPath)' == ''" Text="Publishing to disk requires the SymbolsOutputPath to be set to the root of the path to write to." />
 
     <Copy SourceFiles="$(DotNetHostBinDir)\PDB\$(LibPrefix)nethost$(SymbolsSuffix);$(DotNetHostBinDir)\PDB\$(StaticLibPrefix)nethost$(SymbolsSuffix)"
+          Condition="'$(TargetsWindows)' == 'true'"
+          DestinationFolder="$(SymbolsOutputPath)" />
+    <Copy SourceFiles="$(DotNetHostBinDir)\$(LibPrefix)nethost$(LibSuffix)$(SymbolsSuffix)"
+          Condition="'$(TargetsWindows)' != 'true'"
           DestinationFolder="$(SymbolsOutputPath)" />
   </Target>
 </Project>

From 20fb630715ef2a699cac3c7897c8a068d0ce8737 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Sun, 3 Oct 2021 14:25:54 -0700
Subject: [PATCH 09/11] Update src/installer/pkg/archives/dotnet-nethost.proj

---
 src/installer/pkg/archives/dotnet-nethost.proj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/installer/pkg/archives/dotnet-nethost.proj b/src/installer/pkg/archives/dotnet-nethost.proj
index 77d35c82794799..d23f6db48d31ee 100644
--- a/src/installer/pkg/archives/dotnet-nethost.proj
+++ b/src/installer/pkg/archives/dotnet-nethost.proj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.Build.NoTargets">
   <PropertyGroup>
-    <CreateSymbolsArchive>true</CreateSymbolsArchive>
+    <CreateSymbolsArchive Condition="'$(DotNetBuildFromSource)' != 'true'">true</CreateSymbolsArchive>
   </PropertyGroup>
 
   <ItemGroup>

From b581c3af245af4209222161eee0aacd6ab2d854c Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Tue, 5 Oct 2021 09:28:45 -0700
Subject: [PATCH 10/11] Update src/installer/pkg/archives/dotnet-nethost.proj

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
---
 src/installer/pkg/archives/dotnet-nethost.proj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/installer/pkg/archives/dotnet-nethost.proj b/src/installer/pkg/archives/dotnet-nethost.proj
index d23f6db48d31ee..f4fa94e9b90bab 100644
--- a/src/installer/pkg/archives/dotnet-nethost.proj
+++ b/src/installer/pkg/archives/dotnet-nethost.proj
@@ -7,7 +7,6 @@
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Archives" Version="$(MicrosoftDotNetBuildTasksArchivesVersion)" />
   </ItemGroup>
 
-
   <Target Name="PublishToDisk">
     <Error Condition="'$(OutputPath)' == ''" Text="Publishing to disk requires the OutputPath to be set to the root of the path to write to." />
 

From b860c223dc1336ff356d321e3cf3260786ce3f04 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jkoritzinsky@gmail.com>
Date: Tue, 5 Oct 2021 09:34:23 -0700
Subject: [PATCH 11/11] Update src/installer/pkg/archives/dotnet-nethost.proj

Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
---
 src/installer/pkg/archives/dotnet-nethost.proj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/installer/pkg/archives/dotnet-nethost.proj b/src/installer/pkg/archives/dotnet-nethost.proj
index f4fa94e9b90bab..e6bc4e90c2dbcb 100644
--- a/src/installer/pkg/archives/dotnet-nethost.proj
+++ b/src/installer/pkg/archives/dotnet-nethost.proj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.Build.NoTargets">
   <PropertyGroup>
-    <CreateSymbolsArchive Condition="'$(DotNetBuildFromSource)' != 'true'">true</CreateSymbolsArchive>
+	<!-- When KeepNativeSymbols is set, debug symbols are kept in the .so files. So when it is true, we don't need a symbols archive. -->
+    <CreateSymbolsArchive Condition="'$(KeepNativeSymbols)' != 'true'">true</CreateSymbolsArchive>
   </PropertyGroup>
 
   <ItemGroup>