Remove PackageLicenseFile preventing PackageLicenseExpression from wo…

…rking (#4890)
microsoft · Feb 16, 2024 · 5d731c3 · 5d731c3
1 parent 1ad8ce5
commit 5d731c3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -76,8 +76,6 @@
   <PropertyGroup>
     <Copyright>$(CopyrightMicrosoft)</Copyright>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageLicenseFile>LICENSE_MIT.txt</PackageLicenseFile>
-    <PackageLicenseFullPath>$(SrcPackageFolder)licenses/LICENSE_MIT.txt</PackageLicenseFullPath>
     <!-- Prevent warning about deprecated target frameworks -->
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <DefineConstants Condition=" '$(DotNetBuildFromSource)' == 'true' ">$(DefineConstants);DOTNET_BUILD_FROM_SOURCE</DefineConstants>

diff --git 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"

diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec
@@ -43,6 +43,5 @@
     <file src="netstandard2.0\zh-Hans\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard2.0\zh-Hans" />
     <file src="netstandard2.0\zh-Hant\Microsoft.TestPlatform.AdapterUtilities.resources.dll" target="lib\netstandard2.0\zh-Hant" />
 
-    <!-- TODO: Include source files. -->
   </files>
 </package>
diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec
@@ -415,6 +415,5 @@
     <file src="netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\tr" />
     <file src="netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\zh-Hans" />
     <file src="netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="contentFiles\any\netcoreapp3.1\Extensions\zh-Hant" />
-
   </files>
 </package>
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
@@ -45,6 +45,5 @@
     <file src="netstandard2.0\Microsoft.TestPlatform.Utilities.dll" target="lib\netstandard2.0\" />
     <file src="netstandard2.0\Microsoft.VisualStudio.TestPlatform.Common.dll" target="lib\netstandard2.0\" />
     <file src="netstandard2.0\Microsoft.TestPlatform.PlatformAbstractions.dll" target="lib\netstandard2.0\" />
-
   </files>
 </package>