Update packages and cleanup stuff (#37)

* Update packages and cleanup stuff
coenm · Oct 17, 2024 · 8ebdfaf · 8ebdfaf
1 parent 8007bb9
commit 8ebdfaf
Show file tree

Hide file tree

Showing 28 changed files with 141 additions and 67 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <ItemGroup>
-    <PackageReference Update="Nullable" Version="1.3.0" IsImplicitlyDefined="true" />
-	  <PackageReference Update="Newtonsoft.Json" Version="13.0.1" IsImplicitlyDefined="true" />
+    <PackageReference Update="Nullable" Version="1.3.1" IsImplicitlyDefined="true" />
+	  <PackageReference Update="Newtonsoft.Json" Version="13.0.3" IsImplicitlyDefined="true" />
 
     <!-- xunit -->
-    <PackageReference Update="xunit" Version="2.4.1" IsImplicitlyDefined="true"/>
-    <PackageReference Update="xunit.analyzers" Version="0.10.0" IsImplicitlyDefined="true"/>
-    <PackageReference Update="xunit.categories" Version="2.0.5" IsImplicitlyDefined="true"/>
-    <PackageReference Update="xunit.extensibility.core" Version="2.4.1" IsImplicitlyDefined="true"/>
-    <PackageReference Update="xunit.runner.console" Version="2.4.1" IsImplicitlyDefined="true"/>
-    <PackageReference Update="xunit.runner.reporters" Version="2.4.1" IsImplicitlyDefined="true"/>
-    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" IsImplicitlyDefined="true"/>
-    <PackageReference Update="xunit.assert" Version="2.4.1" IsImplicitlyDefined="true"/>
+    <PackageReference Update="xunit" Version="2.9.2" IsImplicitlyDefined="true"/>
+    <PackageReference Update="xunit.analyzers" Version="1.16.0" IsImplicitlyDefined="true"/>
+    <PackageReference Update="xunit.categories" Version="2.0.8" IsImplicitlyDefined="true"/>
+    <PackageReference Update="xunit.extensibility.core" Version="2.9.2" IsImplicitlyDefined="true"/>
+    <PackageReference Update="xunit.runner.console" Version="2.9.2" IsImplicitlyDefined="true"/>
+    <PackageReference Update="xunit.runner.reporters" Version="2.9.2" IsImplicitlyDefined="true"/>
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.8.2" IsImplicitlyDefined="true"/>
+    <PackageReference Update="xunit.assert" Version="2.9.2" IsImplicitlyDefined="true"/>
     <PackageReference Update="xunit.abstractions" Version="2.0.3" IsImplicitlyDefined="true"/>
-    <PackageReference Update="xunit.extensibility.execution" Version="2.4.1" IsImplicitlyDefined="true"/>
-    <PackageReference Update="Meziantou.Xunit.ParallelTestFramework" Version="1.0.0" IsImplicitlyDefined="true"/>
+    <PackageReference Update="xunit.extensibility.execution" Version="2.9.2" IsImplicitlyDefined="true"/>
+    <PackageReference Update="Meziantou.Xunit.ParallelTestFramework" Version="2.3.0" IsImplicitlyDefined="true"/>
 
-    <PackageReference Update="NUnit" Version="3.13.2" IsImplicitlyDefined="true"/>
-    <PackageReference Update="NUnit3TestAdapter" Version="4.0.0" IsImplicitlyDefined="true"/>
+    <PackageReference Update="NUnit" Version="4.2.2" IsImplicitlyDefined="true"/>
+    <PackageReference Update="NUnit3TestAdapter" Version="4.6.0" IsImplicitlyDefined="true"/>
 
     <!--Unittesting-->
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.0.0" IsImplicitlyDefined="true"/>
-    <PackageReference Update="FluentAssertions" Version="6.2.0" IsImplicitlyDefined="true"/>
-    <PackageReference Update="FluentAssertions.Analyzers" Version="0.12.1" IsImplicitlyDefined="true"/>
-    <PackageReference Update="Verify.Xunit" Version="14.0.1" IsImplicitlyDefined="true"/>
-    <PackageReference Update="Verify.NUnit" Version="14.0.1" IsImplicitlyDefined="true"/>
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.11.1" IsImplicitlyDefined="true"/>
+    <PackageReference Update="FluentAssertions" Version="6.12.1" IsImplicitlyDefined="true"/>
+    <PackageReference Update="FluentAssertions.Analyzers" Version="0.34.1" IsImplicitlyDefined="true"/>
+    <PackageReference Update="Verify.Xunit" Version="27.0.1" IsImplicitlyDefined="true"/>
+    <PackageReference Update="Verify.NUnit" Version="27.0.1" IsImplicitlyDefined="true"/>
 
     <!-- Misc -->
-    <PackageReference IsImplicitlyDefined="true" Update="Microsoft.SourceLink.GitHub" Version="1.0.0" />
-    <PackageReference IsImplicitlyDefined="true" Update="Nerdbank.GitVersioning" Version="3.4.240" />
+    <PackageReference IsImplicitlyDefined="true" Update="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <PackageReference IsImplicitlyDefined="true" Update="Nerdbank.GitVersioning" Version="3.6.143" />
   </ItemGroup>
 </Project>
diff --git a/src/EasyTestFile.Nunit/EasyTestFile.Nunit.csproj b/src/EasyTestFile.Nunit/EasyTestFile.Nunit.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6;net8</TargetFrameworks>
+    <TargetFramework>net8</TargetFramework>
     <RootNamespace>EasyTestFileNunit</RootNamespace>
     <PackageId>EasyTestFile.NUnit</PackageId>
     <PackageTags>EasyTestFile;UnitTests;IntegrationTests;NUnit</PackageTags>

diff --git a/src/EasyTestFile.TUnit/EasyTestFile.TUnit.csproj b/src/EasyTestFile.TUnit/EasyTestFile.TUnit.csproj
@@ -17,6 +17,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="TUnit.Core" Version="0.1.1051" />
+    <PackageReference Include="TUnit.Core" Version="0.1.1061" />
   </ItemGroup>
 </Project>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -27,7 +27,7 @@
     </When>
     <Otherwise>
       <ItemGroup>
-        <PackageReference Include="IndexRange" Version="1.0.0" />
+        <PackageReference Include="IndexRange" Version="1.0.3" />
       </ItemGroup>
     </Otherwise>
   </Choose>

diff --git a/tests/EasyTestFile.Json.Tests/EasyTestFileSettingsExtensionTest.cs b/tests/EasyTestFile.Json.Tests/EasyTestFileSettingsExtensionTest.cs
@@ -10,7 +10,6 @@ namespace EasyTestFile.Json.Tests;
 using Xunit;
 using Sut = EasyTestFileSettingsExtension;
 
-[UsesVerify]
 [SuppressMessage("ReSharper", "InvokeAsExtensionMethod", Justification = "Improves readability SUT.")]
 public class EasyTestFileSettingsExtensionTest
 {

diff --git a/tests/EasyTestFile.Nunit.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt b/tests/EasyTestFile.Nunit.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt
@@ -19,9 +19,24 @@
     Value: {ProjectDirectory},
     TypeId: AssemblyMetadataAttribute
   },
+  {
+    Key: Verify.ProjectName,
+    Value: EasyTestFile.Nunit.Tests,
+    TypeId: AssemblyMetadataAttribute
+  },
   {
     Key: Verify.SolutionDirectory,
     Value: {SolutionDirectory},
     TypeId: AssemblyMetadataAttribute
+  },
+  {
+    Key: Verify.SolutionName,
+    Value: EasyTestFile,
+    TypeId: AssemblyMetadataAttribute
+  },
+  {
+    Key: Verify.TargetFrameworks,
+    Value: ,
+    TypeId: AssemblyMetadataAttribute
   }
 ]
diff --git a/tests/EasyTestFile.Nunit.Tests/VerifyEmbedded.cs b/tests/EasyTestFile.Nunit.Tests/VerifyEmbedded.cs
@@ -27,7 +27,7 @@ public async Task VerifyAssemblyMetadataAttributes()
     private static Assembly GetAssemblyOfType(Type t)
     {
         var currentAssembly = Assembly.GetAssembly(t);
-        Assert.NotNull(currentAssembly);
+        Assert.That(currentAssembly, Is.Not.Null);
         return currentAssembly!;
     }
 }
diff --git a/tests/EasyTestFile.TUnit.Tests/EasyTestFile.TUnit.TTests.csproj b/tests/EasyTestFile.TUnit.Tests/EasyTestFile.TUnit.TTests.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="TUnit" Version="0.1.1051" />
+    <PackageReference Include="TUnit" Version="0.1.1061" />
     <PackageReference Include="Verify.TUnit" Version="27.0.1" />
   </ItemGroup>
 

diff --git a/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WhenCreatedFromSettings.verified.txt b/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WhenCreatedFromSettings.verified.txt
@@ -1,10 +1,9 @@
 {
-  Assembly: null,
-  AutoCreateMissingTestFileDisabled: false,
-  Context: {},
   Directory: null,
-  FileName: null,
-  MethodName: null,
+  AutoCreateMissingTestFileDisabled: false,
   TestFileNamingSuffix: null,
-  _extension: null
+  Assembly: null,
+  _extension: null,
+  MethodName: null,
+  FileName: null
 }
diff --git a/...TestFile.Tests/EasyTestFileSettingsTest.WithDisableAutoCreateMissingTestFile.verified.txt b/...TestFile.Tests/EasyTestFileSettingsTest.WithDisableAutoCreateMissingTestFile.verified.txt
@@ -1,10 +1,9 @@
 {
-  Assembly: null,
-  AutoCreateMissingTestFileDisabled: true,
-  Context: {},
   Directory: null,
-  FileName: null,
-  MethodName: null,
+  AutoCreateMissingTestFileDisabled: true,
   TestFileNamingSuffix: null,
-  _extension: null
+  Assembly: null,
+  _extension: null,
+  MethodName: null,
+  FileName: null
 }
diff --git a/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithSetTestFileNameSuffix1.verified.txt b/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithSetTestFileNameSuffix1.verified.txt
@@ -1,10 +1,9 @@
 {
-  Assembly: null,
-  AutoCreateMissingTestFileDisabled: false,
-  Context: {},
   Directory: null,
-  FileName: null,
-  MethodName: null,
+  AutoCreateMissingTestFileDisabled: false,
   TestFileNamingSuffix: 1,
-  _extension: null
+  Assembly: null,
+  _extension: null,
+  MethodName: null,
+  FileName: null
 }
diff --git a/.../EasyTestFile.Tests/EasyTestFileSettingsTest.WithSetTestFileNameSuffixString.verified.txt b/.../EasyTestFile.Tests/EasyTestFileSettingsTest.WithSetTestFileNameSuffixString.verified.txt
@@ -1,10 +1,9 @@
 {
-  Assembly: null,
-  AutoCreateMissingTestFileDisabled: false,
-  Context: {},
   Directory: null,
-  FileName: null,
-  MethodName: null,
+  AutoCreateMissingTestFileDisabled: false,
   TestFileNamingSuffix: test123,
-  _extension: null
+  Assembly: null,
+  _extension: null,
+  MethodName: null,
+  FileName: null
 }
diff --git a/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithUseExtension.verified.txt b/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.WithUseExtension.verified.txt
@@ -1,10 +1,9 @@
 {
-  Assembly: null,
-  AutoCreateMissingTestFileDisabled: false,
-  Context: {},
   Directory: null,
-  FileName: null,
-  MethodName: null,
+  AutoCreateMissingTestFileDisabled: false,
   TestFileNamingSuffix: null,
-  _extension: json
+  Assembly: null,
+  _extension: json,
+  MethodName: null,
+  FileName: null
 }
diff --git a/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.cs b/tests/EasyTestFile.Tests/EasyTestFileSettingsTest.cs
@@ -7,7 +7,6 @@ namespace EasyTestFile.Tests;
 using VerifyXunit;
 using Xunit;
 
-[UsesVerify]
 public class EasyTestFileSettingsTest
 {
     private static readonly JsonSerializerSettings _jsonSettings = new () { ContractResolver = new AllDataContractResolver(), };

diff --git a/tests/EasyTestFile.Tests/Internals/AttributeReaderTest.cs b/tests/EasyTestFile.Tests/Internals/AttributeReaderTest.cs
@@ -6,7 +6,6 @@ namespace EasyTestFile.Tests.Internals;
 using VerifyXunit;
 using Xunit;
 
-[UsesVerify]
 public class AttributeReaderTest
 {
     [Fact]

diff --git a/tests/EasyTestFile.Tests/Internals/FileNameResolverTest.cs b/tests/EasyTestFile.Tests/Internals/FileNameResolverTest.cs
@@ -8,7 +8,6 @@ namespace EasyTestFile.Tests.Internals;
 using Xunit;
 using Sut = EasyTestFile.Internals.FileNameResolver;
 
-[UsesVerify]
 public class FileNameResolverTest
 {
     [Fact]

diff --git a/tests/EasyTestFile.Tests/TestAssemblyInfoTest.cs b/tests/EasyTestFile.Tests/TestAssemblyInfoTest.cs
@@ -5,7 +5,6 @@ namespace EasyTestFile.Tests;
 using VerifyXunit;
 using Xunit;
 
-[UsesVerify]
 public class TestAssemblyInfoTest
 {
     [Fact]

diff --git a/tests/EasyTestFile.Tests/TestMethodInfoTest.cs b/tests/EasyTestFile.Tests/TestMethodInfoTest.cs
@@ -11,7 +11,6 @@ namespace EasyTestFile.Tests;
 using Xunit;
 using Sut = EasyTestFile.Internals.FileNameResolver;
 
-[UsesVerify]
 public class TestMethodInfoTest
 {
     [Fact]

diff --git a/...tFile.Xunit.CopyAlways.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt b/...tFile.Xunit.CopyAlways.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt
@@ -19,9 +19,24 @@
     Value: {ProjectDirectory},
     TypeId: AssemblyMetadataAttribute
   },
+  {
+    Key: Verify.ProjectName,
+    Value: EasyTestFile.Xunit.CopyAlways.Tests,
+    TypeId: AssemblyMetadataAttribute
+  },
   {
     Key: Verify.SolutionDirectory,
     Value: {SolutionDirectory},
     TypeId: AssemblyMetadataAttribute
+  },
+  {
+    Key: Verify.SolutionName,
+    Value: EasyTestFile,
+    TypeId: AssemblyMetadataAttribute
+  },
+  {
+    Key: Verify.TargetFrameworks,
+    Value: ,
+    TypeId: AssemblyMetadataAttribute
   }
 ]
diff --git a/tests/EasyTestFile.Xunit.CopyAlways.Tests/VerifyEmbedded.cs b/tests/EasyTestFile.Xunit.CopyAlways.Tests/VerifyEmbedded.cs
@@ -7,7 +7,6 @@ namespace EasyTestFileXunit.Embed.Tests;
 using VerifyXunit;
 using Xunit;
 
-[UsesVerify]
 [UsesEasyTestFile]
 public class VerifyEmbedded
 {

diff --git a/...nit.CopyPreserveNewest.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt b/...nit.CopyPreserveNewest.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt
@@ -19,9 +19,24 @@
     Value: {ProjectDirectory},
     TypeId: AssemblyMetadataAttribute
   },
+  {
+    Key: Verify.ProjectName,
+    Value: EasyTestFile.Xunit.CopyPreserveNewest.Tests,
+    TypeId: AssemblyMetadataAttribute
+  },
   {
     Key: Verify.SolutionDirectory,
     Value: {SolutionDirectory},
     TypeId: AssemblyMetadataAttribute
+  },
+  {
+    Key: Verify.SolutionName,
+    Value: EasyTestFile,
+    TypeId: AssemblyMetadataAttribute
+  },
+  {
+    Key: Verify.TargetFrameworks,
+    Value: ,
+    TypeId: AssemblyMetadataAttribute
   }
 ]
diff --git a/tests/EasyTestFile.Xunit.CopyPreserveNewest.Tests/VerifyEmbedded.cs b/tests/EasyTestFile.Xunit.CopyPreserveNewest.Tests/VerifyEmbedded.cs
@@ -7,7 +7,6 @@ namespace EasyTestFileXunit.CopyPreserveNewest.Tests;
 using VerifyXunit;
 using Xunit;
 
-[UsesVerify]
 [UsesEasyTestFile]
 public class VerifyEmbedded
 {

diff --git a/...syTestFile.Xunit.Embed.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt b/...syTestFile.Xunit.Embed.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt
@@ -19,9 +19,24 @@
     Value: {ProjectDirectory},
     TypeId: AssemblyMetadataAttribute
   },
+  {
+    Key: Verify.ProjectName,
+    Value: EasyTestFile.Xunit.Embed.Tests,
+    TypeId: AssemblyMetadataAttribute
+  },
   {
     Key: Verify.SolutionDirectory,
     Value: {SolutionDirectory},
     TypeId: AssemblyMetadataAttribute
+  },
+  {
+    Key: Verify.SolutionName,
+    Value: EasyTestFile,
+    TypeId: AssemblyMetadataAttribute
+  },
+  {
+    Key: Verify.TargetFrameworks,
+    Value: ,
+    TypeId: AssemblyMetadataAttribute
   }
 ]
diff --git a/tests/EasyTestFile.Xunit.Embed.Tests/VerifyEmbedded.cs b/tests/EasyTestFile.Xunit.Embed.Tests/VerifyEmbedded.cs
@@ -7,7 +7,6 @@ namespace EasyTestFileXunit.Embed.Tests;
 using VerifyXunit;
 using Xunit;
 
-[UsesVerify]
 [UsesEasyTestFile]
 public class VerifyEmbedded
 {

diff --git a/...estFile.Xunit.ModeNone.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt b/...estFile.Xunit.ModeNone.Tests/VerifyEmbedded.VerifyAssemblyMetadataAttributes.verified.txt
@@ -19,9 +19,24 @@
     Value: {ProjectDirectory},
     TypeId: AssemblyMetadataAttribute
   },
+  {
+    Key: Verify.ProjectName,
+    Value: EasyTestFile.Xunit.ModeNone.Tests,
+    TypeId: AssemblyMetadataAttribute
+  },
   {
     Key: Verify.SolutionDirectory,
     Value: {SolutionDirectory},
     TypeId: AssemblyMetadataAttribute
+  },
+  {
+    Key: Verify.SolutionName,
+    Value: EasyTestFile,
+    TypeId: AssemblyMetadataAttribute
+  },
+  {
+    Key: Verify.TargetFrameworks,
+    Value: ,
+    TypeId: AssemblyMetadataAttribute
   }
 ]
diff --git a/tests/EasyTestFile.Xunit.ModeNone.Tests/VerifyEmbedded.cs b/tests/EasyTestFile.Xunit.ModeNone.Tests/VerifyEmbedded.cs
@@ -7,7 +7,6 @@ namespace EasyTestFileXunit.ModeNone.Tests;
 using VerifyXunit;
 using Xunit;
 
-[UsesVerify]
 [UsesEasyTestFile]
 public class VerifyEmbedded
 {