Merge pull request #674 from Havunen/master

Added .Net6 target framework

Author: dtchepak

.travis.yml

@@ -1,8 +1,8 @@
 language: csharp
 dist: xenial
-dotnet: 5.0.100
+dotnet: 6.0.100
 mono: none
-env: CONFIGURATION=Release FRAMEWORK=net5.0
+env: CONFIGURATION=Release FRAMEWORK=net6.0
 
 before_script:
   - dotnet --info

Directory.Build.props

@@ -6,7 +6,7 @@
 
   <PropertyGroup>
     <TargetIsNetFx Condition="$(TargetFramework.StartsWith('net4'))">true</TargetIsNetFx>
-    <TargetIsNet5 Condition="'$(TargetFramework)' == 'net5.0'">true</TargetIsNet5>
+    <TargetIsNet5OrNewer Condition="'$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0'">true</TargetIsNet5OrNewer>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 

appveyor.yml

@@ -1,4 +1,4 @@
-os: Visual Studio 2019
+os: Visual Studio 2022
 build: off
 
 environment:

src/NSubstitute/NSubstitute.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>NSubstitute is a friendly substitute for .NET mocking libraries. It has a simple, succinct syntax to help developers write clearer tests. NSubstitute is designed for Arrange-Act-Assert (AAA) testing and with Test Driven Development (TDD) in mind.</Description>
@@ -16,9 +16,19 @@
   </ItemGroup>
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;netstandard2.0;net45;net46;net5.0</TargetFrameworks>
+    <TargetFrameworks>netstandard1.3;netstandard2.0;net45;net46;net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+    <PackageReference Include="System.Linq.Queryable" Version="4.3.0-*" />
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0-*" />
+  </ItemGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
+    <DefineConstants>$(DefineConstants);SYSTEM_REFLECTION_CUSTOMATTRIBUTES_IS_ARRAY</DefineConstants>
+  </PropertyGroup>
+
+
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <WarningsAsErrors />
@@ -34,28 +44,18 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Nullable Condition="'$(TargetIsNet5)' == 'true'">enable</Nullable>
+    <Nullable Condition="'$(TargetIsNet5OrNewer)' == 'true'">enable</Nullable>
     <!-- Nullability does not work nicely for older versions of .NET, so just disable nullability for those versions. -->
     <!-- CS8632 - The annotation for nullable reference types should only be used in code within a '#nullable' annotations context. -->
-    <NoWarn Condition="'$(TargetIsNet5)' != 'true'">$(NoWarn);CS8632</NoWarn>
+    <NoWarn Condition="'$(TargetIsNet5OrNewer)' != 'true'">$(NoWarn);CS8632</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Castle.Core" Version="4.4.1-*" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0-*"
-                      Condition="'$(TargetIsNet5)' != 'true'" />
+    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0-*" Condition="'$(TargetIsNet5OrNewer)' != 'true'" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="System.Linq.Queryable" Version="4.3.0-*" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0-*" />
-  </ItemGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
-    <DefineConstants>$(DefineConstants);SYSTEM_REFLECTION_CUSTOMATTRIBUTES_IS_ARRAY</DefineConstants>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(TargetIsNet5)' == 'true'">
+  <PropertyGroup Condition="'$(TargetIsNet5OrNewer)' == 'true'">
     <DefineConstants>$(DefineConstants);SYSTEM_DIAGNOSTICS_CODEANALYSIS_NULLABILITY</DefineConstants>
   </PropertyGroup>
 

tests/NSubstitute.Acceptance.Specs/NSubstitute.Acceptance.Specs.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp2.0;netcoreapp1.1;net46;net45;net5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.1;net46;net45;net5.0;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
-    <PackageReference Include="NUnit" Version="3.10.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Include="NUnit" Version="3.13.2" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetIsNetFx)' == 'true'">

tests/NSubstitute.Benchmarks/ActivationBenchmark.cs

@@ -1,5 +1,4 @@
 using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Attributes.Jobs;
 using NSubstitute.Benchmarks.TestTypes;
 
 namespace NSubstitute.Benchmarks

tests/NSubstitute.Benchmarks/ArgumentSpecificationUsageBenchmark.cs

@@ -1,5 +1,4 @@
 using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Attributes.Jobs;
 using NSubstitute.Benchmarks.TestTypes;
 
 namespace NSubstitute.Benchmarks

tests/NSubstitute.Benchmarks/DispatchConfiguredMatchingCallBenchmark.cs

@@ -1,7 +1,5 @@
 using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Attributes.Jobs;
 using NSubstitute.Benchmarks.TestTypes;
-using NSubstitute.Core;
 
 namespace NSubstitute.Benchmarks
 {

tests/NSubstitute.Benchmarks/DispatchConfiguredNonMatchingCallBenchmark.cs

@@ -1,7 +1,5 @@
 using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Attributes.Jobs;
 using NSubstitute.Benchmarks.TestTypes;
-using NSubstitute.Core;
 
 namespace NSubstitute.Benchmarks
 {

tests/NSubstitute.Benchmarks/DispatchNonConfiguredCallBenchmark.cs

@@ -1,5 +1,4 @@
 using BenchmarkDotNet.Attributes;
-using BenchmarkDotNet.Attributes.Jobs;
 using NSubstitute.Benchmarks.TestTypes;
 
 namespace NSubstitute.Benchmarks