From 4de88f7802d89a4f88ff2ba5a583536a20c2dfea Mon Sep 17 00:00:00 2001 From: Medeni Baykal <433724+Haplois@users.noreply.github.com> Date: Fri, 28 Jan 2022 00:41:10 +0100 Subject: [PATCH 1/7] Pathched CVE-2018-8356. --- scripts/build/TestPlatform.Dependencies.props | 1 + ...osoft.TestPlatform.AdapterUtilities.csproj | 28 ++-- ...t.TestPlatform.PlatformAbstractions.csproj | 122 ++++++++++-------- 3 files changed, 84 insertions(+), 67 deletions(-) diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props index 5190258c1c..c48cbaf194 100644 --- a/scripts/build/TestPlatform.Dependencies.props +++ b/scripts/build/TestPlatform.Dependencies.props @@ -51,6 +51,7 @@ 1.2.0 4.3.4 + 4.3.3 true diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj index 4531a45427..4c9fcc1c4a 100644 --- a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj +++ b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj @@ -37,21 +37,29 @@ + + + + + + + + + + True + True + Resources.resx + + + ResXFileCodeGenerator + Resources.Designer.cs + + --> diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj index b8d5dd5a4f..2e75818605 100644 --- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj +++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj @@ -1,66 +1,74 @@  - - ..\..\ - - - - Microsoft.TestPlatform.PlatformAbstractions - Microsoft.TestPlatform.PlatformAbstractions - net45;net451;netcoreapp1.0;netcoreapp2.1;netstandard1.3;netstandard2.0 - $(TargetFrameworks);uap10.0;netstandard1.0 - net6.0 - true - false - - NU1605 - + + ..\..\ + + + + Microsoft.TestPlatform.PlatformAbstractions + Microsoft.TestPlatform.PlatformAbstractions + net45;net451;netcoreapp1.0;netcoreapp2.1;netstandard1.3;netstandard2.0 + $(TargetFrameworks);uap10.0;netstandard1.0 + net6.0 + true + false + + NU1605 + - - false - UAP,Version=v10.0 - UAP - 10.0.14393.0 - 10.0.10240.0 - .NETPortable - v4.5 - $(DefineConstants);WINDOWS_UWP - + + false + UAP,Version=v10.0 + UAP + 10.0.14393.0 + 10.0.10240.0 + .NETPortable + v4.5 + $(DefineConstants);WINDOWS_UWP + - - - - - - - - - + + + + + + + + + - - + + - - - - + + + + - - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + From 4b3c5e2db5e2b5fd769a3840aa576386493080b7 Mon Sep 17 00:00:00 2001 From: Medeni Baykal <433724+Haplois@users.noreply.github.com> Date: Fri, 28 Jan 2022 01:09:32 +0100 Subject: [PATCH 2/7] Pathched CVE-2019-0657. --- scripts/build/TestPlatform.Dependencies.props | 1 + .../Microsoft.TestPlatform.AdapterUtilities.csproj | 6 ++++++ src/testhost.x86/testhost.x86.csproj | 4 ++++ src/testhost/testhost.csproj | 4 ++++ 4 files changed, 15 insertions(+) diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props index c48cbaf194..a7067d1315 100644 --- a/scripts/build/TestPlatform.Dependencies.props +++ b/scripts/build/TestPlatform.Dependencies.props @@ -52,6 +52,7 @@ 1.2.0 4.3.4 4.3.3 + 4.3.1 true diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj index 4c9fcc1c4a..928d45d775 100644 --- a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj +++ b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj @@ -47,6 +47,12 @@ + + + + + + + + diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj index 235d4a9dc9..80c0b8f5d3 100644 --- a/src/testhost/testhost.csproj +++ b/src/testhost/testhost.csproj @@ -40,6 +40,10 @@ true + + + + From 2add12895d972acab0bd38551c15819876ea13ab Mon Sep 17 00:00:00 2001 From: Medeni Baykal <433724+Haplois@users.noreply.github.com> Date: Fri, 28 Jan 2022 01:37:53 +0100 Subject: [PATCH 3/7] Pathched CVE-2019-0657, CVE-2019-0980 and CVE-2019-0981. --- scripts/build/TestPlatform.Dependencies.props | 2 +- src/testhost.x86/testhost.x86.csproj | 12 ++++++------ src/testhost/testhost.csproj | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props index a7067d1315..9ccc89180e 100644 --- a/scripts/build/TestPlatform.Dependencies.props +++ b/scripts/build/TestPlatform.Dependencies.props @@ -52,7 +52,7 @@ 1.2.0 4.3.4 4.3.3 - 4.3.1 + 4.3.2 true diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj index b2390f6de4..072d4ca32b 100644 --- a/src/testhost.x86/testhost.x86.csproj +++ b/src/testhost.x86/testhost.x86.csproj @@ -25,10 +25,10 @@ - - - - + + + + @@ -41,9 +41,9 @@ true - + - + diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj index 80c0b8f5d3..f6953def31 100644 --- a/src/testhost/testhost.csproj +++ b/src/testhost/testhost.csproj @@ -25,10 +25,10 @@ - - - - + + + + @@ -41,9 +41,9 @@ true - + - + From 13c3aa45598fe04a018c6a0f25fa2b7b0ba9e106 Mon Sep 17 00:00:00 2001 From: Medeni Baykal <433724+Haplois@users.noreply.github.com> Date: Fri, 28 Jan 2022 02:03:58 +0100 Subject: [PATCH 4/7] Package fixed. --- scripts/verify-nupkgs.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1 index d5ab7b5cff..5b37c23033 100644 --- a/scripts/verify-nupkgs.ps1 +++ b/scripts/verify-nupkgs.ps1 @@ -16,7 +16,7 @@ function Verify-Nuget-Packages($packageDirectory, $version) "Microsoft.NET.Test.Sdk" = 27; "Microsoft.TestPlatform" = 590; "Microsoft.TestPlatform.Build" = 21; - "Microsoft.TestPlatform.CLI" = 404; + "Microsoft.TestPlatform.CLI" = 405; "Microsoft.TestPlatform.Extensions.TrxLogger" = 35; "Microsoft.TestPlatform.ObjectModel" = 238; "Microsoft.TestPlatform.AdapterUtilities" = 62; From be6646400bf0d771cb705c73b56540453f047a3c Mon Sep 17 00:00:00 2001 From: Medeni Baykal <433724+Haplois@users.noreply.github.com> Date: Fri, 28 Jan 2022 10:33:53 +0100 Subject: [PATCH 5/7] Moved versions to arcade folder --- eng/Versions.props | 2 ++ scripts/build/TestPlatform.Dependencies.props | 10 +--------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1dfe660b27..4ba536c931 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,6 +15,8 @@ 0.25.2 2.0.8 4.3.4 + 4.3.3 + 4.3.2 10.0.2 3.0.0 1.3.1 diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props index 9ccc89180e..076b5e0e8d 100644 --- a/scripts/build/TestPlatform.Dependencies.props +++ b/scripts/build/TestPlatform.Dependencies.props @@ -31,17 +31,14 @@ 5.11.0 5.0.0 9.0.1 - 4.8.3 17.1.0-preview-2-31925-026 17.1.0-preview-2-31925-026 17.1.0-preview-2-31925-026 - 17.1.0-preview-2-31925-026 17.0.0-beta.21179.1 - 16.0.461 $(MicrosoftBuildPackageVersion) $(MicrosoftBuildPackageVersion) @@ -50,16 +47,11 @@ 1.1.1 1.2.0 - 4.3.4 - 4.3.3 - 4.3.2 + 3.3.4-beta1.21554.2 true - - 3.3.4-beta1.21554.2 - From e3349d02011dddd9c38399e9a5fac8a128cc309b Mon Sep 17 00:00:00 2001 From: nohwnd Date: Fri, 28 Jan 2022 11:52:48 +0100 Subject: [PATCH 6/7] Fix csproj formatting --- ...osoft.TestPlatform.AdapterUtilities.csproj | 138 +++++++++--------- ...t.TestPlatform.PlatformAbstractions.csproj | 128 ++++++++-------- 2 files changed, 133 insertions(+), 133 deletions(-) diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj index 928d45d775..bef7e8fe25 100644 --- a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj +++ b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj @@ -1,81 +1,81 @@  - - ..\..\ - - + + ..\..\ + + - - netstandard1.0;netstandard2.0;net45 - $(TargetFrameworks);uap10.0 - net6.0 - true - Microsoft.TestPlatform.AdapterUtilities - Microsoft.TestPlatform.AdapterUtilities - + + netstandard1.0;netstandard2.0;net45 + $(TargetFrameworks);uap10.0 + net6.0 + true + Microsoft.TestPlatform.AdapterUtilities + Microsoft.TestPlatform.AdapterUtilities + - - false - UAP,Version=v10.0 - UAP - 10.0.14393.0 - 10.0.10240.0 - .NETPortable - v4.5 - $(DefineConstants);WINDOWS_UWP + + false + UAP,Version=v10.0 + UAP + 10.0.14393.0 + 10.0.10240.0 + .NETPortable + v4.5 + $(DefineConstants);WINDOWS_UWP - - .NETFramework - v4.5.1 - false - + + .NETFramework + v4.5.1 + false + - - any - false - + + any + false + - - - + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - + + + + - - - - - - - - + + + + + + + + - + diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj index 2e75818605..0f83ce9cc9 100644 --- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj +++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj @@ -1,74 +1,74 @@  - - ..\..\ - - - - Microsoft.TestPlatform.PlatformAbstractions - Microsoft.TestPlatform.PlatformAbstractions - net45;net451;netcoreapp1.0;netcoreapp2.1;netstandard1.3;netstandard2.0 - $(TargetFrameworks);uap10.0;netstandard1.0 - net6.0 - true - false - - NU1605 - + + ..\..\ + + + + Microsoft.TestPlatform.PlatformAbstractions + Microsoft.TestPlatform.PlatformAbstractions + net45;net451;netcoreapp1.0;netcoreapp2.1;netstandard1.3;netstandard2.0 + $(TargetFrameworks);uap10.0;netstandard1.0 + net6.0 + true + false + + NU1605 + - - false - UAP,Version=v10.0 - UAP - 10.0.14393.0 - 10.0.10240.0 - .NETPortable - v4.5 - $(DefineConstants);WINDOWS_UWP - + + false + UAP,Version=v10.0 + UAP + 10.0.14393.0 + 10.0.10240.0 + .NETPortable + v4.5 + $(DefineConstants);WINDOWS_UWP + - - - - - - - - - + + + + + + + + + - - + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + From aac0eecf631cc1e6d0c0b0afc1efe18ce4adc46c Mon Sep 17 00:00:00 2001 From: nohwnd Date: Fri, 28 Jan 2022 12:24:46 +0100 Subject: [PATCH 7/7] Auto format csproj --- ...osoft.TestPlatform.AdapterUtilities.csproj | 120 ++++++++-------- ...t.TestPlatform.PlatformAbstractions.csproj | 130 +++++++++--------- 2 files changed, 125 insertions(+), 125 deletions(-) diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj index bef7e8fe25..756c2b2ec9 100644 --- a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj +++ b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.csproj @@ -1,61 +1,61 @@ - - - ..\..\ - - + + + ..\..\ + + - - netstandard1.0;netstandard2.0;net45 - $(TargetFrameworks);uap10.0 - net6.0 - true - Microsoft.TestPlatform.AdapterUtilities - Microsoft.TestPlatform.AdapterUtilities - + + netstandard1.0;netstandard2.0;net45 + $(TargetFrameworks);uap10.0 + net6.0 + true + Microsoft.TestPlatform.AdapterUtilities + Microsoft.TestPlatform.AdapterUtilities + - - false - UAP,Version=v10.0 - UAP - 10.0.14393.0 - 10.0.10240.0 - .NETPortable - v4.5 - $(DefineConstants);WINDOWS_UWP + + false + UAP,Version=v10.0 + UAP + 10.0.14393.0 + 10.0.10240.0 + .NETPortable + v4.5 + $(DefineConstants);WINDOWS_UWP - - .NETFramework - v4.5.1 - false - + + .NETFramework + v4.5.1 + false + - - any - false - + + any + false + - - - + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - + - - - - - - - - + + + + + + + + - + diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj index 0f83ce9cc9..9335b36701 100644 --- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj +++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj @@ -1,74 +1,74 @@ - + - - ..\..\ - - - - Microsoft.TestPlatform.PlatformAbstractions - Microsoft.TestPlatform.PlatformAbstractions - net45;net451;netcoreapp1.0;netcoreapp2.1;netstandard1.3;netstandard2.0 - $(TargetFrameworks);uap10.0;netstandard1.0 - net6.0 - true - false - - NU1605 - + + ..\..\ + + + + Microsoft.TestPlatform.PlatformAbstractions + Microsoft.TestPlatform.PlatformAbstractions + net45;net451;netcoreapp1.0;netcoreapp2.1;netstandard1.3;netstandard2.0 + $(TargetFrameworks);uap10.0;netstandard1.0 + net6.0 + true + false + + NU1605 + - - false - UAP,Version=v10.0 - UAP - 10.0.14393.0 - 10.0.10240.0 - .NETPortable - v4.5 - $(DefineConstants);WINDOWS_UWP - + + false + UAP,Version=v10.0 + UAP + 10.0.14393.0 + 10.0.10240.0 + .NETPortable + v4.5 + $(DefineConstants);WINDOWS_UWP + - - - - - - - - - + + + + + + + + + - - + + - - - - + + + + - - - - + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + +