Add .NET Standard 2.1 support to the projects

NancyFx#3007
0x414c49 · Mar 11, 2020 · 0d12681 · 0d12681
1 parent 11ac0fe
commit 0d12681
Show file tree

Hide file tree

Showing 28 changed files with 122 additions and 20 deletions.
diff --git a/src/Nancy.Authentication.Basic/Nancy.Authentication.Basic.csproj b/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>
diff --git a/src/Nancy.Authentication.Forms/Nancy.Authentication.Forms.csproj b/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>
diff --git a/src/Nancy.Authentication.Stateless/Nancy.Authentication.Stateless.csproj b/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>
diff --git a/src/Nancy.Embedded/Nancy.Embedded.csproj b/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>
diff --git a/src/Nancy.Hosting.Self/Nancy.Hosting.Self.csproj b/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>

diff --git a/src/Nancy.Metadata.Modules/Nancy.Metadata.Modules.csproj b/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>
diff --git a/src/Nancy.Testing/Nancy.Testing.csproj b/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>

diff --git a/src/Nancy.Validation.FluentValidation/Nancy.Validation.FluentValidation.csproj b/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>

diff --git a/src/Nancy.ViewEngines.Markdown/Nancy.ViewEngines.Markdown.csproj b/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>

diff --git a/src/Nancy/Nancy.csproj b/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>

diff --git a/test/Nancy.Authentication.Basic.Tests/Nancy.Authentication.Basic.Tests.csproj b/test/Nancy.Authentication.Basic.Tests/Nancy.Authentication.Basic.Tests.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp2.0;net452</TargetFrameworks>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Update="FakeItEasy" Version="6.0.0" />
+    <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/test/Nancy.Authentication.Forms.Tests/Nancy.Authentication.Forms.Tests.csproj b/test/Nancy.Authentication.Forms.Tests/Nancy.Authentication.Forms.Tests.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp2.0;net452</TargetFrameworks>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Update="FakeItEasy" Version="6.0.0" />
+    <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/test/Nancy.Embedded.Tests/Nancy.Embedded.Tests.csproj b/test/Nancy.Embedded.Tests/Nancy.Embedded.Tests.csproj
@@ -1,9 +1,14 @@
 <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>
+
+  <ItemGroup>
+    <PackageReference Update="FakeItEasy" Version="6.0.0" />
+    <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/test/Nancy.Encryption.MachineKey.Tests/Nancy.Encryption.MachineKey.Tests.csproj b/test/Nancy.Encryption.MachineKey.Tests/Nancy.Encryption.MachineKey.Tests.csproj
@@ -2,4 +2,8 @@
   <PropertyGroup>
     <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Update="FakeItEasy" Version="6.0.0" />
+    <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/test/Nancy.Hosting.Aspnet.Tests/Nancy.Hosting.Aspnet.Tests.csproj b/test/Nancy.Hosting.Aspnet.Tests/Nancy.Hosting.Aspnet.Tests.csproj
@@ -6,4 +6,9 @@
   <ItemGroup>
     <Reference Include="System.Web" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="FakeItEasy" Version="6.0.0" />
+    <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/test/Nancy.Hosting.Self.Tests/Nancy.Hosting.Self.Tests.csproj b/test/Nancy.Hosting.Self.Tests/Nancy.Hosting.Self.Tests.csproj
@@ -1,12 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp2.0;net452</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Remove="..\Nancy.Tests\Fakes\FakeDefaultNancyBootstrapper.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="FakeItEasy" Version="6.0.0" />
+    <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
+  </ItemGroup>
+
   <PropertyGroup Condition=" '$(Configuration)' == 'MonoRelease' ">
     <DefineConstants>$(DefineConstants);MONO</DefineConstants>
   </PropertyGroup>

diff --git a/test/Nancy.Metadata.Modules.Tests/Nancy.Metadata.Modules.Tests.csproj b/test/Nancy.Metadata.Modules.Tests/Nancy.Metadata.Modules.Tests.csproj
@@ -1,5 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp2.0;net452</TargetFrameworks>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Update="FakeItEasy" Version="6.0.0" />
+    <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/test/Nancy.Owin.Tests/Nancy.Owin.Tests.csproj b/test/Nancy.Owin.Tests/Nancy.Owin.Tests.csproj
@@ -7,4 +7,9 @@
     <PackageReference Include="Microsoft.Owin" Version="3.0.1" />
     <PackageReference Include="OwinHttpMessageHandler" Version="1.3.5" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="FakeItEasy" Version="6.0.0" />
+    <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/test/Nancy.Testing.Tests/Nancy.Testing.Tests.csproj b/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>
@@ -17,4 +17,9 @@
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Xml" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="FakeItEasy" Version="6.0.0" />
+    <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/test/Nancy.Tests.Functional/Nancy.Tests.Functional.csproj b/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>
@@ -12,4 +12,9 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
     <ProjectReference Include="../../src/Nancy.ViewEngines.Razor/Nancy.ViewEngines.Razor.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="FakeItEasy" Version="6.0.0" />
+    <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/test/Nancy.Tests/Nancy.Tests.csproj b/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" />
@@ -25,4 +32,9 @@
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="FakeItEasy" Version="6.0.0" />
+    <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/test/Nancy.Validation.DataAnnotations.Tests/Nancy.Validation.DataAnnotations.Tests.csproj b/test/Nancy.Validation.DataAnnotations.Tests/Nancy.Validation.DataAnnotations.Tests.csproj
@@ -6,4 +6,9 @@
   <ItemGroup>
     <Reference Include="System.ComponentModel.DataAnnotations" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="FakeItEasy" Version="6.0.0" />
+    <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/test/Nancy.Validation.FluentValidation.Tests/Nancy.Validation.FluentValidation.Tests.csproj b/test/Nancy.Validation.FluentValidation.Tests/Nancy.Validation.FluentValidation.Tests.csproj
@@ -2,4 +2,8 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp2.0;net452</TargetFrameworks>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Update="FakeItEasy" Version="6.0.0" />
+    <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/test/Nancy.ViewEngines.DotLiquid.Tests/Nancy.ViewEngines.DotLiquid.Tests.csproj b/test/Nancy.ViewEngines.DotLiquid.Tests/Nancy.ViewEngines.DotLiquid.Tests.csproj
@@ -12,4 +12,9 @@
   <ItemGroup>
     <PackageReference Include="DotLiquid" Version="2.0.64" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="FakeItEasy" Version="6.0.0" />
+    <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/test/Nancy.ViewEngines.Markdown.Tests/Nancy.ViewEngines.Markdown.Tests.csproj b/test/Nancy.ViewEngines.Markdown.Tests/Nancy.ViewEngines.Markdown.Tests.csproj
@@ -12,4 +12,9 @@
   <ItemGroup>
     <PackageReference Include="MarkdownSharp" Version="1.13.0" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="FakeItEasy" Version="6.0.0" />
+    <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/test/Nancy.ViewEngines.Razor.Tests.Models/Nancy.ViewEngines.Razor.Tests.Models.csproj b/test/Nancy.ViewEngines.Razor.Tests.Models/Nancy.ViewEngines.Razor.Tests.Models.csproj
@@ -2,4 +2,8 @@
   <PropertyGroup>
     <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Update="FakeItEasy" Version="6.0.0" />
+    <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/test/Nancy.ViewEngines.Razor.Tests/Nancy.ViewEngines.Razor.Tests.csproj b/test/Nancy.ViewEngines.Razor.Tests/Nancy.ViewEngines.Razor.Tests.csproj
@@ -13,4 +13,9 @@
     <ProjectReference Include="../../src/Nancy.ViewEngines.Razor/Nancy.ViewEngines.Razor.csproj" />
     <ProjectReference Include="../Nancy.ViewEngines.Razor.Tests.Models/Nancy.ViewEngines.Razor.Tests.Models.csproj" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="FakeItEasy" Version="6.0.0" />
+    <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/test/Nancy.ViewEngines.Spark.Tests/Nancy.ViewEngines.Spark.Tests.csproj b/test/Nancy.ViewEngines.Spark.Tests/Nancy.ViewEngines.Spark.Tests.csproj
@@ -12,4 +12,9 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="FakeItEasy" Version="6.0.0" />
+    <PackageReference Update="FakeItEasy.Analyzer.CSharp" Version="6.0.0" />
+  </ItemGroup>
+
 </Project>