Merge pull request #65 from ddunkin/dotnet-test

Fix running dotnet test. Add DotNetTestSettings.GetLogger.

ReleaseNotes.md

@@ -1,5 +1,11 @@
 # Release Notes
 
+## Unreleased
+
+* Fix running `dotnet test` with extra properties.
+* Add `DotNetTestSettings.GetLogger` to support custom loggers.
+* Don't send `-maxcpucount` argument when calling `dotnet test` with a dll.
+
 ## 5.21.1
 
 * Send verbosity argument to `dotnet test`.

src/Faithlife.Build/DotNetBuild.cs

@@ -979,6 +979,7 @@ public static void RunTests(this DotNetBuildSettings settings, string? path)
 		}
 		else
 		{
+			var loggerArgs = settings.TestSettings?.GetLogger?.Invoke(path) is { } logger ? new[] { "--logger", logger } : [];
 			if (Path.GetExtension(path)?.ToLowerInvariant() is ".dll" or ".exe")
 			{
 				RunDotNet(new AppRunnerSettings
@@ -988,7 +989,7 @@ public static void RunTests(this DotNetBuildSettings settings, string? path)
 						"test",
 						Path.GetFileName(path),
 						settings.GetVerbosityArg(),
-						settings.GetMaxCpuCountArg(),
+						.. loggerArgs,
 						"--",
 						"RunConfiguration.TreatNoTestsAsError=true",
 					],
@@ -997,8 +998,7 @@ public static void RunTests(this DotNetBuildSettings settings, string? path)
 			}
 			else
 			{
-				RunDotNet(new[]
-				{
+				RunDotNet([
 					"test",
 					path,
 					"-c",
@@ -1008,9 +1008,11 @@ public static void RunTests(this DotNetBuildSettings settings, string? path)
 					"--no-build",
 					settings.GetVerbosityArg(),
 					settings.GetMaxCpuCountArg(),
+					.. settings.GetExtraPropertyArgs("test"),
+					.. loggerArgs,
 					"--",
 					"RunConfiguration.TreatNoTestsAsError=true",
-				}.Concat(settings.GetExtraPropertyArgs("test")));
+				]);
 			}
 		}
 	}

src/Faithlife.Build/DotNetTestSettings.cs

@@ -31,6 +31,11 @@ public sealed class DotNetTestSettings
 	/// </summary>
 	public bool? UseParallel { get; set; }
 
+	/// <summary>
+	/// Get the logger for the specified project.
+	/// </summary>
+	public Func<string?, string?>? GetLogger { get; set; }
+
 	/// <summary>
 	/// Clones the settings.
 	/// </summary>