Use License Expression #319 (#378)

2020-09-03 10:57:17 -07:00 · 2020-09-03 10:57:17 -07:00 · f6bd1c1917
--- a/build/Katana.version.targets
+++ b/build/Katana.version.targets
@ -11,7 +11,6 @@
    <BuildQuality>rtw</BuildQuality>
    <BuildDate>90831</BuildDate>
    <BranchSuffix></BranchSuffix>
-    <Eula>https://raw.githubusercontent.com/aspnet/AspNetKatana/v4.0.1/LICENSE.txt</Eula>
    <ProjectUrl>https://github.com/aspnet/AspNetKatana/</ProjectUrl>
    <Tags>Microsoft OWIN Katana</Tags>
  </PropertyGroup>
--- a/build/Sakefile.shade
+++ b/build/Sakefile.shade
@ -8,7 +8,6 @@ var AZUREAD_VERSION='5.3.0'
 var AZUREAD_SUFFIX=''
 var VERSION='${SHIP.VERSION}'
 var FULL_VERSION='${SHIP.FULL_VERSION}'
-var EULA='https://raw.githubusercontent.com/aspnet/AspNetKatana/v4.0.1/LICENSE.txt'
 var PROJECT_URL='https://github.com/aspnet/AspNetKatana/'
 var TAGS='Microsoft OWIN Katana'

@ -107,7 +106,6 @@ use-standard-goals features='nuget,xunit'
        + "    <BuildQuality>" + SHIP.MILESTONE + "</BuildQuality>" + Environment.NewLine
        + "    <BuildDate>" + BuildDate() + "</BuildDate>" + Environment.NewLine
        + "    <BranchSuffix>" + BranchSuffix() + "</BranchSuffix>" + Environment.NewLine
-        + "    <Eula>" + EULA + "</Eula>" + Environment.NewLine
        + "    <ProjectUrl>" + PROJECT_URL + "</ProjectUrl>" + Environment.NewLine
        + "    <Tags>" + TAGS + "</Tags>" + Environment.NewLine
        + "  </PropertyGroup>" + Environment.NewLine
@ -275,11 +273,10 @@ var signing='${new List<string>()}'
    var azureAdSuffix='${AZUREAD_SUFFIX}'
    set azureAdSuffix='' if='OFFICIAL_BUILD && RELEASE_BUILD && FINAL_MILESTONE'

-    var licenseUrl='${EULA}'
    var projectUrl='${PROJECT_URL}'
    var tags='${TAGS}'

-    nuget-pack nuspecFile='${file}' outputDir='${TARGET_DIR}' extra='-NoPackageAnalysis -Symbols -Properties "id=${baseName};authors=${AUTHORS};author=${AUTHORS};title=${title};description=${description};licenseUrl=${licenseUrl};projectUrl=${projectUrl};tags=${tags};azureAdVersion=${azureAdVersion};azureAdSuffix=${azureAdSuffix}"'
+    nuget-pack nuspecFile='${file}' outputDir='${TARGET_DIR}' extra='-NoPackageAnalysis -Symbols -Properties "id=${baseName};authors=${AUTHORS};author=${AUTHORS};title=${title};description=${description};projectUrl=${projectUrl};tags=${tags};azureAdVersion=${azureAdVersion};azureAdSuffix=${azureAdSuffix}"'

 #nuget-deploy target='deploy' description='Upload NuGet packages to gallery'
  var extra=''
--- a/src/Microsoft.Owin.Cors/Microsoft.Owin.Cors.nuspec
+++ b/src/Microsoft.Owin.Cors/Microsoft.Owin.Cors.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.Diagnostics/Microsoft.Owin.Diagnostics.nuspec
+++ b/src/Microsoft.Owin.Diagnostics/Microsoft.Owin.Diagnostics.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.FileSystems/Microsoft.Owin.FileSystems.nuspec
+++ b/src/Microsoft.Owin.FileSystems/Microsoft.Owin.FileSystems.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.Host.HttpListener/Microsoft.Owin.Host.HttpListener.nuspec
+++ b/src/Microsoft.Owin.Host.HttpListener/Microsoft.Owin.Host.HttpListener.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.Host.SystemWeb/Microsoft.Owin.Host.SystemWeb.nuspec
+++ b/src/Microsoft.Owin.Host.SystemWeb/Microsoft.Owin.Host.SystemWeb.nuspec
@ -5,7 +5,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.Hosting/Microsoft.Owin.Hosting.nuspec
+++ b/src/Microsoft.Owin.Hosting/Microsoft.Owin.Hosting.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.Security.ActiveDirectory/Microsoft.Owin.Security.ActiveDirectory.nuspec
+++ b/src/Microsoft.Owin.Security.ActiveDirectory/Microsoft.Owin.Security.ActiveDirectory.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.Security.Cookies/Microsoft.Owin.Security.Cookies.nuspec
+++ b/src/Microsoft.Owin.Security.Cookies/Microsoft.Owin.Security.Cookies.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.Security.Facebook/Microsoft.Owin.Security.Facebook.nuspec
+++ b/src/Microsoft.Owin.Security.Facebook/Microsoft.Owin.Security.Facebook.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.Security.Google/Microsoft.Owin.Security.Google.nuspec
+++ b/src/Microsoft.Owin.Security.Google/Microsoft.Owin.Security.Google.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.Security.Jwt/Microsoft.Owin.Security.Jwt.nuspec
+++ b/src/Microsoft.Owin.Security.Jwt/Microsoft.Owin.Security.Jwt.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.Security.MicrosoftAccount/Microsoft.Owin.Security.MicrosoftAccount.nuspec
+++ b/src/Microsoft.Owin.Security.MicrosoftAccount/Microsoft.Owin.Security.MicrosoftAccount.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.Security.OAuth/Microsoft.Owin.Security.OAuth.nuspec
+++ b/src/Microsoft.Owin.Security.OAuth/Microsoft.Owin.Security.OAuth.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.Security.OpenIdConnect/Microsoft.Owin.Security.OpenIdConnect.nuspec
+++ b/src/Microsoft.Owin.Security.OpenIdConnect/Microsoft.Owin.Security.OpenIdConnect.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.Security.Twitter/Microsoft.Owin.Security.Twitter.nuspec
+++ b/src/Microsoft.Owin.Security.Twitter/Microsoft.Owin.Security.Twitter.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.Security.WsFederation/Microsoft.Owin.Security.WsFederation.nuspec
+++ b/src/Microsoft.Owin.Security.WsFederation/Microsoft.Owin.Security.WsFederation.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.Security/Microsoft.Owin.Security.nuspec
+++ b/src/Microsoft.Owin.Security/Microsoft.Owin.Security.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.SelfHost/Microsoft.Owin.SelfHost.nuspec
+++ b/src/Microsoft.Owin.SelfHost/Microsoft.Owin.SelfHost.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.StaticFiles/Microsoft.Owin.StaticFiles.nuspec
+++ b/src/Microsoft.Owin.StaticFiles/Microsoft.Owin.StaticFiles.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin.Testing/Microsoft.Owin.Testing.nuspec
+++ b/src/Microsoft.Owin.Testing/Microsoft.Owin.Testing.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/Microsoft.Owin/Microsoft.Owin.nuspec
+++ b/src/Microsoft.Owin/Microsoft.Owin.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>
--- a/src/OwinHost/OwinHost.nuspec
+++ b/src/OwinHost/OwinHost.nuspec
@ -6,7 +6,7 @@
    <authors>$authors$</authors>
    <owners>$authors$</owners>
    <copyright>© Microsoft Corporation. All rights reserved.</copyright>
-    <licenseUrl>$licenseUrl$</licenseUrl>
+    <license type="expression">Apache-2.0</license>
    <projectUrl>$projectUrl$</projectUrl>
    <requireLicenseAcceptance>true</requireLicenseAcceptance>
    <title>$title$</title>