feat: Upgrade to .NET Core 3.1 (EOL Dec 13, 2022) (#179)

Author: nickevansuk

.github/workflows/OpenActive.FakeDatabase.NET.Tests.yml

@@ -14,10 +14,10 @@ jobs:
     steps:
     - name: Checkout OpenActive.Server.NET
       uses: actions/checkout@v2
-    - name: Setup .NET Core 2.1.808
+    - name: Setup .NET Core 3.1.419
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 2.1.808
+        dotnet-version: 3.1.419
     - name: Build OpenActive.FakeDatabase.NET.Tests
       run: dotnet build ./Fakes/OpenActive.FakeDatabase.NET.Tests/OpenActive.FakeDatabase.NET.Tests.csproj --configuration Release
     - name: Run OpenActive.FakeDatabase.NET.Tests

.github/workflows/OpenActive.Server.NET.Tests.yml

@@ -14,10 +14,10 @@ jobs:
     steps:
     - name: Checkout OpenActive.Server.NET
       uses: actions/checkout@v2
-    - name: Setup .NET Core 2.1.808
+    - name: Setup .NET Core 3.1.419
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 2.1.808
+        dotnet-version: 3.1.419
     - name: Build OpenActive.Server.NET.Tests and dependencies
       run: dotnet build ./OpenActive.Server.NET.Tests/OpenActive.Server.NET.Tests.csproj --configuration Release
     - name: Run OpenActive.Server.NET.Tests

.github/workflows/openactive-test-suite.yml

@@ -27,14 +27,10 @@ jobs:
         repository: openactive/openactive-test-suite
         ref: ${{ steps.refs.outputs.mirror_ref }}
         path: tests
-    - name: Setup .NET Core 2.1.808 for Booking Server Reference Implementation
+    - name: Setup .NET Core SDK 3.1.419
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 2.1.808
-    - name: Setup .NET Core SDK 3.1.411 for Authentication Authority Reference Implementation
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 3.1.411
+        dotnet-version: 3.1.419
     - name: Setup Node.js 14.x
       uses: actions/setup-node@v1
       with:
@@ -150,14 +146,10 @@ jobs:
       # Checkout the repo
       - uses: actions/checkout@master
       # Setup .NET Core SDK
-      - name: Setup .NET Core 2.1.808
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 2.1.808
-      - name: Setup .NET Core SDK 3.1.411 for Authentication Authority Reference Implementation
+      - name: Setup .NET Core SDK 3.1.419
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.411
+          dotnet-version: 3.1.419
       # Run dotnet build and publish
       - name: Install OpenActive.Server.NET dependencies
         run: dotnet restore

Examples/BookingSystem.AspNetCore/BookingSystem.AspNetCore.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <UserSecretsId>aspnet-BookingSystem.AspNetCore-443B4F82-A20C-41CE-9924-329A0BCF0D14</UserSecretsId>
   </PropertyGroup>
 

Examples/BookingSystem.AspNetCore/Helpers/ResponseContentHelper.cs

@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.ResponseCaching;
 
 namespace BookingSystem.AspNetCore.Helpers
 {

Examples/BookingSystem.AspNetCore/Startup.cs

@@ -69,9 +69,8 @@ public void ConfigureServices(IServiceCollection services)
             }
 
             services
-                .AddMvc()
-                .AddMvcOptions(options => options.InputFormatters.Insert(0, new OpenBookingInputFormatter()))
-                .SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
+                .AddControllers()
+                .AddMvcOptions(options => options.InputFormatters.Insert(0, new OpenBookingInputFormatter()));
 
             services.AddSingleton<IBookingEngine>(sp => EngineConfig.CreateStoreBookingEngine(AppSettings));
         }
@@ -93,8 +92,14 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
 
             app.UseHttpsRedirection();
             app.UseStaticFiles();
+            app.UseRouting();
+
             app.UseAuthentication();
-            app.UseMvc();
+            app.UseAuthorization();
+            app.UseEndpoints(endpoints =>
+            {
+                endpoints.MapDefaultControllerRoute();
+            });
         }
     }
 }

Fakes/OpenActive.FakeDatabase.NET.Tests/OpenActive.FakeDatabase.NET.Tests.csproj

@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

Fakes/OpenActive.FakeDatabase.NET/OpenActive.FakeDatabase.NET.csproj

@@ -5,7 +5,7 @@
     <AssemblyName>OpenActive.FakeDatabase.NET</AssemblyName>
     <RootNamespace>OpenActive.FakeDatabase.NET</RootNamespace>
     <PackageId>OpenActive.FakeDatabase.NET</PackageId>
-    <Version>0.9.0</Version>
+    <Version>0.11.0</Version>
     <Authors>OpenActive Community</Authors>
     <Company>OpenActive</Company>
     <Description>NOTICE: This library is not designed for production use.

OpenActive.Server.NET.Tests/OpenActive.Server.NET.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

OpenActive.Server.NET/OpenActive.Server.NET.csproj

@@ -12,7 +12,7 @@
     <PackageTags>OpenActive booking</PackageTags>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.10.0</Version>
+    <Version>0.11.0</Version>
     <Description>.NET server library for OpenActive implementation</Description>
     <PackageId>OpenActive.Server.NET</PackageId>
   </PropertyGroup>