simplify ifdef

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Adjust parameter type in `AddBreadcrumb` to use `IReadOnlyDictionary<...>` instead of `Dictionary<...>` ([#1000](https://github.com/getsentry/sentry-dotnet/pull/1000))
 - await dispose everywhere ([#1009](https://github.com/getsentry/sentry-dotnet/pull/1009))
+- simplify ifdef ([#1010](https://github.com/getsentry/sentry-dotnet/pull/1010))
 
 ### Features
 

src/Sentry/DefaultSentryScopeStateProcessor.cs

@@ -1,4 +1,4 @@
-#if HAS_VALUE_TUPLE
+#if !NET461
 using System;
 #endif
 using System.Collections.Generic;
@@ -38,7 +38,7 @@ public void Apply(Scope scope, object state)
 
                     break;
                 }
-#if HAS_VALUE_TUPLE
+#if !NET461
                 case ValueTuple<string, string> tupleStringString:
                     if (!string.IsNullOrEmpty(tupleStringString.Item2))
                     {

src/Sentry/IHasBreadcrumbs.cs

@@ -26,7 +26,7 @@ public interface IHasBreadcrumbs
     /// </summary>
     public static class HasBreadcrumbsExtensions
     {
-#if HAS_VALUE_TUPLE
+#if !NET461
         /// <summary>
         /// Adds a breadcrumb to the object.
         /// </summary>

src/Sentry/Integrations/NetFxInstallationsIntegration.cs

@@ -1,4 +1,4 @@
-#if NETFX
+#if NET461
 using Sentry.PlatformAbstractions;
 
 namespace Sentry.Integrations

src/Sentry/PlatformAbstractions/FrameworkInfo.NetFx.cs

@@ -1,4 +1,4 @@
-#if NETFX
+#if NET461
 using System;
 using System.Collections.Generic;
 using Microsoft.Win32;

src/Sentry/PlatformAbstractions/FrameworkInfo.NetStandard.cs

@@ -1,4 +1,4 @@
-#if !NETFX
+#if !NET461
 
 using System.Collections.Generic;
 using System.Linq;

src/Sentry/PlatformAbstractions/NetFxInstallationsEventProcessor.cs

@@ -1,4 +1,4 @@
-#if NETFX
+#if NET461
 using System;
 using System.Collections.Generic;
 using System.Linq;

src/Sentry/PlatformAbstractions/RegistryKeyExtensions.cs

@@ -1,4 +1,4 @@
-#if NETFX
+#if NET461
 using Microsoft.Win32;
 
 namespace Sentry.PlatformAbstractions

src/Sentry/PlatformAbstractions/Runtime.cs

@@ -27,7 +27,7 @@ public class Runtime
         /// 4.7.2633.0
         /// </example>
         public string? Version { get; internal set; }
-#if NETFX
+#if NET461
         /// <summary>
         /// The .NET Framework installation which is running the process
         /// </summary>
@@ -51,14 +51,14 @@ public class Runtime
         public Runtime(
             string? name = null,
             string? version = null,
-            #if NETFX
+#if NET461
             FrameworkInstallation? frameworkInstallation = null,
-            #endif
+#endif
             string? raw = null)
         {
             Name = name;
             Version = version;
-#if NETFX
+#if NET461
             FrameworkInstallation = frameworkInstallation;
 #endif
             Raw = raw;
@@ -95,7 +95,7 @@ public bool Equals(Runtime other)
             if (ReferenceEquals(this, other)) return true;
             return string.Equals(Name, other.Name)
                    && string.Equals(Version, other.Version)
-#if NETFX
+#if NET461
                    && Equals(FrameworkInstallation, other.FrameworkInstallation)
 #endif
                    && string.Equals(Raw, other.Raw);
@@ -124,7 +124,7 @@ public override int GetHashCode()
             {
                 var hashCode = Name != null ? Name.GetHashCode() : 0;
                 hashCode = (hashCode * 397) ^ (Version != null ? Version.GetHashCode() : 0);
-#if NETFX
+#if NET461
                 hashCode = (hashCode * 397) ^ (FrameworkInstallation != null ? FrameworkInstallation.GetHashCode() : 0);
 #endif
                 hashCode = (hashCode * 397) ^ (Raw != null ? Raw.GetHashCode() : 0);

src/Sentry/PlatformAbstractions/RuntimeInfo.cs

@@ -22,9 +22,9 @@ internal static Runtime GetRuntime()
 
             runtime ??= GetFromEnvironmentVariable();
 
-#if NETFX
+#if NET461
             SetNetFxReleaseAndVersion(runtime);
-#elif NETSTANDARD || NETCOREAPP // Possibly .NET Core
+#else
             SetNetCoreVersion(runtime);
 #endif
             return runtime;
@@ -52,7 +52,7 @@ internal static Runtime GetRuntime()
             return new Runtime(name, raw: rawRuntimeDescription);
         }
 
-#if NETFX
+#if NET461
         internal static void SetNetFxReleaseAndVersion(Runtime runtime)
         {
             if (runtime?.IsNetFx() == true)
@@ -75,15 +75,15 @@ internal static void SetNetFxReleaseAndVersion(Runtime runtime)
         }
 #endif
 
-#if NETSTANDARD || NETCOREAPP // Possibly .NET Core
+#if !NET461
         // Known issue on Docker: https://github.com/dotnet/BenchmarkDotNet/issues/448#issuecomment-361027977
         internal static void SetNetCoreVersion(Runtime runtime)
         {
             if (runtime.IsNetCore())
             {
                 // https://github.com/dotnet/BenchmarkDotNet/issues/448#issuecomment-308424100
                 var assembly = typeof(System.Runtime.GCSettings).GetTypeInfo().Assembly;
-#if NET5_0 || NETCOREAPP3_0
+#if NETCOREAPP3_0_OR_GREATER
                 var assemblyPath = assembly.Location.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries);
 #else
                 var assemblyPath = assembly.CodeBase.Split(new[] { '/', '\\' }, StringSplitOptions.RemoveEmptyEntries);

src/Sentry/Sentry.csproj

@@ -24,18 +24,6 @@
   </ItemGroup>
   <!-- Ben.Demystifier -->
 
-  <PropertyGroup Condition="'$(TargetFramework)' != 'net461'">
-    <DefineConstants>$(DefineConstants);HAS_VALUE_TUPLE</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
-    <DefineConstants>$(DefineConstants);NETSTANDARD</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
-    <DefineConstants>$(DefineConstants);NETFX</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
     <Reference Include="System.Net.Http" />

src/Sentry/SentryOptions.cs

@@ -514,7 +514,7 @@ public SentryOptions()
                 new AppDomainUnhandledExceptionIntegration(),
                 new AppDomainProcessExitIntegration(),
                 new TaskUnobservedTaskExceptionIntegration(),
-#if NETFX
+#if NET461
                 new NetFxInstallationsIntegration(),
 #endif
             };

src/Sentry/SentryOptionsExtensions.cs

@@ -7,7 +7,7 @@
 using Sentry.Infrastructure;
 using Sentry.Integrations;
 using Sentry.Internal;
-#if NETFX
+#if NET461
 using Sentry.PlatformAbstractions;
 #endif
 
@@ -46,7 +46,7 @@ public static void DisableAppDomainUnhandledExceptionCapture(this SentryOptions
         public static void DisableTaskUnobservedTaskExceptionCapture(this SentryOptions options) =>
             options.RemoveIntegration<TaskUnobservedTaskExceptionIntegration>();
 
-#if NETFX
+#if NET461
         /// <summary>
         /// Disables the list addition of .Net Frameworks into events.
         /// </summary>

test/Sentry.Tests/Integrations/NetFxInstallationsIntegrationTests.cs

@@ -1,4 +1,4 @@
-#if NETFX
+#if NET461
 using Sentry.Integrations;
 using Sentry.PlatformAbstractions;
 using Xunit;

test/Sentry.Tests/PlatformAbstractions/FrameworkInfoNetFxTests.cs

@@ -1,4 +1,4 @@
-#if NETFX
+#if NET461
 using Sentry.PlatformAbstractions;
 using Xunit;
 using System;

test/Sentry.Tests/PlatformAbstractions/FrameworkInfoNetStandardTests.cs

@@ -1,4 +1,4 @@
-#if !NETFX
+#if !NET461
 using Sentry.PlatformAbstractions;
 using Xunit;
 

test/Sentry.Tests/PlatformAbstractions/NetFxInstallationsEventProcessorTests.cs

@@ -1,4 +1,4 @@
-#if NETFX
+#if NET461
 using Xunit;
 using System.Collections.Generic;
 using Sentry.PlatformAbstractions;

test/Sentry.Tests/PlatformAbstractions/RuntimeInfoTests.cs

@@ -41,7 +41,7 @@ public void Parse_TestCases(ParseTestCase parseTestCase)
             }
         }
 
-#if NETFX
+#if NET461
         [SkippableFact]
         public void SetReleaseAndVersionNetFx_OnNetFx_NonNullReleaseAndVersion()
         {
@@ -57,7 +57,7 @@ public void SetReleaseAndVersionNetFx_OnNetFx_NonNullReleaseAndVersion()
         }
 #endif
 
-#if NETCOREAPP
+#if NETCOREAPP2_1 || NETCOREAPP3_0
         [Fact]
         public void SetNetCoreVersion_NetCoreAsName()
         {
@@ -69,6 +69,7 @@ public void SetNetCoreVersion_NetCoreAsName()
         }
 #endif
 
+        // TODO: Should be NET5_0_OR_GREATER which isn't available (to be added when NET6 lands)
 #if NET5_0
         [Fact]
         public void SetNetCoreVersion_Net5Runtime_NullNetCoreVersion()

test/Sentry.Tests/Protocol/ScopeExtensionsTests.cs

@@ -395,7 +395,7 @@ public void AddBreadcrumb_DropOldest()
             Assert.Equal("5", sut.Breadcrumbs.Last().Message);
         }
 
-#if HAS_VALUE_TUPLE
+#if !NET461
         [Fact]
         public void AddBreadcrumb_ValueTuple_AllArgumentsMatch()
         {

test/Sentry.Tests/Sentry.Tests.csproj

@@ -4,10 +4,6 @@
     <TargetFrameworks>net5.0;netcoreapp3.1;netcoreapp3.0;netcoreapp2.1;net461</TargetFrameworks>
   </PropertyGroup>
 
-  <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
-    <DefineConstants>NETFX;$(AdditionalConstants)</DefineConstants>
-  </PropertyGroup>
-
   <!-- From Ben.Demystifier -->
   <PropertyGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1' and !$(TargetFramework.StartsWith('net4'))">
     <DefineConstants>$(DefineConstants);HAS_ASYNC_ENUMERATOR</DefineConstants>

test/Sentry.Tests/SentryOptionsExtensionsTests.cs

@@ -4,8 +4,7 @@
 using Sentry.Extensibility;
 using Sentry.Integrations;
 using Sentry.Internal;
-using Sentry.Testing;
-#if NETFX
+#if NET461
 using Sentry.PlatformAbstractions;
 #endif
 using Xunit;
@@ -24,7 +23,7 @@ public void DisableDuplicateEventDetection_RemovesDisableDuplicateEventDetection
                 p => p.GetType() == typeof(DuplicateEventDetectionEventProcessor));
         }
 
-#if NETFX
+#if NET461
         [Fact]
         public void DisableNetFxInstallationsEventProcessor_RemovesDisableNetFxInstallationsEventProcessorEventProcessor()
         {

test/Sentry.Tests/SentryOptionsTests.cs

@@ -1,7 +1,6 @@
-using System;
 using System.IO.Compression;
 using System.Net;
-#if NETFX
+#if NET461
 using Sentry.Internal;
 using Sentry.PlatformAbstractions;
 using Xunit.Sdk;
@@ -24,7 +23,7 @@ public void RequestBodyCompressionLevel_ByDefault_Optimal()
             var sut = new SentryOptions();
             Assert.Equal(CompressionLevel.Optimal, sut.RequestBodyCompressionLevel);
         }
-#if NETFX
+#if NET461
         [SkippableFact(typeof(IsTypeException))]
         public void StackTraceFactory_RunningOnMono_HasMonoStackTraceFactory()
         {

test/Sentry.Tests/TaskUnobservedTaskExceptionIntegrationTests.cs

@@ -1,7 +1,4 @@
 using System;
-#if RELEASE
-using System.Threading;
-#endif
 using NSubstitute;
 using Sentry.Integrations;
 using Sentry.Internal;
@@ -43,15 +40,15 @@ public void Handle_WithException_CaptureEvent()
         public void Handle_UnobservedTaskException_CaptureEvent()
         {
             _fixture.AppDomain = AppDomainAdapter.Instance;
-            var captureCalledEvent = new ManualResetEvent(false);
+            var captureCalledEvent = new System.Threading.ManualResetEvent(false);
             _fixture.Hub.When(x => x.CaptureEvent(Arg.Any<SentryEvent>()))
                 .Do(_ => captureCalledEvent.Set());
 
             var sut = _fixture.GetSut();
             sut.Register(_fixture.Hub, SentryOptions);
             try
             {
-                var taskStartedEvent = new ManualResetEvent(false);
+                var taskStartedEvent = new System.Threading.ManualResetEvent(false);
                 _ = Task.Run(() =>
                 {
                     _ = taskStartedEvent.Set();