From d0e0f8f6d18e0aa0a5753746524fe9c6659927db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20P=C3=B6lz?=
 <38893694+Flash0ver@users.noreply.github.com>
Date: Wed, 25 Jun 2025 16:00:12 +0200
Subject: [PATCH 1/4] build: fix source gen ref

---
 src/Sentry/Sentry.csproj | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj
index b987d1042e..5df7656c8c 100644
--- a/src/Sentry/Sentry.csproj
+++ b/src/Sentry/Sentry.csproj
@@ -202,10 +202,19 @@
     <None Include="buildTransitive\Sentry.SourceGenerators.targets" Pack="true" PackagePath="build\Sentry.SourceGenerators.targets" />
   </ItemGroup>
 
+  <!-- Build and Pack (without dependency to) Roslyn Components / Compiler Extensions (as "analyzers"). -->
   <ItemGroup>
-    <None Include="..\Sentry.SourceGenerators\bin\Release\netstandard2.0\Sentry.SourceGenerators.dll"
-          Pack="true"
-          PackagePath="analyzers/dotnet/cs"
-          Visible="false" />
+    <ProjectReference Include="..\Sentry.SourceGenerators\Sentry.SourceGenerators.csproj" OutputItemType="" ReferenceOutputAssembly="false" PrivateAssets="all" SetTargetFramework="TargetFramework=netstandard2.0" SentryAnalyzersPack="true" />
   </ItemGroup>
+  <!-- See https://learn.microsoft.com/dotnet/core/project-sdk/overview -->
+  <!-- See also https://github.com/ViktorHofer/PackAsAnalyzer -->
+  <Target Name="_SentryPackAnalyzers" BeforeTargets="_GetPackageFiles">
+    <MSBuild Projects="@(ProjectReference->WithMetadataValue('SentryAnalyzersPack', 'true'))" Targets="GetTargetPath">
+      <Output TaskParameter="TargetOutputs" ItemName="_SentryAnalyzersPackagePath" />
+    </MSBuild>
+    <ItemGroup>
+      <None Include="@(_SentryAnalyzersPackagePath)" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+    </ItemGroup>
+  </Target>
+
 </Project>

From 810763b2fd3a7a419153b14daa07cc903ba34dac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20P=C3=B6lz?=
 <38893694+Flash0ver@users.noreply.github.com>
Date: Thu, 26 Jun 2025 23:28:45 +0200
Subject: [PATCH 2/4] build: add Error when no analyzer assemblies are found

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

diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj
index 5df7656c8c..09a013aab6 100644
--- a/src/Sentry/Sentry.csproj
+++ b/src/Sentry/Sentry.csproj
@@ -212,6 +212,7 @@
     <MSBuild Projects="@(ProjectReference->WithMetadataValue('SentryAnalyzersPack', 'true'))" Targets="GetTargetPath">
       <Output TaskParameter="TargetOutputs" ItemName="_SentryAnalyzersPackagePath" />
     </MSBuild>
+    <Error Text="No analyzer assemblies found to pack." Condition="'@(_SentryAnalyzersPackagePath)' == ''" />
     <ItemGroup>
       <None Include="@(_SentryAnalyzersPackagePath)" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
     </ItemGroup>

From 36160c708185d2bb212dc62ee7f3e87f5521f632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20P=C3=B6lz?=
 <38893694+Flash0ver@users.noreply.github.com>
Date: Fri, 27 Jun 2025 12:30:09 +0200
Subject: [PATCH 3/4] build: add Messages to _SentryPackAnalyzers Target

---
 src/Sentry/Sentry.csproj | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj
index 09a013aab6..eefffe1752 100644
--- a/src/Sentry/Sentry.csproj
+++ b/src/Sentry/Sentry.csproj
@@ -203,16 +203,18 @@
   </ItemGroup>
 
   <!-- Build and Pack (without dependency to) Roslyn Components / Compiler Extensions (as "analyzers"). -->
+  <!-- See https://learn.microsoft.com/dotnet/core/project-sdk/overview -->
+  <!-- See also https://github.com/ViktorHofer/PackAsAnalyzer -->
   <ItemGroup>
     <ProjectReference Include="..\Sentry.SourceGenerators\Sentry.SourceGenerators.csproj" OutputItemType="" ReferenceOutputAssembly="false" PrivateAssets="all" SetTargetFramework="TargetFramework=netstandard2.0" SentryAnalyzersPack="true" />
   </ItemGroup>
-  <!-- See https://learn.microsoft.com/dotnet/core/project-sdk/overview -->
-  <!-- See also https://github.com/ViktorHofer/PackAsAnalyzer -->
   <Target Name="_SentryPackAnalyzers" BeforeTargets="_GetPackageFiles">
+    <Message Text="Target: '_SentryPackAnalyzers' with Analyzer-Projects: '@(ProjectReference->WithMetadataValue('SentryAnalyzersPack', 'true'))'" Importance="high" />
     <MSBuild Projects="@(ProjectReference->WithMetadataValue('SentryAnalyzersPack', 'true'))" Targets="GetTargetPath">
       <Output TaskParameter="TargetOutputs" ItemName="_SentryAnalyzersPackagePath" />
     </MSBuild>
     <Error Text="No analyzer assemblies found to pack." Condition="'@(_SentryAnalyzersPackagePath)' == ''" />
+    <Message Text="Packing Analyzers: '@(_SentryAnalyzersPackagePath)'" Importance="high" />
     <ItemGroup>
       <None Include="@(_SentryAnalyzersPackagePath)" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
     </ItemGroup>

From 42ca3d14a166a373425ac3b36fdf50b320cc8b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20P=C3=B6lz?=
 <38893694+Flash0ver@users.noreply.github.com>
Date: Tue, 1 Jul 2025 12:31:28 +0200
Subject: [PATCH 4/4] build: replace ProjectReference with MSBuild

---
 src/Sentry/Sentry.csproj | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj
index eefffe1752..8447b9fd71 100644
--- a/src/Sentry/Sentry.csproj
+++ b/src/Sentry/Sentry.csproj
@@ -206,11 +206,12 @@
   <!-- See https://learn.microsoft.com/dotnet/core/project-sdk/overview -->
   <!-- See also https://github.com/ViktorHofer/PackAsAnalyzer -->
   <ItemGroup>
-    <ProjectReference Include="..\Sentry.SourceGenerators\Sentry.SourceGenerators.csproj" OutputItemType="" ReferenceOutputAssembly="false" PrivateAssets="all" SetTargetFramework="TargetFramework=netstandard2.0" SentryAnalyzersPack="true" />
+    <SentryAnalyzerProjectReference Include="..\Sentry.SourceGenerators\Sentry.SourceGenerators.csproj" />
   </ItemGroup>
-  <Target Name="_SentryPackAnalyzers" BeforeTargets="_GetPackageFiles">
-    <Message Text="Target: '_SentryPackAnalyzers' with Analyzer-Projects: '@(ProjectReference->WithMetadataValue('SentryAnalyzersPack', 'true'))'" Importance="high" />
-    <MSBuild Projects="@(ProjectReference->WithMetadataValue('SentryAnalyzersPack', 'true'))" Targets="GetTargetPath">
+  <Target Name="_SentryPackAnalyzers" BeforeTargets="GenerateNuspec;_GetPackageFiles">
+    <Message Text="Target: '_SentryPackAnalyzers' with Analyzer-Projects: '@(SentryAnalyzerProjectReference)'" Importance="high" />
+    <MSBuild Projects="@(SentryAnalyzerProjectReference)" Properties="Configuration=$(Configuration);TargetFramework=netstandard2.0"/>
+    <MSBuild Projects="@(SentryAnalyzerProjectReference)" Properties="Configuration=$(Configuration);TargetFramework=netstandard2.0" Targets="GetTargetPath">
       <Output TaskParameter="TargetOutputs" ItemName="_SentryAnalyzersPackagePath" />
     </MSBuild>
     <Error Text="No analyzer assemblies found to pack." Condition="'@(_SentryAnalyzersPackagePath)' == ''" />