diff --git a/eng/verify-nupkgs.ps1 b/eng/verify-nupkgs.ps1 index 28ac75bd1f..1d571723de 100644 --- a/eng/verify-nupkgs.ps1 +++ b/eng/verify-nupkgs.ps1 @@ -19,7 +19,7 @@ function Verify-Nuget-Packages { $expectedNumOfFiles = @{ "Microsoft.CodeCoverage" = 75; "Microsoft.NET.Test.Sdk" = 25; - "Microsoft.TestPlatform" = 634; + "Microsoft.TestPlatform" = 601; "Microsoft.TestPlatform.Build" = 20; "Microsoft.TestPlatform.CLI" = 481; "Microsoft.TestPlatform.Extensions.TrxLogger" = 34; diff --git a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj index 00d4586f62..194eac7e86 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 @@ -100,7 +94,6 @@ - @@ -125,7 +118,6 @@ - @@ -148,7 +140,6 @@ - diff --git a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec index f5b07c6ce7..75cdafdd6b 100644 --- a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec +++ b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec @@ -96,8 +96,6 @@ - - @@ -438,40 +436,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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..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.VisualStudio.CUIT\ $(TestPlatformBinFolder)Microsoft.CodeCoverage.IO\ $(TestPlatformBinFolder)Microsoft.VisualStudio.QualityTools\ $(TestPlatformBinFolder)Microsoft.Extensions.DependencyModel\ @@ -141,25 +140,6 @@ - - - - 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/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) 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/QualityToolsAssets/BingWebTest/BingWebTest.csproj b/test/TestAssets/QualityToolsAssets/BingWebTest/BingWebTest.csproj index e9c0056a3f..248b264e3e 100644 --- a/test/TestAssets/QualityToolsAssets/BingWebTest/BingWebTest.csproj +++ b/test/TestAssets/QualityToolsAssets/BingWebTest/BingWebTest.csproj @@ -17,7 +17,6 @@ 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False true @@ -54,24 +53,6 @@ PreserveNewest - - - - - False - - - False - - - False - - - False - - - -