diff --git a/Versions.props b/Versions.props index 3b588db..9d2a18d 100644 --- a/Versions.props +++ b/Versions.props @@ -9,7 +9,7 @@ 5.1.0 1.0.0-alpha.160 1.12.0 - 2.7.1 + 2.7.2-pre.17 diff --git a/src/xunit.runner.visualstudio/Utility/RunSettings.cs b/src/xunit.runner.visualstudio/Utility/RunSettings.cs index 2e3593f..5cdf3ff 100644 --- a/src/xunit.runner.visualstudio/Utility/RunSettings.cs +++ b/src/xunit.runner.visualstudio/Utility/RunSettings.cs @@ -16,6 +16,7 @@ public class RunSettings public TestMethodDisplay? MethodDisplay { get; set; } public TestMethodDisplayOptions? MethodDisplayOptions { get; set; } public bool? NoAutoReporters { get; set; } + public ParallelAlgorithm? ParallelAlgorithm { get; set; } public bool? ParallelizeAssembly { get; set; } public bool? ParallelizeTestCollections { get; set; } public bool? PreEnumerateTheories { get; set; } @@ -42,6 +43,8 @@ public void CopyTo(TestAssemblyConfiguration configuration) configuration.MethodDisplay = MethodDisplay; if (MethodDisplayOptions.HasValue) configuration.MethodDisplayOptions = MethodDisplayOptions; + if (ParallelAlgorithm.HasValue) + configuration.ParallelAlgorithm = ParallelAlgorithm; if (ParallelizeAssembly.HasValue) configuration.ParallelizeAssembly = ParallelizeAssembly; if (ParallelizeTestCollections.HasValue) @@ -106,6 +109,10 @@ public static RunSettings Parse(string? settingsXml) if (bool.TryParse(noAutoReportersString, out var noAutoReporters)) result.NoAutoReporters = noAutoReporters; + var parallelAlgorithmString = xunitElement.Element(Constants.Xunit.ParallelAlgorithm)?.Value; + if (Enum.TryParse(parallelAlgorithmString, ignoreCase: true, out var parallelAlgorithm)) + result.ParallelAlgorithm = parallelAlgorithm; + var parallelizeAssemblyString = xunitElement.Element(Constants.Xunit.ParallelizeAssembly)?.Value; if (bool.TryParse(parallelizeAssemblyString, out var parallelizeAssembly)) result.ParallelizeAssembly = parallelizeAssembly; @@ -209,6 +216,7 @@ public static class Xunit public const string MethodDisplay = "MethodDisplay"; public const string MethodDisplayOptions = "MethodDisplayOptions"; public const string NoAutoReporters = "NoAutoReporters"; + public const string ParallelAlgorithm = "ParallelAlgorithm"; public const string ParallelizeAssembly = "ParallelizeAssembly"; public const string ParallelizeTestCollections = "ParallelizeTestCollections"; public const string PreEnumerateTheories = "PreEnumerateTheories"; diff --git a/src/xunit.runner.visualstudio/xunit.runner.visualstudio.csproj b/src/xunit.runner.visualstudio/xunit.runner.visualstudio.csproj index 4db809a..5cfd053 100644 --- a/src/xunit.runner.visualstudio/xunit.runner.visualstudio.csproj +++ b/src/xunit.runner.visualstudio/xunit.runner.visualstudio.csproj @@ -64,5 +64,5 @@ - +