diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj
index b987d1042e..9670a6ac8a 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) Sentry Generator (as Analyzer). -->
   <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>