From a64e671a8b99db0a92e1e1b3a97eb31fd973e42b Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Wed, 1 Nov 2017 17:15:52 -0700
Subject: [PATCH 1/6] Don't crossgen satellite assemblies

---
 src/redist/redist.csproj | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index c45cd6bdf..0d0f1b7e1 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -208,6 +208,9 @@
 
       <!-- Don't try to CrossGen tasks and supporting DLLs compiled for .NET Framework -->
       <SdkFiles Remove="$(PublishDir)/Microsoft\Microsoft.NET.Build.Extensions\tools\net*\**\*" />
+
+      <!-- Don't crossgen satellite assemblies -->
+      <SdkFiles Remove="$(PublishDir)/**/*.resources.dll" />
     </ItemGroup>
 
     <AddMetadataIsPE Items="@(SdkFiles)">

From 116da0277c0bfb3211165d4a7d1527fa7f05ae94 Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Wed, 1 Nov 2017 17:17:22 -0700
Subject: [PATCH 2/6] Generate symbols for profiling when running crossgen

---
 build_projects/dotnet-cli-build/Crossgen.cs | 35 +++++++++++++++++++++
 src/redist/redist.csproj                    |  5 +++
 2 files changed, 40 insertions(+)

diff --git a/build_projects/dotnet-cli-build/Crossgen.cs b/build_projects/dotnet-cli-build/Crossgen.cs
index 68129a065..48ebdebfa 100644
--- a/build_projects/dotnet-cli-build/Crossgen.cs
+++ b/build_projects/dotnet-cli-build/Crossgen.cs
@@ -3,7 +3,9 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Diagnostics;
 using System.IO;
+using System.Runtime.InteropServices;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
@@ -22,12 +24,18 @@ namespace Microsoft.DotNet.Build.Tasks
 
         public string CrossgenPath { get; set; }
 
+        public bool CreateSymbols { get; set; }
+
+        public string DiasymReaderPath { get; set; }
+
         public bool ReadyToRun { get; set; }
 
         public ITaskItem[] PlatformAssemblyPaths { get; set; }
 
         private string TempOutputPath { get; set; }
 
+        private bool _secondInvocationToCreateSymbols;
+
         protected override bool ValidateParameters()
         {
             base.ValidateParameters();
@@ -58,6 +66,12 @@ namespace Microsoft.DotNet.Build.Tasks
                 File.Delete(TempOutputPath);
             }
 
+            if (toolResult && CreateSymbols)
+            {
+                _secondInvocationToCreateSymbols = true;
+                toolResult = base.Execute();
+            }
+
             return toolResult;
         }
 
@@ -83,9 +97,30 @@ namespace Microsoft.DotNet.Build.Tasks
 
         protected override string GenerateCommandLineCommands()
         {
+            if (_secondInvocationToCreateSymbols)
+            {
+                return $"{GetReadyToRun()} {GetPlatformAssemblyPaths()} {GetDiasymReaderPath()} {GetCreateSymbols()}";
+            }
+
             return $"{GetReadyToRun()} {GetInPath()} {GetOutPath()} {GetPlatformAssemblyPaths()} {GetJitPath()}";
         }
 
+        private string GetCreateSymbols()
+        {
+            var option = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "-createpdb" : "-createperfmap";
+            return $"{option} \"{Path.GetDirectoryName(DestinationPath)}\" \"{DestinationPath}\"";
+        }
+
+        private string GetDiasymReaderPath()
+        {
+            if (string.IsNullOrEmpty(DiasymReaderPath))
+            {
+                return null;
+            }
+
+            return $"-diasymreaderpath \"{DiasymReaderPath}\"";
+        }
+
         private string GetReadyToRun()
         {
             if (ReadyToRun)
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 0d0f1b7e1..ded13959e 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -211,6 +211,8 @@
 
       <!-- Don't crossgen satellite assemblies -->
       <SdkFiles Remove="$(PublishDir)/**/*.resources.dll" />
+
+      <DiasymReaderPath Include="$(SharedFrameworkNameVersionPath)/Microsoft.DiaSymReader.Native.*.dll" />
     </ItemGroup>
 
     <AddMetadataIsPE Items="@(SdkFiles)">
@@ -235,6 +237,8 @@
               JITPath="$(LibCLRJitPath)"
               CrossgenPath="$(CrossgenPath)"
               ReadyToRun="True"
+              CreateSymbols="True"
+              DiasymReaderPath="@(DiasymReaderPath)"
               PlatformAssemblyPaths="@(PlatformAssemblies);
                                      @(PublishDirSubDirectories);
                                      $(SharedFrameworkNameVersionPath)" />
@@ -265,6 +269,7 @@
           AfterTargets="CreateSymbolsDirectory">
     <ItemGroup>
       <PdbsToClean Include="$(PublishDir)/**/*.pdb" />
+      <PdbsToClean Include="$(PublishDir)/**/*.ni.*.map" />
     </ItemGroup>
 
     <Delete Files="@(PdbsToClean)" />

From 607907c67da7fb6466f7a325da9b4d81192e9cec Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Thu, 2 Nov 2017 15:05:24 -0700
Subject: [PATCH 3/6] Retarget VSTest before publishing with backward
 compatible runtimes

---
 src/redist/redist.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index ded13959e..37dbadb3a 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -293,6 +293,7 @@
   </Target>
 
   <Target Name="RetargetVSTestConsole"
+          BeforeTargets="PublishStage2WithBackwardsCompatibleRuntimes"
           AfterTargets="Publish">
     <PropertyGroup>
       <VSTestRuntimeConfigPath>$(PublishDir)/vstest.console.runtimeconfig.json</VSTestRuntimeConfigPath>

From 4f31e3db6690b5f67710bcc75eb10f718940e5a2 Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Thu, 2 Nov 2017 10:07:11 -0700
Subject: [PATCH 4/6] Improve symbols zip archive

We were publishing a -debug zip with sdk code and symbols, but it was captured before
publishing was finished and had incorrect code content. Trying to use it would blow up
due to incorrect runtimeconfig.json.

Replace it with a -symbols zip that contains only symbols and that can be overlayed
over the main zip. This is just like the -langpack zip that has satellite assemblies.

Also add an option to leave the PDBs in the same directory/packages as code:
/p:SeparateSymbolsArchive=false. Setting this on local builds facilitates
debugging and profiling by removing the need to adjust symbol paths or copy PDBs
around.
---
 build/Branding.props         |  4 ++--
 build/package/Layout.targets | 20 ++++++++++----------
 src/redist/redist.csproj     | 27 ++++++++++-----------------
 3 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/build/Branding.props b/build/Branding.props
index 9a66fdc2d..7b126782e 100644
--- a/build/Branding.props
+++ b/build/Branding.props
@@ -21,14 +21,14 @@
     <HostMonikerRid Condition=" '$(HostMonikerRid)' == '' ">$(HostOSName)-$(Architecture)</HostMonikerRid>
 
     <ArtifactNameSdk>dotnet-sdk-internal</ArtifactNameSdk>
-    <ArtifactNameSdkDebug>dotnet-sdk-debug</ArtifactNameSdkDebug>
+    <ArtifactNameSdkSymbols>dotnet-sdk-symbols</ArtifactNameSdkSymbols>
     <ArtifactNameCombinedHostHostFxrFrameworkSdk>dotnet-sdk</ArtifactNameCombinedHostHostFxrFrameworkSdk>
     <ArtifactNameSdkLanguagePack>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-langpack</ArtifactNameSdkLanguagePack>
 
     <ArtifactNameWithVersionSdk>$(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdk>
     <ArtifactNameWithVersionMSBuildExtensions>dotnet-standard-support-vs2015-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionMSBuildExtensions>
 
-    <ArtifactNameWithVersionSdkDebug>$(ArtifactNameSdkDebug)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdkDebug>
+    <ArtifactNameWithVersionSdkSymbols>$(ArtifactNameSdkSymbols)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdkSymbols>
     <ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
     <ArtifactNameWithVersionSdkLanguagePack>$(ArtifactNameSdkLanguagePack)-$(SdkVersion)-$(ProductMonikerRid)</ArtifactNameWithVersionSdkLanguagePack>
     <DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>$(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(HostMonikerRid)</DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk>
diff --git a/build/package/Layout.targets b/build/package/Layout.targets
index 8d37a5b36..e59186202 100644
--- a/build/package/Layout.targets
+++ b/build/package/Layout.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <SdkDebugLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdkDebug)</SdkDebugLayoutOutputDirectory>
+    <SdkSymbolsLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdkSymbols)</SdkSymbolsLayoutOutputDirectory>
     <CombinedHostHostFxrFrameworkSdkOutputDirectory>$(LayoutDirectory)/$(ArtifactNameCombinedHostHostFxrFrameworkSdk)</CombinedHostHostFxrFrameworkSdkOutputDirectory>
     <SdkLanguagePackOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdkLanguagePack)</SdkLanguagePackOutputDirectory>
     <SatelliteAssemblies>*.resources.dll</SatelliteAssemblies>
@@ -12,7 +12,7 @@
     <!-- Set up Items with Layout Input Files -->
     <ItemGroup>
       <SdkLayoutInput Include="$(OutputDirectory)/sdk/**/*" />
-      <SdkDebugLayoutInput Include="$(SymbolsDirectory)/sdk/**/*" />
+      <SdkSymbolsLayoutInput Include="$(SymbolsDirectory)/sdk/**/*" />
       <CombinedHostHostFxrFrameworkSdkInput Include="$(OutputDirectory)/**/*" />
       <SdkLanguagePackInput Include="$(OutputDirectory)/sdk/**/$(SatelliteAssemblies)" />
 
@@ -30,9 +30,9 @@
       <Output TaskParameter="RelativePath" ItemName="SdkRelativeOutputFiles" />
     </MakeRelative>
     <MakeRelative
-      Path1="$(SymbolsDirectory)"
-      Path2="%(SdkDebugLayoutInput.Identity)" >
-      <Output TaskParameter="RelativePath" ItemName="SdkDebugRelativeOutputFiles" />
+      Path1="$(SymbolsDirectory)/"
+      Path2="%(SdkSymbolsLayoutInput.Identity)" >
+      <Output TaskParameter="RelativePath" ItemName="SdkSymbolsRelativeOutputFiles" />
     </MakeRelative>
     <MakeRelative
       Path1="$(OutputDirectory)/"
@@ -70,11 +70,11 @@
         <Name>$(ArtifactNameSdk)</Name>
       </LayoutDefinition>
 
-      <LayoutDefinition Include="Debug">
-        <InputFiles>@(SdkDebugLayoutInput)</InputFiles>
-        <OutputFiles>@(SdkDebugRelativeOutputFiles -> '$(SdkDebugLayoutOutputDirectory)/%(Identity)')</OutputFiles>
-        <NameWithVersion>$(ArtifactNameWithVersionSdkDebug)</NameWithVersion>
-        <Name>$(ArtifactNameSdkDebug)</Name>
+      <LayoutDefinition Include="SdkSymbols" Condition="'$(SeparateSymbolsArchive)' != 'false'">
+        <InputFiles>@(SdkSymbolsLayoutInput)</InputFiles>
+        <OutputFiles>@(SdkSymbolsRelativeOutputFiles -> '$(SdkSymbolsLayoutOutputDirectory)/%(Identity)')</OutputFiles>
+        <NameWithVersion>$(ArtifactNameWithVersionSdkSymbols)</NameWithVersion>
+        <Name>$(ArtifactNameSdkSymbols)</Name>
       </LayoutDefinition>
 
       <LayoutDefinition Include="CombinedHostHostFxrFrameworkSdk">
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 37dbadb3a..fab6164c5 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -101,7 +101,8 @@
 
     <Delete Files="$(PublishDir)/$(TargetName).deps.json;
                    $(PublishDir)/$(TargetName).runtimeconfig.json;
-                   $(PublishDir)/%(BundledToolProjects.Identity).dll" />
+                   $(PublishDir)/%(BundledToolProjects.Identity).dll;
+                   $(PublishDir)/%(BundledToolProjects.Identity).pdb" />
 
     <ChangeEntryPointLibraryName
           DepsFile="$(PublishDir)/%(BundledTools.Identity).deps.json"
@@ -198,7 +199,7 @@
 
   <Target Name="CrossgenPublishDir"
           Condition=" '$(DISABLE_CROSSGEN)' == '' "
-          AfterTargets="PublishMSBuildExtensions">
+          AfterTargets="GenerateCliRuntimeConfigurationFiles">
     <ItemGroup>
       <!-- Removing Full CLR built TestHost assemblies from getting Crossgen as it is throwing error -->
       <SdkFiles Include="$(PublishDir)/**/*" Exclude="$(PublishDir)/TestHost*/**/*;$(PublishDir)/Sdks/**/*" />
@@ -255,24 +256,16 @@
     <Chmod Mode="755" Glob="$(SdkOutputDirectory)/FSharp/RunFsc.sh" />
   </Target>
 
-  <Target Name="CreateSymbolsDirectory"
-          AfterTargets="CrossgenPublishDir">
+  <Target Name="SeparateSymbolsFromPublishDir"
+          AfterTargets="CrossgenPublishDir"
+          Condition="'$(SeparateSymbolsArchive)' != 'false'">
     <ItemGroup>
-      <_AllSdkFiles Include="$(PublishDir)/**/*" />
+      <PdbsToMove Include="$(PublishDir)/**/*.pdb" />
+      <PdbsToMove Include="$(PublishDir)/**/*.ni.*.map" />
     </ItemGroup>
 
-    <Copy SourceFiles="@(_AllSdkFiles)"
-        DestinationFiles="@(_AllSdkFiles->'$(SymbolsDirectory)/sdk/%(RecursiveDir)%(Filename)%(Extension)')" />
-  </Target>
-
-  <Target Name="RemovePdbsFromPublishDir"
-          AfterTargets="CreateSymbolsDirectory">
-    <ItemGroup>
-      <PdbsToClean Include="$(PublishDir)/**/*.pdb" />
-      <PdbsToClean Include="$(PublishDir)/**/*.ni.*.map" />
-    </ItemGroup>
-
-    <Delete Files="@(PdbsToClean)" />
+    <Move SourceFiles="@(PdbsToMove)" 
+          DestinationFiles="@(PdbsToMove->'$(SymbolsDirectory)/sdk/$(SdkVersion)/%(RecursiveDir)%(Filename)%(Extension)')" />
   </Target>
 
   <Target Name="PublishStage2WithBackwardsCompatibleRuntimes"

From a2d18edb91d45ca1d592fa400a794aae57ebb256 Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Thu, 2 Nov 2017 16:35:29 -0700
Subject: [PATCH 5/6] Don't attempt to generate profiling symbols on Mac OS

---
 src/redist/redist.csproj | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index fab6164c5..b8e179c3b 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -233,12 +233,18 @@
            Glob="$(CrossgenPath)"
            Mode="u+x" />
 
+    <!-- Crossgen does not support generating symbols on Mac  -->
+    <PropertyGroup Condition="'$(CreateCrossgenSymbols)' == ''">
+      <CreateCrossgenSymbols>true</CreateCrossgenSymbols>
+      <CreateCrossgenSymbols Condition="'$(OSName)' == 'osx'">false</CreateCrossgenSymbols>
+   </PropertyGroup>
+
     <Crossgen SourceAssembly="%(CrossgenTargets.FullPath)"
               DestinationPath="%(CrossgenTargets.FullPath)"
               JITPath="$(LibCLRJitPath)"
               CrossgenPath="$(CrossgenPath)"
               ReadyToRun="True"
-              CreateSymbols="True"
+              CreateSymbols="$(CreateCrossgenSymbols)"
               DiasymReaderPath="@(DiasymReaderPath)"
               PlatformAssemblyPaths="@(PlatformAssemblies);
                                      @(PublishDirSubDirectories);

From 2a0569dc3400a93b91b0314e3ba402482dd57924 Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Fri, 3 Nov 2017 15:22:41 -0700
Subject: [PATCH 6/6] Fix build error when using SeparateSymbolsArchive=false

---
 build/package/Layout.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/package/Layout.targets b/build/package/Layout.targets
index e59186202..4c14f6ee3 100644
--- a/build/package/Layout.targets
+++ b/build/package/Layout.targets
@@ -30,6 +30,7 @@
       <Output TaskParameter="RelativePath" ItemName="SdkRelativeOutputFiles" />
     </MakeRelative>
     <MakeRelative
+      Condition="'$(SeparateSymbolsArchive)' != 'false'"
       Path1="$(SymbolsDirectory)/"
       Path2="%(SdkSymbolsLayoutInput.Identity)" >
       <Output TaskParameter="RelativePath" ItemName="SdkSymbolsRelativeOutputFiles" />