Update to Net-standard 2.1 and update test project NuGet packages

.travis.yml

@@ -4,12 +4,12 @@ os:
   - osx
 
 sudo: required
-dist: trusty
+dist: bionic
 
 mono:
-  - 4.4.2
+  - 6.8.0
 
-dotnet: 2.1.4
+dotnet: 3.1.102
 
 script:
   - ./build.sh --verbosity=minimal

appveyor.yml

@@ -1,4 +1,4 @@
-image: Visual Studio 2017
+image: Visual Studio 2019
 
 version: 2.0.0-ci000{build}
 configuration: Release

build.cake

@@ -11,8 +11,8 @@ var nogit = Argument<bool>("nogit", false);
 // Variables
 var configuration = "Release";
 var fullFrameworkTarget = "net452";
-var netStandardTarget = "netstandard2.0";
-var netCoreTarget = "netcoreapp2.0";
+var netStandardTarget = "netstandard2.1";
+var netCoreTarget = "netcoreapp3.1";
 
 // Directories
 var output = Directory("build");
@@ -280,13 +280,13 @@ Task("Test")
             }
 
             var settings = new ProcessSettings {
-                Arguments = string.Concat("xunit -configuration ", configuration, " -nobuild"),
+                Arguments = string.Concat("test --configuration ", configuration, " --no-build"),
                 WorkingDirectory = project.GetDirectory()
             };
 
             if (IsRunningOnUnix())
             {
-                settings.Arguments.Append(string.Concat("-framework ", netCoreTarget));
+                settings.Arguments.Append(string.Concat("--framework ", netCoreTarget));
             }
 
             Information("Executing tests for " + project.GetFilename() + " with arguments: " + settings.Arguments.Render());

build.ps1

@@ -1,6 +1,6 @@
-$CakeVersion = "0.24.0"
-$DotNetVersion = select-string -Path .\global.json -Pattern '[\d]\.[\d]\.[\d]' | % {$_.Matches} | % {$_.Value };
-$DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/v$DotNetVersion/scripts/obtain/dotnet-install.ps1";
+$CakeVersion = "0.37.0"
+$DotNetVersion = select-string -Path .\global.json -Pattern '[\d]\.[\d]\.[\d]*' | % {$_.Matches} | % {$_.Value };
+$DotNetInstallerUri = "https://dot.net/v1/dotnet-install.ps1";
 
 # Make sure tools folder exists
 $PSScriptRoot = $pwd

build.sh

@@ -3,10 +3,10 @@
 # Define directories.
 SCRIPT_DIR=$PWD
 TOOLS_DIR=$SCRIPT_DIR/tools
-CAKE_VERSION=0.24.0
+CAKE_VERSION=0.37.0
 CAKE_DLL=$TOOLS_DIR/Cake.$CAKE_VERSION/Cake.exe
-DOTNET_VERSION=$(cat "$SCRIPT_DIR/global.json" | grep -o '[0-9]\.[0-9]\.[0-9]')
-DOTNET_INSTRALL_URI=https://raw.githubusercontent.com/dotnet/cli/v$DOTNET_VERSION/scripts/obtain/dotnet-install.sh
+DOTNET_VERSION=$(cat "$SCRIPT_DIR/global.json" | grep -o '[0-9]\.[0-9]\.[0-9]*')
+DOTNET_INSTRALL_URI=https://dot.net/v1/dotnet-install.sh
 
 # Make sure the tools folder exist.
 if [ ! -d "$TOOLS_DIR" ]; then

global.json

@@ -1,5 +1,6 @@
 {
     "sdk": {
-        "version": "2.1.4"
+		"version": "3.1.102",
+		"rollForward": "minor"
     }
 }

src/Directory.Build.props

@@ -18,12 +18,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="AsyncUsageAnalyzers" Version="1.0.0-alpha003">
-      <PrivateAssets>All</PrivateAssets>
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="16.5.132">
+      <PrivateAssets>True</PrivateAssets>
     </PackageReference>
   </ItemGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'
+                 OR '$(TargetFramework)' == 'netstandard2.1'">
     <DefineConstants>$(DefineConstants);CORE</DefineConstants>
   </PropertyGroup>
 

src/Nancy.Authentication.Basic/Nancy.Authentication.Basic.csproj

@@ -2,6 +2,6 @@
   <PropertyGroup>
     <Description>A basic HTTP authentication provider for Nancy.</Description>
     <PackageTags>$(PackageTags);Authentication</PackageTags>
-    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net452</TargetFrameworks>
   </PropertyGroup>
 </Project>

src/Nancy.Authentication.Forms/Nancy.Authentication.Forms.csproj

@@ -2,6 +2,6 @@
   <PropertyGroup>
     <Description>A forms authentication provider for Nancy.</Description>
     <PackageTags>$(PackageTags);Authentication</PackageTags>
-    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net452</TargetFrameworks>
   </PropertyGroup>
 </Project>

src/Nancy.Authentication.Stateless/Nancy.Authentication.Stateless.csproj

@@ -2,6 +2,6 @@
   <PropertyGroup>
     <Description>A stateless authentication provider for Nancy.</Description>
     <PackageTags>$(PackageTags);Authentication</PackageTags>
-    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net452</TargetFrameworks>
   </PropertyGroup>
 </Project>

src/Nancy.Embedded/Nancy.Embedded.csproj

@@ -2,6 +2,6 @@
   <PropertyGroup>
     <Description>Helpers for serving embedded static content with Nancy.</Description>
     <PackageTags>$(PackageTags);Embedded;Static Content</PackageTags>
-    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net452</TargetFrameworks>
   </PropertyGroup>
 </Project>

src/Nancy.Hosting.Self/Nancy.Hosting.Self.csproj

@@ -2,9 +2,9 @@
   <PropertyGroup>
     <Description>Enables hosting Nancy in any application.</Description>
     <PackageTags>$(PackageTags);Host</PackageTags>
-    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net452</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'">
     <PackageReference Include="System.Security.Principal.Windows">
       <Version>4.3.0</Version>
     </PackageReference>

src/Nancy.Metadata.Modules/Nancy.Metadata.Modules.csproj

@@ -2,6 +2,6 @@
   <PropertyGroup>
     <Description>Nancy metadata modules to describe your APIs.</Description>
     <PackageTags>$(PackageTags);Metadata</PackageTags>
-    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net452</TargetFrameworks>
   </PropertyGroup>
 </Project>

src/Nancy.Testing/Nancy.Testing.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>Test harness for Nancy applications.</Description>
     <PackageTags>$(PackageTags);Testing</PackageTags>
-    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net452</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

src/Nancy.Validation.FluentValidation/Nancy.Validation.FluentValidation.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>Adds Fluent Validation support to Nancy.</Description>
     <PackageTags>$(PackageTags);Validation;FluentValidation</PackageTags>
-    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net452</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

src/Nancy.ViewEngines.Markdown/Nancy.ViewEngines.Markdown.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Description>Enables using Markdown with Nancy.</Description>
     <PackageTags>$(PackageTags);View Engine;Markdown</PackageTags>
-    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net452</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

src/Nancy/Extensions/MemoryStreamExtensions.cs

@@ -15,7 +15,7 @@ public static class MemoryStreamExtensions
         /// <returns>Buffer segment as bytes</returns>
         public static ArraySegment<byte> GetBufferSegment(this MemoryStream stream)
         {
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NETSTANDARD2_1
             ArraySegment<byte> buffer;
             if (stream.TryGetBuffer(out buffer))
             {
@@ -29,7 +29,7 @@ public static ArraySegment<byte> GetBufferSegment(this MemoryStream stream)
 
         private static byte[] GetBytes(this MemoryStream stream)
         {
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NETSTANDARD2_1
             return stream.ToArray(); // This is all we have if TryGetBuffer fails in GetBufferSegment
 #else
             return stream.GetBuffer();

src/Nancy/IO/RequestStream.cs

@@ -390,7 +390,7 @@ private void ShiftStreamToFileStreamIfNecessary()
                 // in NancyWcfGenericService - webRequest.UriTemplateMatch
                 var old = this.stream;
                 this.MoveStreamContentsToFileStream();
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NETSTANDARD2_1
                 old.Dispose();
 #else
                 old.Close();
@@ -483,7 +483,7 @@ private void MoveStreamContentsToFileStream()
 
             if (this.stream.CanSeek && this.stream.Length == 0)
             {
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NETSTANDARD2_1
                 this.stream.Dispose();
 #else
                 this.stream.Close();

src/Nancy/Nancy.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Nancy is a lightweight web framework for the .Net platform, inspired by Sinatra. Nancy aim at delivering a low ceremony approach to building light, fast web applications.</Description>
-    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard2.1;netstandard2.0;net452</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <EmbeddedResource Include="ErrorHandling\Resources\**\*.*;Diagnostics\Resources\**\*.*;Diagnostics\Views\**\*.*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.4" />
     <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
     <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
@@ -18,6 +18,17 @@
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="3.1.0" />
+    <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
+    <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
+    <PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
+    <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
+    <PackageReference Include="System.Security.Claims" Version="4.3.0" />
+    <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
+  </ItemGroup>  
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
     <Reference Include="System.Xml" />
   </ItemGroup>

src/Nancy/TinyIoc/TinyIoC.cs

@@ -80,7 +80,7 @@
 #endif
 
 
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NETSTANDARD2_1
 #undef SERIALIZABLE
 #undef APPDOMAIN_GETASSEMBLIES
 #endif
@@ -4075,7 +4075,7 @@ public void Dispose()
         #endregion
     }
 
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NETSTANDARD2_1
     static class ReverseTypeExtender
     {
         public static bool IsClass(this Type type)
@@ -4130,7 +4130,7 @@ public static Assembly Assembly(this Type type)
     }
 #endif
     // reverse shim for WinRT SR changes...
-#if (!NETFX_CORE && !NETSTANDARD2_0)
+#if (!NETFX_CORE && (!NETSTANDARD2_0 && !NETSTANDARD2_1))
     static class ReverseTypeExtender
     {
         public static bool IsClass(this Type type)

test/Directory.Build.props

@@ -6,11 +6,16 @@
     <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0'">
     <DefineConstants>$(DefineConstants);CORE</DefineConstants>
     <RuntimeFrameworkVersion>2.0.5</RuntimeFrameworkVersion>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
+    <DefineConstants>$(DefineConstants);CORE</DefineConstants>
+    <RuntimeFrameworkVersion>3.1.2</RuntimeFrameworkVersion>
+  </PropertyGroup>
+
   <PropertyGroup Condition=" '$(Configuration)' == 'MonoRelease' ">
     <DefineConstants>$(DefineConstants);MONO</DefineConstants>
   </PropertyGroup>
@@ -36,11 +41,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FakeItEasy" Version="4.6.0" />
-    <PackageReference Include="FakeItEasy.Analyzer.CSharp" Version="4.6.0" />
+    <PackageReference Include="FakeItEasy" Version="6.0.0" />
+    <PackageReference Include="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="xunit" Version="2.4.0-beta.1.build3958" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0-beta.1.build3958" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
@@ -51,8 +56,4 @@
     <Reference Include="System.Core" />
     <Reference Include="System" />
   </ItemGroup>
-
-  <ItemGroup>
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.4.0-beta.1.build3958" />
-  </ItemGroup>
 </Project>

test/Nancy.Authentication.Basic.Tests/Nancy.Authentication.Basic.Tests.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp2.0;net452</TargetFrameworks>
   </PropertyGroup>
 </Project>

test/Nancy.Authentication.Forms.Tests/Nancy.Authentication.Forms.Tests.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp2.0;net452</TargetFrameworks>
   </PropertyGroup>
 </Project>

test/Nancy.Embedded.Tests/Nancy.Embedded.Tests.csproj

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp2.0;net452</TargetFrameworks>
   </PropertyGroup>
-
   <ItemGroup>
     <EmbeddedResource Include="Resources\**\*.*" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
   </ItemGroup>

test/Nancy.Hosting.Self.Tests/Nancy.Hosting.Self.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp2.0;net452</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

test/Nancy.Metadata.Modules.Tests/Nancy.Metadata.Modules.Tests.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp2.0;net452</TargetFrameworks>
   </PropertyGroup>
 </Project>

test/Nancy.Testing.Tests/Nancy.Testing.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp2.0;net452</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

test/Nancy.Tests.Functional/Nancy.Tests.Functional.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp2.0;net452</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

test/Nancy.Tests/Nancy.Tests.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp2.0;net452</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -16,6 +16,13 @@
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.4.0" />
+    <PackageReference Include="System.Data.Common" Version="4.3.0" />
+    <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="1.3.2" />
     <PackageReference Include="System.Collections.Immutable" Version="1.2.0" />