Update Verify and bump major version (#34)

MattKotsenas · web-flow · commit df31faa2bacd · 2025-03-08T22:26:34.000-08:00
Update Verify to latest version and bump major version.
diff --git a/Tests/Verify.Nupkg.Tests/NuspecScrubbingTests.cs b/Tests/Verify.Nupkg.Tests/NuspecScrubbingTests.cs
@@ -3,13 +3,13 @@
 [TestClass]
 public partial class NuspecScrubbingTests
 {
-    private string _packageWithRepoGitExtension = SamplePackages.Instance.PackageWithRepoGitExtension.Value.FullName;
-    private string _packageWithoutRepoGitExtension = SamplePackages.Instance.PackageWithoutRepoGitExtension.Value.FullName;
-    private string _packageWithoutRepoHttps = SamplePackages.Instance.PackageWithoutRepoHttps.Value.FullName;
-    private string _packageWithoutRepoGitHubDomain = SamplePackages.Instance.PackageWithoutRepoGitHubDomain.Value.FullName;
-    private string _packageWithoutRepoUrl = SamplePackages.Instance.PackageWithoutRepoUrl.Value.FullName;
-    private string _packageWithoutRepoCommit = SamplePackages.Instance.PackageWithoutRepoCommit.Value.FullName;
-    private string _packageWithoutRepoBranch = SamplePackages.Instance.PackageWithoutRepoBranch.Value.FullName;
+    private readonly string _packageWithRepoGitExtension = SamplePackages.Instance.PackageWithRepoGitExtension.Value.FullName;
+    private readonly string _packageWithoutRepoGitExtension = SamplePackages.Instance.PackageWithoutRepoGitExtension.Value.FullName;
+    private readonly string _packageWithoutRepoHttps = SamplePackages.Instance.PackageWithoutRepoHttps.Value.FullName;
+    private readonly string _packageWithoutRepoGitHubDomain = SamplePackages.Instance.PackageWithoutRepoGitHubDomain.Value.FullName;
+    private readonly string _packageWithoutRepoUrl = SamplePackages.Instance.PackageWithoutRepoUrl.Value.FullName;
+    private readonly string _packageWithoutRepoCommit = SamplePackages.Instance.PackageWithoutRepoCommit.Value.FullName;
+    private readonly string _packageWithoutRepoBranch = SamplePackages.Instance.PackageWithoutRepoBranch.Value.FullName;
 
     [TestMethod]
     public Task DoNotScrubGitExtensionOnRepoUrl()
@@ -78,6 +78,6 @@ public Task SkipScrubbingForRepoWithNoBranch()
         settings.UseUniqueDirectory();
         settings.ScrubNuspec();
 
-        return VerifyFile(_packageWithoutRepoUrl, settings);
+        return VerifyFile(_packageWithoutRepoBranch, settings);
     }
 }
diff --git a/Tests/Verify.Nupkg.Tests/SimplePackageTests.cs b/Tests/Verify.Nupkg.Tests/SimplePackageTests.cs
@@ -3,7 +3,7 @@ namespace Verify.Nupkg.Tests;
 [TestClass]
 public partial class SimplePackageTests
 {
-    private string _simplePackage = SamplePackages.Instance.SimplePackage.Value.FullName;
+    private readonly string _simplePackage = SamplePackages.Instance.SimplePackage.Value.FullName;
 
     [TestMethod]
     public Task BasicTest()
diff --git a/Tests/Verify.Nupkg.Tests/VerifyNupkgPackageTests.Baseline/manifest.verified.nuspec b/Tests/Verify.Nupkg.Tests/VerifyNupkgPackageTests.Baseline/manifest.verified.nuspec
@@ -14,17 +14,14 @@
     <repository type="git" url="https://github.com/********/Verify.Nupkg.git" branch="********" commit="****************************************" />
     <dependencies>
       <group targetFramework=".NETFramework4.7.2">
-        <dependency id="Verify" version="23.0.1" exclude="Build,Analyzers" />
+        <dependency id="Verify" version="28.13.0" exclude="Build,Analyzers" />
       </group>
       <group targetFramework="net8.0">
-        <dependency id="Verify" version="23.0.1" exclude="Build,Analyzers" />
+        <dependency id="Verify" version="28.13.0" exclude="Build,Analyzers" />
       </group>
       <group targetFramework="net9.0">
-        <dependency id="Verify" version="23.0.1" exclude="Build,Analyzers" />
+        <dependency id="Verify" version="28.13.0" exclude="Build,Analyzers" />
       </group>
     </dependencies>
-    <frameworkAssemblies>
-      <frameworkAssembly assemblyName="System.IO.Compression" targetFramework=".NETFramework4.7.2" />
-    </frameworkAssemblies>
   </metadata>
 </package>
diff --git a/Verify.Nupkg/Verify.Nupkg.csproj b/Verify.Nupkg/Verify.Nupkg.csproj
@@ -21,7 +21,7 @@
 
   <ItemGroup>
     <PackageReference Include="Polyfill" Version="7.20.0" PrivateAssets="all" />
-    <PackageReference Include="Verify" Version="23.0.1" />
+    <PackageReference Include="Verify" Version="28.13.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/benchmarks/Benchmarks.csproj b/benchmarks/Benchmarks.csproj
@@ -7,7 +7,7 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
-    <PackageReference Include="Verify" Version="23.1.0" />
+    <PackageReference Include="Verify" Version="28.13.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/benchmarks/Program.cs b/benchmarks/Program.cs
@@ -55,7 +55,8 @@ public class NuspecScrubbing
 
     private readonly VerifySettings _settings;
     private readonly Target _target;
-    private readonly string _verifyFile = Path.Combine(Directory.GetCurrentDirectory(), "can-be-anything.nuspec");
+    private readonly string _verifyDirectory = Directory.GetCurrentDirectory();
+    private readonly string _verifyFile = "can-be-anything.nuspec";
 
     public NuspecScrubbing()
     {
@@ -73,18 +74,28 @@ public async Task Baseline()
     {
         Func<InnerVerifier, Task<VerifyResult>> verify = _ => _.Verify(_target);
 
-        await new SettingsTask(_settings, async verifySettings =>
+        try
         {
-            using var verifier = new InnerVerifier(_verifyFile, verifySettings);
-            return await verify(verifier);
-        });
+            await new SettingsTask(_settings, async verifySettings =>
+            {
+                using var verifier = new InnerVerifier(_verifyDirectory, _verifyFile, verifySettings);
+                return await verify(verifier);
+            });
+        }
+        catch (Exception)
+        {
+            // Mismatch is expected
+        }
     }
 
     [GlobalCleanup]
     public void Cleanup()
     {
-        string verifiedFile = _verifyFile.Replace(".nuspec", ".verified.nuspec");
-        File.Delete(verifiedFile);
+        string receivedFile = Path.Combine(_verifyFile, _verifyFile.Replace(".nuspec", ".verified.nuspec"));
+        string verifiedFile = Path.Combine(_verifyFile, _verifyFile.Replace(".nuspec", ".verified.nuspec"));
+
+        if (File.Exists(receivedFile)) { File.Delete(receivedFile); }
+        if (File.Exists(verifiedFile)) { File.Delete(verifiedFile); }
     }
 }
 
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "2.0",
+  "version": "3.0",
   "publicReleaseRefSpec": [
     "^refs/heads/main$",
     "^refs/tags/v\\d+\\.\\d+\\.\\d+"
@@ -10,4 +10,4 @@
       "enabled": true
     }
   }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ namespace Verify.Nupkg.Tests;`
`3`	`3`	`[TestClass]`
`4`	`4`	`public partial class SimplePackageTests`
`5`	`5`	`{`
`6`		`- private string _simplePackage = SamplePackages.Instance.SimplePackage.Value.FullName;`
	`6`	`+ private readonly string _simplePackage = SamplePackages.Instance.SimplePackage.Value.FullName;`
`7`	`7`
`8`	`8`	`[TestMethod]`
`9`	`9`	`public Task BasicTest()`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ public class NuspecScrubbing`
`55`	`55`
`56`	`56`	`private readonly VerifySettings _settings;`
`57`	`57`	`private readonly Target _target;`
`58`		`- private readonly string _verifyFile = Path.Combine(Directory.GetCurrentDirectory(), "can-be-anything.nuspec");`
	`58`	`+ private readonly string _verifyDirectory = Directory.GetCurrentDirectory();`
	`59`	`+ private readonly string _verifyFile = "can-be-anything.nuspec";`
`59`	`60`
`60`	`61`	`public NuspecScrubbing()`
`61`	`62`	`{`
`@@ -73,18 +74,28 @@ public async Task Baseline()`
`73`	`74`	`{`
`74`	`75`	`Func<InnerVerifier, Task<VerifyResult>> verify = _ => _.Verify(_target);`
`75`	`76`
`76`		`- await new SettingsTask(_settings, async verifySettings =>`
	`77`	`+ try`
`77`	`78`	`{`
`78`		`- using var verifier = new InnerVerifier(_verifyFile, verifySettings);`
`79`		`- return await verify(verifier);`
`80`		`- });`
	`79`	`+ await new SettingsTask(_settings, async verifySettings =>`
	`80`	`+ {`
	`81`	`+ using var verifier = new InnerVerifier(_verifyDirectory, _verifyFile, verifySettings);`
	`82`	`+ return await verify(verifier);`
	`83`	`+ });`
	`84`	`+ }`
	`85`	`+ catch (Exception)`
	`86`	`+ {`
	`87`	`+ // Mismatch is expected`
	`88`	`+ }`
`81`	`89`	`}`
`82`	`90`
`83`	`91`	`[GlobalCleanup]`
`84`	`92`	`public void Cleanup()`
`85`	`93`	`{`
`86`		`- string verifiedFile = _verifyFile.Replace(".nuspec", ".verified.nuspec");`
`87`		`- File.Delete(verifiedFile);`
	`94`	`+ string receivedFile = Path.Combine(_verifyFile, _verifyFile.Replace(".nuspec", ".verified.nuspec"));`
	`95`	`+ string verifiedFile = Path.Combine(_verifyFile, _verifyFile.Replace(".nuspec", ".verified.nuspec"));`
	`96`	`+`
	`97`	`+ if (File.Exists(receivedFile)) { File.Delete(receivedFile); }`
	`98`	`+ if (File.Exists(verifiedFile)) { File.Delete(verifiedFile); }`
`88`	`99`	`}`
`89`	`100`	`}`
`90`	`101`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json",`
`3`		`- "version": "2.0",`
	`3`	`+ "version": "3.0",`
`4`	`4`	`"publicReleaseRefSpec": [`
`5`	`5`	`"^refs/heads/main$",`
`6`	`6`	`"^refs/tags/v\\d+\\.\\d+\\.\\d+"`
`@@ -10,4 +10,4 @@`
`10`	`10`	`"enabled": true`
`11`	`11`	`}`
`12`	`12`	`}`
`13`		`-}`
	`13`	`+}`