From aeee3ca6d3794c3c40f4c9cfbd6f587f8f27506c Mon Sep 17 00:00:00 2001 From: Marko Lahma Date: Wed, 7 Feb 2024 13:07:02 +0200 Subject: [PATCH 1/3] Remove PackageLicenseFile which prevents PackageLicenseExpression from working correctly --- Directory.Build.props | 5 ++++- .../Microsoft.TestPlatform.AdapterUtilities.nuspec | 2 ++ .../Microsoft.TestPlatform.Build.nuspec | 3 +++ .../Microsoft.TestPlatform.Extensions.TrxLogger.nuspec | 3 +++ .../Microsoft.TestPlatform.ObjectModel.nuspec | 3 +++ ...rosoft.TestPlatform.VsTestConsole.TranslationLayer.nuspec | 3 +++ .../Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec | 3 +++ .../Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec | 3 +++ .../Microsoft.TestPlatform.CLI.nuspec | 2 ++ .../Microsoft.TestPlatform.Internal.Uwp.nuspec | 2 ++ .../Microsoft.TestPlatform.TestHost.nuspec | 3 +++ 11 files changed, 31 insertions(+), 1 deletion(-) diff --git a/Directory.Build.props b/Directory.Build.props index 00aba0cf52..d0fef8bec8 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -76,7 +76,6 @@ $(CopyrightMicrosoft) MIT - LICENSE_MIT.txt $(SrcPackageFolder)licenses/LICENSE_MIT.txt false @@ -90,6 +89,10 @@ true + + + + Microsoft diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec index 861a39335d..c1921f4766 100644 --- a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec +++ b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec @@ -43,6 +43,8 @@ + + diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.nuspec b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.nuspec index c529c32611..ff87dcc2df 100644 --- a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.nuspec +++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.nuspec @@ -28,5 +28,8 @@ + + + diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.nuspec b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.nuspec index adfd9708bc..badc826339 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.nuspec +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.nuspec @@ -59,5 +59,8 @@ + + + diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.nuspec b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.nuspec index 105050657a..b2dd51cc47 100644 --- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.nuspec +++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.nuspec @@ -112,5 +112,8 @@ + + + diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.nuspec b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.nuspec index 4da3c58780..8c76cfccbd 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.nuspec +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.nuspec @@ -154,5 +154,8 @@ + + + diff --git a/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec b/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec index 117a6ba933..bd29588a48 100644 --- a/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec +++ b/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec @@ -80,5 +80,8 @@ + + + diff --git a/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec index e95212b77a..94ff114ce1 100644 --- a/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec +++ b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec @@ -27,5 +27,8 @@ + + + diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec index 7b8d5514f4..70d4fc740d 100644 --- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec +++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec @@ -416,5 +416,7 @@ + + diff --git a/src/package/Microsoft.TestPlatform.Internal.Uwp/Microsoft.TestPlatform.Internal.Uwp.nuspec b/src/package/Microsoft.TestPlatform.Internal.Uwp/Microsoft.TestPlatform.Internal.Uwp.nuspec index bf6bc770bd..622f18a620 100644 --- a/src/package/Microsoft.TestPlatform.Internal.Uwp/Microsoft.TestPlatform.Internal.Uwp.nuspec +++ b/src/package/Microsoft.TestPlatform.Internal.Uwp/Microsoft.TestPlatform.Internal.Uwp.nuspec @@ -46,5 +46,7 @@ + + diff --git a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec index 2b676ebbdb..b36713ab52 100644 --- a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec +++ b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec @@ -94,5 +94,8 @@ + + + From 590087484f2d79cc9a617d0ea04443803f1b709c Mon Sep 17 00:00:00 2001 From: Marko Lahma Date: Wed, 7 Feb 2024 15:03:47 +0200 Subject: [PATCH 2/3] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Amaury Levé --- Directory.Build.props | 5 ----- .../Microsoft.TestPlatform.AdapterUtilities.nuspec | 3 --- .../Microsoft.TestPlatform.Build.nuspec | 3 --- .../Microsoft.TestPlatform.Extensions.TrxLogger.nuspec | 3 --- .../Microsoft.TestPlatform.ObjectModel.nuspec | 3 --- ...rosoft.TestPlatform.VsTestConsole.TranslationLayer.nuspec | 3 --- .../Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec | 3 --- .../Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec | 3 --- .../Microsoft.TestPlatform.CLI.nuspec | 3 --- .../Microsoft.TestPlatform.Internal.Uwp.nuspec | 3 --- .../Microsoft.TestPlatform.TestHost.nuspec | 3 --- 11 files changed, 35 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index d0fef8bec8..08a99ab45b 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -76,7 +76,6 @@ $(CopyrightMicrosoft) MIT - $(SrcPackageFolder)licenses/LICENSE_MIT.txt false $(DefineConstants);DOTNET_BUILD_FROM_SOURCE @@ -89,10 +88,6 @@ true - - - - Microsoft diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec index c1921f4766..71718ac23c 100644 --- a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec +++ b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec @@ -43,8 +43,5 @@ - - - diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.nuspec b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.nuspec index ff87dcc2df..c529c32611 100644 --- a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.nuspec +++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.nuspec @@ -28,8 +28,5 @@ - - - diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.nuspec b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.nuspec index badc826339..adfd9708bc 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.nuspec +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.nuspec @@ -59,8 +59,5 @@ - - - diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.nuspec b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.nuspec index b2dd51cc47..105050657a 100644 --- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.nuspec +++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.nuspec @@ -112,8 +112,5 @@ - - - diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.nuspec b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.nuspec index 8c76cfccbd..4da3c58780 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.nuspec +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.nuspec @@ -154,8 +154,5 @@ - - - diff --git a/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec b/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec index bd29588a48..117a6ba933 100644 --- a/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec +++ b/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec @@ -80,8 +80,5 @@ - - - diff --git a/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec index 94ff114ce1..e95212b77a 100644 --- a/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec +++ b/src/package/Microsoft.NET.Test.Sdk/Microsoft.NET.Test.Sdk.nuspec @@ -27,8 +27,5 @@ - - - diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec index 70d4fc740d..7af61c0a59 100644 --- a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec +++ b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec @@ -415,8 +415,5 @@ - - - diff --git a/src/package/Microsoft.TestPlatform.Internal.Uwp/Microsoft.TestPlatform.Internal.Uwp.nuspec b/src/package/Microsoft.TestPlatform.Internal.Uwp/Microsoft.TestPlatform.Internal.Uwp.nuspec index 622f18a620..0eed862a9a 100644 --- a/src/package/Microsoft.TestPlatform.Internal.Uwp/Microsoft.TestPlatform.Internal.Uwp.nuspec +++ b/src/package/Microsoft.TestPlatform.Internal.Uwp/Microsoft.TestPlatform.Internal.Uwp.nuspec @@ -45,8 +45,5 @@ - - - diff --git a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec index b36713ab52..2b676ebbdb 100644 --- a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec +++ b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec @@ -94,8 +94,5 @@ - - - From 4226e561a5af2eeec9b9e3894b31c54b23b7dbf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Amaury=20Lev=C3=A9?= Date: Wed, 7 Feb 2024 15:20:53 +0100 Subject: [PATCH 3/3] Update expected package items count All MIT packages no longer include MIT license file --- eng/verify-nupkgs.ps1 | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/verify-nupkgs.ps1 b/eng/verify-nupkgs.ps1 index 72cd3f77db..72ec51d765 100644 --- a/eng/verify-nupkgs.ps1 +++ b/eng/verify-nupkgs.ps1 @@ -17,18 +17,18 @@ Add-Type -AssemblyName System.IO.Compression.FileSystem function Verify-Nuget-Packages { Write-Host "Starting Verify-Nuget-Packages." $expectedNumOfFiles = @{ - "Microsoft.CodeCoverage" = 60; - "Microsoft.NET.Test.Sdk" = 16; + "Microsoft.CodeCoverage" = 59; + "Microsoft.NET.Test.Sdk" = 15; "Microsoft.TestPlatform" = 607; - "Microsoft.TestPlatform.Build" = 21; - "Microsoft.TestPlatform.CLI" = 471; - "Microsoft.TestPlatform.Extensions.TrxLogger" = 35; - "Microsoft.TestPlatform.ObjectModel" = 93; - "Microsoft.TestPlatform.AdapterUtilities" = 34; + "Microsoft.TestPlatform.Build" = 20; + "Microsoft.TestPlatform.CLI" = 470; + "Microsoft.TestPlatform.Extensions.TrxLogger" = 34; + "Microsoft.TestPlatform.ObjectModel" = 92; + "Microsoft.TestPlatform.AdapterUtilities" = 33; "Microsoft.TestPlatform.Portable" = 592; - "Microsoft.TestPlatform.TestHost" = 63; - "Microsoft.TestPlatform.TranslationLayer" = 123; - "Microsoft.TestPlatform.Internal.Uwp" = 39; + "Microsoft.TestPlatform.TestHost" = 62; + "Microsoft.TestPlatform.TranslationLayer" = 122; + "Microsoft.TestPlatform.Internal.Uwp" = 38; } $packageDirectory = Resolve-Path "$PSScriptRoot/../artifacts/packages/$configuration"