Remove PackageLicenseFile which prevents PackageLicenseExpression fro…

…m working correctly
microsoft · Feb 7, 2024 · aeee3ca · aeee3ca
1 parent 4e52655
commit aeee3ca
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 1 deletion.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -76,7 +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>
@@ -90,6 +89,10 @@
     <BuildWithNetFrameworkHostedCompiler>true</BuildWithNetFrameworkHostedCompiler>
   </PropertyGroup>
 
+  <ItemGroup>
+    <NuspecProperty Include="MITPackageLicenseFullPath=$(PackageLicenseFullPath)" />
+  </ItemGroup>
+
   <!-- Sign config -->
   <PropertyGroup>
     <StrongNameKeyId>Microsoft</StrongNameKeyId>

diff --git a/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec b/src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec
@@ -43,6 +43,8 @@
     <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" />
 
+    <file src="$MITPackageLicenseFullPath$" target="" />
+
     <!-- TODO: Include source files. -->
   </files>
 </package>
diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.nuspec b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.nuspec
@@ -28,5 +28,8 @@
     <file src="netstandard2.0/tr/Microsoft.TestPlatform.Build.resources.dll" target="lib/netstandard2.0/tr" />
     <file src="netstandard2.0/zh-Hans/Microsoft.TestPlatform.Build.resources.dll" target="lib/netstandard2.0/zh-Hans" />
     <file src="netstandard2.0/zh-Hant/Microsoft.TestPlatform.Build.resources.dll" target="lib/netstandard2.0/zh-Hant" />
+
+    <file src="$MITPackageLicenseFullPath$" target="" />
+
   </files>
 </package>
diff --git a/...soft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.nuspec b/...soft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.nuspec
@@ -59,5 +59,8 @@
     <file src="netstandard2.0\tr\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard2.0\tr" />
     <file src="netstandard2.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard2.0\zh-Hans" />
     <file src="netstandard2.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.resources.dll" target="lib\netstandard2.0\zh-Hant" />
+
+    <file src="$MITPackageLicenseFullPath$" target="" />
+
   </files>
 </package>
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.nuspec b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.nuspec
@@ -112,5 +112,8 @@
     <file src="netstandard2.0\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\netstandard2.0\zh-Hans" />
     <file src="netstandard2.0\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll"             target="lib\netstandard2.0\zh-Hant" />
     <!-- /netstandard 2.0 -->
+
+    <file src="$MITPackageLicenseFullPath$" target="" />
+
   </files>
 </package>
diff --git a/...TestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.nuspec b/...TestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.nuspec
@@ -154,5 +154,8 @@
     <file src="netstandard2.0\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\tr" />
     <file src="netstandard2.0\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\zh-Hans" />
     <file src="netstandard2.0\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netstandard2.0\zh-Hant" />
+
+    <file src="$MITPackageLicenseFullPath$" target="" />
+
   </files>
 </package>
diff --git a/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec b/src/package/Microsoft.CodeCoverage/Microsoft.CodeCoverage.nuspec
@@ -80,5 +80,8 @@
     <file src="net462\Microsoft.VisualStudio.TraceDataCollector\tr\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="build\netstandard2.0\tr" />
     <file src="net462\Microsoft.VisualStudio.TraceDataCollector\zh-Hans\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="build\netstandard2.0\zh-Hans" />
     <file src="net462\Microsoft.VisualStudio.TraceDataCollector\zh-Hant\Microsoft.VisualStudio.TraceDataCollector.resources.dll" target="build\netstandard2.0\zh-Hant" />
+
+    <file src="$MITPackageLicenseFullPath$" target="" />
+
   </files>
 </package>
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
@@ -27,5 +27,8 @@
 
     <file src="netstandard2.0\_._" target="lib/netcoreapp3.1" />
     <file src="netstandard2.0\_._" target="lib/net462" />
+
+    <file src="$MITPackageLicenseFullPath$" target="" />
+
   </files>
 </package>
diff --git a/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec b/src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec
@@ -416,5 +416,7 @@
     <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" />
 
+    <file src="$MITPackageLicenseFullPath$" target="" />
+
   </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
@@ -46,5 +46,7 @@
     <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\" />
 
+    <file src="$MITPackageLicenseFullPath$" target="" />
+
   </files>
 </package>
diff --git a/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec b/src/package/Microsoft.TestPlatform.TestHost/Microsoft.TestPlatform.TestHost.nuspec
@@ -94,5 +94,8 @@
     <file src="netcoreapp3.1\tr\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp3.1\tr" />
     <file src="netcoreapp3.1\zh-Hans\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp3.1\zh-Hans" />
     <file src="netcoreapp3.1\zh-Hant\Microsoft.VisualStudio.TestPlatform.Common.resources.dll" target="lib\netcoreapp3.1\zh-Hant" />
+
+    <file src="$MITPackageLicenseFullPath$" target="" />
+
   </files>
 </package>