From bbf66074ecaeff20abb0b21387922dd771cbd605 Mon Sep 17 00:00:00 2001
From: Sergio Pedri <sergio0694@live.com>
Date: Sun, 1 Oct 2023 16:35:35 +0200
Subject: [PATCH] Improve shared .props to manage analyzer projects

---
 build/Directory.Build.props | 8 ++++++--
 src/Directory.Build.props   | 8 ++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/build/Directory.Build.props b/build/Directory.Build.props
index 9381df45e..e5dcc07eb 100644
--- a/build/Directory.Build.props
+++ b/build/Directory.Build.props
@@ -141,9 +141,13 @@
     <ProjectDirectoryPathFromSourceRoot>$([MSBuild]::MakeRelative('$(MSBuildThisFileDirectory)..\', $(MSBuildProjectDirectory)))</ProjectDirectoryPathFromSourceRoot>
     <IsPublishedProject>$(ProjectDirectoryPathFromSourceRoot.StartsWith('src\'))</IsPublishedProject>
     <IsSourceGeneratorProject>false</IsSourceGeneratorProject>
-    <IsSourceGeneratorProject Condition="$(IsPublishedProject) AND ($(MSBuildProjectName.EndsWith('.SourceGenerators')) OR $(MSBuildProjectName.EndsWith('.CodeFixers')))">true</IsSourceGeneratorProject>
+    <IsSourceGeneratorProject Condition="$(IsPublishedProject) AND $(MSBuildProjectName.EndsWith('.SourceGenerators'))">true</IsSourceGeneratorProject>
+    <IsCodeFixersProject>false</IsCodeFixersProject>
+    <IsCodeFixersProject Condition="$(IsPublishedProject) AND $(MSBuildProjectName.EndsWith('.CodeFixers'))">true</IsCodeFixersProject>
+    <IsAnalyzersProject>false</IsAnalyzersProject>
+    <IsAnalyzersProject Condition="$(IsSourceGeneratorProject) OR $(IsCodeFixersProject)">true</IsAnalyzersProject>
     <IsPackagedProject>false</IsPackagedProject>
-    <IsPackagedProject Condition="$(IsPublishedProject) AND !$(IsSourceGeneratorProject)">true</IsPackagedProject>
+    <IsPackagedProject Condition="$(IsPublishedProject) AND !$(IsAnalyzersProject)">true</IsPackagedProject>
     <IsTestProject>$(ProjectDirectoryPathFromSourceRoot.StartsWith('tests\'))</IsTestProject>    
     <IsInternalsTestProject>false</IsInternalsTestProject>
     <IsInternalsTestProject Condition="$(IsTestProject) AND $(MSBuildProjectName.EndsWith('.Internals'))">true</IsInternalsTestProject>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 98b026937..19fabcadd 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -45,11 +45,11 @@
   <!-- Additional properties for all source projects-->
   <PropertyGroup>
 
-    <!-- Disable packing symbols for source generators -->
-    <PackSymbols Condition="$(IsSourceGeneratorProject)">false</PackSymbols>
+    <!-- Disable packing symbols for all analyzers -->
+    <PackSymbols Condition="$(IsAnalyzersProject)">false</PackSymbols>
 
-    <!-- Enable extended analyzer rules for all source generators -->
-    <EnforceExtendedAnalyzerRules Condition="$(IsSourceGeneratorProject)">true</EnforceExtendedAnalyzerRules>
+    <!-- Enable extended analyzer rules for all analyzers -->
+    <EnforceExtendedAnalyzerRules Condition="$(IsAnalyzersProject)">true</EnforceExtendedAnalyzerRules>
 
     <!-- Check whether the project has a .targets file to bundle -->
     <IsTargetsFileAvailableForPacking>false</IsTargetsFileAvailableForPacking>