From 4f67ff921673d7367c44ea1840c7a731628bf9bf Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Sun, 16 Jun 2019 11:30:56 -0700
Subject: [PATCH] Deploy Microsoft.Web.Xdt.Extensions.pdb - #10495 - add a
 general mechanism to publish "loose" PDBs

also, correct a typo from af2f647d635d: always publish the log artifacts
---
 .azure/pipelines/ci.yml                             |  4 +++-
 Directory.Build.props                               |  1 +
 Directory.Build.targets                             | 13 +++++++++++++
 eng/PublishSymbols.proj                             |  2 ++
 .../src/Microsoft.Web.Xdt.Extensions.csproj         |  1 +
 5 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
index 47ef331fa2..cffbae0de3 100644
--- a/.azure/pipelines/ci.yml
+++ b/.azure/pipelines/ci.yml
@@ -131,15 +131,17 @@ jobs:
     artifacts:
     - name: Windows_Logs
       path: artifacts/log/
+      publishOnError: true
     - name: Windows_Packages
       path: artifacts/packages/
+    - name: Windows_Symbols
+      path: artifacts/symbols/
     - name: Windows_VSIX
       path: artifacts/VSSetup/
     - name: Windows_Manifests
       path: artifacts/manifests/
     - name: Windows_Installers
       path: artifacts/installers/
-      publishOnError: true
 
 # Build Windows ARM
 - template: jobs/default-build.yml
diff --git a/Directory.Build.props b/Directory.Build.props
index bf91ebeb50..a39b240399 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -117,6 +117,7 @@
   <!-- Artifacts layout -->
   <PropertyGroup>
     <InstallersOutputPath>$(ArtifactsDir)installers\$(Configuration)\</InstallersOutputPath>
+    <SymbolsOutputPath>$(ArtifactsDir)symbols\$(Configuration)\</SymbolsOutputPath>
   </PropertyGroup>
 
   <!-- Ensure these output paths exist. -->
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 8dd3f5d309..a4e85b3646 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -118,6 +118,19 @@
 
   </ItemGroup>
 
+  <PropertyGroup Condition=" '$(CopySymbolsToArtifacts)' == 'true' AND '$(TargetFramework)' != '' ">
+    <BuildDependsOn>$(BuildDependsOn);_CopySymbolsToArtifacts</BuildDependsOn>
+  </PropertyGroup>
+
+  <Target Name="_CopySymbolsToArtifacts">
+    <Copy SourceFiles="$([System.IO.Path]::ChangeExtension('$(TargetPath)', 'pdb'))"
+        DestinationFolder="$(SymbolsOutputPath)$(TargetFramework)"
+        OverwriteReadOnlyFiles="$(OverwriteReadOnlyFiles)"
+        Retries="$(CopyRetryCount)"
+        RetryDelayMilliseconds="$(CopyRetryDelayMilliseconds)"
+        SkipUnchangedFiles="$(SkipCopyUnchangedFiles)" />
+  </Target>
+
   <Import Project="eng\Workarounds.targets" />
   <Import Project="eng\targets\ResolveIisReferences.targets" Condition=" '$(MSBuildProjectExtension)' != '.vcxproj' " />
   <Import Project="eng\targets\Cpp.Common.targets"  Condition="'$(MSBuildProjectExtension)' == '.vcxproj'" />
diff --git a/eng/PublishSymbols.proj b/eng/PublishSymbols.proj
index dd2c968566..a33a1df232 100644
--- a/eng/PublishSymbols.proj
+++ b/eng/PublishSymbols.proj
@@ -54,9 +54,11 @@
 
   <Target Name="SetupPublishSymbols">
     <ItemGroup>
+      <SymbolFilesToPublish Include="$(SymbolDirectory)/**/*.pdb" />
       <SymbolPackagesToPublish Include="$(SymbolDirectory)/**/*.symbols.nupkg" />
     </ItemGroup>
 
+    <Message Importance="High" Text="Publishing symbol files to '$(SymbolServerDescription)':%0A  @(SymbolFilesToPublish, '%0A  ')" />
     <Message Importance="High" Text="Publishing symbol packages to '$(SymbolServerDescription)':%0A  @(SymbolPackagesToPublish, '%0A  ')"/>
   </Target>
 </Project>
diff --git a/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj b/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj
index e1fe332fac..62764baee8 100644
--- a/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj
+++ b/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <Description>Additional functionality for Xdt transforms.</Description>
     <TargetFramework>net461</TargetFramework>
+    <CopySymbolsToArtifacts>true</CopySymbolsToArtifacts>
     <IsPackable>false</IsPackable>
     <HasReferenceAssembly>false</HasReferenceAssembly>
   </PropertyGroup>