From 5ed9de8c8e1528c95ef72fb20e8c2e671f9d8d80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20P=C3=B6lz?=
 <38893694+Flash0ver@users.noreply.github.com>
Date: Wed, 23 Apr 2025 09:08:26 +0200
Subject: [PATCH 1/4] rename property DisableSentryNative to SentryNative

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

diff --git a/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets b/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets
index 8bdd87b869..5ab0088570 100644
--- a/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets
+++ b/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets
@@ -9,11 +9,11 @@
 <Project>
 
   <ItemGroup>
-    <!-- When user sets <DisableSentryNative>true</DisableSentryNative> in their project -->
+    <!-- When user sets <SentryNative>false</SentryNative> or <SentryNative>disable</SentryNative> in their project -->
     <!-- SentryNative.IsEnabled should result in compile-time constant for trimmed applications -->
     <!-- Effectively disabling native library -->
     <RuntimeHostConfigurationOption Include="Sentry.Native.IsEnabled"
-                                    Condition="'$(DisableSentryNative)' != 'true'"
+                                    Condition="'$(SentryNative)' != 'false' and '$(SentryNative)' != 'disable'"
                                     Value="true"
                                     Trim="true" />
   </ItemGroup>
@@ -22,7 +22,7 @@
     <!-- net8.0 or greater -->
     <FrameworkSupportsNative Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0')) and ('$(OutputType)' == 'Exe' or '$(OutputType)' == 'WinExe')">true</FrameworkSupportsNative>
     <!-- Make it opt-out -->
-    <FrameworkSupportsNative Condition="'$(DisableSentryNative)' == 'true'">false</FrameworkSupportsNative>
+    <FrameworkSupportsNative Condition="'$(SentryNative)' == 'false' or '$(SentryNative)' == 'disable'">false</FrameworkSupportsNative>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(FrameworkSupportsNative)' == 'true' and '$(RuntimeIdentifier)' == 'win-x64'">

From b914cbc825294bc96515cf0c7190cccc5946a723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20P=C3=B6lz?=
 <38893694+Flash0ver@users.noreply.github.com>
Date: Wed, 23 Apr 2025 09:11:43 +0200
Subject: [PATCH 2/4] fix type in feature switch comments

---
 src/Sentry/Platforms/Native/SentryNative.cs                     | 2 +-
 .../Platforms/Native/buildTransitive/Sentry.Native.targets      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Sentry/Platforms/Native/SentryNative.cs b/src/Sentry/Platforms/Native/SentryNative.cs
index ed0c5cbbbc..6625845f04 100644
--- a/src/Sentry/Platforms/Native/SentryNative.cs
+++ b/src/Sentry/Platforms/Native/SentryNative.cs
@@ -14,7 +14,7 @@ internal static class SentryNative
 
 #if NET9_0_OR_GREATER
     // FeatureSwitchDefinition should help with trimming disabled code.
-    // This way, `SentryNative.IsEnabled` should be treated as a compile-time constant for trimmed apps.
+    // This way, `Sentry.Native.IsEnabled` should be treated as a compile-time constant for trimmed apps.
     [FeatureSwitchDefinition(SentryNativeIsEnabledSwitchName)]
 #endif
     private static bool IsEnabled => !AppContext.TryGetSwitch(SentryNativeIsEnabledSwitchName, out var isEnabled) || isEnabled;
diff --git a/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets b/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets
index 5ab0088570..27755b3168 100644
--- a/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets
+++ b/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <!-- When user sets <SentryNative>false</SentryNative> or <SentryNative>disable</SentryNative> in their project -->
-    <!-- SentryNative.IsEnabled should result in compile-time constant for trimmed applications -->
+    <!-- Sentry.Native.IsEnabled should result in compile-time constant for trimmed applications -->
     <!-- Effectively disabling native library -->
     <RuntimeHostConfigurationOption Include="Sentry.Native.IsEnabled"
                                     Condition="'$(SentryNative)' != 'false' and '$(SentryNative)' != 'disable'"

From a76a48234039fcf9fbecbd00cc3710fdf54429e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20P=C3=B6lz?=
 <38893694+Flash0ver@users.noreply.github.com>
Date: Wed, 23 Apr 2025 09:26:40 +0200
Subject: [PATCH 3/4] docs: update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 198f555c62..be90f5d69f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 
 ### Features
 
-- Option to disable the SentryNative integration ([#4107](https://github.com/getsentry/sentry-dotnet/pull/4107))
+- Option to disable the SentryNative integration ([#4107](https://github.com/getsentry/sentry-dotnet/pull/4107), [#4134](https://github.com/getsentry/sentry-dotnet/pull/4134))
 - Reintroduced experimental support for Session Replay on Android ([#4097](https://github.com/getsentry/sentry-dotnet/pull/4097))
 
 ### Fixes

From cfc79203b389add3501d0eda0e1e599ceda421d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20P=C3=B6lz?=
 <38893694+Flash0ver@users.noreply.github.com>
Date: Wed, 23 Apr 2025 09:37:15 +0200
Subject: [PATCH 4/4] Revert "fix type in feature switch comments"

This reverts commit b914cbc825294bc96515cf0c7190cccc5946a723.
---
 src/Sentry/Platforms/Native/SentryNative.cs                     | 2 +-
 .../Platforms/Native/buildTransitive/Sentry.Native.targets      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Sentry/Platforms/Native/SentryNative.cs b/src/Sentry/Platforms/Native/SentryNative.cs
index 6625845f04..ed0c5cbbbc 100644
--- a/src/Sentry/Platforms/Native/SentryNative.cs
+++ b/src/Sentry/Platforms/Native/SentryNative.cs
@@ -14,7 +14,7 @@ internal static class SentryNative
 
 #if NET9_0_OR_GREATER
     // FeatureSwitchDefinition should help with trimming disabled code.
-    // This way, `Sentry.Native.IsEnabled` should be treated as a compile-time constant for trimmed apps.
+    // This way, `SentryNative.IsEnabled` should be treated as a compile-time constant for trimmed apps.
     [FeatureSwitchDefinition(SentryNativeIsEnabledSwitchName)]
 #endif
     private static bool IsEnabled => !AppContext.TryGetSwitch(SentryNativeIsEnabledSwitchName, out var isEnabled) || isEnabled;
diff --git a/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets b/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets
index 27755b3168..5ab0088570 100644
--- a/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets
+++ b/src/Sentry/Platforms/Native/buildTransitive/Sentry.Native.targets
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <!-- When user sets <SentryNative>false</SentryNative> or <SentryNative>disable</SentryNative> in their project -->
-    <!-- Sentry.Native.IsEnabled should result in compile-time constant for trimmed applications -->
+    <!-- SentryNative.IsEnabled should result in compile-time constant for trimmed applications -->
     <!-- Effectively disabling native library -->
     <RuntimeHostConfigurationOption Include="Sentry.Native.IsEnabled"
                                     Condition="'$(SentryNative)' != 'false' and '$(SentryNative)' != 'disable'"