Skip to content

Commit f890efa

Browse files
dtchepakdtchepak
authored
Merge pull request #674 from Havunen/master
Added .Net6 target framework
2 parents e15f0f4 + f3577d4 commit f890efa

13 files changed

+27
-35
lines changed

‎.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
language: csharp
22
dist: xenial
3-
dotnet: 5.0.100
3+
dotnet: 6.0.100
44
mono: none
5-
env: CONFIGURATION=Release FRAMEWORK=net5.0
5+
env: CONFIGURATION=Release FRAMEWORK=net6.0
66

77
before_script:
88
- dotnet --info

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<PropertyGroup>
88
<TargetIsNetFx Condition="$(TargetFramework.StartsWith('net4'))">true</TargetIsNetFx>
9-
<TargetIsNet5 Condition="'$(TargetFramework)' == 'net5.0'">true</TargetIsNet5>
9+
<TargetIsNet5OrNewer Condition="'$(TargetFramework)' == 'net5.0' Or '$(TargetFramework)' == 'net6.0'">true</TargetIsNet5OrNewer>
1010
<LangVersion>latest</LangVersion>
1111
</PropertyGroup>
1212

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
os: Visual Studio 2019
1+
os: Visual Studio 2022
22
build: off
33

44
environment:

‎src/NSubstitute/NSubstitute.csproj

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<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 @@
1616
</ItemGroup>
1717

1818
<PropertyGroup>
19-
<TargetFrameworks>netstandard1.3;netstandard2.0;net45;net46;net5.0</TargetFrameworks>
19+
<TargetFrameworks>netstandard1.3;netstandard2.0;net45;net46;net5.0;net6.0</TargetFrameworks>
2020
</PropertyGroup>
2121

22+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
23+
<PackageReference Include="System.Linq.Queryable" Version="4.3.0-*" />
24+
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0-*" />
25+
</ItemGroup>
26+
27+
<PropertyGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
28+
<DefineConstants>$(DefineConstants);SYSTEM_REFLECTION_CUSTOMATTRIBUTES_IS_ARRAY</DefineConstants>
29+
</PropertyGroup>
30+
31+
2232
<PropertyGroup>
2333
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
2434
<WarningsAsErrors />
@@ -34,28 +44,18 @@
3444
</PropertyGroup>
3545

3646
<PropertyGroup>
37-
<Nullable Condition="'$(TargetIsNet5)' == 'true'">enable</Nullable>
47+
<Nullable Condition="'$(TargetIsNet5OrNewer)' == 'true'">enable</Nullable>
3848
<!-- Nullability does not work nicely for older versions of .NET, so just disable nullability for those versions. -->
3949
<!-- CS8632 - The annotation for nullable reference types should only be used in code within a '#nullable' annotations context. -->
40-
<NoWarn Condition="'$(TargetIsNet5)' != 'true'">$(NoWarn);CS8632</NoWarn>
50+
<NoWarn Condition="'$(TargetIsNet5OrNewer)' != 'true'">$(NoWarn);CS8632</NoWarn>
4151
</PropertyGroup>
4252

4353
<ItemGroup>
4454
<PackageReference Include="Castle.Core" Version="4.4.1-*" />
45-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0-*"
46-
Condition="'$(TargetIsNet5)' != 'true'" />
55+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.3.0-*" Condition="'$(TargetIsNet5OrNewer)' != 'true'" />
4756
</ItemGroup>
4857

49-
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
50-
<PackageReference Include="System.Linq.Queryable" Version="4.3.0-*" />
51-
<PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0-*" />
52-
</ItemGroup>
53-
54-
<PropertyGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
55-
<DefineConstants>$(DefineConstants);SYSTEM_REFLECTION_CUSTOMATTRIBUTES_IS_ARRAY</DefineConstants>
56-
</PropertyGroup>
57-
58-
<PropertyGroup Condition="'$(TargetIsNet5)' == 'true'">
58+
<PropertyGroup Condition="'$(TargetIsNet5OrNewer)' == 'true'">
5959
<DefineConstants>$(DefineConstants);SYSTEM_DIAGNOSTICS_CODEANALYSIS_NULLABILITY</DefineConstants>
6060
</PropertyGroup>
6161

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp2.0;netcoreapp1.1;net46;net45;net5.0</TargetFrameworks>
4+
<TargetFrameworks>netcoreapp2.1;net46;net45;net5.0;net6.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
9-
<PackageReference Include="NUnit" Version="3.10.1" />
10-
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
9+
<PackageReference Include="NUnit" Version="3.13.2" />
10+
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
1111
</ItemGroup>
1212

1313
<ItemGroup Condition="'$(TargetIsNetFx)' == 'true'">

‎tests/NSubstitute.Benchmarks/ActivationBenchmark.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using BenchmarkDotNet.Attributes;
2-
using BenchmarkDotNet.Attributes.Jobs;
32
using NSubstitute.Benchmarks.TestTypes;
43

54
namespace NSubstitute.Benchmarks

‎tests/NSubstitute.Benchmarks/ArgumentSpecificationUsageBenchmark.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using BenchmarkDotNet.Attributes;
2-
using BenchmarkDotNet.Attributes.Jobs;
32
using NSubstitute.Benchmarks.TestTypes;
43

54
namespace NSubstitute.Benchmarks

‎tests/NSubstitute.Benchmarks/DispatchConfiguredMatchingCallBenchmark.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using BenchmarkDotNet.Attributes;
2-
using BenchmarkDotNet.Attributes.Jobs;
32
using NSubstitute.Benchmarks.TestTypes;
4-
using NSubstitute.Core;
53

64
namespace NSubstitute.Benchmarks
75
{

‎tests/NSubstitute.Benchmarks/DispatchConfiguredNonMatchingCallBenchmark.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
using BenchmarkDotNet.Attributes;
2-
using BenchmarkDotNet.Attributes.Jobs;
32
using NSubstitute.Benchmarks.TestTypes;
4-
using NSubstitute.Core;
53

64
namespace NSubstitute.Benchmarks
75
{

‎tests/NSubstitute.Benchmarks/DispatchNonConfiguredCallBenchmark.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using BenchmarkDotNet.Attributes;
2-
using BenchmarkDotNet.Attributes.Jobs;
32
using NSubstitute.Benchmarks.TestTypes;
43

54
namespace NSubstitute.Benchmarks

‎tests/NSubstitute.Benchmarks/NSubstitute.Benchmarks.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>net462;netcoreapp2.1</TargetFrameworks>
4+
<TargetFrameworks>net6.0</TargetFrameworks>
5+
<StartupObject>NSubstitute.Benchmarks.Program</StartupObject>
56
</PropertyGroup>
67

78
<ItemGroup>
@@ -11,7 +12,7 @@
1112
</ItemGroup>
1213

1314
<ItemGroup>
14-
<PackageReference Include="BenchmarkDotNet" Version="0.10.14" />
15+
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
1516
<ProjectReference Include="..\..\src\NSubstitute\NSubstitute.csproj" />
1617
</ItemGroup>
1718
</Project>

‎tests/NSubstitute.Benchmarks/ToStringCallBenchmark.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using BenchmarkDotNet.Attributes;
2-
using BenchmarkDotNet.Attributes.Jobs;
32
using NSubstitute.Benchmarks.TestTypes;
43

54
namespace NSubstitute.Benchmarks

‎tests/NSubstitute.Benchmarks/VerifyReceivedCallBenchmark.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using BenchmarkDotNet.Attributes;
2-
using BenchmarkDotNet.Attributes.Jobs;
32
using NSubstitute.Benchmarks.TestTypes;
43

54
namespace NSubstitute.Benchmarks

0 commit comments

Comments
 (0)