feat!: remove .NET Core 3.1 support from MockHttpServer since it is E…

…OL for a long time now.
skwasjer · Oct 1, 2024 · 86f820e · 86f820e
1 parent ea2dfb7
commit 86f820e
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 43 deletions.
diff --git a/src/MockHttp.Server/MockHttp.Server.csproj b/src/MockHttp.Server/MockHttp.Server.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net6.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
     <PackageId>skwas.MockHttp.Server</PackageId>
     <AssemblyName>skwas.MockHttp.Server</AssemblyName>
     <RootNamespace>MockHttp</RootNamespace>

diff --git a/src/MockHttp.Server/Server/HttpResponseMessageExtensions.cs b/src/MockHttp.Server/Server/HttpResponseMessageExtensions.cs
@@ -19,15 +19,11 @@ internal static async Task MapToFeatureAsync
         responseFeature.ReasonPhrase = response.ReasonPhrase;
 
         CopyHeaders(response.Headers, responseFeature.Headers);
-        // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+        // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
         if (response.Content is not null)
         {
             CopyHeaders(response.Content.Headers, responseFeature.Headers);
-            Stream contentStream = await response.Content.ReadAsStreamAsync(
-#if NET6_0_OR_GREATER
-                cancellationToken
-#endif
-            ).ConfigureAwait(false);
+            Stream contentStream = await response.Content.ReadAsStreamAsync(cancellationToken).ConfigureAwait(false);
             await using ConfiguredAsyncDisposable _ = contentStream.ConfigureAwait(false);
             await contentStream.CopyToAsync(responseBodyFeature.Writer.AsStream(), 4096, cancellationToken).ConfigureAwait(false);
         }

diff --git a/src/MockHttp.Server/Server/Log.cs b/src/MockHttp.Server/Server/Log.cs
@@ -7,15 +7,18 @@ internal static partial class Log
 {
     internal const string LogRequestMessageTemplate = "Connection id \"{ConnectionId}\", Request id \"{RequestId}\": {Message}";
 
-#if NET6_0_OR_GREATER
     [LoggerMessage(
         EventId = 0,
         Level = LogLevel.Debug,
-        Message = LogRequestMessageTemplate)]
-    private static partial void LogDebugRequestMessage(ILogger logger, string connectionId, string requestId, string message, Exception? exception);
-#else
-    private static readonly Action<ILogger, string, string, string, Exception?> LogDebugRequestMessage = LoggerMessage.Define<string, string, string>(LogLevel.Debug, new EventId(0), LogRequestMessageTemplate);
-#endif
+        Message = LogRequestMessageTemplate
+    )]
+    private static partial void LogDebugRequestMessage(
+        ILogger logger,
+        string connectionId,
+        string requestId,
+        string message,
+        Exception? exception
+    );
 
     public static void LogRequestMessage(this ILogger logger, HttpContext httpContext, string message, Exception? exception = null)
     {

diff --git a/src/MockHttp.Server/Server/WrappedHttpRequest.cs b/src/MockHttp.Server/Server/WrappedHttpRequest.cs
@@ -21,7 +21,7 @@ public WrappedHttpRequest(HttpRequest request)
 
         RequestUri = uriBuilder.Uri;
 
-        // ReSharper disable once ConditionIsAlwaysTrueOrFalse
+        // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
         if (request.Body is not null)
         {
             Content = new StreamContent(request.Body)

diff --git a/test/MockHttp.Server.Tests/Fixtures/LoggerFactoryFixture.cs b/test/MockHttp.Server.Tests/Fixtures/LoggerFactoryFixture.cs
@@ -16,9 +16,7 @@ protected LoggerFactoryFixture(Action<ILoggingBuilder>? configure = null)
 
                 builder
                     .AddDebug()
-#if NET6_0_OR_GREATER
                     .AddSimpleConsole(opts => opts.IncludeScopes = true)
-#endif
                     ;
 
                 configure?.Invoke(builder);

diff --git a/test/MockHttp.Server.Tests/MockHttp.Server.Tests.csproj b/test/MockHttp.Server.Tests/MockHttp.Server.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0;net6.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net8.0;net6.0</TargetFrameworks>
 
     <IsTestProject>true</IsTestProject>
 

diff --git a/test/MockHttp.Server.Tests/MockHttpServerTests.cs b/test/MockHttp.Server.Tests/MockHttpServerTests.cs
@@ -177,7 +177,7 @@ public async Task When_using_other_API_like_webRequest_it_should_respond_correct
         request.ContentType = MediaTypes.PlainText;
         await using (Stream requestStream = await request.GetRequestStreamAsync())
         {
-            requestStream.Write(Encoding.ASCII.GetBytes("request-content"));
+            await requestStream.WriteAsync(Encoding.ASCII.GetBytes("request-content"));
         }
 
         // Assert

diff --git a/test/MockHttp.Server.Tests/PublicApi/.NET_Core_3.1.verified.txt b/test/MockHttp.Server.Tests/PublicApi/.NET_Core_3.1.verified.txt