Merge pull request #23 from CaptnCodr/feature/update-xunit

Update xunit to v3 & more deps.
nhamcrest · Dec 18, 2024 · 8d596bf · 8d596bf
2 parents 14e2188 + 5822b88
commit 8d596bf
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 35 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest, macOS-latest, ubuntu-latest]
-        dotnet: [7.0.302]
+        dotnet: [8.0.x]
     runs-on: ${{ matrix.os }}
 
     steps:

diff --git a/.gitignore b/.gitignore
@@ -96,6 +96,7 @@ $tf/
 
 # ReSharper is a .NET coding add-in
 _ReSharper*/
+.idea
 *.[Rr]e[Ss]harper
 *.DotSettings.user
 

diff --git a/src/NHamcrest.NUnit.Examples/NHamcrest.NUnit.Examples.csproj b/src/NHamcrest.NUnit.Examples/NHamcrest.NUnit.Examples.csproj
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="NUnit" Version="3.14.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="NUnit" Version="4.3.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NHamcrest.NUnit\NHamcrest.NUnit.csproj" />

diff --git a/src/NHamcrest.NUnit/NHamcrest.NUnit.csproj b/src/NHamcrest.NUnit/NHamcrest.NUnit.csproj
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <Copyright>Copyright © 2023</Copyright>
-    <Version Condition="'$(VersionSuffix)' == ''">3.4.0</Version>
-    <Version Condition="'$(VersionSuffix)' != ''">3.4.0-$(VersionSuffix)</Version>
+    <Copyright>Copyright © 2017-2025</Copyright>
+    <Version Condition="'$(VersionSuffix)' == ''">4.0.0</Version>
+    <Version Condition="'$(VersionSuffix)' != ''">4.0.0-$(VersionSuffix)</Version>
     <Description>Adapter for NUnit for using NHamcrest library</Description>
     <Authors>Graham Hay, Algirdas Lašas, Constantin Tews</Authors>
     <PackageLicenseUrl>https://github.com/nhamcrest/NHamcrest/blob/master/LICENCE.txt</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/nhamcrest/NHamcrest</PackageProjectUrl>
     <PackageTags>unittesting hamcrest matcher test</PackageTags>
-    <AssemblyVersion>3.4.0.0</AssemblyVersion>
-    <FileVersion>3.4.0.0</FileVersion>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <FileVersion>4.0.0.0</FileVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.14.0" />
+    <PackageReference Include="NUnit" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NHamcrest\NHamcrest.csproj" />

diff --git a/src/NHamcrest.Tests/NHamcrest.Tests.csproj b/src/NHamcrest.Tests/NHamcrest.Tests.csproj
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <Version>3.4.0</Version>
+    <TargetFramework>net8.0</TargetFramework>
+    <Version>4.0.0</Version>
     <Description />
   </PropertyGroup>
   <ItemGroup>
     <Compile Remove="FeatureMatcherTests.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NSubstitute" Version="5.1.0" />
-    <PackageReference Include="xunit" Version="2.6.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+    <PackageReference Include="NSubstitute" Version="5.3.0" />
+    <PackageReference Include="xunit.v3" Version="1.0.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Castle.Core" Version="5.1.1" />
-    <PackageReference Include="Microsoft.NET.TEST.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.TEST.Sdk" Version="17.12.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NHamcrest.XUnit\NHamcrest.XUnit.csproj" />

diff --git a/src/NHamcrest.XUnit.Examples/NHamcrest.XUnit.Examples.csproj b/src/NHamcrest.XUnit.Examples/NHamcrest.XUnit.Examples.csproj
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
-    <PackageReference Include="xunit" Version="2.6.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="xunit.v3" Version="1.0.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/NHamcrest.XUnit/NHamcrest.XUnit.csproj b/src/NHamcrest.XUnit/NHamcrest.XUnit.csproj
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <Copyright>Copyright © 2023</Copyright>
-    <Version Condition="'$(VersionSuffix)' == ''">3.4.0</Version>
-    <Version Condition="'$(VersionSuffix)' != ''">3.4.0-$(VersionSuffix)</Version>
+    <Copyright>Copyright © 2017-2025</Copyright>
+    <Version Condition="'$(VersionSuffix)' == ''">4.0.0</Version>
+    <Version Condition="'$(VersionSuffix)' != ''">4.0.0-$(VersionSuffix)</Version>
     <Description>Adapter for xunit for using NHamcrest library</Description>
     <Authors>Graham Hay, Algirdas Lašas, Constantin Tews</Authors>
     <PackageLicenseUrl>https://github.com/nhamcrest/NHamcrest/blob/master/LICENCE.txt</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/nhamcrest/NHamcrest</PackageProjectUrl>
     <PackageTags>unittesting hamcrest matcher test</PackageTags>
-    <AssemblyVersion>3.4.0.0</AssemblyVersion>
-    <FileVersion>3.4.0.0</FileVersion>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <FileVersion>4.0.0.0</FileVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="xunit.assert" Version="2.6.1" />
+    <PackageReference Include="xunit.v3.assert" Version="1.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NHamcrest\NHamcrest.csproj" />

diff --git a/src/NHamcrest/NHamcrest.csproj b/src/NHamcrest/NHamcrest.csproj
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
-    <Copyright>Copyright © 2023</Copyright>
-    <Version Condition="'$(VersionSuffix)' == ''">3.4.0</Version>
-    <Version Condition="'$(VersionSuffix)' != ''">3.4.0-$(VersionSuffix)</Version>
+    <Copyright>Copyright © 2017-2025</Copyright>
+    <Version Condition="'$(VersionSuffix)' == ''">4.0.0</Version>
+    <Version Condition="'$(VersionSuffix)' != ''">4.0.0-$(VersionSuffix)</Version>
     <Description>.NET port of Hamcrest, a matcher library with some extra matchers</Description>
     <Authors>Graham Hay, Algirdas Lašas, Constantin Tews</Authors>
     <PackageLicenseUrl>https://github.com/nhamcrest/NHamcrest/blob/master/LICENCE.txt</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/nhamcrest/NHamcrest</PackageProjectUrl>
     <PackageTags>unittesting hamcrest matcher test</PackageTags>
-    <AssemblyVersion>3.4.0.0</AssemblyVersion>
-    <FileVersion>3.4.0.0</FileVersion>
+    <AssemblyVersion>4.0.0.0</AssemblyVersion>
+    <FileVersion>4.0.0.0</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <NoWarn>1591</NoWarn>