Dropped netstandard2.0 for ASP.NET Core (#2807)

bitsandfoxes · web-flow · commit 24cfe5beb3b7 · 2023-11-22T14:12:23.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,14 +2,20 @@
 
 ## Unreleased - 4.x
 
-### API breaking Changes
-
-- ISpanTracer has been renamed back again to ISpan, to make it easier to upgrade from v3.x to v4.x ([#2870](https://github.com/getsentry/sentry-dotnet/pull/2870))
-
 ### Fixes
 
 - Android native symbol upload ([#2876](https://github.com/getsentry/sentry-dotnet/pull/2876))
 
+### .NET target frameworks changes
+
+**Dropped netstandard2.0 support for Sentry.AspNetCore** ([#2807](https://github.com/getsentry/sentry-dotnet/pull/2807))
+
+### API breaking Changes
+
+#### Changed APIs
+
+- ISpanTracer has been renamed back again to ISpan, to make it easier to upgrade from v3.x to v4.x ([#2870](https://github.com/getsentry/sentry-dotnet/pull/2870))
+
 ## 4.0.0-beta.1
 
 ### Features
diff --git a/src/Sentry.AspNetCore/ApplicationBuilderExtensions.cs b/src/Sentry.AspNetCore/ApplicationBuilderExtensions.cs
@@ -1,8 +1,4 @@
-#if NETSTANDARD2_0
-using IHostApplicationLifetime = Microsoft.AspNetCore.Hosting.IApplicationLifetime;
-#else
 using Microsoft.Extensions.Hosting;
-#endif
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
diff --git a/src/Sentry.AspNetCore/Extensions/HttpContextExtensions.cs b/src/Sentry.AspNetCore/Extensions/HttpContextExtensions.cs
@@ -2,17 +2,14 @@
 using Microsoft.AspNetCore.Routing;
 using Sentry.Extensibility;
 
-#if !NETSTANDARD2_0
 using Microsoft.AspNetCore.Http.Features;
-#endif
 
 namespace Sentry.AspNetCore.Extensions;
 
 internal static class HttpContextExtensions
 {
     internal static string? TryGetRouteTemplate(this HttpContext context)
     {
-#if !NETSTANDARD2_0 // endpoint routing is only supported after ASP.NET Core 3.0
         // Requires .UseRouting()/.UseEndpoints()
         var endpoint = context.Features.Get<IEndpointFeature?>()?.Endpoint as RouteEndpoint;
         var routePattern = endpoint?.RoutePattern.RawText;
@@ -23,7 +20,7 @@ internal static class HttpContextExtensions
         {
             return formattedRoute;
         }
-#endif
+
         // Fallback for legacy .UseMvc().
         // Note: GetRouteData can return null on netstandard2
         return (context.GetRouteData() is { } routeData)
diff --git a/src/Sentry.AspNetCore/Sentry.AspNetCore.csproj b/src/Sentry.AspNetCore/Sentry.AspNetCore.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net6.0;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
     <PackageTags>$(PackageTags);AspNetCore;MVC</PackageTags>
     <Description>Official ASP.NET Core integration for Sentry - Open-source error tracking that helps developers monitor and fix crashes in real time.</Description>
   </PropertyGroup>
@@ -13,23 +13,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\Sentry.Extensions.Logging\Sentry.Extensions.Logging.csproj" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <ProjectReference Include="..\Sentry.DiagnosticSource\Sentry.DiagnosticSource.csproj" />
-
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.Abstractions" Version="2.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.1.0" />
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.5.0" />
-
-    <!-- this is needed because the version that is brought in transitively has a vulnerability warning -->
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.22" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
diff --git a/src/Sentry.AspNetCore/SentryAspNetCoreOptions.cs b/src/Sentry.AspNetCore/SentryAspNetCoreOptions.cs
@@ -3,12 +3,7 @@
 using Microsoft.AspNetCore.Http;
 using Sentry.Extensibility;
 using Sentry.Extensions.Logging;
-
-#if NETSTANDARD2_0
-using IWebHostEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment;
-#else
 using Microsoft.Extensions.Hosting;
-#endif
 
 namespace Sentry.AspNetCore;
 
diff --git a/src/Sentry.AspNetCore/SentryAspNetCoreOptionsSetup.cs b/src/Sentry.AspNetCore/SentryAspNetCoreOptionsSetup.cs
@@ -3,11 +3,7 @@
 using Microsoft.Extensions.Options;
 using Sentry.Extensions.Logging;
 
-#if NETSTANDARD2_0
-using IHostingEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment;
-#else
 using IHostingEnvironment = Microsoft.AspNetCore.Hosting.IWebHostEnvironment;
-#endif
 
 namespace Sentry.AspNetCore;
 
diff --git a/src/Sentry.AspNetCore/SentryMiddleware.cs b/src/Sentry.AspNetCore/SentryMiddleware.cs
@@ -1,9 +1,5 @@
 using Microsoft.AspNetCore.Diagnostics;
-#if NETSTANDARD2_0
-using IHostingEnvironment = Microsoft.AspNetCore.Hosting.IHostingEnvironment;
-#else
 using IHostingEnvironment = Microsoft.AspNetCore.Hosting.IWebHostEnvironment;
-#endif
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
diff --git a/test/Sentry.AspNetCore.TestUtils/AspNetSentrySdkTestFixture.cs b/test/Sentry.AspNetCore.TestUtils/AspNetSentrySdkTestFixture.cs
@@ -1,3 +1,4 @@
+#if NET6_0_OR_GREATER
 using Microsoft.AspNetCore.Hosting;
 
 namespace Sentry.AspNetCore.TestUtils;
@@ -24,3 +25,4 @@ protected override void ConfigureBuilder(WebHostBuilder builder)
         AfterConfigureBuilder?.Invoke(builder);
     }
 }
+#endif
diff --git a/test/Sentry.AspNetCore.TestUtils/Sentry.AspNetCore.TestUtils.csproj b/test/Sentry.AspNetCore.TestUtils/Sentry.AspNetCore.TestUtils.csproj
@@ -6,25 +6,27 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Sentry.AspNetCore\Sentry.AspNetCore.csproj" />
     <ProjectReference Include="..\Sentry.Testing\Sentry.Testing.csproj" />
   </ItemGroup>
 
-  <!--
-    ASP.NET Core on .NET Framework is supported by Microsoft indefinitely on version 2.1 only.
-    Indeed, version 2.1 has newer nuget packages than version 2.2 (which is out of support).
-    Thus, we will test on 2.1.*, not 2.*.
-    See https://dotnet.microsoft.com/platform/support/policy/aspnet
-    And https://github.com/dotnet/aspnetcore/issues/3753#issuecomment-438046364
+  <ItemGroup Condition="$(TargetFramework) != 'net48'">
+    <ProjectReference Include="..\..\src\Sentry.AspNetCore\Sentry.AspNetCore.csproj" />
+  </ItemGroup>
 
-    Also, JetBrains Rider (via Checkmarx) may report the following security vulnerabilities:
-      CVE-2019-0815
-      CVE-2020-1045
-      CVE-2020-1597
-    These are safe to ignore for our tests.  A real project would resolve them by installing
-    an updated version of the ASP.NET Core runtime on their hosting server.
-    See https://github.com/dotnet/aspnetcore/issues/15423
-  -->
+  <!--
+  ASP.NET Core on .NET Framework is supported by Microsoft indefinitely on version 2.1 only.
+  Indeed, version 2.1 has newer nuget packages than version 2.2 (which is out of support).
+  Thus, we will test on 2.1.*, not 2.*.
+  See https://dotnet.microsoft.com/platform/support/policy/aspnet
+  And https://github.com/dotnet/aspnetcore/issues/3753#issuecomment-438046364
+  Also, JetBrains Rider (via Checkmarx) may report the following security vulnerabilities:
+    CVE-2019-0815
+    CVE-2020-1045
+    CVE-2020-1597
+  These are safe to ignore for our tests.  A real project would resolve them by installing
+  an updated version of the ASP.NET Core runtime on their hosting server.
+  See https://github.com/dotnet/aspnetcore/issues/15423
+-->
   <ItemGroup Condition="$(TargetFramework) == 'net48'">
     <PackageReference Include="Microsoft.AspNetCore" Version="2.1.7" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
diff --git a/test/Sentry.AspNetCore.Tests/Sentry.AspNetCore.Tests.csproj b/test/Sentry.AspNetCore.Tests/Sentry.AspNetCore.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net7.0;net6.0;net48</TargetFrameworks>
+    <TargetFrameworks>net8.0;net7.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Sentry.Serilog.Tests/AspNetCoreIntegrationTests.cs b/test/Sentry.Serilog.Tests/AspNetCoreIntegrationTests.cs
@@ -1,3 +1,4 @@
+#if NET6_0_OR_GREATER
 using Sentry.AspNetCore.TestUtils;
 
 namespace Sentry.Serilog.Tests;
@@ -22,3 +23,4 @@ public async Task UnhandledException_MarkedAsUnhandled()
         Assert.Collection(Events, @event => Assert.Collection(@event.SentryExceptions, x => Assert.False(x.Mechanism?.Handled)));
     }
 }
+#endif
diff --git a/test/Sentry.Serilog.Tests/IntegrationTests.Simple.DotNet6_0.verified.txt b/test/Sentry.Serilog.Tests/IntegrationTests.Simple.DotNet6_0.verified.txt
@@ -200,7 +200,7 @@
                       FileName: IntegrationTests.verify.cs,
                       Function: Task IntegrationTests.Simple(),
                       Module: null,
-                      LineNumber: 47,
+                      LineNumber: 48,
                       ColumnNumber: 17,
                       AbsolutePath: {ProjectDirectory}IntegrationTests.verify.cs,
                       ContextLine: null,
diff --git a/test/Sentry.Serilog.Tests/IntegrationTests.Simple.DotNet7_0.verified.txt b/test/Sentry.Serilog.Tests/IntegrationTests.Simple.DotNet7_0.verified.txt
@@ -200,7 +200,7 @@
                       FileName: IntegrationTests.verify.cs,
                       Function: Task IntegrationTests.Simple(),
                       Module: null,
-                      LineNumber: 47,
+                      LineNumber: 48,
                       ColumnNumber: 17,
                       AbsolutePath: {ProjectDirectory}IntegrationTests.verify.cs,
                       ContextLine: null,
diff --git a/test/Sentry.Serilog.Tests/IntegrationTests.Simple.DotNet8_0.verified.txt b/test/Sentry.Serilog.Tests/IntegrationTests.Simple.DotNet8_0.verified.txt
@@ -200,7 +200,7 @@
                       FileName: IntegrationTests.verify.cs,
                       Function: Task IntegrationTests.Simple(),
                       Module: null,
-                      LineNumber: 47,
+                      LineNumber: 48,
                       ColumnNumber: 17,
                       AbsolutePath: {ProjectDirectory}IntegrationTests.verify.cs,
                       ContextLine: null,
diff --git a/test/Sentry.Serilog.Tests/IntegrationTests.verify.cs b/test/Sentry.Serilog.Tests/IntegrationTests.verify.cs
@@ -1,4 +1,5 @@
-﻿namespace Sentry.Serilog.Tests;
+﻿#if NET6_0_OR_GREATER
+namespace Sentry.Serilog.Tests;
 
 [UsesVerify]
 [Collection(nameof(SentrySdkCollection))]
@@ -101,3 +102,4 @@ public Task LoggingInsideTheContextOfLogging()
             .IgnoreStandardSentryMembers();
     }
 }
+#endif
diff --git a/test/Sentry.Serilog.Tests/Sentry.Serilog.Tests.csproj b/test/Sentry.Serilog.Tests/Sentry.Serilog.Tests.csproj
@@ -8,16 +8,20 @@
     <PackageReference Include="Serilog" Version="2.12.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
 
+    <ProjectReference Include="..\Sentry.Testing\Sentry.Testing.csproj" />
     <ProjectReference Include="..\..\src\Sentry.Serilog\Sentry.Serilog.csproj" />
-    <ProjectReference Include="..\Sentry.AspNetCore.TestUtils\Sentry.AspNetCore.TestUtils.csproj" />
 
-    <Using Include="Microsoft.AspNetCore.Builder" />
-    <Using Include="Microsoft.AspNetCore.Hosting" />
     <Using Include="Serilog" />
     <Using Include="Serilog.Events" />
     <Using Include="Serilog.Context" />
     <Using Include="Serilog.Formatting.Display" />
     <Using Include="Serilog.Parsing" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' != 'net48'">
+    <ProjectReference Include="..\Sentry.AspNetCore.TestUtils\Sentry.AspNetCore.TestUtils.csproj" />
+    <Using Include="Microsoft.AspNetCore.Builder" />
+    <Using Include="Microsoft.AspNetCore.Hosting" />
+  </ItemGroup>
+
 </Project>
diff --git a/test/Sentry.Serilog.Tests/SentrySdkCollection.cs b/test/Sentry.Serilog.Tests/SentrySdkCollection.cs
@@ -1,3 +1,4 @@
+#if NET6_0_OR_GREATER
 namespace Sentry.Serilog.Tests;
 
 [CollectionDefinition(nameof(SerilogAspNetSentrySdkTestFixture))]
@@ -8,3 +9,4 @@ public sealed class SentrySdkCollection : ICollectionFixture<SerilogAspNetSentry
     // ICollectionFixture<> interfaces.
     // See: https://xunit.net/docs/shared-context#collection-fixture
 }
+#endif
diff --git a/test/Sentry.Serilog.Tests/SerilogAspNetSentrySdkTestFixture.cs b/test/Sentry.Serilog.Tests/SerilogAspNetSentrySdkTestFixture.cs
@@ -1,3 +1,4 @@
+#if NET6_0_OR_GREATER
 using Sentry.AspNetCore.TestUtils;
 
 namespace Sentry.Serilog.Tests;
@@ -18,9 +19,7 @@ protected override void ConfigureBuilder(WebHostBuilder builder)
         {
             app.UseExceptionHandler(new ExceptionHandlerOptions
             {
-#if NET6_0_OR_GREATER
                 AllowStatusCode404Response = true,
-#endif
                 ExceptionHandlingPath = "/error"
             });
         };
@@ -36,3 +35,4 @@ protected override void ConfigureBuilder(WebHostBuilder builder)
         base.ConfigureBuilder(builder);
     }
 }
+#endif

Original file line number	Diff line number	Diff line change
`@@ -2,17 +2,14 @@`
`2`	`2`	`using Microsoft.AspNetCore.Routing;`
`3`	`3`	`using Sentry.Extensibility;`
`4`	`4`
`5`		`-#if !NETSTANDARD2_0`
`6`	`5`	`using Microsoft.AspNetCore.Http.Features;`
`7`		`-#endif`
`8`	`6`
`9`	`7`	`namespace Sentry.AspNetCore.Extensions;`
`10`	`8`
`11`	`9`	`internal static class HttpContextExtensions`
`12`	`10`	`{`
`13`	`11`	`internal static string? TryGetRouteTemplate(this HttpContext context)`
`14`	`12`	`{`
`15`		`-#if !NETSTANDARD2_0 // endpoint routing is only supported after ASP.NET Core 3.0`
`16`	`13`	`// Requires .UseRouting()/.UseEndpoints()`
`17`	`14`	`var endpoint = context.Features.Get<IEndpointFeature?>()?.Endpoint as RouteEndpoint;`
`18`	`15`	`var routePattern = endpoint?.RoutePattern.RawText;`
`@@ -23,7 +20,7 @@ internal static class HttpContextExtensions`
`23`	`20`	`{`
`24`	`21`	`return formattedRoute;`
`25`	`22`	`}`
`26`		`-#endif`
	`23`	`+`
`27`	`24`	`// Fallback for legacy .UseMvc().`
`28`	`25`	`// Note: GetRouteData can return null on netstandard2`
`29`	`26`	`return (context.GetRouteData() is { } routeData)`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#if NET6_0_OR_GREATER`
`1`	`2`	`using Microsoft.AspNetCore.Hosting;`
`2`	`3`
`3`	`4`	`namespace Sentry.AspNetCore.TestUtils;`
`@@ -24,3 +25,4 @@ protected override void ConfigureBuilder(WebHostBuilder builder)`
`24`	`25`	`AfterConfigureBuilder?.Invoke(builder);`
`25`	`26`	`}`
`26`	`27`	`}`
	`28`	`+#endif`