diff --git a/Directory.Build.props b/Directory.Build.props
index 51ef037d2e..f8aef03798 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -15,17 +15,6 @@
-
- 17.10.0
-
- $(TPVersionPrefix)-dev
15.0.0
@@ -147,6 +136,8 @@
MSTest
$(TestRunnerAdditionalArguments) --filter "TestCategory!=Windows&TestCategory!=Windows-Review"
+
+ false
diff --git a/eng/Versions.props b/eng/Versions.props
index 07084bb842..dcba6d24a2 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -13,7 +13,7 @@
from appending +, which breaks DTAAgent.
-->
false
- 17.15.0
+ 18.0.0
preview
@@ -57,7 +57,7 @@
Make sure you are taking a version from a release branch (rel/d*) in VS. Otherwise there won't be symbols for the dlls in package,
a and it will create a symcheck bug on re-insertion into VS.
-->
- 17.13.35723.115
+ 18.0.0-preview-1-10811-208
$(MicrosoftVisualStudioDiagnosticsUtilitiesVersion)
17.13.39960
17.13.24
@@ -69,8 +69,9 @@
8.0.0
4.5.5
8.0.0
- 17.10.0-preview-2-34602-162
- 17.10.0-preview-2-34602-162
+
+ 18.0.0-preview-1-10811-208
+ 18.0.0-preview-1-10811-208
17.12.35519.223
5.0.0
6.1.0
diff --git a/src/testhost.x86/app.config b/src/testhost.x86/app.config
index 80f1fde929..b06017b279 100644
--- a/src/testhost.x86/app.config
+++ b/src/testhost.x86/app.config
@@ -18,7 +18,7 @@
-
+
@@ -26,23 +26,23 @@
-
+
-
+
-
+
-
+
-
+
diff --git a/src/vstest.console/app.config b/src/vstest.console/app.config
index bd074de580..3f040b9d20 100644
--- a/src/vstest.console/app.config
+++ b/src/vstest.console/app.config
@@ -14,11 +14,11 @@
-
+
-
+
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TestPlatformNugetPackageTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TestPlatformNugetPackageTests.cs
index 5f55b852eb..712e00b6e8 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TestPlatformNugetPackageTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TestPlatformNugetPackageTests.cs
@@ -22,6 +22,7 @@ public static void ClassInit(TestContext _)
[TestMethod]
[TestCategory("Windows-Review")]
+ [Ignore("Code Coverage is using 17.x.x dependency, will be solved in other PR. https://github.com/microsoft/vstest/issues/15223")]
[NetFullTargetFrameworkDataSourceAttribute(useCoreRunner: false)]
[NetCoreTargetFrameworkDataSourceAttribute(useCoreRunner: false)]
public void RunMultipleTestAssembliesWithCodeCoverage(RunnerInfo runnerInfo)
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/CustomTestHostTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/CustomTestHostTests.cs
index 9996f086e0..0081ef5a19 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/CustomTestHostTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/CustomTestHostTests.cs
@@ -140,7 +140,8 @@ public void RunTestsWithCustomTestHostLauncherUsesLaunchWhenGivenAnOutdatedITest
[TestMethod]
[TestCategory("Windows-Review")]
[TestCategory("Feature")]
- [RunnerCompatibilityDataSource(AfterFeature = Features.MULTI_TFM)]
+ // "Just row" used here because mstest does not cooperate with older versions of vstest.console correctly, so we test with just the latest version available..
+ [RunnerCompatibilityDataSource(AfterFeature = Features.MULTI_TFM, JustRow = 0)]
public void RunAllTestsWithMixedTFMsWillProvideAdditionalInformationToTheDebugger(RunnerInfo runnerInfo)
{
// Arrange
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTestsWithDifferentConfigurationTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTestsWithDifferentConfigurationTests.cs
index abf6f49b7b..b7717d4fe5 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTestsWithDifferentConfigurationTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTestsWithDifferentConfigurationTests.cs
@@ -102,7 +102,7 @@ public void RunTestsWithRunSettingsWithParallel(RunnerInfo runnerInfo)
[TestMethod]
[TestCategory("Windows-Review")]
[NetFullTargetFrameworkDataSource()]
- public void RunTestsWithTestSettings(RunnerInfo runnerInfo)
+ public void RunTestsWithTestSettingsInTpv2(RunnerInfo runnerInfo)
{
SetTestEnvironment(_testEnvironment, runnerInfo);
ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, NetFramework, Message);
@@ -130,6 +130,72 @@ public void RunTestsWithTestSettings(RunnerInfo runnerInfo)
Assert.AreEqual(1, _runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Skipped));
}
+ [TestMethod]
+ [TestCategory("Windows-Review")]
+ [NetFullTargetFrameworkDataSource()]
+ public void RunTestsWithTestSettingsInTpv0(RunnerInfo runnerInfo)
+ {
+ SetTestEnvironment(_testEnvironment, runnerInfo);
+ ExecuteNotSupportedRunnerFrameworkTests(runnerInfo.RunnerFramework, NetFramework, Message);
+ Setup();
+
+ var testSettingsXml = """
+
+
+ This is a default test run configuration for a local test run.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ """;
+
+ var testsettingsFile = Path.Combine(TempDirectory.Path, "tempsettings.testsettings");
+
+ File.WriteAllText(testsettingsFile, testSettingsXml, Encoding.UTF8);
+
+ var source = GetAssetFullPath("MstestV1UnitTestProject.dll");
+
+ InvokeVsTestForExecution(source, null, runnerInfo.TargetFramework, runSettings: testsettingsFile, null);
+
+ // Assert
+ // Ensure that we are actually running via TPv0 provider.
+ StringAssert.Contains(StdOutWithWhiteSpace, "The test execution was delegated to legacy TestPlatform runner");
+
+ ValidateSummaryStatus(2, 2, 1);
+ ExitCodeEquals(1); // failing tests
+ StdErrHasTestRunFailedMessageButNoOtherError();
+ }
+
[TestMethod]
[NetFullTargetFrameworkDataSource]
[NetCoreTargetFrameworkDataSource]