Skip to content

Remove PackageLicenseFile preventing PackageLicenseExpression from working #4890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 16, 2024
Merged

Remove PackageLicenseFile preventing PackageLicenseExpression from working #4890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aeee3ca
Remove PackageLicenseFile which prevents PackageLicenseExpression fro…
lahma Feb 7, 2024
5900874
Apply suggestions from code review
lahma Feb 7, 2024
4226e56
Update expected package items count
Evangelink Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
20 changes: 10 additions & 10 deletions eng/verify-nupkgs.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ Add-Type -AssemblyName System.IO.Compression.FileSystem
function Verify-Nuget-Packages {
Write-Host "Starting Verify-Nuget-Packages."
$expectedNumOfFiles = @{
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For all packages using MIT license, reduce count by 1 as license file is no longer present.

"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"
Expand Down
1 change: 0 additions & 1 deletion src/Microsoft.TestPlatform.AdapterUtilities/Microsoft.TestPlatform.AdapterUtilities.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
1 change: 0 additions & 1 deletion src/package/Microsoft.TestPlatform.CLI/Microsoft.TestPlatform.CLI.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
1 change: 0 additions & 1 deletion src/package/Microsoft.TestPlatform.Internal.Uwp/Microsoft.TestPlatform.Internal.Uwp.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>