From a31de18e3e4c17a278f6afa0b0b34952164f14bc Mon Sep 17 00:00:00 2001
From: Phil Allen <phillipa@microsoft.com>
Date: Mon, 3 Mar 2025 19:58:38 -0800
Subject: [PATCH] Change symbol publishing for more reliable builds

Set "IsPackable"
Set "IncludeSymbols"
Set "IsShippingAssembly"
---
 Directory.Build.props                                          | 3 +++
 src/Analyzers/Directory.Build.props                            | 3 ---
 .../src/Microsoft.CodeAnalysis.Razor.Compiler.csproj           | 3 +++
 src/Razor/src/Directory.Build.props                            | 3 ---
 .../Microsoft.VisualStudio.RazorExtension.csproj               | 3 ++-
 src/Shared/Directory.Build.props                               | 3 ---
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 8c293b9a383..e552eb5d0eb 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -28,6 +28,9 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
 
+    <!-- VS does not require Windows PDBs to be published anymore. -->
+    <PublishWindowsPdb>false</PublishWindowsPdb>
+
     <SharedSourceRoot>$(MSBuildThisFileDirectory)src\Shared\</SharedSourceRoot>
     <SharedFilesRoot>$(SharedSourceRoot)files\</SharedFilesRoot>
 
diff --git a/src/Analyzers/Directory.Build.props b/src/Analyzers/Directory.Build.props
index 29220e70368..5231476a90d 100644
--- a/src/Analyzers/Directory.Build.props
+++ b/src/Analyzers/Directory.Build.props
@@ -8,9 +8,6 @@
     <IncludeSymbols>true</IncludeSymbols>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
 
-    <!-- In theory we want to have this property set, but our pipeline doesn't set the access tokens yet -->
-    <PublishWindowsPdb Condition="'$(DotNetSymbolServerTokenMsdl)'!='' and '$(DotNetSymbolServerTokenSymWeb)'!=''">true</PublishWindowsPdb>
-
     <RollForward Condition="'$(IsTestProject)' == 'true'">LatestMajor</RollForward>
   </PropertyGroup>
 
diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Microsoft.CodeAnalysis.Razor.Compiler.csproj b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Microsoft.CodeAnalysis.Razor.Compiler.csproj
index 6f611c0c931..6428e0f55ed 100644
--- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Microsoft.CodeAnalysis.Razor.Compiler.csproj
+++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Microsoft.CodeAnalysis.Razor.Compiler.csproj
@@ -4,6 +4,9 @@
     <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor compiler.</Description>
     <TargetFrameworks>$(DefaultNetCoreTargetFramework);netstandard2.0</TargetFrameworks>
     <ExcludeFromSourceOnlyBuild>false</ExcludeFromSourceOnlyBuild>
+    <IsPackable>true</IsPackable>
+    <IsShippingAssembly>true</IsShippingAssembly>
+    <IncludeSymbols>true</IncludeSymbols>
 
     <!--
       RS2008: Enable analyzer release tracking
diff --git a/src/Razor/src/Directory.Build.props b/src/Razor/src/Directory.Build.props
index 3f160476dc8..8d70ad15a31 100644
--- a/src/Razor/src/Directory.Build.props
+++ b/src/Razor/src/Directory.Build.props
@@ -7,9 +7,6 @@
     <IsShipping>true</IsShipping>
     <IncludeSymbols>true</IncludeSymbols>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-
-    <!-- In theory we want to have this property set, but our pipeline doesn't set the access tokens yet -->
-    <PublishWindowsPdb Condition="'$(DotNetSymbolServerTokenMsdl)'!='' and '$(DotNetSymbolServerTokenSymWeb)'!=''">true</PublishWindowsPdb>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj b/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
index 338bdf86a6e..810b344b3e0 100644
--- a/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
+++ b/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
@@ -19,7 +19,8 @@
     <!-- Update the VSToolsPath to ensure VSIX builds -->
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
     <ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
-    <IsPackable>false</IsPackable>
+    <IsPackable>true</IsPackable>
+    <IsShippingAssembly>true</IsShippingAssembly>
 
     <GenerateResourceUsePreserializedResources Condition="'$(MSBuildRuntimeType)' == 'Core'">true</GenerateResourceUsePreserializedResources>
 
diff --git a/src/Shared/Directory.Build.props b/src/Shared/Directory.Build.props
index 0dcc995fa50..fa5c971dc87 100644
--- a/src/Shared/Directory.Build.props
+++ b/src/Shared/Directory.Build.props
@@ -8,9 +8,6 @@
     <IncludeSymbols>true</IncludeSymbols>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
 
-    <!-- In theory we want to have this property set, but our pipeline doesn't set the access tokens yet -->
-    <PublishWindowsPdb Condition="'$(DotNetSymbolServerTokenMsdl)'!='' and '$(DotNetSymbolServerTokenSymWeb)'!=''">true</PublishWindowsPdb>
-
     <RollForward Condition="'$(IsTestProject)' == 'true'">LatestMajor</RollForward>
   </PropertyGroup>