diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 4eff80d6fe..6a3e061e09 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -11,7 +11,7 @@
8c7b3dcd2bd657c11b12973f1214e7c3c616b174
-
+
https://github.com/dotnet/runtime
30ab651fcb4354552bd4891619a0bdd81e0ebdbf
@@ -21,7 +21,7 @@
7d57652f33493fa022125b7f63aad0d70c52d810
-
+
https://github.com/dotnet/core-setup
7d57652f33493fa022125b7f63aad0d70c52d810
diff --git a/eng/Versions.props b/eng/Versions.props
index 7d09135418..98006b5190 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -65,8 +65,8 @@
8.0.0
4.5.5
8.0.0
- 18.0.0-preview-1-10811-208
- 18.0.0-preview-1-10811-208
+ 18.0.0-preview-1-10911-061
+ 18.0.0-preview-1-10911-061
17.12.35519.223
5.0.0
6.1.0
diff --git a/eng/verify-nupkgs.ps1 b/eng/verify-nupkgs.ps1
index 1d571723de..57c4d49072 100644
--- a/eng/verify-nupkgs.ps1
+++ b/eng/verify-nupkgs.ps1
@@ -17,18 +17,19 @@ Add-Type -AssemblyName System.IO.Compression.FileSystem
function Verify-Nuget-Packages {
Write-Host "Starting Verify-Nuget-Packages."
$expectedNumOfFiles = @{
- "Microsoft.CodeCoverage" = 75;
- "Microsoft.NET.Test.Sdk" = 25;
- "Microsoft.TestPlatform" = 601;
- "Microsoft.TestPlatform.Build" = 20;
- "Microsoft.TestPlatform.CLI" = 481;
- "Microsoft.TestPlatform.Extensions.TrxLogger" = 34;
- "Microsoft.TestPlatform.ObjectModel" = 92;
- "Microsoft.TestPlatform.AdapterUtilities" = 61;
- "Microsoft.TestPlatform.Portable" = 608;
- "Microsoft.TestPlatform.TestHost" = 63;
- "Microsoft.TestPlatform.TranslationLayer" = 122;
- "Microsoft.TestPlatform.Internal.Uwp" = 38;
+ "Microsoft.CodeCoverage" = 75
+ "Microsoft.NET.Test.Sdk" = 25
+ "Microsoft.TestPlatform" = 538
+ "Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI" = 380
+ "Microsoft.TestPlatform.Build" = 20
+ "Microsoft.TestPlatform.CLI" = 481
+ "Microsoft.TestPlatform.Extensions.TrxLogger" = 34
+ "Microsoft.TestPlatform.ObjectModel" = 92
+ "Microsoft.TestPlatform.AdapterUtilities" = 61
+ "Microsoft.TestPlatform.Portable" = 608
+ "Microsoft.TestPlatform.TestHost" = 63
+ "Microsoft.TestPlatform.TranslationLayer" = 122
+ "Microsoft.TestPlatform.Internal.Uwp" = 38
}
$packageDirectory = Resolve-Path "$PSScriptRoot/../artifacts/packages/$configuration"
@@ -63,6 +64,9 @@ function Verify-Nuget-Packages {
Write-Host "Found $(@($nugetPackages).Count) nuget packages:`n $($nugetPackages.FullName -join "`n ")"
+
+ $nugetPackages += Get-Item "$PSScriptRoot/../artifacts/VSSetup/$configuration/Insertion/Microsoft.VisualStudio.TestTools.TestPlatform.V2.CLI.vsix"
+
Write-Host "Unzipping NuGet packages to '$tmpDirectory'."
$unzipNugetPackageDirs = @()
foreach ($nugetPackage in $nugetPackages) {
@@ -178,14 +182,6 @@ function Verify-NugetPackageExe {
"TestPlatform\SettingsMigrator.exe" = "x86"
"dump\DumpMinitool.exe" = "x86-64"
-
- "QTAgent32.exe" = "x86"
- "QTAgent32_35.exe" = "x86"
- "QTAgent32_40.exe" = "x86"
- "QTDCAgent32.exe" = "x86"
-
- "V1\VSTestVideoRecorder.exe" = "x86"
- "VideoRecorder\VSTestVideoRecorder.exe" = "x86"
}
$errs = @()
diff --git a/playground/TestPlatform.Playground/Program.cs b/playground/TestPlatform.Playground/Program.cs
index 0cebf6d996..b79b82c5f2 100644
--- a/playground/TestPlatform.Playground/Program.cs
+++ b/playground/TestPlatform.Playground/Program.cs
@@ -35,61 +35,23 @@ static void Main()
var thisAssemblyPath = Assembly.GetEntryAssembly()!.Location;
var here = Path.GetDirectoryName(thisAssemblyPath)!;
- var playground = Path.GetFullPath(Path.Combine(here, "..", "..", "..", ".."));
var console = Path.Combine(here, "vstest.console", "netfx", "vstest.console.exe");
var sourceSettings = $$$"""
-
-
-
-
-
-
-
-
-
-
-
- False
- True
-
-
- 999999
-
-
-
-
-
-
-
-
-
-
-
+
+ true
+
+
+
+
+
+
""";
var sources = new[] {
- Path.Combine(playground, "bin", "MSTest1", "Debug", "net472", "MSTest1.dll"),
- Path.Combine(playground, "bin", "MSTest2", "Debug", "net472", "MSTest2.dll"),
+ @"S:\t\UnitTestProject14\UnitTestProject14\bin\Debug\UnitTestProject14.dll"
// The built in .NET projects don't now work right now in Playground, there is some conflict with Arcade.
// But if you create one outside of Playground it will work.
//Path.Combine(playground, "bin", "MSTest1", "Debug", "net7.0", "MSTest1.dll"),
diff --git a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj
index 194eac7e86..5158174729 100644
--- a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj
+++ b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.csproj
@@ -90,7 +90,6 @@
-
@@ -115,7 +114,6 @@
-
@@ -137,7 +135,6 @@
-
diff --git a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
index 20649d7a03..92cab69a7b 100644
--- a/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
+++ b/src/package/Microsoft.TestPlatform/Microsoft.TestPlatform.nuspec
@@ -55,8 +55,6 @@
-
-
@@ -71,48 +69,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -170,8 +131,6 @@
-
-
@@ -221,18 +180,11 @@
-
-
-
-
-
-
-
@@ -249,7 +201,6 @@
-
@@ -272,25 +223,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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 428a98d2e7..dac1888733 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
@@ -36,7 +36,6 @@
$(TestPlatformBinFolder)Microsoft.Extensions.DependencyModel\
$(TestPlatformBinFolder)Microsoft.Extensions.FileSystemGlobbing\
$(TestPlatformBinFolder)Microsoft.VSSDK.BuildTools\
- $(TestPlatformBinFolder)Microsoft.VisualStudio.QualityTools.DataCollectors\
$(TestPlatformBinFolder)Microsoft.Internal.TestPlatform.Extensions\
@@ -188,16 +187,13 @@
-
- Extensions\VideoRecorder
-
-
+
Extensions
Extensions
-
+
Extensions
@@ -266,26 +262,12 @@
-
-
-
-
- Extensions\V1\x64
-
-
- Extensions\V1\x86
-
-
- Extensions\V1
-
-
-
-
+
diff --git a/src/testhost.x86/app.config b/src/testhost.x86/app.config
index b06017b279..61d2d0fa06 100644
--- a/src/testhost.x86/app.config
+++ b/src/testhost.x86/app.config
@@ -24,26 +24,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/vstest.console/app.config b/src/vstest.console/app.config
index 3f040b9d20..9132c7fde7 100644
--- a/src/vstest.console/app.config
+++ b/src/vstest.console/app.config
@@ -16,10 +16,6 @@
-
-
-
-
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ListExtensionsTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ListExtensionsTests.cs
index 2b03d2126a..b268f3e639 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ListExtensionsTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/ListExtensionsTests.cs
@@ -20,19 +20,13 @@ public void ListDiscoverersShouldShowInboxDiscoverers(RunnerInfo runnerInfo)
if (IsDesktopRunner())
{
- StdOutputContains("executor://codedwebtestadapter/v1");
StdOutputContains("executor://mstestadapter/v1");
- StdOutputContains("executor://webtestadapter/v1");
- StdOutputContains(".Webtest");
StdOutputContains("executor://cppunittestexecutor/v1");
}
else
{
// There are no inbox adapters for dotnet core
- StdOutputDoesNotContains("executor://codedwebtestadapter/v1");
StdOutputDoesNotContains("executor://mstestadapter/v1");
- StdOutputDoesNotContains("executor://webtestadapter/v1");
- StdOutputDoesNotContains(".Webtest");
StdOutputDoesNotContains("executor://cppunittestexecutor/v1");
}
}
@@ -47,18 +41,14 @@ public void ListExecutorsShouldShowInboxExecutors(RunnerInfo runnerInfo)
if (IsDesktopRunner())
{
- StdOutputContains("executor://CodedWebTestAdapter/v1");
StdOutputContains("executor://MSTestAdapter/v1");
- StdOutputContains("executor://WebTestAdapter/v1");
StdOutputContains("executor://CppUnitTestExecutor/v1");
StdOutputContains("executor://UAPCppExecutorIdentifier");
}
else
{
// There are no inbox adapters for dotnet core
- StdOutputDoesNotContains("executor://CodedWebTestAdapter/v1");
StdOutputDoesNotContains("executor://MSTestAdapter/v1");
- StdOutputDoesNotContains("executor://WebTestAdapter/v1");
StdOutputDoesNotContains("executor://CppUnitTestExecutor/v1");
StdOutputDoesNotContains("executor://UAPCppExecutorIdentifier");
}
diff --git a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTestsWithDifferentConfigurationTests.cs b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTestsWithDifferentConfigurationTests.cs
index b7717d4fe5..b1f2757a56 100644
--- a/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTestsWithDifferentConfigurationTests.cs
+++ b/test/Microsoft.TestPlatform.Acceptance.IntegrationTests/TranslationLayerTests/RunTestsWithDifferentConfigurationTests.cs
@@ -188,12 +188,10 @@ public void RunTestsWithTestSettingsInTpv0(RunnerInfo runnerInfo)
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");
+ // Ensure that we are trying to run via tpv0 and failing because that is no longer allowed.
+ StringAssert.Contains(StdErrWithWhiteSpace, "An exception occurred while invoking executor 'executor://mstestadapter/v1': MSTest v1 run was offloaded to legacy TestPlatform runner");
- ValidateSummaryStatus(2, 2, 1);
ExitCodeEquals(1); // failing tests
- StdErrHasTestRunFailedMessageButNoOtherError();
}
[TestMethod]