Skip to content

Commit e835f27

Browse files
CaptnCodrCaptnCodr
authored
Merge pull request #10 from CaptnCodr/feature/NET6-Upgrade
.NET6 Upgrade
2 parents 36f62a9 + 18b9989 commit e835f27

File tree

12 files changed

+49
-46
lines changed

12 files changed

+49
-46
lines changed

‎appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 2.0.1.{build}-{branch}
1+
version: 3.0.0.{build}-{branch}
22
configuration:
33
- Debug
44
- Release

‎src/NHamcrest.NUnit.Examples/NHamcrest.NUnit.Examples.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>netstandard1.6</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="NUnit" Version="3.6.1" />
7+
<PackageReference Include="NUnit" Version="3.13.3" />
88
</ItemGroup>
99
<ItemGroup>
1010
<ProjectReference Include="..\NHamcrest.NUnit\NHamcrest.NUnit.csproj" />

‎src/NHamcrest.NUnit/NHamcrest.NUnit.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>netstandard1.6</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="NUnit" Version="3.6.1" />
7+
<PackageReference Include="NUnit" Version="3.13.3" />
88
</ItemGroup>
99
<ItemGroup>
1010
<ProjectReference Include="..\NHamcrest\NHamcrest.csproj" />

‎src/NHamcrest.Tests/Core/AllOfTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ public void Match_if_all_matchers_succeed()
1313
{
1414
var matcher = Matches.AllOf(_successfulMatcher, _successfulMatcher);
1515

16-
Assert.Equal(true, matcher.Matches(""));
16+
Assert.True(matcher.Matches(""));
1717
}
1818

1919
[Fact]
2020
public void No_match_if_any_matcher_fails()
2121
{
2222
var matcher = Matches.AllOf(_failingMatcher, _successfulMatcher);
2323

24-
Assert.Equal(false, matcher.Matches(""));
24+
Assert.False(matcher.Matches(""));
2525
}
2626

2727
[Fact]

‎src/NHamcrest.Tests/Core/AnyOfTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,25 @@ public class AnyOfTests
1717
public void Match_if_any_matchers_succeed()
1818
{
1919
var matcher = Matches.AnyOf(_successfulMatcher, _failingMatcher);
20-
Assert.Equal(true, matcher.Matches(""));
20+
Assert.True(matcher.Matches(""));
2121

2222
matcher = Matches.AnyOf(new List<IMatcher<string>> { _failingMatcher, _successfulMatcher });
23-
Assert.Equal(true, matcher.Matches(""));
23+
Assert.True(matcher.Matches(""));
2424
}
2525

2626
[Fact]
2727
public void No_match_if_all_matchers_fail()
2828
{
2929
var matcher = Matches.AnyOf(_failingMatcher, _failingMatcher);
3030

31-
Assert.Equal(false, matcher.Matches(""));
31+
Assert.False(matcher.Matches(""));
3232
}
3333

3434
[Fact]
3535
public void Shortcut_matching_when_matcher_succeeds()
3636
{
3737
var matcher = Matches.AnyOf(_successfulMatcher, _explodingMatcher);
38-
Assert.Equal(true, matcher.Matches(""));
38+
Assert.True(matcher.Matches(""));
3939
}
4040

4141
[Fact]

‎src/NHamcrest.Tests/Core/CombinableMatcherTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,36 @@ public void Both_returns_match_if_both_succeed()
1414
{
1515
var matcher = Matches.Both(new CombinableMatcher<string>(_successfulMatcher).And(_successfulMatcher));
1616

17-
Assert.Equal(true, matcher.Matches(""));
17+
Assert.True(matcher.Matches(""));
1818
}
1919

2020
[Fact]
2121
public void Both_returns_no_match_if_either_fails()
2222
{
2323
var matcher = Matches.Both(new CombinableMatcher<string>(_successfulMatcher).And(_failingMatcher));
2424

25-
Assert.Equal(false, matcher.Matches(""));
25+
Assert.False(matcher.Matches(""));
2626
}
2727

2828
[Fact]
2929
public void Either_returns_match_if_any_succeeds()
3030
{
3131
var matcher = Matches.Either(new CombinableMatcher<string>(_successfulMatcher).Or(_successfulMatcher));
32-
Assert.Equal(true, matcher.Matches(""));
32+
Assert.True(matcher.Matches(""));
3333

3434
matcher = Matches.Either(new CombinableMatcher<string>(_successfulMatcher).Or(_failingMatcher));
35-
Assert.Equal(true, matcher.Matches(""));
35+
Assert.True(matcher.Matches(""));
3636

3737
matcher = Matches.Either(new CombinableMatcher<string>(_failingMatcher).Or(_successfulMatcher));
38-
Assert.Equal(true, matcher.Matches(""));
38+
Assert.True(matcher.Matches(""));
3939
}
4040

4141
[Fact]
4242
public void Either_returns_no_match_if_all_fail()
4343
{
4444
var matcher = Matches.Either(new CombinableMatcher<string>(_failingMatcher).And(_failingMatcher));
4545

46-
Assert.Equal(false, matcher.Matches(""));
46+
Assert.False(matcher.Matches(""));
4747
}
4848

4949
[Fact]

‎src/NHamcrest.Tests/DescriptionTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void None_returns_a_null_description()
2222
{
2323
var nullDescription = Description.None;
2424

25-
Assert.IsType(typeof(NullDescription), nullDescription);
25+
Assert.IsType<NullDescription>(nullDescription);
2626
}
2727

2828
[Fact]

‎src/NHamcrest.Tests/FeatureMatcherDescriptionTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ public void FeatureMatcherGeneratesCorrectDescriptionForAllProperties(int intVal
2626
[InlineData(1, "foo", 2, "qux", "failed to match one", "boom!")]
2727
[InlineData(3, "bar", 17, "baz", "the world exploded", "stack overflow")]
2828
public void FeatureMatcherGeneratesCorrectMismatchDescriptionForAllFailedProperties(
29-
int intVal,
30-
string stringVal,
31-
int mismatchedIntVal,
32-
string mismatchedStringVal,
33-
string mismatchedIntDescription,
29+
int intVal,
30+
string stringVal,
31+
int mismatchedIntVal,
32+
string mismatchedStringVal,
33+
string mismatchedIntDescription,
3434
string mismatchedStringDescription)
3535
{
3636
var sut = Describe.Object<SimpleFlatClass>()

‎src/NHamcrest.Tests/NHamcrest.Tests.csproj

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.1</TargetFramework>
5-
<Version>2.0.0</Version>
4+
<TargetFramework>net6.0</TargetFramework>
5+
<Version>3.0.0</Version>
66
<Description />
77
</PropertyGroup>
88
<ItemGroup>
99
<Compile Remove="FeatureMatcherTests.cs" />
1010
</ItemGroup>
1111
<ItemGroup>
12-
<PackageReference Include="xunit" Version="2.2.0" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
14-
<PackageReference Include="Castle.Core" Version="4.0.0" />
15-
<PackageReference Include="Moq" Version="4.7.1" />
16-
<PackageReference Include="Microsoft.NET.TEST.Sdk" Version="15.0.0"/>
12+
<PackageReference Include="xunit" Version="2.4.2" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
17+
<PackageReference Include="Castle.Core" Version="5.1.0" />
18+
<PackageReference Include="Moq" Version="4.18.2" />
19+
<PackageReference Include="Microsoft.NET.TEST.Sdk" Version="17.2.0" />
1720
</ItemGroup>
1821
<ItemGroup>
1922
<ProjectReference Include="..\NHamcrest.XUnit\NHamcrest.XUnit.csproj" />

‎src/NHamcrest.XUnit.Examples/NHamcrest.XUnit.Examples.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>netstandard1.5</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="xunit" Version="2.2.0" />
8-
<PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
7+
<PackageReference Include="xunit" Version="2.4.2" />
8+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
99
</ItemGroup>
1010
<ItemGroup>
1111
<ProjectReference Include="..\NHamcrest.XUnit\NHamcrest.XUnit.csproj" />

‎src/NHamcrest.XUnit/NHamcrest.XUnit.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.5;net451</TargetFrameworks>
4+
<TargetFramework>net6.0</TargetFramework>
55
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
6-
<Copyright>Copyright © 2017</Copyright>
7-
<Version Condition="'$(VersionSuffix)' == ''">2.0.1</Version>
8-
<Version Condition="'$(VersionSuffix)' != ''">2.0.1-$(VersionSuffix)</Version>
6+
<Copyright>Copyright © 2022</Copyright>
7+
<Version Condition="'$(VersionSuffix)' == ''">3.0.0</Version>
8+
<Version Condition="'$(VersionSuffix)' != ''">0.0.0-$(VersionSuffix)</Version>
99
<Description>Adapter for xunit for using NHamcrest library</Description>
1010
<Authors>Graham Hay, Algirdas Lašas</Authors>
1111
<PackageLicenseUrl>https://github.com/nhamcrest/NHamcrest/blob/master/LICENCE.txt</PackageLicenseUrl>
1212
<PackageProjectUrl>https://github.com/nhamcrest/NHamcrest</PackageProjectUrl>
1313
<PackageTags>unittesting hamcrest matcher test</PackageTags>
14-
<AssemblyVersion>2.0.1.0</AssemblyVersion>
15-
<FileVersion>2.0.1.0</FileVersion>
14+
<AssemblyVersion>3.0.0.0</AssemblyVersion>
15+
<FileVersion>3.0.0.0</FileVersion>
1616
</PropertyGroup>
1717
<ItemGroup>
18-
<PackageReference Include="xunit.assert" Version="[2.2,3)" />
18+
<PackageReference Include="xunit.assert" Version="2.4.2" />
1919
</ItemGroup>
2020
<ItemGroup>
2121
<ProjectReference Include="..\NHamcrest\NHamcrest.csproj" />

‎src/NHamcrest/NHamcrest.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFrameworks>netstandard1.5;net451</TargetFrameworks>
4+
<TargetFramework>net6.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
7-
<Copyright>Copyright © 2017</Copyright>
8-
<Version Condition="'$(VersionSuffix)' == ''">2.0.1</Version>
9-
<Version Condition="'$(VersionSuffix)' != ''">2.0.1-$(VersionSuffix)</Version>
7+
<Copyright>Copyright © 2022</Copyright>
8+
<Version Condition="'$(VersionSuffix)' == ''">3.0.0</Version>
9+
<Version Condition="'$(VersionSuffix)' != ''">3.0.0-$(VersionSuffix)</Version>
1010
<Description>.NET port of Hamcrest, a matcher library with some extra matchers</Description>
1111
<Authors>Graham Hay, Algirdas Lašas</Authors>
1212
<Company />
1313
<Product />
1414
<PackageLicenseUrl>https://github.com/nhamcrest/NHamcrest/blob/master/LICENCE.txt</PackageLicenseUrl>
1515
<PackageProjectUrl>https://github.com/nhamcrest/NHamcrest</PackageProjectUrl>
1616
<PackageTags>unittesting hamcrest matcher test</PackageTags>
17-
<AssemblyVersion>2.0.1.0</AssemblyVersion>
18-
<FileVersion>2.0.1.0</FileVersion>
17+
<AssemblyVersion>3.0.0.0</AssemblyVersion>
18+
<FileVersion>3.0.0.0</FileVersion>
1919
</PropertyGroup>
2020
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
2121
<NoWarn>1701;1702;1705;1591</NoWarn>

0 commit comments

Comments
 (0)