From 802e2f6f1ffcf9f8c23a2aee07f49a4bb64fd806 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 30 Jun 2025 09:34:38 +0000
Subject: [PATCH 1/8] Initial plan
From 86f71dff3221fe758ef72f9602065f3ac42f7f59 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 30 Jun 2025 09:41:46 +0000
Subject: [PATCH 2/8] Remove CUIT project and package references
Co-authored-by: drognanar <3418274+drognanar@users.noreply.github.com>
---
.../Microsoft.TestPlatform.csproj | 12 ++---
.../Microsoft.TestPlatform.nuspec | 34 +-------------
...tudio.TestTools.TestPlatform.V2.CLI.csproj | 21 +--------
.../CUITTest.cs | 37 ---------------
.../CUITTestProject/CUITTestProject.csproj | 47 -------------------
.../CUITTestProject/CodedUITest1.cs | 18 -------
test/TestAssets/TestAssets.sln | 8 +---
7 files changed, 8 insertions(+), 169 deletions(-)
delete mode 100644 test/Microsoft.TestPlatform.Acceptance.IntegrationTests/CUITTest.cs
delete mode 100644 test/TestAssets/CUITTestProject/CUITTestProject.csproj
delete mode 100644 test/TestAssets/CUITTestProject/CodedUITest1.cs
diff --git a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj
index 46ebe5d69b..b24befd565 100644
--- a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj
+++ b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj
@@ -25,12 +25,6 @@
This package contains the full set of binaries for the Visual Studio Test Platform (vstest).
It provides a modern, cross platform testing engine that powers the testing on .NET Core as well.
It integrates with popular test frameworks like MSTest(v1 and v2), xUnit and Nunit with support for extensibility.
-
- The package supports running Coded UI tests.
- While running Coded UI tests, you must ensure that the package version matches the major version of Visual Studio used to build the test binaries.
- For example, if your Coded UI test project was built using Visual Studio 2019 (version 16.x), you must use test platform version 16.x.
- Coded UI test is deprecated (https://docs.microsoft.com/en-us/visualstudio/releases/2019/release-notes-preview#test-tools) and
- Visual Studio 2019 (Test Platform version 16.x) will be the last version with Coded UI test functionality.
LICENSE_VS.txt
@@ -102,7 +96,7 @@
-
+
@@ -128,7 +122,7 @@
-
+
@@ -152,7 +146,7 @@
-
+
diff --git a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
index a2e27146bc..3d5421d8ff 100644
--- a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
+++ b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
@@ -477,39 +477,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj
index bf5410cb19..343dab91d8 100644
--- a/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj
+++ b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj
@@ -31,7 +31,7 @@
$(ArtifactsBinDir)Microsoft.TestPlatform.CLI\$(Configuration)\$(NetFrameworkMinimum)\
$(ArtifactsBinDir)Microsoft.TestPlatform\$(Configuration)\$(NetFrameworkRunnerTargetFramework)\
$(TestPlatformBinFolder)Microsoft.Internal.Dia\
- $(TestPlatformBinFolder)Microsoft.VisualStudio.CUIT\
+
$(TestPlatformBinFolder)Microsoft.CodeCoverage.IO\
$(TestPlatformBinFolder)Microsoft.VisualStudio.QualityTools\
$(TestPlatformBinFolder)Microsoft.Extensions.DependencyModel\
@@ -141,24 +141,7 @@
-
-
-
- CUITPlugins
-
-
- CUITPlugins
-
-
-
-
-
-
-
-
-
-
-
+
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/CUITTest.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/CUITTest.cs
deleted file mode 100644
index 96f8da27c6..0000000000
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/CUITTest.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using Microsoft.TestPlatform.TestUtilities;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace Microsoft.TestPlatform.AcceptanceTests;
-
-[TestClass]
-[TestCategory("Windows-Review")]
-public class CuitTest : AcceptanceTestBase
-{
- [TestMethod]
- [TestCategory("Windows-Review")]
- [NetFullTargetFrameworkDataSource]
- public void CuitRunAllTests(RunnerInfo runnerInfo)
- {
- SetTestEnvironment(_testEnvironment, runnerInfo);
- CuitRunAll(runnerInfo);
- }
-
- private void CuitRunAll(RunnerInfo runnerInfo)
- {
- if (runnerInfo.IsNetRunner)
- {
- Assert.Inconclusive("CUIT tests are not supported with .NET Core runner.");
- return;
- }
-
- var assemblyAbsolutePath = _testEnvironment.GetTestAsset("CUITTestProject.dll", "net462");
- var arguments = PrepareArguments(assemblyAbsolutePath, string.Empty, string.Empty, FrameworkArgValue, resultsDirectory: TempDirectory.Path);
- arguments += " -- RunConfiguration.TargetPlatform=x86";
-
- InvokeVsTest(arguments);
- ValidateSummaryStatus(1, 0, 0);
- }
-}
diff --git a/test/TestAssets/CUITTestProject/CUITTestProject.csproj b/test/TestAssets/CUITTestProject/CUITTestProject.csproj
deleted file mode 100644
index 44dffdbef0..0000000000
--- a/test/TestAssets/CUITTestProject/CUITTestProject.csproj
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
- true
- true
-
-
-
- CUITTestProject
- $(NetFrameworkMinimum)
- Exe
-
-
-
-
- ..\..\..\.packages\microsoft.visualstudio.cuit\$(TestPlatformExternalsVersion)\tools\net451\Microsoft.VisualStudio.QualityTools.CodedUITestFramework.dll
-
-
- ..\..\..\.packages\microsoft.visualstudio.qualitytools\$(TestPlatformExternalsVersion)\tools\net451\Microsoft.VisualStudio.QualityTools.UnitTestFramework.dll
-
-
- ..\..\..\.packages\microsoft.visualstudio.cuit\$(TestPlatformExternalsVersion)\tools\net451\Microsoft.VisualStudio.TestTools.UITest.Common.dll
-
-
- ..\..\..\.packages\microsoft.visualstudio.cuit\$(TestPlatformExternalsVersion)\tools\net451\Microsoft.VisualStudio.TestTools.UITest.Extension.dll
-
-
- ..\..\..\.packages\microsoft.visualstudio.cuit\$(TestPlatformExternalsVersion)\tools\net451\Microsoft.VisualStudio.TestTools.UITesting.dll
-
-
-
-
-
-
-
- $(TestPlatformExternalsVersion)
-
-
- $(TestPlatformExternalsVersion)
-
-
-
-
-
-
-
diff --git a/test/TestAssets/CUITTestProject/CodedUITest1.cs b/test/TestAssets/CUITTestProject/CodedUITest1.cs
deleted file mode 100644
index 808ac345d0..0000000000
--- a/test/TestAssets/CUITTestProject/CodedUITest1.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using Microsoft.VisualStudio.TestTools.UITesting;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace CodedUITestProject
-{
- [CodedUITest]
- public class CodedUITestProject
- {
- [TestMethod]
- public void CodedUITestMethod1()
- {
- UITestControl.Desktop.DrawHighlight();
- }
- }
-}
diff --git a/test/TestAssets/TestAssets.sln b/test/TestAssets/TestAssets.sln
index 636eab172d..e12a3f1d25 100644
--- a/test/TestAssets/TestAssets.sln
+++ b/test/TestAssets/TestAssets.sln
@@ -31,8 +31,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProjectx86", "Sim
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProjectARM64", "SimpleTestProjectARM64\SimpleTestProjectARM64.csproj", "{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CUITTestProject", "CUITTestProject\CUITTestProject.csproj", "{CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}"
-EndProject
+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DisableAppdomainTest1", "DisableAppdomainTest1\DisableAppdomainTest1.csproj", "{36C7990F-0A36-47CE-8E10-7887D24E2F9A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DisableAppdomainTest2", "DisableAppdomainTest2\DisableAppdomainTest2.csproj", "{A09B21CC-F726-413A-B185-3AE1172BAED0}"
@@ -198,10 +197,7 @@ Global
{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7C865EAA-C6C2-4CAF-A6AD-D9CF29577A36}.Release|Any CPU.Build.0 = Release|Any CPU
- {CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {CF46C8A0-E9FA-40E9-96CA-DCD3797546D8}.Release|Any CPU.Build.0 = Release|Any CPU
+
{36C7990F-0A36-47CE-8E10-7887D24E2F9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36C7990F-0A36-47CE-8E10-7887D24E2F9A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36C7990F-0A36-47CE-8E10-7887D24E2F9A}.Release|Any CPU.ActiveCfg = Release|Any CPU
From 144ed08a9c99243a3e4a3c7197ae70e71372fa1c Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 30 Jun 2025 09:46:34 +0000
Subject: [PATCH 3/8] Remove remaining CUIT manifest references and cleanup
BingWebTest project
Co-authored-by: drognanar <3418274+drognanar@users.noreply.github.com>
---
.../Microsoft.TestPlatform.nuspec | 3 +--
.../BingWebTest/BingWebTest.csproj | 21 ++-----------------
2 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
index 3d5421d8ff..e373ae5014 100644
--- a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
+++ b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
@@ -98,8 +98,7 @@
-
-
+
diff --git a/test/TestAssets/QualityToolsAssets/BingWebTest/BingWebTest.csproj b/test/TestAssets/QualityToolsAssets/BingWebTest/BingWebTest.csproj
index e9c0056a3f..4caf3dc25b 100644
--- a/test/TestAssets/QualityToolsAssets/BingWebTest/BingWebTest.csproj
+++ b/test/TestAssets/QualityToolsAssets/BingWebTest/BingWebTest.csproj
@@ -17,7 +17,7 @@
10.0
$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)
$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages
- False
+
true
@@ -54,24 +54,7 @@
PreserveNewest
-
-
-
-
- False
-
-
- False
-
-
- False
-
-
- False
-
-
-
-
+
diff --git a/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj
index 343dab91d8..428a98d2e7 100644
--- a/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj
+++ b/src/package/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.csproj
@@ -31,7 +31,6 @@
$(ArtifactsBinDir)Microsoft.TestPlatform.CLI\$(Configuration)\$(NetFrameworkMinimum)\
$(ArtifactsBinDir)Microsoft.TestPlatform\$(Configuration)\$(NetFrameworkRunnerTargetFramework)\
$(TestPlatformBinFolder)Microsoft.Internal.Dia\
-
$(TestPlatformBinFolder)Microsoft.CodeCoverage.IO\
$(TestPlatformBinFolder)Microsoft.VisualStudio.QualityTools\
$(TestPlatformBinFolder)Microsoft.Extensions.DependencyModel\
@@ -141,8 +140,6 @@
-
-
From 96425e18819991e49a9dfd0336fd8b22c7e25a0d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 30 Jun 2025 10:36:11 +0000
Subject: [PATCH 7/8] Update expected file count for Microsoft.TestPlatform
package to 586
Co-authored-by: drognanar <3418274+drognanar@users.noreply.github.com>
---
eng/verify-nupkgs.ps1 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/eng/verify-nupkgs.ps1 b/eng/verify-nupkgs.ps1
index f1595e100f..f1972a4a74 100644
--- a/eng/verify-nupkgs.ps1
+++ b/eng/verify-nupkgs.ps1
@@ -19,7 +19,7 @@ function Verify-Nuget-Packages {
$expectedNumOfFiles = @{
"Microsoft.CodeCoverage" = 59;
"Microsoft.NET.Test.Sdk" = 25;
- "Microsoft.TestPlatform" = 619;
+ "Microsoft.TestPlatform" = 586;
"Microsoft.TestPlatform.Build" = 20;
"Microsoft.TestPlatform.CLI" = 481;
"Microsoft.TestPlatform.Extensions.TrxLogger" = 34;
From 78ccf1d8ba5f3ef5c1ca9659601f060997d63f46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Jare=C5=A1?=
Date: Mon, 7 Jul 2025 16:55:26 +0200
Subject: [PATCH 8/8] Ignore legacy tests that load CUIT and fail
---
.../RunsettingsTests.cs | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/RunsettingsTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/RunsettingsTests.cs
index 3546759ab5..ba0c8910aa 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/RunsettingsTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/RunsettingsTests.cs
@@ -307,6 +307,7 @@ public void LegacySettingsWithPlatform(RunnerInfo runnerInfo)
}
[TestMethod]
+ [Ignore("Ignore until we have new host available with CUIT removed.")]
[TestCategory("Windows-Review")]
[NetFullTargetFrameworkDataSourceAttribute(inIsolation: true, useCoreRunner: false)]
public void LegacySettingsWithScripts(RunnerInfo runnerInfo)
@@ -353,6 +354,7 @@ public void LegacySettingsWithScripts(RunnerInfo runnerInfo)
}
[TestMethod]
+ [Ignore("Ignore until we have new host available with CUIT removed.")]
[TestCategory("Windows-Review")]
[NetFullTargetFrameworkDataSourceAttribute(inIsolation: true, useCoreRunner: false)]
public void LegacySettingsWithDeploymentItem(RunnerInfo runnerInfo)
@@ -390,6 +392,7 @@ public void LegacySettingsWithDeploymentItem(RunnerInfo runnerInfo)
}
[TestMethod]
+ [Ignore("Ignore until we have new host available with CUIT removed.")]
[TestCategory("Windows")]
[NetFullTargetFrameworkDataSourceAttribute(inIsolation: true, useCoreRunner: false)]
public void LegacySettingsTestTimeout(RunnerInfo runnerInfo)
@@ -417,6 +420,7 @@ public void LegacySettingsTestTimeout(RunnerInfo runnerInfo)
}
[TestMethod]
+ [Ignore("Ignore until we have new host available with CUIT removed.")]
[TestCategory("Windows-Review")]
[NetFullTargetFrameworkDataSourceAttribute(inIsolation: true, useCoreRunner: false)]
public void LegacySettingsAssemblyResolution(RunnerInfo runnerInfo)