diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 3807961c242b..4b4c467150b4 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -55,8 +55,6 @@ This file should be imported by eng/Versions.props 11.0.0-beta.25567.101 10.0.0-rc.3.25567.101 10.0.0-rc.3.25567.101 - 10.0.2-servicing.25601.110 - 10.0.2-servicing.25601.110 11.0.0-beta.25567.101 11.0.0-beta.25567.101 10.0.0-rc.3.25567.101 @@ -144,8 +142,8 @@ This file should be imported by eng/Versions.props 7.0.0-preview.2.256 7.0.0-preview.2.256 - 2.1.0-preview.25575.3 - 4.1.0-preview.25575.3 + 2.1.0-preview.25617.6 + 4.1.0-preview.25617.6 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae7b79929607..3d7dd39deb2a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -557,13 +557,13 @@ https://github.com/dotnet/dotnet f67b36f27be47c1fe753f85bfd86ba10fcdf4c4e - + https://github.com/microsoft/testfx - 838c4cd634276a89dbfc88f5371d9000252b9299 + e183a03b1e200baa83f3b00b83633338d356581a - + https://github.com/microsoft/testfx - 838c4cd634276a89dbfc88f5371d9000252b9299 + e183a03b1e200baa83f3b00b83633338d356581a https://github.com/dotnet/dotnet diff --git a/eng/Versions.props b/eng/Versions.props index 32612617d38f..60d378272929 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -115,6 +115,11 @@ 17.14.28 18.0 + + + 10.0.2-servicing.25601.110 + 10.0.2-servicing.25601.110 + diff --git a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTests.cs b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTests.cs index 3ccb65185fc5..0d7c7ae32076 100644 --- a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTests.cs +++ b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTests.cs @@ -278,14 +278,14 @@ public void RunMultipleTestProjectsWithDifferentFailures_ShouldReturnExitCodeGen CommandResult result = new DotnetTestCommand(Log, disableNewOutput: false) .WithWorkingDirectory(testInstance.Path) - .Execute("--minimum-expected-tests 2", - TestCommandDefinition.ConfigurationOption.Name, configuration); + .Execute(MicrosoftTestingPlatformOptions.MinimumExpectedTestsOption.Name, "2", + TestCommandDefinition.ConfigurationOption.Name, configuration); if (!TestContext.IsLocalized()) { Assert.Matches(RegexPatternHelper.GenerateProjectRegexPattern("TestProject", TestingConstants.ZeroTestsRan, true, configuration, "8"), result.StdOut); Assert.Matches(RegexPatternHelper.GenerateProjectRegexPattern("OtherTestProject", TestingConstants.Failed, true, configuration, "2"), result.StdOut); - Assert.Matches(RegexPatternHelper.GenerateProjectRegexPattern("AnotherTestProject", TestingConstants.Failed, true, configuration, "9"), result.StdOut); + Assert.Matches(RegexPatternHelper.GenerateProjectRegexPattern("AnotherTestProject", TestingConstants.Passed, true, configuration), result.StdOut); result.StdOut .Should().Contain("Test run summary: Failed!") diff --git a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestsWithArtifacts.cs b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestsWithArtifacts.cs index 321d34f0ef48..e242b2fae4ff 100644 --- a/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestsWithArtifacts.cs +++ b/test/dotnet.Tests/CommandTests/Test/GivenDotnetTestBuildsAndRunsTestsWithArtifacts.cs @@ -47,7 +47,8 @@ public void RunTestProjectWithFailingTestsAndFileArtifacts_ShouldReturnExitCodeG [InlineData(TestingConstants.Debug)] [InlineData(TestingConstants.Release)] - [Theory] + // Linux and macOS are being skipped. See: https://github.com/dotnet/sdk/issues/52029 + [WindowsOnlyTheory] public void RunTestProjectWithCodeCoverage_ShouldReturnExitCodeGenericFailure(string configuration) { TestAsset testInstance = _testAssetsManager.CopyTestAsset("TestProjectSolutionWithCodeCoverage", Guid.NewGuid().ToString()).WithSource();