Added .NET 5.0 support

TypedRest · Jan 29, 2021 · 3fc28a3 · 3fc28a3
1 parent 3e29875
commit 3fc28a3
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 13 deletions.
diff --git a/readme.md b/readme.md
@@ -13,7 +13,7 @@ The **[Client Library](#client-library)** allows you to call Service Brokers tha
 
 [![OpenServiceBroker.Server](https://img.shields.io/nuget/v/OpenServiceBroker.Server.svg)](https://www.nuget.org/packages/OpenServiceBroker.Server/)
 
-Set up a regular ASP.NET Core 2.1 or 3.1 project and add the NuGet package [`OpenServiceBroker.Server`](https://www.nuget.org/packages/OpenServiceBroker.Server/). Then implement the following interfaces:
+Set up a regular ASP.NET Core 2.1, 3.1 or 5.0 project and add the NuGet package [`OpenServiceBroker.Server`](https://www.nuget.org/packages/OpenServiceBroker.Server/). Then implement the following interfaces:
 - [`ICatalogService`](src/Server/Catalogs/ICatalogService.cs) (optionally also [`IETagProvider`](src/Server/Catalogs/IETagProvider.cs) and/or [`ILastModifiedProvider`](src/Server/Catalogs/ILastModifiedProvider.cs) on the same class)
 - either [`IServiceInstanceBlocking`](src/Server/Instances/IServiceInstanceBlocking.cs) or [`IServiceInstanceDeferred`](src/Server/Instances/IServiceInstanceDeferred.cs) or both
 - either [`IServiceBindingBlocking`](src/Server/Bindings/IServiceBindingBlocking.cs) or [`IServiceBindingDeferred`](src/Server/Bindings/IServiceBindingDeferred.cs) or both
@@ -33,7 +33,7 @@ services.AddControllers()
         .AddOpenServiceBroker();
 ```
 
-You can use the **[project template](template/)** to quickly set up a pre-configured ASP.NET Core 3.1 project with `OpenServiceBroker.Server`.
+You can use the **[project template](template/)** to quickly set up a pre-configured ASP.NET Core 5.0 project with `OpenServiceBroker.Server`.
 
 ### Versioning
 

diff --git a/src/Server/BrokerControllerBase.cs b/src/Server/BrokerControllerBase.cs
@@ -106,7 +106,7 @@ protected OriginatingIdentity? OriginatingIdentity
         {
             get
             {
-                string headerValue = Request.Headers[OriginatingIdentity.HttpHeaderName].FirstOrDefault();
+                string? headerValue = Request.Headers[OriginatingIdentity.HttpHeaderName].FirstOrDefault();
                 return string.IsNullOrEmpty(headerValue) ? null : OriginatingIdentity.Parse(headerValue);
             }
         }

diff --git a/src/Server/MvcBuilderExtensions.cs b/src/Server/MvcBuilderExtensions.cs
@@ -20,7 +20,7 @@ public static IMvcBuilder AddOpenServiceBroker(this IMvcBuilder builder)
         {
             builder.AddApplicationPart(typeof(CatalogController).Assembly);
 
-#if NETCOREAPP3_1
+#if !NETSTANDARD2_0
             builder.AddNewtonsoftJson();
 #endif
 

diff --git a/src/Server/Server.csproj b/src/Server/Server.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>OpenServiceBroker.Server</AssemblyName>
     <RootNamespace>OpenServiceBroker</RootNamespace>
     <LangVersion>8.0</LangVersion>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netcoreapp3.1;net5.0</TargetFrameworks>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591</NoWarn>
@@ -49,5 +49,9 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.11" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.11" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.2" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="5.0.0" />
+  </ItemGroup>
 
 </Project>
diff --git a/src/UnitTests/FactsBase.cs b/src/UnitTests/FactsBase.cs
@@ -26,7 +26,7 @@ protected FactsBase()
                             .AddMvc()
                             .AddOpenServiceBroker())
                    .Configure(x => x.UseMvc()));
-#elif NETCOREAPP3_1
+#else
                    .ConfigureServices(x
                         => x.AddScoped(_ => Mock.Object)
                             .AddControllers()

diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj
@@ -5,7 +5,7 @@
     <AssemblyName>OpenServiceBroker.UnitTests</AssemblyName>
     <RootNamespace>OpenServiceBroker</RootNamespace>
     <LangVersion>8.0</LangVersion>
-    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <IsPackable>False</IsPackable>
     <DeterministicSourcePaths>False</DeterministicSourcePaths>
@@ -32,6 +32,9 @@
   <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
     <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.9" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
+    <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.2" />
+  </ItemGroup>
 
   <!-- Mark as unit test project -->
   <ItemGroup>

diff --git a/src/build.ps1 b/src/build.ps1
@@ -6,7 +6,7 @@ function Run-DotNet {
     if (Get-Command dotnet -ErrorAction SilentlyContinue) {
         dotnet @args
     } else {
-        ..\0install.ps1 run --batch --version 3.1..!3.2 https://apps.0install.net/dotnet/core-sdk.xml @args
+        ..\0install.ps1 run --batch --version 5.0..!5.1 https://apps.0install.net/dotnet/core-sdk.xml @args
     }
     if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
 }

diff --git a/src/build.sh b/src/build.sh
@@ -6,7 +6,7 @@ cd `dirname $0`
 if command -v dotnet > /dev/null 2> /dev/null; then
     dotnet="dotnet"
 else
-    dotnet="../0install.sh run --version 3.1..!3.2 https://apps.0install.net/dotnet/core-sdk.xml"
+    dotnet="../0install.sh run --version 5.0..!5.1 https://apps.0install.net/dotnet/core-sdk.xml"
 fi
 
 # Build

diff --git a/src/test.ps1 b/src/test.ps1
@@ -5,7 +5,7 @@ function Run-DotNet {
     if (Get-Command dotnet -ErrorAction SilentlyContinue) {
         dotnet @args
     } else {
-        ..\0install.ps1 run --batch --version 3.1..!3.2 https://apps.0install.net/dotnet/core-sdk.xml @args
+        ..\0install.ps1 run --batch --version 5.0..!5.1 https://apps.0install.net/dotnet/core-sdk.xml @args
     }
     if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
 }

diff --git a/src/test.sh b/src/test.sh
@@ -6,7 +6,7 @@ cd `dirname $0`
 if command -v dotnet > /dev/null 2> /dev/null; then
     dotnet="dotnet"
 else
-    dotnet="../0install.sh run --version 3.1..!3.2 https://apps.0install.net/dotnet/core-sdk.xml"
+    dotnet="../0install.sh run --version 5.0..!5.1 https://apps.0install.net/dotnet/core-sdk.xml"
 fi
 
 # Unit tests

diff --git a/template/MyServiceBroker.csproj b/template/MyServiceBroker.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <NoWarn>$(NoWarn);1591</NoWarn>

diff --git a/template/build.ps1 b/template/build.ps1
@@ -6,7 +6,7 @@ function Run-DotNet {
     if (Get-Command dotnet -ErrorAction SilentlyContinue) {
         dotnet @args
     } else {
-        ..\0install.ps1 run --batch --version 3.1..!3.2 https://apps.0install.net/dotnet/core-sdk.xml @args
+        ..\0install.ps1 run --batch --version 5.0..!5.1 https://apps.0install.net/dotnet/core-sdk.xml @args
     }
     if ($LASTEXITCODE -ne 0) {throw "Exit Code: $LASTEXITCODE"}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,7 +106,7 @@ protected OriginatingIdentity? OriginatingIdentity @@
             {
                 get
                 {
-                    string headerValue = Request.Headers[OriginatingIdentity.HttpHeaderName].FirstOrDefault();
+                    string? headerValue = Request.Headers[OriginatingIdentity.HttpHeaderName].FirstOrDefault();
                     return string.IsNullOrEmpty(headerValue) ? null : OriginatingIdentity.Parse(headerValue);
                 }
             }
@@ Expand Down @@