From 6bbb6e6f922e03ac7c3e704a98b7519b6ab49ee3 Mon Sep 17 00:00:00 2001
From: James Crosswell <jamescrosswell@users.noreply.github.com>
Date: Wed, 25 Feb 2026 16:33:34 +1300
Subject: [PATCH 1/5] fix: MSB4006 circular dependency involving target
 "SetupCocoaSDK"

Resolves #4955:
- #4955
---
 .../Sentry.Bindings.Cocoa.csproj              | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/Sentry.Bindings.Cocoa/Sentry.Bindings.Cocoa.csproj b/src/Sentry.Bindings.Cocoa/Sentry.Bindings.Cocoa.csproj
index a13704f041..a47e647604 100644
--- a/src/Sentry.Bindings.Cocoa/Sentry.Bindings.Cocoa.csproj
+++ b/src/Sentry.Bindings.Cocoa/Sentry.Bindings.Cocoa.csproj
@@ -103,17 +103,25 @@
           DependsOnTargets="_DownloadCocoaSDK;_BuildCocoaSDK;_GenerateSentryCocoaBindings;SanitizeSentryCocoaFramework"
           Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
 
-  <!-- Setup exactly once: https://learn.microsoft.com/visualstudio/msbuild/run-target-exactly-once -->
+  <!--
+    Outer build (multi-TFM): runs _SetupCocoaSDK once before MSBuild fans out to inner per-TFM builds.
+    Critically, this ensures the stamp file exists before the inner builds are scheduled, so
+    SetupCocoaSDK's Condition (which checks for the stamp) correctly skips all inner builds.
+  -->
   <Target Name="SetupCocoaSDKBeforeOuterBuild" DependsOnTargets="_SetupCocoaSDK"
           Condition="$([MSBuild]::IsOSPlatform('OSX'))"
           BeforeTargets="DispatchToInnerBuilds" />
 
+  <!--
+    Inner build (single-TFM) or direct single-TFM invocation (-f flag): runs _SetupCocoaSDK as a
+    direct dependency, without a recursive MSBuild call. The recursive call pattern caused a circular
+    dependency (SetupCocoaSDK → BeforeBuild → SetupCocoaSDK) that newer MSBuild versions detect as an error.
+    All subtargets are idempotent, so if the outer build already ran them this is a no-op.
+  -->
   <Target Name="SetupCocoaSDK"
+          DependsOnTargets="_SetupCocoaSDK"
           BeforeTargets="BeforeBuild"
-          Condition="$([MSBuild]::IsOSPlatform('OSX'))">
-    <!-- Setup exactly once: https://learn.microsoft.com/visualstudio/msbuild/run-target-exactly-once -->
-    <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_SetupCocoaSDK" RemoveProperties="TargetFramework" />
-  </Target>
+          Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
 
   <Target Name="CleanCocoaSDK" AfterTargets="Clean" Condition="$([MSBuild]::IsOSPlatform('OSX'))">
     <RemoveDir Directories="$(SentryCocoaCache)" ContinueOnError="true" />
@@ -133,10 +141,12 @@
   </Target>
 
   <!-- Sanitize the xcframework before NativeReference resolution and packing -->
+  <!-- Stamp file ensures this only runs once even when invoked from multiple inner TFM builds -->
   <Target Name="SanitizeSentryCocoaFramework"
-          Condition="$([MSBuild]::IsOSPlatform('OSX')) and Exists('$(SentryCocoaFramework)')">
+          Condition="$([MSBuild]::IsOSPlatform('OSX')) and Exists('$(SentryCocoaFramework)') and !Exists('$(SentryCocoaFramework).sanitized.stamp')">
     <Message Importance="High" Text="Sanitizing $(SentryCocoaFramework): removing dSYMs, Headers, Modules, PrivateHeaders (including symlinks)." />
     <Exec Command="find &quot;$(SentryCocoaFramework)&quot; -depth \( -name dSYMs -o -name Headers -o -name Modules -o -name PrivateHeaders \) -exec echo Removing {} \; -exec rm -rf {} + 2&gt;/dev/null || true" />
+    <Touch Files="$(SentryCocoaFramework).sanitized.stamp" AlwaysCreate="true" />
   </Target>
 
   <!-- Workaround for https://github.com/xamarin/xamarin-macios/issues/15299 -->

From 46b325a41796fd17a2f7e858d690f02930cee6fb Mon Sep 17 00:00:00 2001
From: James Crosswell <jamescrosswell@users.noreply.github.com>
Date: Wed, 25 Feb 2026 16:44:10 +1300
Subject: [PATCH 2/5] changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f699acc9d5..4f0aaaab6b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Fixes
 
 - The SDK now logs a `Warning` instead of an `Error` when being ratelimited ([#4927](https://github.com/getsentry/sentry-dotnet/pull/4927))
+- Occassional MSB4006 circular dependency errors involving target "SetupCocoaSDK" when building the SDK ([#4956](https://github.com/getsentry/sentry-dotnet/pull/4956))
 
 ## 6.2.0-alpha.0
 

From 63898aca994fdefe3f9b9649a22bbb9f82c6441f Mon Sep 17 00:00:00 2001
From: James Crosswell <jamescrosswell@users.noreply.github.com>
Date: Fri, 6 Mar 2026 11:17:09 +1300
Subject: [PATCH 3/5] Removed changelog entry

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f0aaaab6b..f699acc9d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,6 @@
 ### Fixes
 
 - The SDK now logs a `Warning` instead of an `Error` when being ratelimited ([#4927](https://github.com/getsentry/sentry-dotnet/pull/4927))
-- Occassional MSB4006 circular dependency errors involving target "SetupCocoaSDK" when building the SDK ([#4956](https://github.com/getsentry/sentry-dotnet/pull/4956))
 
 ## 6.2.0-alpha.0
 

From 3b0a3b3fc3b76d808c172cee19a8059d0ff3b537 Mon Sep 17 00:00:00 2001
From: James Crosswell <jamescrosswell@users.noreply.github.com>
Date: Wed, 11 Mar 2026 13:51:52 +1300
Subject: [PATCH 4/5] Fixed comment

---
 src/Sentry.Bindings.Cocoa/Sentry.Bindings.Cocoa.csproj | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/Sentry.Bindings.Cocoa/Sentry.Bindings.Cocoa.csproj b/src/Sentry.Bindings.Cocoa/Sentry.Bindings.Cocoa.csproj
index a47e647604..bfd3832ba7 100644
--- a/src/Sentry.Bindings.Cocoa/Sentry.Bindings.Cocoa.csproj
+++ b/src/Sentry.Bindings.Cocoa/Sentry.Bindings.Cocoa.csproj
@@ -103,11 +103,7 @@
           DependsOnTargets="_DownloadCocoaSDK;_BuildCocoaSDK;_GenerateSentryCocoaBindings;SanitizeSentryCocoaFramework"
           Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
 
-  <!--
-    Outer build (multi-TFM): runs _SetupCocoaSDK once before MSBuild fans out to inner per-TFM builds.
-    Critically, this ensures the stamp file exists before the inner builds are scheduled, so
-    SetupCocoaSDK's Condition (which checks for the stamp) correctly skips all inner builds.
-  -->
+  <!-- Outer build (multi-TFM): runs _SetupCocoaSDK once before MSBuild fans out to inner per-TFM builds.  -->
   <Target Name="SetupCocoaSDKBeforeOuterBuild" DependsOnTargets="_SetupCocoaSDK"
           Condition="$([MSBuild]::IsOSPlatform('OSX'))"
           BeforeTargets="DispatchToInnerBuilds" />

From a30d0d6646b3b1a77b25cd8013045bc82af42686 Mon Sep 17 00:00:00 2001
From: James Crosswell <jamescrosswell@users.noreply.github.com>
Date: Thu, 12 Mar 2026 18:25:53 +1300
Subject: [PATCH 5/5] Review feedback

---
 src/Sentry.Bindings.Cocoa/Sentry.Bindings.Cocoa.csproj | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Sentry.Bindings.Cocoa/Sentry.Bindings.Cocoa.csproj b/src/Sentry.Bindings.Cocoa/Sentry.Bindings.Cocoa.csproj
index bfd3832ba7..4d7db910ee 100644
--- a/src/Sentry.Bindings.Cocoa/Sentry.Bindings.Cocoa.csproj
+++ b/src/Sentry.Bindings.Cocoa/Sentry.Bindings.Cocoa.csproj
@@ -79,6 +79,11 @@
       Condition="Exists('$(SentryCocoaFramework).zip') and !Exists('$(SentryCocoaFramework)')"
       Command="unzip -o $(SentryCocoaFramework).zip -d $(SentryCocoaCache) &amp;&amp; mv $(SentryCocoaCache)Sentry-Dynamic.xcframework $(SentryCocoaFramework)" />
 
+    <!-- Invalidate any stale sanitization stamp left over from a previous extraction.
+         Without this, if the xcframework directory is deleted while the zip survives, the stamp
+         would prevent SanitizeSentryCocoaFramework from running on the freshly extracted framework. -->
+    <Delete Files="$(SentryCocoaFramework).sanitized.stamp" />
+
     <!-- Make a copy of the header files before we butcher these to suite objective sharpie -->
     <MakeDir Directories="$(SentryCocoaFrameworkHeaders)" />
     <ItemGroup>