Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/verify-nupkgs.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
</PackageDescription>
<!-- Override default license -->
<PackageLicenseFile>LICENSE_VS.txt</PackageLicenseFile>
Expand Down Expand Up @@ -100,7 +94,6 @@
<PackageReference Include="Microsoft.Internal.TestPlatform.Extensions" Version="$(MicrosoftInternalTestPlatformExtensions)" PrivateAssets="All" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.VisualStudio.TraceDataCollector" Version="$(MicrosoftInternalCodeCoverageVersion)" PrivateAssets="All" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.Internal.CodeCoverage" Version="$(MicrosoftInternalCodeCoverageVersion)" PrivateAssets="All" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.VisualStudio.CUIT" Version="$(TestPlatformExternalsVersion)" PrivateAssets="All" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="$(MicrosoftVSSDKBuildToolsVersion)" PrivateAssets="All" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness" Version="$(MicrosoftFakesVersion)" PrivateAssets="All" GeneratePathProperty="true" />
<PackageReference Include="Microsoft.VisualStudio.Telemetry" Version="$(MicrosoftVSTelemetryVersion)" PrivateAssets="All" GeneratePathProperty="true" />
Expand All @@ -125,7 +118,6 @@
<MicrosoftVisualStudioQualityToolsDataCollectorsFiles Include="$(PkgMicrosoft_VisualStudio_QualityTools_DataCollectors)\tools\net451\**\*"></MicrosoftVisualStudioQualityToolsDataCollectorsFiles>
<MicrosoftInternalTestPlatformExtensionsFiles Include="$(PkgMicrosoft_Internal_TestPlatform_Extensions)\tools\net451\**\*"></MicrosoftInternalTestPlatformExtensionsFiles>
<MicrosoftInternalCodeCoverageFiles Include="$(PkgMicrosoft_Internal_CodeCoverage)\contentFiles\MS.TP\**\*"></MicrosoftInternalCodeCoverageFiles>
<MicrosoftVisualStudioCUITFiles Include="$(PkgMicrosoft_VisualStudio_CUIT)\tools\net451\**\*"></MicrosoftVisualStudioCUITFiles>
<MicrosoftVSSDKBuildToolsFiles Include="$(PkgMicrosoft_VSSDK_BuildTools)\tools\vssdk\**\*"></MicrosoftVSSDKBuildToolsFiles>
<MicrosoftQualityToolsTestingFakesTestRunnerHarnessFiles Include="$(PkgMicrosoft_QualityTools_Testing_Fakes_TestRunnerHarness)\contentFiles\**\*"></MicrosoftQualityToolsTestingFakesTestRunnerHarnessFiles>
<MicrosoftInternalTestPlatformRemoteFiles Include="$(PkgMicrosoft_Internal_TestPlatform_Remote)\tools\netstandard\**\*"></MicrosoftInternalTestPlatformRemoteFiles>
Expand All @@ -148,7 +140,6 @@
<Copy SourceFiles="@(MicrosoftVisualStudioQualityToolsDataCollectorsFiles)" DestinationFiles="$(OutDir)\Microsoft.VisualStudio.QualityTools.DataCollectors\%(RecursiveDir)%(Filename)%(Extension)" />
<Copy SourceFiles="@(MicrosoftInternalTestPlatformExtensionsFiles)" DestinationFiles="$(OutDir)\Microsoft.Internal.TestPlatform.Extensions\%(RecursiveDir)%(Filename)%(Extension)" />
<Copy SourceFiles="@(MicrosoftInternalCodeCoverageFiles)" DestinationFiles="$(OutDir)\Microsoft.Internal.CodeCoverage\%(RecursiveDir)%(Filename)%(Extension)" />
<Copy SourceFiles="@(MicrosoftVisualStudioCUITFiles)" DestinationFolder="$(OutDir)\Microsoft.VisualStudio.CUIT" />
<Copy SourceFiles="@(MicrosoftVSSDKBuildToolsFiles)" DestinationFolder="$(OutDir)\Microsoft.VSSDK.BuildTools" />
<Copy SourceFiles="@(MicrosoftQualityToolsTestingFakesTestRunnerHarnessFiles)" DestinationFiles="$(OutDir)\Microsoft.QualityTools.Testing.Fakes.TestRunnerHarness\%(RecursiveDir)%(Filename)%(Extension)" />
<Copy SourceFiles="@(MicrosoftVisualStudioTelemetryFiles)" DestinationFiles="$(OutDir)\%(RecursiveDir)%(Filename)%(Extension)" />
Expand Down
36 changes: 0 additions & 36 deletions src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@
<file src="net48\Microsoft.VisualStudio.TestPlatform.Client.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.Client.dll" />
<file src="net48\Microsoft.VisualStudio.TestPlatform.Common.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.Common.dll" />
<file src="net48\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" />
<file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.sxs.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.sxs.manifest" />
<file src="net48\Microsoft.VisualStudio.QualityTools\Microsoft.VisualStudio.TestTools.UITest.Playback.Engine.sxs.manifest" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Playback.Engine.sxs.manifest" />
<file src="net48\Newtonsoft.Json.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Newtonsoft.Json.dll" />
<file src="net48\Microsoft.VisualStudio.QualityTools\QTAgent.exe" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent.exe" />
<file src="net48\Microsoft.VisualStudio.QualityTools\QTAgent.exe.Config" target="tools\net462\Common7\IDE\Extensions\TestPlatform\QTAgent.exe.Config" />
Expand Down Expand Up @@ -438,40 +436,6 @@
<file src="net48\Microsoft.Internal.CodeCoverage\TestPlatform\**\*" target="tools\net462\Common7\IDE\Extensions\TestPlatform\" />
<file src="net48\Microsoft.Internal.CodeCoverage\Dynamic Code Coverage Tools\**\*" target="tools\net462\Team Tools\Dynamic Code Coverage Tools\" />

<!-- CUIT -->
<file src="net48\Microsoft.VisualStudio.CUIT\Interop.UIAutomationClient.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Interop.UIAutomationClient.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.ShDocVw.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.ShDocVw.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.Diagnostics.Measurement.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Diagnostics.Measurement.dll" />
<file src="net48\Microsoft.VisualStudio.Interop.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.Interop.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.QualityTools.CodedUITestFramework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.CodedUITestFramework.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.QualityTools.Sqm.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.QualityTools.Sqm.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Common.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Common.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.MSAA.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.MSAA.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.ExtensionUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.ExtensionUtilities.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Framework.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Framework.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Logging.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Logging.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Playback.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Playback.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.WindowsStoreUtility.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.WindowsStoreUtility.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITesting.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITesting.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.Interop.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.Interop.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Playback.Engine.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Playback.Engine.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Synchronization.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\Microsoft.VisualStudio.TestTools.UITest.Synchronization.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\UIAComWrapper.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\UIAComWrapper.dll" />

<file src="net48\Microsoft.VisualStudio.CUIT\IEPropertyConfiguration.xml" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\IEPropertyConfiguration.xml" />
<file src="net48\Microsoft.VisualStudio.CUIT\IEPropertyConfiguration.xsd" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\IEPropertyConfiguration.xsd" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.CrossBrowser.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.CrossBrowser.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.EventHelper.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.EventHelper.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE64.Communication.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE64.Communication.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.Interop.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.Interop.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.Uia.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.Uia.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.UiaWidget.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.UiaWidget.dll" />
<file src="net48\Microsoft.VisualStudio.CUIT\Microsoft.VisualStudio.TestTools.UITest.Extension.UiaWidget.UIAHtmlElementUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\CUITPlugins\Microsoft.VisualStudio.TestTools.UITest.Extension.UiaWidget.UIAHtmlElementUtilities.dll" />

<!-- .NET Core testhost and CPP adapter -->
<file src="net48\Microsoft.Internal.TestPlatform.Extensions\Extensions\Cpp\dbghelp.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\dbghelp.dll" />
<file src="net48\Microsoft.TestPlatform.CommunicationUtilities.dll" target="tools\net462\Common7\IDE\Extensions\TestPlatform\TestHostNet\Microsoft.TestPlatform.CommunicationUtilities.dll" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
<TestPlatformCliBinFolder>$(ArtifactsBinDir)Microsoft.TestPlatform.CLI\$(Configuration)\$(NetFrameworkMinimum)\</TestPlatformCliBinFolder>
<TestPlatformBinFolder>$(ArtifactsBinDir)Microsoft.TestPlatform\$(Configuration)\$(NetFrameworkRunnerTargetFramework)\</TestPlatformBinFolder>
<MsDiaFolder>$(TestPlatformBinFolder)Microsoft.Internal.Dia\</MsDiaFolder>
<CUITFolder>$(TestPlatformBinFolder)Microsoft.VisualStudio.CUIT\</CUITFolder>
<CodeCoverageIOFolder>$(TestPlatformBinFolder)Microsoft.CodeCoverage.IO\</CodeCoverageIOFolder>
<VSQualityToolsFolder>$(TestPlatformBinFolder)Microsoft.VisualStudio.QualityTools\</VSQualityToolsFolder>
<DependencyModelFolder>$(TestPlatformBinFolder)Microsoft.Extensions.DependencyModel\</DependencyModelFolder>
Expand Down Expand Up @@ -141,25 +140,6 @@
</VsixSourceItem>
</ItemGroup>

<!-- CUIT -->
<ItemGroup>
<VsixSourceItem Include="$(CUITFolder)Microsoft.VisualStudio.TestTools.UITest.Extension.*.dll" Exclude="$(CUITFolder)Microsoft.VisualStudio.TestTools.UITest.Extension.MSAA.dll">
<VSIXSubPath>CUITPlugins</VSIXSubPath>
</VsixSourceItem>
<VsixSourceItem Include="$(CUITFolder)IEPropertyConfiguration.*">
<VSIXSubPath>CUITPlugins</VSIXSubPath>
</VsixSourceItem>
<VsixSourceItem Include="$(CUITFolder)Microsoft.VisualStudio.TestTools.UITest.*.dll" Exclude="$(CUITFolder)Microsoft.VisualStudio.TestTools.UITest.Extension.CrossBrowser.dll;$(CUITFolder)Microsoft.VisualStudio.TestTools.UITest.Extension.IE*;$(CUITFolder)Microsoft.VisualStudio.TestTools.UITest.Extension.Uia*;" />
<VsixSourceItem Include="$(CUITFolder)Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.dll" />
<VsixSourceItem Include="$(CUITFolder)Microsoft.VisualStudio.TestTools.UITest.Extension.IE.Communication.Interop.dll" />
<VsixSourceItem Include="$(CUITFolder)Microsoft.VisualStudio.QualityTools.*.dll" />
<VsixSourceItem Include="$(CUITFolder)Interop.UIAutomationClient.dll" />
<VsixSourceItem Include="$(CUITFolder)Microsoft.ShDocVw.dll" />
<VsixSourceItem Include="$(CUITFolder)Microsoft.VisualStudio.Diagnostics.Measurement.dll" />
<VsixSourceItem Include="$(CUITFolder)Microsoft.VisualStudio.TestTools.UITesting.dll" />
<VsixSourceItem Include="$(CUITFolder)UIAComWrapper.dll" />
</ItemGroup>

<!-- Code Coverage -->
<ItemGroup>
<VsixSourceItem Include="$(CodeCoverageIOFolder)Microsoft.CodeCoverage.IO.dll" />
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
Loading
Loading