Address build warning xUnit1030

coderpatros · coderpatros · commit a695e275437d · 2025-07-23T17:32:04.000+10:00
warning xUnit1030: Test methods should not call ConfigureAwait(false), as it may bypass parallelization limits. Omit ConfigureAwait, or use ConfigureAwait(true) to avoid CA2007. (https://xunit.net/xunit.analyzers/rules/xUnit1030) Signed-off-by: Patrick Dwyer <coderpatros@outlook.com>
diff --git a/tests/cyclonedx.tests/ConvertTests.cs b/tests/cyclonedx.tests/ConvertTests.cs
@@ -99,7 +99,7 @@ public async Task Convert(string inputFilename, ConvertFormat inputFormat, strin
                     InputFormat = inputFormat,
                     OutputFormat = outputFormat,
                     OutputVersion = outputVersion,
-                }).ConfigureAwait(false);
+                }).ConfigureAwait(true);
                 
                 Assert.Equal(0, exitCode);
                 var bom = File.ReadAllText(fullOutputPath);
@@ -122,7 +122,7 @@ public async Task ConvertToSpdxJson(ConvertFormat outputFormat)
                     InputFormat = ConvertFormat.autodetect,
                     OutputFormat = outputFormat
                     
-                }).ConfigureAwait(false);
+                }).ConfigureAwait(true);
                 
                 Assert.Equal(0, exitCode);
                 var bom = File.ReadAllText(outputFilename);
@@ -146,7 +146,7 @@ public async Task ConvertFromSpdxJson(ConvertFormat inputFormat)
                     InputFormat = inputFormat,
                     OutputFormat = ConvertFormat.xml,
                     
-                }).ConfigureAwait(false);
+                }).ConfigureAwait(true);
                 
                 Assert.Equal(0, exitCode);
                 var bom = File.ReadAllText(outputFilename);
diff --git a/tests/cyclonedx.tests/MergeTests.cs b/tests/cyclonedx.tests/MergeTests.cs
@@ -71,7 +71,7 @@ public async Task Merge(
                     options.InputFiles.Add(Path.Combine("Resources", "Merge", inputFilename));
                 }
 
-                var exitCode = await MergeCommand.Merge(options).ConfigureAwait(false);
+                var exitCode = await MergeCommand.Merge(options).ConfigureAwait(true);
 
                 Assert.Equal(0, exitCode);
                 var bom = File.ReadAllText(fullOutputPath);
diff --git a/tests/cyclonedx.tests/SignBomTests.cs b/tests/cyclonedx.tests/SignBomTests.cs
@@ -39,7 +39,7 @@ public async Task SignXmlBom()
                 {
                     BomFile = testFilename,
                     KeyFile = Path.Combine("Resources", "private.key"),
-                }).ConfigureAwait(false);
+                }).ConfigureAwait(true);
                 
                 Assert.Equal(ExitCode.Ok, (ExitCode)exitCode);
 
diff --git a/tests/cyclonedx.tests/SignFileTests.cs b/tests/cyclonedx.tests/SignFileTests.cs
@@ -33,18 +33,18 @@ public async Task SignFile()
             using (var tempDirectory = new TempDirectory())
             {
                 var testFilename = Path.Combine(tempDirectory.DirectoryPath, "bom.xml");
-                var fileContents = await File.ReadAllTextAsync(Path.Combine("Resources", "bom-1.3.xml")).ConfigureAwait(false);
+                var fileContents = await File.ReadAllTextAsync(Path.Combine("Resources", "bom-1.3.xml")).ConfigureAwait(true);
                 if (Environment.OSVersion.Platform == PlatformID.Win32NT)
                 {
                     fileContents = fileContents.Replace("\r\n", "\n");
                 }
-                await File.WriteAllTextAsync(testFilename, fileContents).ConfigureAwait(false);
+                await File.WriteAllTextAsync(testFilename, fileContents).ConfigureAwait(true);
 
                 var exitCode = await SignFileCommand.SignFile(new SignFileCommandOptions
                 {
                     File = testFilename,
                     KeyFile = Path.Combine("Resources", "private.key"),
-                }).ConfigureAwait(false);
+                }).ConfigureAwait(true);
                 
                 Assert.Equal(ExitCode.Ok, (ExitCode)exitCode);
 
diff --git a/tests/cyclonedx.tests/ValidateTests.cs b/tests/cyclonedx.tests/ValidateTests.cs
@@ -78,7 +78,7 @@ public async Task Validate(string inputFilename, ValidationBomFormat inputFormat
                 InputFormat = inputFormat,
                 InputVersion = inputVersion,
                 FailOnErrors = true,
-            }).ConfigureAwait(false);
+            }).ConfigureAwait(true);
             
             if (valid)
             {
diff --git a/tests/cyclonedx.tests/VerifyAllTests.cs b/tests/cyclonedx.tests/VerifyAllTests.cs
@@ -32,7 +32,7 @@ public async Task OriginalBomSignatureVerifies()
             {
                 BomFile = Path.Combine("Resources", "signed-bom.xml"),
                 KeyFile = Path.Combine("Resources", "public.key")
-            }).ConfigureAwait(false);
+            }).ConfigureAwait(true);
             
             Assert.Equal(ExitCode.Ok, (ExitCode)exitCode);
         }
@@ -44,7 +44,7 @@ public async Task ModifiedBomFailsSignatureVerification()
             {
                 BomFile = Path.Combine("Resources", "signed-bom-modified.xml"),
                 KeyFile = Path.Combine("Resources", "public.key")
-            }).ConfigureAwait(false);
+            }).ConfigureAwait(true);
             
             Assert.Equal(ExitCode.SignatureFailedVerification, (ExitCode)exitCode);
         }
diff --git a/tests/cyclonedx.tests/VerifyFileTests.cs b/tests/cyclonedx.tests/VerifyFileTests.cs
@@ -32,19 +32,19 @@ public async Task ValidSignatureVerifies()
             {
                 var testFilename = Path.Combine(tempDirectory.DirectoryPath, "bom.xml");
 
-                var fileContents = await File.ReadAllTextAsync(Path.Combine("Resources", "bom-1.3.xml")).ConfigureAwait(false);
+                var fileContents = await File.ReadAllTextAsync(Path.Combine("Resources", "bom-1.3.xml")).ConfigureAwait(true);
                 if (Environment.OSVersion.Platform == PlatformID.Win32NT)
                 {
                     fileContents = fileContents.Replace("\r\n", "\n");
                 }
-                await File.WriteAllTextAsync(testFilename, fileContents).ConfigureAwait(false);
+                await File.WriteAllTextAsync(testFilename, fileContents).ConfigureAwait(true);
 
                 var exitCode = await VerifyFileCommand.VerifyFile(new VerifyFileCommandOptions
                 {
                     File = testFilename,
                     KeyFile = Path.Combine("Resources", "public.key"),
                     SignatureFile = Path.Combine("Resources", "bom-1.3.xml.valid.sig"),
-                }).ConfigureAwait(false);
+                }).ConfigureAwait(true);
                 
                 Assert.Equal(ExitCode.Ok, (ExitCode)exitCode);
             }
@@ -57,19 +57,19 @@ public async Task InvalidSignatureFailsVerification()
             {
                 var testFilename = Path.Combine(tempDirectory.DirectoryPath, "bom.xml");
 
-                var fileContents = await File.ReadAllTextAsync(Path.Combine("Resources", "bom-1.3.xml")).ConfigureAwait(false);
+                var fileContents = await File.ReadAllTextAsync(Path.Combine("Resources", "bom-1.3.xml")).ConfigureAwait(true);
                 if (Environment.OSVersion.Platform == PlatformID.Win32NT)
                 {
                     fileContents = fileContents.Replace("\r\n", "\n");
                 }
-                await File.WriteAllTextAsync(testFilename, fileContents).ConfigureAwait(false);
+                await File.WriteAllTextAsync(testFilename, fileContents).ConfigureAwait(true);
 
                 var exitCode = await VerifyFileCommand.VerifyFile(new VerifyFileCommandOptions
                 {
                     File = testFilename,
                     KeyFile = Path.Combine("Resources", "public.key"),
                     SignatureFile = Path.Combine("Resources", "bom-1.3.xml.invalid.sig"),
-                }).ConfigureAwait(false);
+                }).ConfigureAwait(true);
                 
                 Assert.Equal(ExitCode.SignatureFailedVerification, (ExitCode)exitCode);
             }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public async Task Merge(`
`71`	`71`	`options.InputFiles.Add(Path.Combine("Resources", "Merge", inputFilename));`
`72`	`72`	`}`
`73`	`73`
`74`		`- var exitCode = await MergeCommand.Merge(options).ConfigureAwait(false);`
	`74`	`+ var exitCode = await MergeCommand.Merge(options).ConfigureAwait(true);`
`75`	`75`
`76`	`76`	`Assert.Equal(0, exitCode);`
`77`	`77`	`var bom = File.ReadAllText(fullOutputPath);`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public async Task SignXmlBom()`
`39`	`39`	`{`
`40`	`40`	`BomFile = testFilename,`
`41`	`41`	`KeyFile = Path.Combine("Resources", "private.key"),`
`42`		`- }).ConfigureAwait(false);`
	`42`	`+ }).ConfigureAwait(true);`
`43`	`43`
`44`	`44`	`Assert.Equal(ExitCode.Ok, (ExitCode)exitCode);`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -33,18 +33,18 @@ public async Task SignFile()`
`33`	`33`	`using (var tempDirectory = new TempDirectory())`
`34`	`34`	`{`
`35`	`35`	`var testFilename = Path.Combine(tempDirectory.DirectoryPath, "bom.xml");`
`36`		`- var fileContents = await File.ReadAllTextAsync(Path.Combine("Resources", "bom-1.3.xml")).ConfigureAwait(false);`
	`36`	`+ var fileContents = await File.ReadAllTextAsync(Path.Combine("Resources", "bom-1.3.xml")).ConfigureAwait(true);`
`37`	`37`	`if (Environment.OSVersion.Platform == PlatformID.Win32NT)`
`38`	`38`	`{`
`39`	`39`	`fileContents = fileContents.Replace("\r\n", "\n");`
`40`	`40`	`}`
`41`		`- await File.WriteAllTextAsync(testFilename, fileContents).ConfigureAwait(false);`
	`41`	`+ await File.WriteAllTextAsync(testFilename, fileContents).ConfigureAwait(true);`
`42`	`42`
`43`	`43`	`var exitCode = await SignFileCommand.SignFile(new SignFileCommandOptions`
`44`	`44`	`{`
`45`	`45`	`File = testFilename,`
`46`	`46`	`KeyFile = Path.Combine("Resources", "private.key"),`
`47`		`- }).ConfigureAwait(false);`
	`47`	`+ }).ConfigureAwait(true);`
`48`	`48`
`49`	`49`	`Assert.Equal(ExitCode.Ok, (ExitCode)exitCode);`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ public async Task Validate(string inputFilename, ValidationBomFormat inputFormat`
`78`	`78`	`InputFormat = inputFormat,`
`79`	`79`	`InputVersion = inputVersion,`
`80`	`80`	`FailOnErrors = true,`
`81`		`- }).ConfigureAwait(false);`
	`81`	`+ }).ConfigureAwait(true);`
`82`	`82`
`83`	`83`	`if (valid)`
`84`	`84`	`{`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public async Task OriginalBomSignatureVerifies()`
`32`	`32`	`{`
`33`	`33`	`BomFile = Path.Combine("Resources", "signed-bom.xml"),`
`34`	`34`	`KeyFile = Path.Combine("Resources", "public.key")`
`35`		`- }).ConfigureAwait(false);`
	`35`	`+ }).ConfigureAwait(true);`
`36`	`36`
`37`	`37`	`Assert.Equal(ExitCode.Ok, (ExitCode)exitCode);`
`38`	`38`	`}`
`@@ -44,7 +44,7 @@ public async Task ModifiedBomFailsSignatureVerification()`
`44`	`44`	`{`
`45`	`45`	`BomFile = Path.Combine("Resources", "signed-bom-modified.xml"),`
`46`	`46`	`KeyFile = Path.Combine("Resources", "public.key")`
`47`		`- }).ConfigureAwait(false);`
	`47`	`+ }).ConfigureAwait(true);`
`48`	`48`
`49`	`49`	`Assert.Equal(ExitCode.SignatureFailedVerification, (ExitCode)exitCode);`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,19 +32,19 @@ public async Task ValidSignatureVerifies()`
`32`	`32`	`{`
`33`	`33`	`var testFilename = Path.Combine(tempDirectory.DirectoryPath, "bom.xml");`
`34`	`34`
`35`		`- var fileContents = await File.ReadAllTextAsync(Path.Combine("Resources", "bom-1.3.xml")).ConfigureAwait(false);`
	`35`	`+ var fileContents = await File.ReadAllTextAsync(Path.Combine("Resources", "bom-1.3.xml")).ConfigureAwait(true);`
`36`	`36`	`if (Environment.OSVersion.Platform == PlatformID.Win32NT)`
`37`	`37`	`{`
`38`	`38`	`fileContents = fileContents.Replace("\r\n", "\n");`
`39`	`39`	`}`
`40`		`- await File.WriteAllTextAsync(testFilename, fileContents).ConfigureAwait(false);`
	`40`	`+ await File.WriteAllTextAsync(testFilename, fileContents).ConfigureAwait(true);`
`41`	`41`
`42`	`42`	`var exitCode = await VerifyFileCommand.VerifyFile(new VerifyFileCommandOptions`
`43`	`43`	`{`
`44`	`44`	`File = testFilename,`
`45`	`45`	`KeyFile = Path.Combine("Resources", "public.key"),`
`46`	`46`	`SignatureFile = Path.Combine("Resources", "bom-1.3.xml.valid.sig"),`
`47`		`- }).ConfigureAwait(false);`
	`47`	`+ }).ConfigureAwait(true);`
`48`	`48`
`49`	`49`	`Assert.Equal(ExitCode.Ok, (ExitCode)exitCode);`
`50`	`50`	`}`
`@@ -57,19 +57,19 @@ public async Task InvalidSignatureFailsVerification()`
`57`	`57`	`{`
`58`	`58`	`var testFilename = Path.Combine(tempDirectory.DirectoryPath, "bom.xml");`
`59`	`59`
`60`		`- var fileContents = await File.ReadAllTextAsync(Path.Combine("Resources", "bom-1.3.xml")).ConfigureAwait(false);`
	`60`	`+ var fileContents = await File.ReadAllTextAsync(Path.Combine("Resources", "bom-1.3.xml")).ConfigureAwait(true);`
`61`	`61`	`if (Environment.OSVersion.Platform == PlatformID.Win32NT)`
`62`	`62`	`{`
`63`	`63`	`fileContents = fileContents.Replace("\r\n", "\n");`
`64`	`64`	`}`
`65`		`- await File.WriteAllTextAsync(testFilename, fileContents).ConfigureAwait(false);`
	`65`	`+ await File.WriteAllTextAsync(testFilename, fileContents).ConfigureAwait(true);`
`66`	`66`
`67`	`67`	`var exitCode = await VerifyFileCommand.VerifyFile(new VerifyFileCommandOptions`
`68`	`68`	`{`
`69`	`69`	`File = testFilename,`
`70`	`70`	`KeyFile = Path.Combine("Resources", "public.key"),`
`71`	`71`	`SignatureFile = Path.Combine("Resources", "bom-1.3.xml.invalid.sig"),`
`72`		`- }).ConfigureAwait(false);`
	`72`	`+ }).ConfigureAwait(true);`
`73`	`73`
`74`	`74`	`Assert.Equal(ExitCode.SignatureFailedVerification, (ExitCode)exitCode);`
`75`	`75`	`}`