From 7329400924468911fd62bd9526b76d81b18319ad Mon Sep 17 00:00:00 2001
From: James Crosswell <jamescrosswell@users.noreply.github.com>
Date: Mon, 16 Jun 2025 11:29:15 +1200
Subject: [PATCH 1/4] chore: Fix reference to Sentry.SourceGenerators

The current reference is very brittle:
- It assumes the Sentry.SourceGenerators project has already been built
- It assumes a release build
- It will break if the TFM ever changes or in a multi-targeting scenario

This breaks integration tests when these are run locally (since not all of the above assumptions hold up when running these locally).

#skip-changelog
---
 src/Sentry/Sentry.csproj | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj
index f5d358f8bc..b5a9b60ade 100644
--- a/src/Sentry/Sentry.csproj
+++ b/src/Sentry/Sentry.csproj
@@ -201,9 +201,8 @@
   </ItemGroup>
 
   <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="Analyzer"
+                      ReferenceOutputAssembly="false" />
   </ItemGroup>
 </Project>

From 4f152c79b076da1f7f9542f02f76eb446093fede Mon Sep 17 00:00:00 2001
From: Flash0ver <38893694+Flash0ver@users.noreply.github.com>
Date: Thu, 19 Jun 2025 21:43:49 +0200
Subject: [PATCH 2/4] fix: build and pack Sentry Generators without dependency

---
 src/Sentry/Sentry.csproj | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj
index b5a9b60ade..ad9169bc6f 100644
--- a/src/Sentry/Sentry.csproj
+++ b/src/Sentry/Sentry.csproj
@@ -200,9 +200,17 @@
     <None Include="buildTransitive\Sentry.SourceGenerators.targets" Pack="true" PackagePath="build\Sentry.SourceGenerators.targets" />
   </ItemGroup>
 
+  <!-- Build and Pack (without reference to) Sentry Generator. -->
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackSentryGenerator</TargetsForTfmSpecificContentInPackage>
+  </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Sentry.SourceGenerators\Sentry.SourceGenerators.csproj"
-                      OutputItemType="Analyzer"
-                      ReferenceOutputAssembly="false" />
+    <ProjectReference Include="..\Sentry.SourceGenerators\Sentry.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="true" PrivateAssets="all" SetTargetFramework="TargetFramework=netstandard2.0" />
   </ItemGroup>
+  <Target Name="PackSentryGenerator">
+    <ItemGroup>
+      <TfmSpecificPackageFile Include="$(OutputPath)\Sentry.SourceGenerators.dll" PackagePath="analyzers/dotnet/cs" BuildAction="None" />
+    </ItemGroup>
+  </Target>
+
 </Project>

From b3ca6803a360d2a416adbbcb8fa03ed6900b3615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20P=C3=B6lz?=
 <38893694+Flash0ver@users.noreply.github.com>
Date: Mon, 23 Jun 2025 22:10:44 +0200
Subject: [PATCH 3/4] build: replace TfmSpecificPackageFile with custom Target

---
 src/Sentry/Sentry.csproj | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj
index 38d1cb5eb7..83c9f9b7d0 100644
--- a/src/Sentry/Sentry.csproj
+++ b/src/Sentry/Sentry.csproj
@@ -202,16 +202,17 @@
     <None Include="buildTransitive\Sentry.SourceGenerators.targets" Pack="true" PackagePath="build\Sentry.SourceGenerators.targets" />
   </ItemGroup>
 
-  <!-- Build and Pack (without reference to) Sentry Generator. -->
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);PackSentryGenerator</TargetsForTfmSpecificContentInPackage>
-  </PropertyGroup>
+  <!-- Build and Pack (without dependency to) Sentry Generator (as Analyzer). -->
   <ItemGroup>
-    <ProjectReference Include="..\Sentry.SourceGenerators\Sentry.SourceGenerators.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="true" PrivateAssets="all" SetTargetFramework="TargetFramework=netstandard2.0" />
+    <ProjectReference Include="..\Sentry.SourceGenerators\Sentry.SourceGenerators.csproj" OutputItemType="" ReferenceOutputAssembly="false" PrivateAssets="all" SetTargetFramework="TargetFramework=netstandard2.0" SentryAnalyzersPack="true" />
   </ItemGroup>
-  <Target Name="PackSentryGenerator">
+  <!-- See https://github.com/ViktorHofer/PackAsAnalyzer -->
+  <Target Name="_SentryPackAnalyzers" BeforeTargets="GenerateNuspec;_GetPackageFiles">
+    <MSBuild Projects="@(ProjectReference->WithMetadataValue('SentryAnalyzersPack', 'true'))" Targets="GetTargetPath">
+      <Output TaskParameter="TargetOutputs" ItemName="_SentryAnalyzersPackagePath" />
+    </MSBuild>
     <ItemGroup>
-      <TfmSpecificPackageFile Include="$(OutputPath)\Sentry.SourceGenerators.dll" PackagePath="analyzers/dotnet/cs" BuildAction="None" />
+      <None Include="@(_SentryAnalyzersPackagePath)" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
     </ItemGroup>
   </Target>
 

From ee425d84773821bd094210dbc760f4faa212c519 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20P=C3=B6lz?=
 <38893694+Flash0ver@users.noreply.github.com>
Date: Tue, 24 Jun 2025 08:33:20 +0200
Subject: [PATCH 4/4] build: remve GenerateNuspec from BeforeTargets

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

diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj
index 83c9f9b7d0..9670a6ac8a 100644
--- a/src/Sentry/Sentry.csproj
+++ b/src/Sentry/Sentry.csproj
@@ -206,8 +206,9 @@
   <ItemGroup>
     <ProjectReference Include="..\Sentry.SourceGenerators\Sentry.SourceGenerators.csproj" OutputItemType="" ReferenceOutputAssembly="false" PrivateAssets="all" SetTargetFramework="TargetFramework=netstandard2.0" SentryAnalyzersPack="true" />
   </ItemGroup>
-  <!-- See https://github.com/ViktorHofer/PackAsAnalyzer -->
-  <Target Name="_SentryPackAnalyzers" BeforeTargets="GenerateNuspec;_GetPackageFiles">
+  <!-- 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>