diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 103ecafb3314..fd288698601e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -61,9 +61,9 @@
https://github.com/NuGet/NuGet.Client
d428c2a79aae81ade1caa326e04f65a119025f42
-
+
https://github.com/microsoft/vstest
- df62aca07cacc5c018dc8e828f03a0cd79ee52da
+ c4c4491da41cd51039eb64139ec5f26a5a202845
https://github.com/mono/linker
diff --git a/eng/Versions.props b/eng/Versions.props
index c527ab98a3a9..857c5995117b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -62,7 +62,7 @@
- 16.7.0-release-20200612-02
+ 16.8.0-preview-20200728-02
$(MicrosoftNETTestSdkPackageVersion)
$(MicrosoftNETTestSdkPackageVersion)
diff --git a/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs b/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs
index 937c21cd7c72..72c55b3938f8 100644
--- a/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs
+++ b/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestFromCsprojForMultipleTFM.cs
@@ -49,11 +49,11 @@ public void MStestMultiTFM()
.Should().Contain("Total tests: 3")
.And.Contain("Passed: 2")
.And.Contain("Failed: 1")
- .And.Contain("\u221a VSTestPassTestDesktop", "because .NET 4.6 tests will pass")
+ .And.Contain("Passed VSTestPassTestDesktop", "because .NET 4.6 tests will pass")
.And.Contain("Total tests: 3")
.And.Contain("Passed: 1")
.And.Contain("Failed: 2")
- .And.Contain("X VSTestFailTestNetCoreApp", "because netcoreapp2.0 tests will fail");
+ .And.Contain("Failed VSTestFailTestNetCoreApp", "because netcoreapp2.0 tests will fail");
}
result.ExitCode.Should().Be(1);
}
@@ -87,13 +87,13 @@ public void XunitMultiTFM()
result.StdOut.Should().Contain("Total tests: 3");
result.StdOut.Should().Contain("Passed: 2");
result.StdOut.Should().Contain("Failed: 1");
- result.StdOut.Should().Contain("\u221a TestNamespace.VSTestXunitTests.VSTestXunitPassTestDesktop");
+ result.StdOut.Should().Contain("Passed TestNamespace.VSTestXunitTests.VSTestXunitPassTestDesktop");
// for target framework netcoreapp1.0
result.StdOut.Should().Contain("Total tests: 3");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 2");
- result.StdOut.Should().Contain("X TestNamespace.VSTestXunitTests.VSTestXunitFailTestNetCoreApp");
+ result.StdOut.Should().Contain("Failed TestNamespace.VSTestXunitTests.VSTestXunitFailTestNetCoreApp");
}
result.ExitCode.Should().Be(1);
diff --git a/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs b/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
index 26ce333d9b42..b7b4259b788f 100644
--- a/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
+++ b/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
@@ -46,8 +46,8 @@ public void MSTestSingleTFM()
result.StdOut.Should().Contain("Total tests: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
- result.StdOut.Should().Contain("\u221a VSTestPassTest");
- result.StdOut.Should().Contain("X VSTestFailTest");
+ result.StdOut.Should().Contain("Passed VSTestPassTest");
+ result.StdOut.Should().Contain("Failed VSTestFailTest");
}
result.ExitCode.Should().Be(1);
@@ -74,8 +74,8 @@ public void ItImplicitlyRestoresAProjectWhenTesting()
result.StdOut.Should().Contain("Total tests: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
- result.StdOut.Should().Contain("\u221a VSTestPassTest");
- result.StdOut.Should().Contain("X VSTestFailTest");
+ result.StdOut.Should().Contain("Passed VSTestPassTest");
+ result.StdOut.Should().Contain("Failed VSTestFailTest");
}
result.ExitCode.Should().Be(1);
@@ -142,8 +142,8 @@ public void XunitSingleTFM()
result.StdOut.Should().Contain("Total tests: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
- result.StdOut.Should().Contain("\u221a TestNamespace.VSTestXunitTests.VSTestXunitPassTest");
- result.StdOut.Should().Contain("X TestNamespace.VSTestXunitTests.VSTestXunitFailTest");
+ result.StdOut.Should().Contain("Passed TestNamespace.VSTestXunitTests.VSTestXunitPassTest");
+ result.StdOut.Should().Contain("Failed TestNamespace.VSTestXunitTests.VSTestXunitFailTest");
}
result.ExitCode.Should().Be(1);
@@ -164,10 +164,10 @@ public void GivenAFailingTestItDisplaysFailureDetails()
if (!TestContext.IsLocalized())
{
- result.StdOut.Should().Contain("X TestNamespace.VSTestXunitTests.VSTestXunitFailTest");
- result.StdOut.Should().Contain("Total tests: 2");
- result.StdOut.Should().Contain("Passed: 1");
- result.StdOut.Should().Contain("Failed: 1");
+ result.StdOut.Should().Contain("Failed TestNamespace.VSTestXunitTests.VSTestXunitFailTest");
+ result.StdOut.Should().Contain("Total: 2");
+ result.StdOut.Should().Contain("Passed: 1");
+ result.StdOut.Should().Contain("Failed: 1");
}
}
@@ -197,8 +197,8 @@ public void ItAcceptsMultipleLoggersAsCliArguments()
// We append current date time to trx file name, hence modifying this check
Assert.True(Directory.EnumerateFiles(trxLoggerDirectory, trxFileNamePattern).Any());
- result.StdOut.Should().Contain("\u221a VSTestPassTest");
- result.StdOut.Should().Contain("X VSTestFailTest");
+ result.StdOut.Should().Contain("Passed VSTestPassTest");
+ result.StdOut.Should().Contain("Failed VSTestFailTest");
}
// Cleanup trxLoggerDirectory if it exist
@@ -341,8 +341,8 @@ public void ItBuildsAndTestsAppWhenRestoringToSpecificDirectory()
result.StdOut.Should().Contain("Total tests: 2");
result.StdOut.Should().Contain("Passed: 1");
result.StdOut.Should().Contain("Failed: 1");
- result.StdOut.Should().Contain("\u221a VSTestPassTest");
- result.StdOut.Should().Contain("X VSTestFailTest");
+ result.StdOut.Should().Contain("Passed VSTestPassTest");
+ result.StdOut.Should().Contain("Failed VSTestFailTest");
}
result.ExitCode.Should().Be(1);
@@ -362,11 +362,11 @@ public void ItUsesVerbosityPassedToDefineVerbosityOfConsoleLoggerOfTheTests()
// Verify
if (!TestContext.IsLocalized())
{
- result.StdOut.Should().Contain("Total tests: 2");
- result.StdOut.Should().Contain("Passed: 1");
- result.StdOut.Should().Contain("Failed: 1");
- result.StdOut.Should().NotContain("\u221a TestNamespace.VSTestTests.VSTestPassTest");
- result.StdOut.Should().NotContain("X TestNamespace.VSTestTests.VSTestFailTest");
+ result.StdOut.Should().Contain("Total: 2");
+ result.StdOut.Should().Contain("Passed: 1");
+ result.StdOut.Should().Contain("Failed: 1");
+ result.StdOut.Should().NotContain("Passed TestNamespace.VSTestTests.VSTestPassTest");
+ result.StdOut.Should().NotContain("Failed TestNamespace.VSTestTests.VSTestFailTest");
}
result.ExitCode.Should().Be(1);
@@ -424,9 +424,9 @@ public void ItAcceptsNoLogoAsCliArguments()
if (!TestContext.IsLocalized())
{
result.StdOut.Should().NotContain("Microsoft (R) Test Execution Command Line Tool Version");
- result.StdOut.Should().Contain("Total tests: 2");
- result.StdOut.Should().Contain("Passed: 1");
- result.StdOut.Should().Contain("Failed: 1");
+ result.StdOut.Should().Contain("Total: 2");
+ result.StdOut.Should().Contain("Passed: 1");
+ result.StdOut.Should().Contain("Failed: 1");
}
}
@@ -458,9 +458,9 @@ public void ItCreatesCoverageFileWhenCodeCoverageEnabledByRunsettings()
// Verify test results
if (!TestContext.IsLocalized())
{
- result.StdOut.Should().Contain("Total tests: 2");
- result.StdOut.Should().Contain("Passed: 1");
- result.StdOut.Should().Contain("Failed: 1");
+ result.StdOut.Should().Contain("Total: 2");
+ result.StdOut.Should().Contain("Passed: 1");
+ result.StdOut.Should().Contain("Failed: 1");
}
// Verify coverage file.
@@ -494,9 +494,9 @@ public void ItCreatesCoverageFileInResultsDirectory()
// Verify test results
if (!TestContext.IsLocalized())
{
- result.StdOut.Should().Contain("Total tests: 2");
- result.StdOut.Should().Contain("Passed: 1");
- result.StdOut.Should().Contain("Failed: 1");
+ result.StdOut.Should().Contain("Total: 2");
+ result.StdOut.Should().Contain("Passed: 1");
+ result.StdOut.Should().Contain("Failed: 1");
}
// Verify coverage file.
@@ -523,9 +523,9 @@ public void ItShouldShowWarningMessageOnCollectCodeCoverage()
if (!TestContext.IsLocalized())
{
result.StdOut.Should().Contain("No code coverage data available. Code coverage is currently supported only on Windows.");
- result.StdOut.Should().Contain("Total tests: 1");
- result.StdOut.Should().Contain("Passed: 1");
- result.StdOut.Should().Contain("Test Run Successful.");
+ result.StdOut.Should().Contain("Total: 1");
+ result.StdOut.Should().Contain("Passed: 1");
+ result.StdOut.Should().NotContain("Failed!");
}
result.ExitCode.Should().Be(0);
diff --git a/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsprojWithCorrectTestRunParameters.cs b/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsprojWithCorrectTestRunParameters.cs
index bffcf0f862c1..9e0963c1d65f 100644
--- a/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsprojWithCorrectTestRunParameters.cs
+++ b/src/Tests/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsprojWithCorrectTestRunParameters.cs
@@ -48,7 +48,7 @@ public void GivenAProjectAndMultipleTestRunParametersItPassesThemToVStestConsole
result.StdOut.Should().NotMatch("The test run parameter argument '*' is invalid.");
result.StdOut.Should().Contain("Total tests: 1");
result.StdOut.Should().Contain("Passed: 1");
- result.StdOut.Should().Contain("\u221a VSTestTestRunParameters");
+ result.StdOut.Should().Contain("Passed VSTestTestRunParameters");
}
result.ExitCode.Should().Be(0);
@@ -86,7 +86,7 @@ public void GivenADllAndMultipleTestRunParametersItPassesThemToVStestConsoleInTh
result.StdOut.Should().NotMatch("The test run parameter argument '*' is invalid.");
result.StdOut.Should().Contain("Total tests: 1");
result.StdOut.Should().Contain("Passed: 1");
- result.StdOut.Should().Contain("\u221a VSTestTestRunParameters");
+ result.StdOut.Should().Contain("Passed VSTestTestRunParameters");
}
result.ExitCode.Should().Be(0);
diff --git a/src/Tests/dotnet-vstest.Tests/VSTestTests.cs b/src/Tests/dotnet-vstest.Tests/VSTestTests.cs
index 7e17986e0caf..209fd493b8c0 100644
--- a/src/Tests/dotnet-vstest.Tests/VSTestTests.cs
+++ b/src/Tests/dotnet-vstest.Tests/VSTestTests.cs
@@ -48,8 +48,8 @@ public void TestsFromAGivenContainerShouldRunWithExpectedOutput()
.Should().Contain("Total tests: 2")
.And.Contain("Passed: 1")
.And.Contain("Failed: 1")
- .And.Contain("\u221a VSTestPassTest")
- .And.Contain("X VSTestFailTest");
+ .And.Contain("Passed VSTestPassTest")
+ .And.Contain("Failed VSTestFailTest");
}
result.ExitCode.Should().Be(1);
@@ -88,7 +88,7 @@ public void GivenADllAndMultipleTestRunParametersItPassesThemToVStestConsoleInTh
result.StdOut.Should().NotMatch("The test run parameter argument '*' is invalid.");
result.StdOut.Should().Contain("Total tests: 1");
result.StdOut.Should().Contain("Passed: 1");
- result.StdOut.Should().Contain("\u221a VSTestTestRunParameters");
+ result.StdOut.Should().Contain("Passed VSTestTestRunParameters");
}
result.ExitCode.Should().Be(0);