demaconsulting · Malcolmnixon · Dec 4, 2025 · Dec 4, 2025
diff --git a/test/DemaConsulting.SpdxTool.Tests/DemaConsulting.SpdxTool.Tests.csproj b/test/DemaConsulting.SpdxTool.Tests/DemaConsulting.SpdxTool.Tests.csproj
@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
-        <LangVersion>12</LangVersion>
+		<LangVersion>12</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 

diff --git a/test/DemaConsulting.SpdxTool.Tests/TestAddPackage.cs b/test/DemaConsulting.SpdxTool.Tests/TestAddPackage.cs
@@ -44,7 +44,7 @@ public void AddPackage_CommandLine()
 
         // Assert: Verify error reported
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "'add-package' command is only valid in a workflow");
+        Assert.Contains("'add-package' command is only valid in a workflow", output);
     }
 
     /// <summary>

diff --git a/test/DemaConsulting.SpdxTool.Tests/TestAddRelationship.cs b/test/DemaConsulting.SpdxTool.Tests/TestAddRelationship.cs
@@ -81,7 +81,7 @@ public void AddRelationship_MissingArguments()
 
         // Assert: Verify error reported
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "'add-relationship' command missing arguments");
+        Assert.Contains("'add-relationship' command missing arguments", output);
     }
 
     /// <summary>
@@ -103,7 +103,7 @@ public void AddRelationship_MissingFile()
 
         // Assert: Verify error reported
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "File not found: missing.spdx.json");
+        Assert.Contains("File not found: missing.spdx.json", output);
     }
 
     /// <summary>

diff --git a/test/DemaConsulting.SpdxTool.Tests/TestCopyPackage.cs b/test/DemaConsulting.SpdxTool.Tests/TestCopyPackage.cs
@@ -44,7 +44,7 @@ public void CopyPackage_MissingArguments()
 
         // Assert: Verify error reported
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "'copy-package' command missing arguments");
+        Assert.Contains("'copy-package' command missing arguments", output);
     }
 
     /// <summary>
@@ -65,7 +65,7 @@ public void CopyPackage_MissingFile()
 
         // Assert: Verify error reported
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "File not found: missing.spdx.json");
+        Assert.Contains("File not found: missing.spdx.json", output);
     }
 
     /// <summary>

diff --git a/test/DemaConsulting.SpdxTool.Tests/TestFindPackage.cs b/test/DemaConsulting.SpdxTool.Tests/TestFindPackage.cs
@@ -84,7 +84,7 @@ public void FindPackage_MissingArguments()
 
         // Assert: Verify error reported
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "'find-package' command missing arguments");
+        Assert.Contains("'find-package' command missing arguments", output);
     }
 
     /// <summary>
@@ -104,7 +104,7 @@ public void FindPackage_MissingFile()
 
         // Assert: Verify error reported
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "File not found: missing.spdx.json");
+        Assert.Contains("File not found: missing.spdx.json", output);
     }
 
     /// <summary>
@@ -129,7 +129,7 @@ public void FindPackage_CommandLine()
 
             // Assert: Verify package ID
             Assert.AreEqual(0, exitCode);
-            StringAssert.Contains(output, "SPDXRef-Package-2");
+            Assert.Contains("SPDXRef-Package-2", output);
         }
         finally
         {
@@ -174,7 +174,7 @@ public void FindPackage_ByName()
 
             // Assert: Verify package ID
             Assert.AreEqual(0, exitCode);
-            StringAssert.Contains(output, "Found package SPDXRef-Package-1");
+            Assert.Contains("Found package SPDXRef-Package-1", output);
         }
         finally
         {
@@ -220,7 +220,7 @@ public void FindPackage_ByVersion()
 
             // Assert: Verify package ID
             Assert.AreEqual(0, exitCode);
-            StringAssert.Contains(output, "Found package SPDXRef-Package-2");
+            Assert.Contains("Found package SPDXRef-Package-2", output);
         }
         finally
         {
@@ -266,7 +266,7 @@ public void FindPackage_ByFileName()
 
             // Assert: Verify package ID
             Assert.AreEqual(0, exitCode);
-            StringAssert.Contains(output, "Found package SPDXRef-Package-1");
+            Assert.Contains("Found package SPDXRef-Package-1", output);
         }
         finally
         {
@@ -312,7 +312,7 @@ public void FindPackage_ByDownload()
 
             // Assert: Verify package ID
             Assert.AreEqual(0, exitCode);
-            StringAssert.Contains(output, "Found package SPDXRef-Package-2");
+            Assert.Contains("Found package SPDXRef-Package-2", output);
         }
         finally
         {

diff --git a/test/DemaConsulting.SpdxTool.Tests/TestGetVersion.cs b/test/DemaConsulting.SpdxTool.Tests/TestGetVersion.cs
@@ -84,7 +84,7 @@ public void GetVersion_MissingArguments()
 
         // Assert: Verify error reported
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "'get-version' command missing arguments");
+        Assert.Contains("'get-version' command missing arguments", output);
     }
 
     /// <summary>
@@ -104,7 +104,7 @@ public void GetVersion_MissingFile()
 
         // Assert: Verify error reported
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "File not found: missing.spdx.json");
+        Assert.Contains("File not found: missing.spdx.json", output);
     }
 
     /// <summary>
@@ -129,7 +129,7 @@ public void GetVersion_CommandLine()
 
             // Assert: Verify package ID
             Assert.AreEqual(0, exitCode);
-            StringAssert.Contains(output, "2.0.0");
+            Assert.Contains("2.0.0", output);
         }
         finally
         {
@@ -174,7 +174,7 @@ public void GetVersion_Workflow()
 
             // Assert: Verify package ID
             Assert.AreEqual(0, exitCode);
-            StringAssert.Contains(output, "Found version 2.0.0");
+            Assert.Contains("Found version 2.0.0", output);
         }
         finally
         {

diff --git a/test/DemaConsulting.SpdxTool.Tests/TestHash.cs b/test/DemaConsulting.SpdxTool.Tests/TestHash.cs
@@ -41,7 +41,7 @@ public void HashCommand_MissingArguments()
 
         // Assert: Verify error reported
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "'hash' command missing arguments");
+        Assert.Contains("'hash' command missing arguments", output);
     }
 
     /// <summary>
@@ -62,7 +62,7 @@ public void HashCommand_MissingFile()
 
         // Assert: Verify error reported
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "Error: Could not find file 'missing-file.txt'");
+        Assert.Contains("Error: Could not find file 'missing-file.txt'", output);
     }
 
     /// <summary>
@@ -119,7 +119,7 @@ public void HashCommand_Verify_MissingFile()
 
         // Assert: Verify error reported
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "Error: Could not find file");
+        Assert.Contains("Error: Could not find file", output);
     }
 
     /// <summary>
@@ -146,7 +146,7 @@ public void HashCommand_Verify_Bad()
 
             // Assert: Verify error reported
             Assert.AreEqual(1, exitCode);
-            StringAssert.Contains(output, "Sha256 hash mismatch for 'test.txt'");
+            Assert.Contains("Sha256 hash mismatch for 'test.txt'", output);
         }
         finally
         {
@@ -179,7 +179,7 @@ public void HashCommand_Verify_Good()
 
             // Assert: Verify success reported
             Assert.AreEqual(0, exitCode);
-            StringAssert.Contains(output, "Sha256 Digest OK for 'test.txt'");
+            Assert.Contains("Sha256 Digest OK for 'test.txt'", output);
         }
         finally
         {

diff --git a/test/DemaConsulting.SpdxTool.Tests/TestHelp.cs b/test/DemaConsulting.SpdxTool.Tests/TestHelp.cs
@@ -41,7 +41,7 @@ public void Help_MissingArguments()
 
         // Assert: Verify an error was detected
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "'help' command missing arguments");
+        Assert.Contains("'help' command missing arguments", output);
     }
 
     /// <summary>
@@ -60,7 +60,7 @@ public void Help_UnknownCommand()
 
         // Assert: Verify an error was detected
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "Unknown command: 'unknown-command'");
+        Assert.Contains("Unknown command: 'unknown-command'", output);
     }
 
     /// <summary>
@@ -79,6 +79,6 @@ public void Help_RunWorkflow()
 
         // Assert: Verify success
         Assert.AreEqual(0, exitCode);
-        StringAssert.Contains(output, "This command runs the steps specified in the workflow file/url.");
+        Assert.Contains("This command runs the steps specified in the workflow file/url.", output);
     }
 }
diff --git a/test/DemaConsulting.SpdxTool.Tests/TestLog.cs b/test/DemaConsulting.SpdxTool.Tests/TestLog.cs
@@ -50,7 +50,7 @@ public void Log_Short()
 
             // Assert: Verify the log contains the usage information
             var log = File.ReadAllText("output.log");
-            StringAssert.Contains(log, "Usage: spdx-tool");
+            Assert.Contains("Usage: spdx-tool", log);
         }
         finally
         {
@@ -83,7 +83,7 @@ public void Log_Long()
 
             // Assert: Verify the log contains the usage information
             var log = File.ReadAllText("output.log");
-            StringAssert.Contains(log, "Usage: spdx-tool");
+            Assert.Contains("Usage: spdx-tool", log);
         }
         finally
         {

diff --git a/test/DemaConsulting.SpdxTool.Tests/TestPrint.cs b/test/DemaConsulting.SpdxTool.Tests/TestPrint.cs
@@ -42,7 +42,7 @@ public void Print_CommandLine()
 
         // Assert: Verify output
         Assert.AreEqual(0, exitCode);
-        StringAssert.Contains(output, "Hello, World!");
+        Assert.Contains("Hello, World!", output);
     }
 
     /// <summary>
@@ -81,8 +81,8 @@ public void Print_Workflow()
 
             // Assert: Verify success
             Assert.AreEqual(0, exitCode);
-            StringAssert.Contains(output, "The first parameter is Hello.");
-            StringAssert.Contains(output, "World is the second parameter.");
+            Assert.Contains("The first parameter is Hello.", output);
+            Assert.Contains("World is the second parameter.", output);
         }
         finally
         {

diff --git a/test/DemaConsulting.SpdxTool.Tests/TestQuery.cs b/test/DemaConsulting.SpdxTool.Tests/TestQuery.cs
@@ -50,7 +50,7 @@ public void Query_MissingArguments()
 
         // Assert: Verify error reported
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "'query' command missing arguments");
+        Assert.Contains("'query' command missing arguments", output);
     }
 
     /// <summary>
@@ -71,7 +71,7 @@ public void Query_BadPattern()
 
         // Assert: Verify error reported
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "Pattern must contain a 'value' capture group");
+        Assert.Contains("Pattern must contain a 'value' capture group", output);
     }
 
     /// <summary>
@@ -91,7 +91,7 @@ public void Query_InvalidProgram()
 
         // Assert: Verify error reported
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "Unable to start program 'does-not-exist'");
+        Assert.Contains("Unable to start program 'does-not-exist'", output);
     }
 
     /// <summary>
@@ -112,7 +112,7 @@ public void Query_DotNet_CommandLine()
 
         // Assert: Verify error reported
         Assert.AreEqual(0, exitCode);
-        StringAssert.Matches(output, VersionRegex());
+        Assert.MatchesRegex(VersionRegex(), output);
     }
 
     /// <summary>
@@ -157,7 +157,7 @@ public void Query_DotNet_Workflow()
 
             // Assert: Verify success
             Assert.AreEqual(0, exitCode);
-            StringAssert.Matches(output, VersionRegex());
+            Assert.MatchesRegex(VersionRegex(), output);
         }
         finally
         {

diff --git a/test/DemaConsulting.SpdxTool.Tests/TestRenameId.cs b/test/DemaConsulting.SpdxTool.Tests/TestRenameId.cs
@@ -43,7 +43,7 @@ public void RenameId_MissingArguments()
 
         // Assert: Verify error reported
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "'rename-id' command missing arguments");
+        Assert.Contains("'rename-id' command missing arguments", output);
     }
 
     /// <summary>
@@ -64,7 +64,7 @@ public void RenameId_MissingFile()
 
         // Assert: Verify error reported
         Assert.AreEqual(1, exitCode);
-        StringAssert.Contains(output, "File not found: missing.spdx.json");
+        Assert.Contains("File not found: missing.spdx.json", output);
     }
 
     /// <summary>