From bd1195404a24de3bb7369f14edd2d4a0a3db69b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Fri, 4 Jul 2025 17:17:46 +0200 Subject: [PATCH 1/7] version 18 start --- Directory.Build.props | 11 ----------- eng/Versions.props | 2 +- src/testhost.x86/app.config | 12 ++++++------ src/vstest.console/app.config | 4 ++-- 4 files changed, 9 insertions(+), 20 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 51ef037d2e..762da32487 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -15,17 +15,6 @@ - - 17.10.0 - - $(TPVersionPrefix)-dev 15.0.0 diff --git a/eng/Versions.props b/eng/Versions.props index e65efc750f..f712979775 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 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 @@ - + - + From 56aa9fc3cef45e1604d741382bda3b6de7b5a9a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Mon, 7 Jul 2025 16:36:46 +0200 Subject: [PATCH 2/7] use version that almost restores --- eng/Versions.props | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f712979775..b90c190343 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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-10727-193 + 18.0.0-preview-1-10804-064 17.12.35519.223 5.0.0 6.1.0 From 17ecc8016df8ba9a2bac88733382a16c894e2f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Wed, 9 Jul 2025 12:15:24 +0200 Subject: [PATCH 3/7] Update versions to make it run with local patch --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index b869fdc463..32dee94633 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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-10807-200 $(MicrosoftVisualStudioDiagnosticsUtilitiesVersion) 17.13.39960 17.13.24 @@ -70,8 +70,8 @@ 4.5.5 8.0.0 - 18.0.0-preview-1-10727-193 - 18.0.0-preview-1-10804-064 + 18.0.0-preview-1-10807-200 + 18.0.0-preview-1-10807-200 17.12.35519.223 5.0.0 6.1.0 From 8cb4166fbb6f90bca13d623acf1b0768051abb81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Wed, 9 Jul 2025 13:59:18 +0200 Subject: [PATCH 4/7] Add test for tpv0 --- ...RunTestsWithDifferentConfigurationTests.cs | 68 ++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) 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] From aa5d80673e182c080da272862df80807d970982e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Mon, 14 Jul 2025 16:37:00 +0200 Subject: [PATCH 5/7] Update package versions to the ones that are patched to remove cuit --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 32dee94633..dcba6d24a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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. --> - 18.0.0-preview-1-10807-200 + 18.0.0-preview-1-10811-208 $(MicrosoftVisualStudioDiagnosticsUtilitiesVersion) 17.13.39960 17.13.24 @@ -70,8 +70,8 @@ 4.5.5 8.0.0 - 18.0.0-preview-1-10807-200 - 18.0.0-preview-1-10807-200 + 18.0.0-preview-1-10811-208 + 18.0.0-preview-1-10811-208 17.12.35519.223 5.0.0 6.1.0 From a7253c150d69087798c8847efd431b21c8b43bc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Tue, 15 Jul 2025 09:49:34 +0200 Subject: [PATCH 6/7] Skip CC tests and flaky debugger tests --- .../TestPlatformNugetPackageTests.cs | 1 + .../TranslationLayerTests/CustomTestHostTests.cs | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) 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 From 51c256fa187949b699873233b882944a163dc42e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Tue, 15 Jul 2025 11:23:47 +0200 Subject: [PATCH 7/7] Disable capture output to see errors and to avoid race condition --- Directory.Build.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Directory.Build.props b/Directory.Build.props index 762da32487..f8aef03798 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -136,6 +136,8 @@ MSTest $(TestRunnerAdditionalArguments) --filter "TestCategory!=Windows&TestCategory!=Windows-Review" + + false