From fac2cd37777c0825535842ba20bfa40bc7bba2dd Mon Sep 17 00:00:00 2001
From: Bruno Garcia <bruno@brunogarcia.com>
Date: Thu, 11 Jan 2024 21:38:14 -0500
Subject: [PATCH] opt-out

---
 CHANGELOG.md                                    | 6 +++---
 src/Sentry/buildTransitive/Sentry.targets       | 2 +-
 test/SingleFileTestApp/SingleFileTestApp.csproj | 5 +----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c0a9a863c..8bbba85426 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,9 +7,9 @@
 - Added `Sentry` namespace to global usings when `ImplicitUsings` is enabled ([#3043](https://github.com/getsentry/sentry-dotnet/pull/3043))
 If you have conflicts, you can opt-out by adding the following to your `csproj`:
 ```
-<ItemGroup>
-  <Using Remove="Sentry" />
-</ItemGroup>
+<PropertyGroup>
+  <SentryImplicitUsings>false</SentryImplicitUsings>
+</PropertyGroup>
 ```
 
 ## 4.0.0-beta.8
diff --git a/src/Sentry/buildTransitive/Sentry.targets b/src/Sentry/buildTransitive/Sentry.targets
index 07f613e6ba..952c2e91e2 100644
--- a/src/Sentry/buildTransitive/Sentry.targets
+++ b/src/Sentry/buildTransitive/Sentry.targets
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <ItemGroup Condition="$(Language) == 'C#' and ($(ImplicitUsings) == 'enable' or $(ImplicitUsings) == 'true')">
+  <ItemGroup Condition="$(Language) == 'C#' and $(SentryImplicitUsings) != 'false' and ($(ImplicitUsings) == 'enable' or $(ImplicitUsings) == 'true')">
     <Using Include="Sentry" />
   </ItemGroup>
 
diff --git a/test/SingleFileTestApp/SingleFileTestApp.csproj b/test/SingleFileTestApp/SingleFileTestApp.csproj
index c1c8ed3334..123c265621 100644
--- a/test/SingleFileTestApp/SingleFileTestApp.csproj
+++ b/test/SingleFileTestApp/SingleFileTestApp.csproj
@@ -8,12 +8,9 @@
     <ImplicitUsings>true</ImplicitUsings>
     <PublishSingleFile>true</PublishSingleFile>
     <SelfContained>true</SelfContained>
+    <SentryImplicitUsings>false</SentryImplicitUsings>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Using Remove="Sentry" />
-  </ItemGroup>
-
   <PropertyGroup>
     <_OSArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)</_OSArchitecture>
     <!-- Set the appropriate RuntimeIdentifier. See: https://learn.microsoft.com/en-us/dotnet/core/rid-catalog -->