diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b0afa9aa39..20c1387af2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -4,7 +4,7 @@ jobs: - job: Windows timeoutInMinutes: 120 pool: - vmImage: 'vs2017-win2016' + vmImage: 'windows-latest' variables: buildConfiguration: 'Release' steps: @@ -50,7 +50,7 @@ jobs: dependsOn: Windows timeoutInMinutes: 120 pool: - vmImage: 'vs2017-win2016' + vmImage: 'windows-latest' variables: buildConfiguration: 'Release' steps: diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a99c6d13b3..527949952d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,24 +7,24 @@ - + https://github.com/dotnet/arcade 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade 474307e526160c813c9fd58060eb8356ccca6099 - + https://github.com/dotnet/arcade 474307e526160c813c9fd58060eb8356ccca6099 diff --git a/eng/Versions.props b/eng/Versions.props index 10fdae546e..1c96aa7efa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.0.1 + 17.0.2 preview false @@ -36,7 +36,7 @@ 4.8.3 5.3.0.1 2.3.0 - 9.0.1 + 13.0.1 4.6.0-preview4.19202.2 4.4.0 5.3.0 @@ -60,8 +60,8 @@ 2.4.1 2.0.3 2.4.1 - 6.0.0-beta.21427.6 - 6.0.0-beta.21427.6 + 6.0.0-beta.21460.7 + 6.0.0-beta.21460.7 1.22.0 1.1.2 2.0.0 @@ -73,7 +73,7 @@ 1.7.0 1.1.0-beta.20074.1 1.0.0-beta2-19554-01 - 6.0.0-beta.21427.6 + 6.0.0-beta.21460.7 1.0.0-beta.21272.1 - 17.0.1-dev + 17.0.2-dev 2.1.0 2.1.0 @@ -29,7 +29,7 @@ 5.0.0 5.0.0 - 9.0.1 + 13.0.1 4.8.3 17.0.0-previews-4-31630-230 diff --git a/scripts/build/TestPlatform.Settings.targets b/scripts/build/TestPlatform.Settings.targets index ae4daa11b4..235471c34c 100644 --- a/scripts/build/TestPlatform.Settings.targets +++ b/scripts/build/TestPlatform.Settings.targets @@ -5,7 +5,7 @@ - 17.0.1 + 17.0.2 + + + diff --git a/src/testhost/app.config b/src/testhost/app.config index 2a67681b5e..e889aff770 100644 --- a/src/testhost/app.config +++ b/src/testhost/app.config @@ -46,6 +46,11 @@ + + + + + @@ -61,4 +66,4 @@ - \ No newline at end of file + diff --git a/src/vstest.console/app.config b/src/vstest.console/app.config index e6f209a541..bbc2c9a12b 100644 --- a/src/vstest.console/app.config +++ b/src/vstest.console/app.config @@ -20,6 +20,11 @@ + + + + + @@ -54,4 +59,4 @@ --> - \ No newline at end of file + diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/MultitargetingTestHostTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/MultitargetingTestHostTests.cs index 46c67fb526..568474dcb0 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/MultitargetingTestHostTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/MultitargetingTestHostTests.cs @@ -14,6 +14,7 @@ public class MultitargetingTestHostTests : AcceptanceTestBase { [TestMethod] [TestCategory("Windows-Review")] + [Ignore("Unreliable")] // the underlying test is using xUnit to avoid AppDomain enhancements in MSTest that make this pass even without multitargetting // xUnit supports net452 onwards, so that is why this starts at net452, I also don't test all framework versions [NetCoreRunner(NETFX452_48)] diff --git a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs index 865c5880f3..33697de0ae 100644 --- a/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs +++ b/test/Microsoft.TestPlatform.TestHostProvider.UnitTests/Hosting/DotnetTestHostManagerTests.cs @@ -333,7 +333,7 @@ public void GetTestHostProcessStartInfoShouldUseTestHostExeFromNugetIfNotFoundIn ""microsoft.testplatform.testhost/15.0.0-Dev"": { ""dependencies"": { ""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"", - ""Newtonsoft.Json"": ""9.0.1"" + ""Newtonsoft.Json"": ""13.0.1"" }, ""runtime"": { ""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { }, @@ -403,7 +403,7 @@ public void GetTestHostProcessStartInfoShouldUseTestHostX86ExeFromNugetIfNotFoun ""microsoft.testplatform.testhost/15.0.0-Dev"": { ""dependencies"": { ""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"", - ""Newtonsoft.Json"": ""9.0.1"" + ""Newtonsoft.Json"": ""13.0.1"" }, ""runtime"": { ""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { }, @@ -683,7 +683,7 @@ public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromDepsFile() ""microsoft.testplatform.testhost/15.0.0-Dev"": { ""dependencies"": { ""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"", - ""Newtonsoft.Json"": ""9.0.1"" + ""Newtonsoft.Json"": ""13.0.1"" }, ""runtime"": { ""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { }, @@ -748,7 +748,7 @@ public void GetTestHostProcessStartInfoShouldIncludeTestHostPathFromSourceDirect ""microsoft.testplatform.testhost/15.0.0-Dev"": { ""dependencies"": { ""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"", - ""Newtonsoft.Json"": ""9.0.1"" + ""Newtonsoft.Json"": ""13.0.1"" }, ""runtime"": { ""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { }, @@ -816,7 +816,7 @@ public void GetTestHostProcessStartInfoShouldSkipInvalidAdditionalProbingPaths() ""microsoft.testplatform.testhost/15.0.0-Dev"": { ""dependencies"": { ""Microsoft.TestPlatform.ObjectModel"": ""15.0.0-Dev"", - ""Newtonsoft.Json"": ""9.0.1"" + ""Newtonsoft.Json"": ""13.0.1"" }, ""runtime"": { ""lib/netstandard1.5/Microsoft.TestPlatform.CommunicationUtilities.dll"": { }, diff --git a/test/TestAssets/NewtonSoftDependency/App.config b/test/TestAssets/NewtonSoftDependency/App.config index 776d09c68c..f71f97e6bb 100644 --- a/test/TestAssets/NewtonSoftDependency/App.config +++ b/test/TestAssets/NewtonSoftDependency/App.config @@ -4,7 +4,7 @@ - + diff --git a/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj b/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj index 52bef29035..4966b9b2b9 100644 --- a/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj +++ b/test/TestAssets/NewtonSoftDependency/NewtonSoftDependency.csproj @@ -26,7 +26,9 @@ - + +