From 051b50804cd1bd5a4f3b8f252df7a7857f58fe4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Thu, 16 Feb 2023 16:15:07 +0100 Subject: [PATCH 1/8] Fix build --- global.json | 4 ++-- scripts/build/TestPlatform.Dependencies.props | 2 +- scripts/common.lib.ps1 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/global.json b/global.json index aa34bbd791..f7d579ba06 100644 --- a/global.json +++ b/global.json @@ -1,12 +1,12 @@ { "sdk": { - "version": "6.0.100-rc.1.21379.2", + "version": "6.0.114", "rollForward": "minor", "allowPrerelease": false, "architecture": "x64" }, "tools": { - "dotnet": "6.0.100-rc.1.21379.2" + "dotnet": "6.0.114" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21427.6", diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props index ec3d316d44..02d7fc795c 100644 --- a/scripts/build/TestPlatform.Dependencies.props +++ b/scripts/build/TestPlatform.Dependencies.props @@ -1,4 +1,4 @@ - + 15.8.3247 diff --git a/scripts/common.lib.ps1 b/scripts/common.lib.ps1 index b46fb26c47..7a3b4f4bb2 100644 --- a/scripts/common.lib.ps1 +++ b/scripts/common.lib.ps1 @@ -98,7 +98,7 @@ function Install-DotNetCli Write-Log "Install-DotNetCli: Get the latest dotnet cli toolset..." $dotnetInstallPath = Join-Path $env:TP_TOOLS_DIR "dotnet" New-Item -ItemType directory -Path $dotnetInstallPath -Force | Out-Null - & $dotnetInstallScript -Channel 6.0 -Quality Preview -InstallDir $dotnetInstallPath -Version $env:DOTNET_CLI_VERSION + & $dotnetInstallScript -Channel 6.0.100 -InstallDir $dotnetInstallPath -Version $env:DOTNET_CLI_VERSION & $dotnetInstallScript -InstallDir "$dotnetInstallPath" -Runtime 'dotnet' -Version '2.1.0' -Channel '2.1.0' -Architecture x64 -NoPath $env:DOTNET_ROOT= $dotnetInstallPath From fccd6c6b15ce515f04f7c694312529bb202569d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Thu, 30 Jun 2022 11:25:35 +0200 Subject: [PATCH 2/8] Upgrade to Newtonsoft.Json 13.0.1 (#3815) --- eng/Versions.props | 2 +- .../Microsoft.TestPlatform.Protocol.csproj | 4 +--- scripts/build.ps1 | 4 ++-- scripts/build.sh | 2 +- scripts/build/TestPlatform.Dependencies.props | 2 +- src/package/ThirdPartyNotices.txt | 2 +- src/testhost.x86/app.config | 5 +++++ src/testhost/app.config | 7 ++++++- src/vstest.console/app.config | 7 ++++++- .../Hosting/DotnetTestHostManagerTests.cs | 10 +++++----- test/TestAssets/NewtonSoftDependency/App.config | 2 +- .../NewtonSoftDependency/NewtonSoftDependency.csproj | 4 +++- 12 files changed, 33 insertions(+), 18 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 10fdae546e..25134f0ff0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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 diff --git a/samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj b/samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj index c3ecb6ac02..3e6609ddc4 100644 --- a/samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj +++ b/samples/Microsoft.TestPlatform.Protocol/Microsoft.TestPlatform.Protocol.csproj @@ -6,8 +6,6 @@ - - 9.0.1 - + diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 726d07c52d..e113951183 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -462,11 +462,11 @@ function Publish-Package } # Copy dependency of Microsoft.TestPlatform.TestHostRuntimeProvider - $newtonsoft = Join-Path $env:TP_PACKAGES_DIR "newtonsoft.json\9.0.1\lib\net45\Newtonsoft.Json.dll" + $newtonsoft = Join-Path $env:TP_PACKAGES_DIR "newtonsoft.json\13.0.1\lib\net45\Newtonsoft.Json.dll" Write-Verbose "Copy-Item $newtonsoft $fullCLRPackage451Dir -Force" Copy-Item $newtonsoft $fullCLRPackage451Dir -Force - $newtonsoft = Join-Path $env:TP_PACKAGES_DIR "newtonsoft.json\9.0.1\lib\netstandard1.0\Newtonsoft.Json.dll" + $newtonsoft = Join-Path $env:TP_PACKAGES_DIR "newtonsoft.json\13.0.1\lib\netstandard1.0\Newtonsoft.Json.dll" Write-Verbose "Copy-Item $newtonsoft $coreCLR20PackageDir -Force" Copy-Item $newtonsoft $coreCLR20PackageDir -Force diff --git a/scripts/build.sh b/scripts/build.sh index 7ba14d50d6..a4eee644b1 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -435,7 +435,7 @@ function publish_package() done #*************************************************************************************************************# - newtonsoft=$TP_PACKAGES_DIR/newtonsoft.json/9.0.1/lib/netstandard1.0/Newtonsoft.Json.dll + newtonsoft=$TP_PACKAGES_DIR/newtonsoft.json/13.0.1/lib/netstandard1.0/Newtonsoft.Json.dll cp $newtonsoft $packageDir done diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props index 02d7fc795c..ea2e3bf455 100644 --- a/scripts/build/TestPlatform.Dependencies.props +++ b/scripts/build/TestPlatform.Dependencies.props @@ -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/src/package/ThirdPartyNotices.txt b/src/package/ThirdPartyNotices.txt index 8efcee2fa8..4c85ae8285 100644 --- a/src/package/ThirdPartyNotices.txt +++ b/src/package/ThirdPartyNotices.txt @@ -8,7 +8,7 @@ and the licenses under which Microsoft received such components are set forth be informational purposes only. Microsoft reserves all rights not expressly granted herein, whether by implication, estoppel or otherwise. -1. Newtonsoft version 9.0.1 (https://github.com/JamesNK/Newtonsoft.Json) +1. Newtonsoft version 13.0.1 (https://github.com/JamesNK/Newtonsoft.Json) 2. Mono.Cecil version 0.11.3 (https://github.com/jbevain/cecil) diff --git a/src/testhost.x86/app.config b/src/testhost.x86/app.config index 254425ccbe..a7be49fb01 100644 --- a/src/testhost.x86/app.config +++ b/src/testhost.x86/app.config @@ -46,6 +46,11 @@ + + + + + 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.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 @@ - + + From 459abb21c90470c4ba385f0e7012bf26ebefd4a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Thu, 16 Feb 2023 16:49:13 +0100 Subject: [PATCH 3/8] Upgrade arcade --- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) 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 25134f0ff0..2974a26fd3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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 + 17.0.2 preview false 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 - 17.0.1-dev + 17.0.2-dev 2.1.0 2.1.0