From 4681b09ee6a14235828004218d60b7bd84058d90 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Thu, 17 Jul 2025 13:45:06 +0200
Subject: [PATCH 1/7] relative to msbuildstart paths

---
 src/Sentry/Platforms/Native/Sentry.Native.targets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Sentry/Platforms/Native/Sentry.Native.targets b/src/Sentry/Platforms/Native/Sentry.Native.targets
index 05114b9d53..ac138470e5 100644
--- a/src/Sentry/Platforms/Native/Sentry.Native.targets
+++ b/src/Sentry/Platforms/Native/Sentry.Native.targets
@@ -1,10 +1,10 @@
 <Project>
 
   <PropertyGroup>
-    <SentryNativeSourceDirectory>..\..\modules\sentry-native\</SentryNativeSourceDirectory>
+    <SentryNativeSourceDirectory>$(MSBuildStartupDirectory)\modules\sentry-native\</SentryNativeSourceDirectory>
     <SentryNativeLibraryName>sentry-native</SentryNativeLibraryName>
-    <SentryNativeBuildScript>../../scripts/build-sentry-native.ps1</SentryNativeBuildScript>
-    <SentryNativeBuildInputs>../../.git/modules/modules/sentry-native/HEAD;$(MSBuildThisFileDirectory)Sentry.Native.targets;$(SentryNativeBuildScript)</SentryNativeBuildInputs>
+    <SentryNativeBuildScript>$(MSBuildStartupDirectory)/scripts/build-sentry-native.ps1</SentryNativeBuildScript>
+    <SentryNativeBuildInputs>$(MSBuildStartupDirectory)/.git/modules/modules/sentry-native/HEAD;$(MSBuildThisFileDirectory)Sentry.Native.targets;$(SentryNativeBuildScript)</SentryNativeBuildInputs>
     <SentryNativeOutputDirectory>$(MSBuildThisFileDirectory)sentry-native\</SentryNativeOutputDirectory>
     <!-- List of runtime identifiers: https://github.com/dotnet/runtime/blob/main/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json -->
     <NativeLibRelativePath-win-x64>win-x64</NativeLibRelativePath-win-x64>

From f66d4a3b19a5dd221dabbe29610d193713b2d77b Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Thu, 17 Jul 2025 14:03:48 +0200
Subject: [PATCH 2/7] fix beforetarget

---
 src/Sentry/Platforms/Native/Sentry.Native.targets | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Sentry/Platforms/Native/Sentry.Native.targets b/src/Sentry/Platforms/Native/Sentry.Native.targets
index ac138470e5..955857b8ec 100644
--- a/src/Sentry/Platforms/Native/Sentry.Native.targets
+++ b/src/Sentry/Platforms/Native/Sentry.Native.targets
@@ -85,9 +85,8 @@
   <!-- Build the Sentry Native SDK (this only runs on local machines because in CI we expect the SDK to be
        built already on each native platform and fetched for the final .net build. -->
   <Target Name="_BuildSentryNativeSDK"
-    BeforeTargets="DispatchToInnerBuilds;BeforeBuild"
+    BeforeTargets="DispatchToInnerBuilds"
     Condition="'$(_SentryIsNet8OrGreater)' == 'true' and '$(CI)' != 'true'"
-    Inputs="$(SentryNativeBuildInputs)"
     Outputs="$(SentryNativeBuildOutputs)">
     <!-- We want a "-Clean" because if the build script changes, previous cmake cache may contain invalid defines. -->
     <Exec Command="pwsh $(SentryNativeBuildScript) -Clean" />

From 70ee69dd1ba723082a531a39d16a1fca6f932075 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Thu, 17 Jul 2025 14:22:07 +0200
Subject: [PATCH 3/7] keep inputs

---
 src/Sentry/Platforms/Native/Sentry.Native.targets | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Sentry/Platforms/Native/Sentry.Native.targets b/src/Sentry/Platforms/Native/Sentry.Native.targets
index 955857b8ec..ad2afac8f2 100644
--- a/src/Sentry/Platforms/Native/Sentry.Native.targets
+++ b/src/Sentry/Platforms/Native/Sentry.Native.targets
@@ -87,6 +87,7 @@
   <Target Name="_BuildSentryNativeSDK"
     BeforeTargets="DispatchToInnerBuilds"
     Condition="'$(_SentryIsNet8OrGreater)' == 'true' and '$(CI)' != 'true'"
+    Inputs="$(SentryNativeBuildInputs)"
     Outputs="$(SentryNativeBuildOutputs)">
     <!-- We want a "-Clean" because if the build script changes, previous cmake cache may contain invalid defines. -->
     <Exec Command="pwsh $(SentryNativeBuildScript) -Clean" />

From 36ca089af49b2ec33f5d15a3eae2dbc3391db5d4 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Thu, 17 Jul 2025 14:56:05 +0200
Subject: [PATCH 4/7] before build

---
 src/Sentry/Platforms/Native/Sentry.Native.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sentry/Platforms/Native/Sentry.Native.targets b/src/Sentry/Platforms/Native/Sentry.Native.targets
index ad2afac8f2..5ca180eb9b 100644
--- a/src/Sentry/Platforms/Native/Sentry.Native.targets
+++ b/src/Sentry/Platforms/Native/Sentry.Native.targets
@@ -85,7 +85,7 @@
   <!-- Build the Sentry Native SDK (this only runs on local machines because in CI we expect the SDK to be
        built already on each native platform and fetched for the final .net build. -->
   <Target Name="_BuildSentryNativeSDK"
-    BeforeTargets="DispatchToInnerBuilds"
+    BeforeTargets="Build"
     Condition="'$(_SentryIsNet8OrGreater)' == 'true' and '$(CI)' != 'true'"
     Inputs="$(SentryNativeBuildInputs)"
     Outputs="$(SentryNativeBuildOutputs)">

From 94e0293e115c7f893f1b8af6b855b7ca02c3533b Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Thu, 17 Jul 2025 15:23:25 +0200
Subject: [PATCH 5/7] build only once

---
 .../Platforms/Native/Sentry.Native.targets     | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Sentry/Platforms/Native/Sentry.Native.targets b/src/Sentry/Platforms/Native/Sentry.Native.targets
index 5ca180eb9b..d50ce65093 100644
--- a/src/Sentry/Platforms/Native/Sentry.Native.targets
+++ b/src/Sentry/Platforms/Native/Sentry.Native.targets
@@ -85,11 +85,25 @@
   <!-- Build the Sentry Native SDK (this only runs on local machines because in CI we expect the SDK to be
        built already on each native platform and fetched for the final .net build. -->
   <Target Name="_BuildSentryNativeSDK"
-    BeforeTargets="Build"
-    Condition="'$(_SentryIsNet8OrGreater)' == 'true' and '$(CI)' != 'true'"
     Inputs="$(SentryNativeBuildInputs)"
     Outputs="$(SentryNativeBuildOutputs)">
     <!-- We want a "-Clean" because if the build script changes, previous cmake cache may contain invalid defines. -->
     <Exec Command="pwsh $(SentryNativeBuildScript) -Clean" />
   </Target>
+
+  <!-- We want to build the sentry-native only once, BEFORE building TFM specific verions of the SDK -->
+  <!-- How to run a target exactly once: https://learn.microsoft.com/en-us/visualstudio/msbuild/run-target-exactly-once?view=vs-2022-->
+  <Target Name="_BuildSentryNativeSDKBeforeOuterBuild"
+    Condition="'$(_SentryIsNet8OrGreater)' == 'true' and '$(CI)' != 'true'"
+    DependsOnTargets="_BuildSentryNativeSDK"
+    BeforeTargets="DispatchToInnerBuilds">
+  </Target>
+
+  <Target Name="_BuildSentryNativeSDKBeforeInnerBuild"
+    Condition="'$(_SentryIsNet8OrGreater)' == 'true' and '$(CI)' != 'true'"
+    BeforeTargets="BeforeBuild">
+    <MSBuild Projects="$(MSBuildProjectFullPath)"
+      Targets="_BuildSentryNativeSDK"
+      RemoveProperties="TargetFramework" />
+  </Target>
 </Project>

From ad6087fc4b7b0c733f6c125c02d24e4178c87683 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Thu, 17 Jul 2025 15:26:19 +0200
Subject: [PATCH 6/7] prettify the comment

---
 src/Sentry/Platforms/Native/Sentry.Native.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Sentry/Platforms/Native/Sentry.Native.targets b/src/Sentry/Platforms/Native/Sentry.Native.targets
index d50ce65093..61e5dbbdd7 100644
--- a/src/Sentry/Platforms/Native/Sentry.Native.targets
+++ b/src/Sentry/Platforms/Native/Sentry.Native.targets
@@ -92,7 +92,7 @@
   </Target>
 
   <!-- We want to build the sentry-native only once, BEFORE building TFM specific verions of the SDK -->
-  <!-- How to run a target exactly once: https://learn.microsoft.com/en-us/visualstudio/msbuild/run-target-exactly-once?view=vs-2022-->
+  <!-- How to run a target exactly once: https://learn.microsoft.com/visualstudio/msbuild/run-target-exactly-once-->
   <Target Name="_BuildSentryNativeSDKBeforeOuterBuild"
     Condition="'$(_SentryIsNet8OrGreater)' == 'true' and '$(CI)' != 'true'"
     DependsOnTargets="_BuildSentryNativeSDK"

From b4effe3429e61a8065c751caaf8b347ac85dbbb6 Mon Sep 17 00:00:00 2001
From: bitsandfoxes <reg@bitfox.at>
Date: Thu, 17 Jul 2025 16:12:57 +0200
Subject: [PATCH 7/7] keep relative path from known position

---
 src/Sentry/Platforms/Native/Sentry.Native.targets | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Sentry/Platforms/Native/Sentry.Native.targets b/src/Sentry/Platforms/Native/Sentry.Native.targets
index 61e5dbbdd7..f425ac9b30 100644
--- a/src/Sentry/Platforms/Native/Sentry.Native.targets
+++ b/src/Sentry/Platforms/Native/Sentry.Native.targets
@@ -1,10 +1,10 @@
 <Project>
 
   <PropertyGroup>
-    <SentryNativeSourceDirectory>$(MSBuildStartupDirectory)\modules\sentry-native\</SentryNativeSourceDirectory>
+    <SentryNativeSourceDirectory>$(MSBuildThisFileDirectory)..\..\..\..\modules\sentry-native\</SentryNativeSourceDirectory>
     <SentryNativeLibraryName>sentry-native</SentryNativeLibraryName>
-    <SentryNativeBuildScript>$(MSBuildStartupDirectory)/scripts/build-sentry-native.ps1</SentryNativeBuildScript>
-    <SentryNativeBuildInputs>$(MSBuildStartupDirectory)/.git/modules/modules/sentry-native/HEAD;$(MSBuildThisFileDirectory)Sentry.Native.targets;$(SentryNativeBuildScript)</SentryNativeBuildInputs>
+    <SentryNativeBuildScript>$(MSBuildThisFileDirectory)..\..\..\..\scripts\build-sentry-native.ps1</SentryNativeBuildScript>
+    <SentryNativeBuildInputs>$(MSBuildThisFileDirectory)..\..\..\..\.git\modules\modules\sentry-native/HEAD;$(MSBuildThisFileDirectory)Sentry.Native.targets;$(SentryNativeBuildScript)</SentryNativeBuildInputs>
     <SentryNativeOutputDirectory>$(MSBuildThisFileDirectory)sentry-native\</SentryNativeOutputDirectory>
     <!-- List of runtime identifiers: https://github.com/dotnet/runtime/blob/main/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json -->
     <NativeLibRelativePath-win-x64>win-x64</NativeLibRelativePath-win-x64>