From 0ad088691a5098ce102b3dc14b978317b6e1a4fd Mon Sep 17 00:00:00 2001
From: Ryan Lengel Isgrig <rylengel@microsoft.com>
Date: Wed, 7 Jul 2021 15:39:08 -0700
Subject: [PATCH 1/5] Update directory.build.props LicenseUrl tags with
 PackageLicenseExpression referencing the MIT license

---
 packages/Directory.Build.props         | 9 ++-------
 skills/csharp/Directory.Build.props    | 2 +-
 tests/functional/Directory.Build.props | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/packages/Directory.Build.props b/packages/Directory.Build.props
index f25047d671..39f06aeb1c 100644
--- a/packages/Directory.Build.props
+++ b/packages/Directory.Build.props
@@ -13,17 +13,12 @@
   <PropertyGroup>
     <!-- Rules found at: https://aka.ms/Microsoft-NuGet-Compliance -->
     <PackageIconUrl>https://raw.githubusercontent.com/microsoft/botframework-sdk/master/icon.png</PackageIconUrl>
-    <PackageLicenseUrl>https://github.com/Microsoft/BotBuilder/blob/master/LICENSE</PackageLicenseUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-    <LicenseUrl>https://github.com/Microsoft/BotBuilder-dotnet/blob/master/LICENSE</LicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType />
     <NeutralLanguage>en-US</NeutralLanguage>
     <RepositoryUrl>https://github.com/Microsoft/botframework-components</RepositoryUrl>
-    <!--
-      Suppress a warning about upcoming deprecation of PackageLicenseUrl. When embedding licenses are supported,
-      replace PackageLicenseUrl with PackageLicenseExpression.
-    -->
-    <NoWarn>$(NoWarn);NU5125</NoWarn>
+    <NoWarn>$(NoWarn);</NoWarn>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
diff --git a/skills/csharp/Directory.Build.props b/skills/csharp/Directory.Build.props
index 61dd1dc0cf..1c0432473e 100644
--- a/skills/csharp/Directory.Build.props
+++ b/skills/csharp/Directory.Build.props
@@ -24,7 +24,7 @@
 
   <PropertyGroup>
     <RepositoryUrl>https://github.com/microsoft/botframework-skills</RepositoryUrl>
-    <LicenseUrl>https://github.com/microsoft/botframework-skills/blob/master/LICENSE</LicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType />
     <NeutralLanguage>en-US</NeutralLanguage>
     <NoWarn>$(NoWarn);NU5125;NU1701;8002</NoWarn>
diff --git a/tests/functional/Directory.Build.props b/tests/functional/Directory.Build.props
index 3e44d6df83..d869fda3bd 100644
--- a/tests/functional/Directory.Build.props
+++ b/tests/functional/Directory.Build.props
@@ -25,7 +25,7 @@
 
   <PropertyGroup>    
     <RepositoryUrl>https://github.com/microsoft/BotFramework-FunctionalTests</RepositoryUrl>
-    <LicenseUrl>https://github.com/microsoft/BotFramework-FunctionalTests/blob/main/LICENSE</LicenseUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType />
     <NeutralLanguage>en-US</NeutralLanguage>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>

From a2d6686fc755284cc27ec6d35c0ec35dfd2907aa Mon Sep 17 00:00:00 2001
From: Ryan Lengel Isgrig <rylengel@microsoft.com>
Date: Wed, 7 Jul 2021 15:54:35 -0700
Subject: [PATCH 2/5] replace nuspec licenseURl with license

---
 .../HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec | 2 +-
 packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec b/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec
index b23ac3a951..3497aec0dc 100644
--- a/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec
+++ b/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec
@@ -6,7 +6,7 @@
         <authors>Microsoft</authors>
         <owners>Microsoft</owners>
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-        <licenseUrl>https://github.com/Microsoft/BotBuilder/blob/master/LICENSE</licenseUrl>
+        <license>https://github.com/Microsoft/BotBuilder/blob/master/LICENSE</license>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
         <projectUrl>https://github.com/Microsoft/botframework-components/tree/main/packages/HelpAndCancel</projectUrl>
         <releaseNotes>First version of HelpAndCancel package</releaseNotes>
diff --git a/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec b/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec
index 06132ce5ff..244ea256f5 100644
--- a/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec
+++ b/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec
@@ -6,7 +6,7 @@
         <authors>Microsoft</authors>
         <owners>Microsoft</owners>
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-        <licenseUrl>https://github.com/Microsoft/BotBuilder/blob/master/LICENSE</licenseUrl>
+        <license>https://github.com/Microsoft/BotBuilder/blob/master/LICENSE</license>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
         <projectUrl>https://github.com/Microsoft/botframework-components/tree/main/packages/Welcome</projectUrl>
         <releaseNotes>First version of welcome package</releaseNotes>

From 4a936fe742f3e0e0d71a0b531179e5d3d7f7b31e Mon Sep 17 00:00:00 2001
From: Ryan Lengel Isgrig <rylengel@microsoft.com>
Date: Wed, 7 Jul 2021 16:09:30 -0700
Subject: [PATCH 3/5] replace nuspec license with license type referencing MIT

---
 .../HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec | 2 +-
 packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec b/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec
index 3497aec0dc..48fbae0651 100644
--- a/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec
+++ b/packages/HelpAndCancel/Microsoft.Bot.Components.HelpAndCancel.nuspec
@@ -6,7 +6,7 @@
         <authors>Microsoft</authors>
         <owners>Microsoft</owners>
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-        <license>https://github.com/Microsoft/BotBuilder/blob/master/LICENSE</license>
+        <license type="expression">MIT</license>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
         <projectUrl>https://github.com/Microsoft/botframework-components/tree/main/packages/HelpAndCancel</projectUrl>
         <releaseNotes>First version of HelpAndCancel package</releaseNotes>
diff --git a/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec b/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec
index 244ea256f5..81126a03bb 100644
--- a/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec
+++ b/packages/Welcome/Microsoft.Bot.Components.Welcome.nuspec
@@ -6,7 +6,7 @@
         <authors>Microsoft</authors>
         <owners>Microsoft</owners>
         <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-        <license>https://github.com/Microsoft/BotBuilder/blob/master/LICENSE</license>
+        <license type="expression">MIT</license>
         <requireLicenseAcceptance>true</requireLicenseAcceptance>
         <projectUrl>https://github.com/Microsoft/botframework-components/tree/main/packages/Welcome</projectUrl>
         <releaseNotes>First version of welcome package</releaseNotes>

From 123bf4bc3d24214afb342da22d8c2c38de2cdafc Mon Sep 17 00:00:00 2001
From: Ryan Lengel Isgrig <43043272+ryanlengel@users.noreply.github.com>
Date: Thu, 8 Jul 2021 10:53:12 -0700
Subject: [PATCH 4/5] Update Directory.Build.props

Add NU5048 to NoWarn
---
 packages/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Directory.Build.props b/packages/Directory.Build.props
index 39f06aeb1c..9dab288acf 100644
--- a/packages/Directory.Build.props
+++ b/packages/Directory.Build.props
@@ -18,7 +18,7 @@
     <RepositoryType />
     <NeutralLanguage>en-US</NeutralLanguage>
     <RepositoryUrl>https://github.com/Microsoft/botframework-components</RepositoryUrl>
-    <NoWarn>$(NoWarn);</NoWarn>
+    <NoWarn>$(NoWarn);NU5048</NoWarn>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>

From beab5575af7cfad39557236a4d8671894c57d58f Mon Sep 17 00:00:00 2001
From: Ryan Lengel Isgrig <43043272+ryanlengel@users.noreply.github.com>
Date: Thu, 8 Jul 2021 10:55:20 -0700
Subject: [PATCH 5/5] Update Directory.Build.props

---
 packages/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/Directory.Build.props b/packages/Directory.Build.props
index 9dab288acf..a65ea1de3e 100644
--- a/packages/Directory.Build.props
+++ b/packages/Directory.Build.props
@@ -12,7 +12,7 @@
 
   <PropertyGroup>
     <!-- Rules found at: https://aka.ms/Microsoft-NuGet-Compliance -->
-    <PackageIconUrl>https://raw.githubusercontent.com/microsoft/botframework-sdk/master/icon.png</PackageIconUrl>
+    <PackageIconUrl>https://raw.githubusercontent.com/microsoft/botframework-sdk/main/icon.png</PackageIconUrl>
     <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType />