Merge branch 'main' of https://github.com/VerifyTests/Verify

SimonCropp · SimonCropp · commit 6ce8e072936d · 2021-12-02T18:07:49.000+11:00
diff --git a/docs/converter.md b/docs/converter.md
@@ -161,7 +161,7 @@ return new(
         return Task.CompletedTask;
     });
 ```
-<sup><a href='/src/Verify.Tests/Converters/TypeConverterTests.cs#L49-L61' title='Snippet source file'>snippet source</a> | <a href='#snippet-conversionresultwithcleanup' title='Start of snippet'>anchor</a></sup>
+<sup><a href='/src/Verify.Tests/Converters/TypeConverterTests.cs#L48-L60' title='Snippet source file'>snippet source</a> | <a href='#snippet-conversionresultwithcleanup' title='Start of snippet'>anchor</a></sup>
 <!-- endSnippet -->
 
 
diff --git a/src/DeterministicTests/DeterministicTests.csproj b/src/DeterministicTests/DeterministicTests.csproj
@@ -7,10 +7,8 @@
     <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DiffEngine" Version="8.4.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="ProjectDefaults" Version="1.0.61" PrivateAssets="All" />
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <NoWarn>CS1591;CS0649;xUnit1026;xUnit1013</NoWarn>
-    <Version>14.6.2</Version>
+    <NoWarn>CS1591;CS0649;xUnit1026;xUnit1013;msb3277;CS0436</NoWarn>
+    <Version>14.6.6</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>Json, Testing, Verify, Snapshot, Approvals</PackageTags>
     <Description>Enables verification of complex models and documents.</Description>
+    <CheckEolTargetFramework>false</CheckEolTargetFramework>
   </PropertyGroup>
 </Project>
diff --git a/src/DisableClipboard/DisableClipboard.csproj b/src/DisableClipboard/DisableClipboard.csproj
@@ -4,10 +4,8 @@
     <TargetFramework>net6</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DiffEngine" Version="8.4.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="ProjectDefaults" Version="1.0.61" PrivateAssets="All" />
diff --git a/src/DisableDirScrubbing/DisableDirScrubbing.csproj b/src/DisableDirScrubbing/DisableDirScrubbing.csproj
@@ -4,10 +4,8 @@
     <TargetFramework>net6</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DiffEngine" Version="8.4.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="ProjectDefaults" Version="1.0.61" PrivateAssets="All" />
diff --git a/src/SortedPropertiesTests/SortedPropertiesTests.csproj b/src/SortedPropertiesTests/SortedPropertiesTests.csproj
@@ -4,10 +4,8 @@
     <TargetFrameworks>net6</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DiffEngine" Version="8.4.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="ProjectDefaults" Version="1.0.61" PrivateAssets="All" />
diff --git a/src/StrictJsonTests/StrictJsonTests.csproj b/src/StrictJsonTests/StrictJsonTests.csproj
@@ -4,10 +4,8 @@
     <TargetFrameworks>net6</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DiffEngine" Version="8.4.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
     <PackageReference Include="ProjectDefaults" Version="1.0.61" PrivateAssets="All" />
diff --git a/src/Verify.DerivePaths.Tests/Verify.DerivePaths.Tests.csproj b/src/Verify.DerivePaths.Tests/Verify.DerivePaths.Tests.csproj
@@ -4,10 +4,8 @@
     <TargetFrameworks>net6</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DiffEngine" Version="8.4.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all" />
     <PackageReference Include="ProjectDefaults" Version="1.0.61" PrivateAssets="All" />
diff --git a/src/Verify.Expecto/Verify.Expecto.csproj b/src/Verify.Expecto/Verify.Expecto.csproj
@@ -1,19 +1,17 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net5;net6</TargetFrameworks>
-    <NoWarn>$(NoWarn);CS0436</NoWarn>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;netcoreapp3.0;netcoreapp2.2;netcoreapp2.1;net5;net6</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net472;net5;net6</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;netcoreapp3.0;netcoreapp2.2;netcoreapp2.1;net461;net472;net5;net6</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Expecto" Version="9.0.4" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ProjectDefaults" Version="1.0.61" PrivateAssets="All" />
     <PackageReference Include="EmptyFiles" Version="2.8.0" PrivateAssets="None" />
-    <PackageReference Include="Nullable" Version="1.3.0" Condition="$(TargetFramework) == 'netstandard2.0' OR $(TargetFramework) == 'net461' OR $(TargetFramework) == 'net472'" PrivateAssets="all" />
-    <PackageReference Include="IndexRange" Version="1.0.0" Condition="$(TargetFramework) == 'netstandard2.0' OR $(TargetFramework) == 'net461' OR $(TargetFramework) == 'net472'" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" Condition="$(TargetFramework) == 'netstandard2.0' OR $(TargetFramework) == 'net461' OR $(TargetFramework) == 'net472'" />
+    <PackageReference Include="IndexRange"
+                      Version="1.0.0"
+                      Condition="$(TargetFramework) == 'netstandard2.0' OR $(TargetFramework) == 'net461' OR $(TargetFramework) == 'net472' OR $(TargetFramework) == 'netcoreapp2.2' OR $(TargetFramework) == 'netcoreapp2.1'" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
     <ProjectReference Include="..\Verify\Verify.csproj" PrivateAssets="None" />
   </ItemGroup>
diff --git a/src/Verify.Integration.Tests/Verify.Integration.Tests.csproj b/src/Verify.Integration.Tests/Verify.Integration.Tests.csproj
@@ -4,10 +4,8 @@
     <TargetFrameworks>net6</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="DiffEngine" Version="8.4.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="Xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all" />
     <PackageReference Include="ProjectDefaults" Version="1.0.61" PrivateAssets="All" />
diff --git a/src/Verify.MSTest.Tests/Verify.MSTest.Tests.csproj b/src/Verify.MSTest.Tests/Verify.MSTest.Tests.csproj
@@ -9,17 +9,14 @@
     <TargetFrameworks>net6;net48</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.8" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ProjectDefaults" Version="1.0.61" PrivateAssets="All" />
     <ProjectReference Include="..\TargetLibrary\TargetLibrary.csproj" />
     <ProjectReference Include="..\Verify.MSTest\Verify.MSTest.csproj" />
     <ProjectReference Include="..\Verify\Verify.csproj" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" Condition="$(TargetFramework) == 'net48'" />
   </ItemGroup>
   <Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.props" />
   <Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.targets" />
diff --git a/src/Verify.MSTest/Verify.MSTest.csproj b/src/Verify.MSTest/Verify.MSTest.csproj
@@ -1,19 +1,15 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net5;net6</TargetFrameworks>
-    <NoWarn>$(NoWarn);CS0436</NoWarn>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;netcoreapp3.0;netcoreapp2.2;netcoreapp2.1;net5;net6</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net472;net5;net6</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;netcoreapp3.0;netcoreapp2.2;netcoreapp2.1;net461;net472;net5;net6</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ProjectDefaults" Version="1.0.61" PrivateAssets="All" />
     <PackageReference Include="EmptyFiles" Version="2.8.0" PrivateAssets="None" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.8" />
-    <PackageReference Include="Nullable" Version="1.3.0" Condition="$(TargetFramework) == 'netstandard2.0' OR $(TargetFramework) == 'net461' OR $(TargetFramework) == 'net472'" PrivateAssets="all" />
-    <PackageReference Include="IndexRange" Version="1.0.0" Condition="$(TargetFramework) == 'netstandard2.0' OR $(TargetFramework) == 'net461' OR $(TargetFramework) == 'net472'" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" Condition="$(TargetFramework) == 'netstandard2.0' OR $(TargetFramework) == 'net461' OR $(TargetFramework) == 'net472'" />
+    <PackageReference Include="IndexRange" Version="1.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
     <ProjectReference Include="..\Verify\Verify.csproj" PrivateAssets="None" />
   </ItemGroup>
diff --git a/src/Verify.NUnit.Tests/Verify.NUnit.Tests.csproj b/src/Verify.NUnit.Tests/Verify.NUnit.Tests.csproj
@@ -9,16 +9,13 @@
     <TargetFrameworks>net6;net48</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
     <PackageReference Include="ProjectDefaults" Version="1.0.61" PrivateAssets="All" />
     <ProjectReference Include="..\TargetLibrary\TargetLibrary.csproj" />
     <ProjectReference Include="..\Verify.NUnit\Verify.NUnit.csproj" />
     <ProjectReference Include="..\Verify\Verify.csproj" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" Condition="$(TargetFramework) == 'net48'" />
   </ItemGroup>
   <Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.props" />
   <Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.targets" />
diff --git a/src/Verify.NUnit/Verify.NUnit.csproj b/src/Verify.NUnit/Verify.NUnit.csproj
@@ -1,18 +1,15 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net5;net6</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;netcoreapp3.0;netcoreapp2.2;netcoreapp2.1;net5;net6</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net461;net472;net5;net6</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;netcoreapp3.0;netcoreapp2.2;netcoreapp2.1;net461;net472;net5;net6</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="ProjectDefaults" Version="1.0.61" PrivateAssets="All" />
     <PackageReference Include="EmptyFiles" Version="2.8.0" PrivateAssets="None" />
-    <PackageReference Include="Nullable" Version="1.3.0" Condition="$(TargetFramework) == 'netstandard2.0' OR $(TargetFramework) == 'net461' OR $(TargetFramework) == 'net472'" PrivateAssets="all" />
-    <PackageReference Include="IndexRange" Version="1.0.0" Condition="$(TargetFramework) == 'netstandard2.0' OR $(TargetFramework) == 'net461' OR $(TargetFramework) == 'net472'" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" Condition="$(TargetFramework) == 'netstandard2.0' OR $(TargetFramework) == 'net461' OR $(TargetFramework) == 'net472'" />
+    <PackageReference Include="IndexRange" Version="1.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" Condition="$(Configuration) == 'Release'" />
     <ProjectReference Include="..\Verify\Verify.csproj" PrivateAssets="None" />
   </ItemGroup>
diff --git a/src/Verify.Tests/Converters/TypeConverterTests.cs b/src/Verify.Tests/Converters/TypeConverterTests.cs
@@ -1,10 +1,9 @@
-﻿using VerifyTests;
+﻿#if NET6_0 && DEBUG
+using VerifyTests;
 using VerifyXunit;
 using Xunit;
-#if DEBUG
 using System.Drawing;
 using System.Drawing.Imaging;
-#endif
 
 [UsesVerify]
 public class TypeConverterTests
@@ -46,7 +45,7 @@ public async Task WithStreamRequiringCleanup()
         VerifierSettings.RegisterFileConverter<TargetForCleanup>(
             (_, _) =>
             {
-                #region ConversionResultWithCleanup
+#region ConversionResultWithCleanup
 
                 return new(
                     info: info,
@@ -58,7 +57,7 @@ public async Task WithStreamRequiringCleanup()
                         return Task.CompletedTask;
                     });
 
-                #endregion
+#endregion
             });
         var target = new TargetForCleanup
         {
@@ -136,7 +135,6 @@ class CanConvertTarget
         public string Value { get; set; } = null!;
     }
 
-#if DEBUG
     [ModuleInitializer]
     public static void WithInfoInit()
     {
@@ -240,5 +238,5 @@ static IEnumerable<Stream> ConvertBmpTpPngStreams(Bitmap bitmap)
         bitmap.Save(stream, ImageFormat.Png);
         yield return stream;
     }
-#endif
-}
+}
+#endif
diff --git a/src/Verify.Tests/Naming/NamerTests.RuntimeAndVersion.Core2_1.verified.txt b/src/Verify.Tests/Naming/NamerTests.RuntimeAndVersion.Core2_1.verified.txt
@@ -0,0 +1 @@
+Core2_1
diff --git a/src/Verify.Tests/Naming/NamerTests.RuntimeAndVersion.Core3_0.verified.txt b/src/Verify.Tests/Naming/NamerTests.RuntimeAndVersion.Core3_0.verified.txt
@@ -0,0 +1 @@
+Core3_0
diff --git a/src/Verify.Tests/Naming/NamerTests.RuntimeAndVersionFluent.Core2_1.verified.txt b/src/Verify.Tests/Naming/NamerTests.RuntimeAndVersionFluent.Core2_1.verified.txt
@@ -0,0 +1 @@
+Core2_1
diff --git a/src/Verify.Tests/Naming/NamerTests.RuntimeAndVersionFluent.Core3_0.verified.txt b/src/Verify.Tests/Naming/NamerTests.RuntimeAndVersionFluent.Core3_0.verified.txt
@@ -0,0 +1 @@
+Core3_0
diff --git a/src/Verify.Tests/Naming/NamerTests.TargetFrameworkAndVersion.Core2_1.verified.txt b/src/Verify.Tests/Naming/NamerTests.TargetFrameworkAndVersion.Core2_1.verified.txt
@@ -0,0 +1 @@
+Foo
diff --git a/src/Verify.Tests/Naming/NamerTests.TargetFrameworkAndVersion.Core3_0.verified.txt b/src/Verify.Tests/Naming/NamerTests.TargetFrameworkAndVersion.Core3_0.verified.txt
@@ -0,0 +1 @@
+Foo
diff --git a/src/Verify.Tests/Naming/NamerTests.TargetFrameworkAndVersionFluent.Core2_1.verified.txt b/src/Verify.Tests/Naming/NamerTests.TargetFrameworkAndVersionFluent.Core2_1.verified.txt
@@ -0,0 +1 @@
+Foo
diff --git a/src/Verify.Tests/Naming/NamerTests.TargetFrameworkAndVersionFluent.Core3_0.verified.txt b/src/Verify.Tests/Naming/NamerTests.TargetFrameworkAndVersionFluent.Core3_0.verified.txt
@@ -0,0 +1 @@
+Foo
diff --git a/src/Verify.Tests/Snippets/ConverterSnippets.cs b/src/Verify.Tests/Snippets/ConverterSnippets.cs
@@ -1,4 +1,4 @@
-﻿#if DEBUG
+﻿#if DEBUG && NET6_0
 using System.Drawing;
 using System.Drawing.Imaging;
 using VerifyTests;
diff --git a/src/Verify.Tests/Verify.Tests.csproj b/src/Verify.Tests/Verify.Tests.csproj
@@ -1,43 +1,30 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6;netcoreapp3.1;netcoreapp3.0;netcoreapp2.1</TargetFrameworks>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <PlatformTarget>x64</PlatformTarget>
     <NoWarn>$(NoWarn);CS8002</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(OS)' == 'Windows_NT' ">
-    <TargetFrameworks>net461;net48;net6;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net461;net48;net6;netcoreapp3.1;netcoreapp3.0;netcoreapp2.1</TargetFrameworks>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <Compile Remove="Converters\TypeConverterTests.cs" />
-  </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="DiffEngine" Version="8.4.1" />
     <PackageReference Include="InfoOf.Fody" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="MarkdownSnippets.MsBuild" Version="24.2.1" PrivateAssets="all" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+    <PackageReference Include="MarkdownSnippets.MsBuild" Version="24.2.2" PrivateAssets="all" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0" Condition="$(TargetFramework) == 'net6'" />
     <PackageReference Include="Xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all" />
     <PackageReference Include="ProjectDefaults" Version="1.0.61" PrivateAssets="All" />
     <ProjectReference Include="..\TargetLibrary\TargetLibrary.csproj" />
     <ProjectReference Include="..\Verify.Xunit\Verify.Xunit.csproj" />
     <ProjectReference Include="..\Verify\Verify.csproj" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" Condition="$(TargetFramework) == 'net461' OR $(TargetFramework) == 'net48'" />
     <None Update="sample.*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="BinaryEquals.*.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="BinaryNotEquals.*.txt">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="BinaryNotEqualsSameLength.*.txt">
+    <None Update="Binary*.*.txt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <Folder Include="Naming\CustomDirectory\" />
diff --git a/src/Verify.Xunit.Tests/Verify.Xunit.Tests.csproj b/src/Verify.Xunit.Tests/Verify.Xunit.Tests.csproj
@@ -9,18 +9,15 @@
     <TargetFrameworks>net6;net48</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="PublicApiGenerator" Version="10.2.0" />
     <PackageReference Include="Xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" PrivateAssets="all" />
     <PackageReference Include="ProjectDefaults" Version="1.0.61" PrivateAssets="All" />
     <ProjectReference Include="..\TargetLibrary\TargetLibrary.csproj" />
     <ProjectReference Include="..\Verify.Xunit\Verify.Xunit.csproj" />
     <ProjectReference Include="..\Verify\Verify.csproj" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" Condition="$(TargetFramework) == 'net48'" />
     <Folder Include="Scrubbers\" />
   </ItemGroup>
   <Import Project="$(ProjectDir)..\Verify\buildTransitive\Verify.props" />
diff --git a/src/Verify.Xunit/Verify.Xunit.csproj b/src/Verify.Xunit/Verify.Xunit.csproj
diff --git a/src/Verify/Compare/FileComparer.cs b/src/Verify/Compare/FileComparer.cs
diff --git a/src/Verify/Naming/Namer.cs b/src/Verify/Naming/Namer.cs
diff --git a/src/Verify/Serialization/Scrubbers/ApplyScrubbers.cs b/src/Verify/Serialization/Scrubbers/ApplyScrubbers.cs
diff --git a/src/Verify/Verifier/InnerVerifier_Stream.cs b/src/Verify/Verifier/InnerVerifier_Stream.cs
diff --git a/src/Verify/Verifier/VerifyEngine.cs b/src/Verify/Verifier/VerifyEngine.cs
diff --git a/src/Verify/Verify.csproj b/src/Verify/Verify.csproj
diff --git a/src/Verify/VerifySettings.cs b/src/Verify/VerifySettings.cs
