From 046765913dff824f9ed0f2d2fe0fb9b111906cf5 Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Fri, 1 Nov 2019 09:13:50 -0700
Subject: [PATCH] Use PackageLicenseExpression instead of URL (#42277)

---
 Directory.Build.props | 7 -------
 eng/Packaging.props   | 3 ++-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 03139308d7f9..d5b446ae74d6 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -197,13 +197,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" />
 
diff --git a/eng/Packaging.props b/eng/Packaging.props
index c0b5d6f7f65d..b896bcfe3d22 100644
--- a/eng/Packaging.props
+++ b/eng/Packaging.props
@@ -6,7 +6,8 @@
     <RuntimeIdGraphDefinitionFile>$(RepoRoot)pkg/Microsoft.NETCore.Platforms/runtime.json</RuntimeIdGraphDefinitionFile>
     <ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</ReleaseNotes>
     <ProjectUrl>/~https://github.com/dotnet/corefx</ProjectUrl>
-    <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>