From 03ba8e659a3d93abd929946b41c28ddfd3fcb263 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Thu, 3 Jul 2025 17:36:01 +0200 Subject: [PATCH 1/5] added constant and made sentrysdk internal --- src/Sentry/Sentry.csproj | 2 ++ src/Sentry/SentrySdk.cs | 11 ++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj index b987d1042e..0a8960192e 100644 --- a/src/Sentry/Sentry.csproj +++ b/src/Sentry/Sentry.csproj @@ -18,11 +18,13 @@ netstandard2.0;netstandard2.1 false + $(DefineConstants);SENTRY_UNITY + diff --git a/src/Sentry/SentrySdk.cs b/src/Sentry/SentrySdk.cs index d00b002576..60da7fde91 100644 --- a/src/Sentry/SentrySdk.cs +++ b/src/Sentry/SentrySdk.cs @@ -6,6 +6,13 @@ namespace Sentry; + +#if SENTRY_UNITY +/// +/// please, don't +/// +internal +#else /// /// Sentry SDK entrypoint. /// @@ -14,7 +21,9 @@ namespace Sentry; /// It allows safe static access to a client and scope management. /// When the SDK is uninitialized, calls to this class result in no-op so no callbacks are invoked. /// -public static partial class SentrySdk +public +#endif + static partial class SentrySdk { internal static IHub CurrentHub = DisabledHub.Instance; From d131091b06bd0cd145ce46036f8322b271f9c127 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Thu, 3 Jul 2025 17:36:55 +0200 Subject: [PATCH 2/5] removed temp attempt --- src/Sentry/Sentry.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj index 0a8960192e..7f34a0ef60 100644 --- a/src/Sentry/Sentry.csproj +++ b/src/Sentry/Sentry.csproj @@ -24,7 +24,6 @@ - From b708072f280a4f87cce9c0bad1256a05c8623086 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Thu, 3 Jul 2025 17:38:24 +0200 Subject: [PATCH 3/5] comment --- src/Sentry/SentrySdk.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Sentry/SentrySdk.cs b/src/Sentry/SentrySdk.cs index 60da7fde91..9503902194 100644 --- a/src/Sentry/SentrySdk.cs +++ b/src/Sentry/SentrySdk.cs @@ -6,11 +6,11 @@ namespace Sentry; - #if SENTRY_UNITY /// -/// please, don't +/// Internal Sentry SDK entrypoint. /// +/// Use `Sentry.Unity.SentrySdk` instead. internal #else /// From 9e38832d5c56c7b874511b82bfeba7ead17436c9 Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Mon, 7 Jul 2025 13:57:43 +0200 Subject: [PATCH 4/5] added migration to summary --- src/Sentry/SentrySdk.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Sentry/SentrySdk.cs b/src/Sentry/SentrySdk.cs index 9503902194..6801f5ac6c 100644 --- a/src/Sentry/SentrySdk.cs +++ b/src/Sentry/SentrySdk.cs @@ -10,7 +10,17 @@ namespace Sentry; /// /// Internal Sentry SDK entrypoint. /// -/// Use `Sentry.Unity.SentrySdk` instead. +/// +/// This class is now internal. Use Sentry.Unity.SentrySdk instead. +/// +/// To migrate your code: +/// +/// Change using Sentry; to using Sentry.Unity; +/// Keep using the SentrySdk API itself - no changes needed to method calls +/// Add using Sentry; if you need access to types like SentryId, SentryLevel, etc. +/// +/// +/// internal #else /// From 2aa2bb21648ef7645c13fc263449de2c326fdd1d Mon Sep 17 00:00:00 2001 From: bitsandfoxes Date: Mon, 7 Jul 2025 15:11:59 +0200 Subject: [PATCH 5/5] moved unity into 'platforms' --- src/Sentry/Platforms/Unity/Sentry.Unity.props | 15 +++++++++++++ src/Sentry/Platforms/Unity/SentrySdk.Unity.cs | 21 +++++++++++++++++++ src/Sentry/Sentry.csproj | 17 +++------------ src/Sentry/SentrySdk.cs | 20 ++---------------- 4 files changed, 41 insertions(+), 32 deletions(-) create mode 100644 src/Sentry/Platforms/Unity/Sentry.Unity.props create mode 100644 src/Sentry/Platforms/Unity/SentrySdk.Unity.cs diff --git a/src/Sentry/Platforms/Unity/Sentry.Unity.props b/src/Sentry/Platforms/Unity/Sentry.Unity.props new file mode 100644 index 0000000000..ba9f0f42d2 --- /dev/null +++ b/src/Sentry/Platforms/Unity/Sentry.Unity.props @@ -0,0 +1,15 @@ + + + + netstandard2.0;netstandard2.1 + + false + $(DefineConstants);SENTRY_UNITY + + + + + + + + diff --git a/src/Sentry/Platforms/Unity/SentrySdk.Unity.cs b/src/Sentry/Platforms/Unity/SentrySdk.Unity.cs new file mode 100644 index 0000000000..28cecb3361 --- /dev/null +++ b/src/Sentry/Platforms/Unity/SentrySdk.Unity.cs @@ -0,0 +1,21 @@ +#if SENTRY_UNITY + +namespace Sentry; + +/// +/// Internal Sentry SDK entrypoint. +/// +/// +/// This class is now internal. Use Sentry.Unity.SentrySdk instead. +/// +/// To migrate your code: +/// +/// Change using Sentry; to using Sentry.Unity; +/// Keep using the SentrySdk API itself - no changes needed to method calls +/// Add using Sentry; if you need access to types like SentryId, SentryLevel, etc. +/// +/// +/// +internal static partial class SentrySdk; + +#endif diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj index 7f34a0ef60..2e98629933 100644 --- a/src/Sentry/Sentry.csproj +++ b/src/Sentry/Sentry.csproj @@ -7,30 +7,19 @@ true - + net9.0;net8.0;netstandard2.1;netstandard2.0;net462 $(TargetFrameworks);net9.0-android35.0;net8.0-android34.0 $(TargetFrameworks);net9.0-ios18.0;net8.0-ios17.0 $(TargetFrameworks);net9.0-maccatalyst18.0;net8.0-maccatalyst17.0 - - - netstandard2.0;netstandard2.1 - - false - $(DefineConstants);SENTRY_UNITY - - - - - - - + + true diff --git a/src/Sentry/SentrySdk.cs b/src/Sentry/SentrySdk.cs index 6801f5ac6c..ba151a50c1 100644 --- a/src/Sentry/SentrySdk.cs +++ b/src/Sentry/SentrySdk.cs @@ -6,23 +6,7 @@ namespace Sentry; -#if SENTRY_UNITY -/// -/// Internal Sentry SDK entrypoint. -/// -/// -/// This class is now internal. Use Sentry.Unity.SentrySdk instead. -/// -/// To migrate your code: -/// -/// Change using Sentry; to using Sentry.Unity; -/// Keep using the SentrySdk API itself - no changes needed to method calls -/// Add using Sentry; if you need access to types like SentryId, SentryLevel, etc. -/// -/// -/// -internal -#else +#if !SENTRY_UNITY /// /// Sentry SDK entrypoint. /// @@ -33,7 +17,7 @@ namespace Sentry; /// public #endif - static partial class SentrySdk +static partial class SentrySdk { internal static IHub CurrentHub = DisabledHub.Instance;