Add support for .NET Core 3.1 to 6.0. Fixes #815

Author: commonsensesoftware

build/test.props

@@ -20,10 +20,6 @@
   <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
  </ItemGroup>
 
- <ItemGroup Condition=" '$(IsAspNetCore)' == 'true' ">
-  <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.2-*" />
- </ItemGroup>
-
  <ItemGroup>
   <Using Include="Moq" />
   <Using Include="Xunit" />

build/test.targets

@@ -2,14 +2,20 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
  <PropertyGroup>
-  <FluentAssertionsVersion>6.5.1</FluentAssertionsVersion>
-  <FluentAssertionsVersion Condition=" '$(TargetFramework)' != 'net6.0' ">5.10.3</FluentAssertionsVersion>
+  <FluentAssertionsVersion>6.6.0</FluentAssertionsVersion>
+  <FluentAssertionsVersion Condition=" '$(TargetFramework)' == 'net452' ">5.10.3</FluentAssertionsVersion>
+  <TestHostVersion>6.0.4-*</TestHostVersion>
+  <TestHostVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">3.1.24</TestHostVersion>
  </PropertyGroup>
 
  <ItemGroup Condition=" '$(IsSharedProject)' == 'false' ">
   <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
  </ItemGroup>
 
+ <ItemGroup Condition=" '$(IsAspNetCore)' == 'true' ">
+  <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="$(TestHostVersion)" />
+ </ItemGroup>
+
  <ItemGroup>
   <Using Include="FluentAssertions" />
  </ItemGroup>

src/Abstractions/src/Asp.Versioning.Abstractions/ISunsetPolicyManager.cs

@@ -22,7 +22,7 @@ bool TryGetPolicy(
         string? name,
         ApiVersion? apiVersion,
 #if !NETSTANDARD
-        [MaybeNullWhen(false)]
+        [MaybeNullWhen( false )]
 #endif
         out SunsetPolicy sunsetPolicy );
 }

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/Asp.Versioning.Mvc.Acceptance.Tests.csproj

@@ -1,13 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
-  <TargetFramework>net6.0</TargetFramework>
+  <TargetFrameworks>net6.0;netcoreapp3.1</TargetFrameworks>
   <RootNamespace>Asp.Versioning</RootNamespace>
  </PropertyGroup>
 
+ <PropertyGroup>
+  <RuntimeCompilationVersion>6.0.4-*</RuntimeCompilationVersion>
+  <RuntimeCompilationVersion Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">3.1.24</RuntimeCompilationVersion>
+ </PropertyGroup>
+ 
  <ItemGroup>
   <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
-  <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.2" />
+  <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="$(RuntimeCompilationVersion)" />
+ </ItemGroup>
+
+ <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+  <PackageReference Include="System.Net.Http.Json" Version="3.2.1" />
+ </ItemGroup>
+ 
+ <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+  <Compile Remove="Http\**\*.cs" />
+  <None Include="Http\**\*.cs" />
  </ItemGroup>
 
  <ItemGroup>

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/HttpServerFixture.cs

@@ -13,6 +13,7 @@ namespace Asp.Versioning;
 using Microsoft.Extensions.DependencyInjection;
 using System.IO;
 using System.Reflection;
+using System.Text;
 using static Microsoft.Extensions.DependencyInjection.ServiceDescriptor;
 
 public abstract partial class HttpServerFixture
@@ -35,14 +36,34 @@ protected virtual void OnAddApiVersioning( IApiVersioningBuilder builder ) { }
 
     private static string GenerateEndpointDirectedGraph( IServiceProvider services )
     {
+        const int MaxUriLength = 65519;
         var dfa = services.GetRequiredService<DfaGraphWriter>();
         var dataSource = services.GetRequiredService<EndpointDataSource>();
-        using var writer = new StringWriter();
+        string graph;
 
-        dfa.Write( dataSource, writer );
-        writer.Flush();
+        using ( var writer = new StringWriter() )
+        {
+            dfa.Write( dataSource, writer );
+            writer.Flush();
+            graph = writer.ToString();
+        }
+
+        var count = graph.Length / MaxUriLength;
+        var fragment = new StringBuilder();
+
+        for ( var i = 0; i <= count; i++ )
+        {
+            if ( i < count )
+            {
+                fragment.Append( Uri.EscapeDataString( graph.Substring( MaxUriLength * i, MaxUriLength ) ) );
+            }
+            else
+            {
+                fragment.Append( Uri.EscapeDataString( graph[( MaxUriLength * i )..] ) );
+            }
+        }
 
-        return "https://edotor.net/?engine=dot#" + Uri.EscapeDataString( writer.ToString() );
+        return "https://edotor.net/?engine=dot#" + fragment.ToString();
     }
 
     private TestServer CreateServer()

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/OData/Basic/Controllers/WeatherForecastsController.cs

@@ -1,5 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 
+#pragma warning disable IDE0060 // Remove unused parameter
 #pragma warning disable CA1822 // Mark members as static
 
 namespace Asp.Versioning.OData.Basic.Controllers;

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/OData/Basic/given a versioned ODataController/when using a query string and split into two types.cs

@@ -107,8 +107,15 @@ public async Task then_get_should_return_400_for_an_unspecified_version()
         var problem = await response.Content.ReadAsProblemDetailsAsync();
 
         // assert
+
+        // change from 3.1 to 6.0; DELETE is version-neutral
+        // and the only candidate, so GET returns 405
+#if NETCOREAPP3_1
+        response.StatusCode.Should().Be( MethodNotAllowed );
+#else
         response.StatusCode.Should().Be( BadRequest );
         problem.Type.Should().Be( ProblemDetailsDefaults.Unspecified.Type );
+#endif
     }
 
     public when_using_a_query_string_and_split_into_two_types( BasicFixture fixture, ITestOutputHelper console )

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/OData/Basic/given a versioned ODataController/when using a query string.cs

@@ -47,8 +47,15 @@ public async Task then_get_should_return_400_for_an_unspecified_version()
         var problem = await response.Content.ReadAsProblemDetailsAsync();
 
         // assert
+
+        // change from 3.1 to 6.0; DELETE is version-neutral
+        // and the only candidate, so GET returns 405
+#if NETCOREAPP3_1
+        response.StatusCode.Should().Be( MethodNotAllowed );
+#else
         response.StatusCode.Should().Be( BadRequest );
         problem.Type.Should().Be( ProblemDetailsDefaults.Unspecified.Type );
+#endif
     }
 
     public when_using_a_query_string( BasicFixture fixture, ITestOutputHelper console )

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/OData/UsingConventions/given a versioned ODataController using conventions/when using a query string and split into two types.cs

@@ -88,14 +88,20 @@ public async Task then_get_should_return_400_for_an_unspecified_version()
     {
         // arrange
 
-
         // act
         var response = await GetAsync( "api/people" );
         var problem = await response.Content.ReadAsProblemDetailsAsync();
 
         // assert
+
+        // change from 3.1 to 6.0; DELETE is version-neutral
+        // and the only candidate, so GET returns 405
+#if NETCOREAPP3_1
+        response.StatusCode.Should().Be( MethodNotAllowed );
+#else
         response.StatusCode.Should().Be( BadRequest );
         problem.Type.Should().Be( ProblemDetailsDefaults.Unspecified.Type );
+#endif
     }
 
     public when_using_a_query_string_and_split_into_two_types( ConventionsFixture fixture ) : base( fixture ) { }

src/AspNetCore/Acceptance/Asp.Versioning.Mvc.Acceptance.Tests/OData/UsingConventions/given a versioned ODataController using conventions/when using a query string.cs

@@ -17,7 +17,7 @@ public async Task then_get_should_return_200( string requestUrl )
 
 
         // act
-        var response = (await GetAsync( requestUrl )).EnsureSuccessStatusCode();
+        var response = ( await GetAsync( requestUrl ) ).EnsureSuccessStatusCode();
 
         // assert
         response.Headers.GetValues( "api-supported-versions" ).Single().Should().Be( "1.0" );
@@ -47,8 +47,15 @@ public async Task then_get_should_return_400_for_an_unspecified_version()
         var problem = await response.Content.ReadAsProblemDetailsAsync();
 
         // assert
+
+        // change from 3.1 to 6.0; DELETE is version-neutral
+        // and the only candidate, so GET returns 405
+#if NETCOREAPP3_1
+        response.StatusCode.Should().Be( MethodNotAllowed );
+#else
         response.StatusCode.Should().Be( BadRequest );
         problem.Type.Should().Be( ProblemDetailsDefaults.Unspecified.Type );
+#endif
     }
 
     public when_using_a_query_string( ConventionsFixture fixture ) : base( fixture ) { }