Use PackageLicenseExpression instead of URL (dotnet/corefx#42271)

* Use PackageLicenseExpression instead of URL

* Cleanup packaging properties from Directory.Build.props

Commit migrated from https://github.com/dotnet/corefx/commit/987158f576e4ac4db1a4c1058cbbd5607ab22e69

diff --git a/eng/packaging.props b/eng/packaging.props
index 422b880..dc94bd7 100644 (file)
--- a/eng/packaging.props
+++ b/eng/packaging.props
@@ -6,7 +6,8 @@
     <RuntimeIdGraphDefinitionFile>$(PkgDir)Microsoft.NETCore.Platforms/runtime.json</RuntimeIdGraphDefinitionFile>
     <ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</ReleaseNotes>
     <ProjectUrl Condition="'$(ProjectUrl)' == ''">https://github.com/dotnet/corefx</ProjectUrl>
-    <LicenseUrl Condition="'$(LicenseUrl)' == ''">https://github.com/dotnet/corefx/blob/master/LICENSE.TXT</LicenseUrl>
+    <Copyright>$(CopyrightNetFoundation)</Copyright>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <!-- defined in buildtools packaging.targets, but we need this before targets are imported -->
     <PackagePlatform Condition="'$(PackagePlatform)' == ''">$(Platform)</PackagePlatform>
     <PackagePlatform Condition="'$(PackagePlatform)' == 'amd64'">x64</PackagePlatform>

diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 18721f9..bd3d4f0 100644 (file)
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -186,13 +186,6 @@
 
   <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />
 
-  <PropertyGroup Condition="'$(CopyrightNetFoundation)' != ''">
-    <Copyright>$(CopyrightNetFoundation)</Copyright>
-    <!-- Temporarily disable PackageLicenseExpression until we can workaround 
-         https://github.com/NuGet/Home/issues/7894 -->
-    <!-- PackageLicenseExpression>MIT</PackageLicenseExpression -->
-  </PropertyGroup>
-
   <!-- Import packaging props -->
   <Import Project="$(RepositoryEngineeringDir)packaging.props" />