From f6bd1c19174797f11a6b90c0d0e813a4123eda49 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Thu, 3 Sep 2020 10:57:17 -0700 Subject: [PATCH] Use License Expression #319 (#378) --- build/Katana.version.targets | 1 - build/Sakefile.shade | 5 +---- src/Microsoft.Owin.Cors/Microsoft.Owin.Cors.nuspec | 2 +- .../Microsoft.Owin.Diagnostics.nuspec | 2 +- .../Microsoft.Owin.FileSystems.nuspec | 2 +- .../Microsoft.Owin.Host.HttpListener.nuspec | 2 +- .../Microsoft.Owin.Host.SystemWeb.nuspec | 2 +- src/Microsoft.Owin.Hosting/Microsoft.Owin.Hosting.nuspec | 2 +- .../Microsoft.Owin.Security.ActiveDirectory.nuspec | 2 +- .../Microsoft.Owin.Security.Cookies.nuspec | 2 +- .../Microsoft.Owin.Security.Facebook.nuspec | 2 +- .../Microsoft.Owin.Security.Google.nuspec | 2 +- .../Microsoft.Owin.Security.Jwt.nuspec | 2 +- .../Microsoft.Owin.Security.MicrosoftAccount.nuspec | 2 +- .../Microsoft.Owin.Security.OAuth.nuspec | 2 +- .../Microsoft.Owin.Security.OpenIdConnect.nuspec | 2 +- .../Microsoft.Owin.Security.Twitter.nuspec | 2 +- .../Microsoft.Owin.Security.WsFederation.nuspec | 2 +- src/Microsoft.Owin.Security/Microsoft.Owin.Security.nuspec | 2 +- src/Microsoft.Owin.SelfHost/Microsoft.Owin.SelfHost.nuspec | 2 +- .../Microsoft.Owin.StaticFiles.nuspec | 2 +- src/Microsoft.Owin.Testing/Microsoft.Owin.Testing.nuspec | 2 +- src/Microsoft.Owin/Microsoft.Owin.nuspec | 2 +- src/OwinHost/OwinHost.nuspec | 2 +- 24 files changed, 23 insertions(+), 27 deletions(-) diff --git a/build/Katana.version.targets b/build/Katana.version.targets index 6e9ec9e8..0b55d41d 100644 --- a/build/Katana.version.targets +++ b/build/Katana.version.targets @@ -11,7 +11,6 @@ rtw 90831 - https://raw.githubusercontent.com/aspnet/AspNetKatana/v4.0.1/LICENSE.txt https://github.com/aspnet/AspNetKatana/ Microsoft OWIN Katana diff --git a/build/Sakefile.shade b/build/Sakefile.shade index f5f0edbf..8d1fa962 100644 --- 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' + " " + SHIP.MILESTONE + "" + Environment.NewLine + " " + BuildDate() + "" + Environment.NewLine + " " + BranchSuffix() + "" + Environment.NewLine - + " " + EULA + "" + Environment.NewLine + " " + PROJECT_URL + "" + Environment.NewLine + " " + TAGS + "" + Environment.NewLine + " " + Environment.NewLine @@ -275,11 +273,10 @@ var signing='${new List()}' 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='' diff --git a/src/Microsoft.Owin.Cors/Microsoft.Owin.Cors.nuspec b/src/Microsoft.Owin.Cors/Microsoft.Owin.Cors.nuspec index 7acd39d3..5456f6ff 100644 --- a/src/Microsoft.Owin.Cors/Microsoft.Owin.Cors.nuspec +++ b/src/Microsoft.Owin.Cors/Microsoft.Owin.Cors.nuspec @@ -6,7 +6,7 @@ $authors$ $authors$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.Diagnostics/Microsoft.Owin.Diagnostics.nuspec b/src/Microsoft.Owin.Diagnostics/Microsoft.Owin.Diagnostics.nuspec index 66f78476..94254a35 100644 --- a/src/Microsoft.Owin.Diagnostics/Microsoft.Owin.Diagnostics.nuspec +++ b/src/Microsoft.Owin.Diagnostics/Microsoft.Owin.Diagnostics.nuspec @@ -6,7 +6,7 @@ $authors$ $authors$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.FileSystems/Microsoft.Owin.FileSystems.nuspec b/src/Microsoft.Owin.FileSystems/Microsoft.Owin.FileSystems.nuspec index 0d887b47..ddeb94a0 100644 --- a/src/Microsoft.Owin.FileSystems/Microsoft.Owin.FileSystems.nuspec +++ b/src/Microsoft.Owin.FileSystems/Microsoft.Owin.FileSystems.nuspec @@ -6,7 +6,7 @@ $authors$ $authors$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.Host.HttpListener/Microsoft.Owin.Host.HttpListener.nuspec b/src/Microsoft.Owin.Host.HttpListener/Microsoft.Owin.Host.HttpListener.nuspec index 537b803c..9e19e4bd 100644 --- 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$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.Host.SystemWeb/Microsoft.Owin.Host.SystemWeb.nuspec b/src/Microsoft.Owin.Host.SystemWeb/Microsoft.Owin.Host.SystemWeb.nuspec index 50810b3c..6ff94ba8 100644 --- 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$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.Hosting/Microsoft.Owin.Hosting.nuspec b/src/Microsoft.Owin.Hosting/Microsoft.Owin.Hosting.nuspec index dd42bb43..e33f47ec 100644 --- a/src/Microsoft.Owin.Hosting/Microsoft.Owin.Hosting.nuspec +++ b/src/Microsoft.Owin.Hosting/Microsoft.Owin.Hosting.nuspec @@ -6,7 +6,7 @@ $authors$ $authors$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.Security.ActiveDirectory/Microsoft.Owin.Security.ActiveDirectory.nuspec b/src/Microsoft.Owin.Security.ActiveDirectory/Microsoft.Owin.Security.ActiveDirectory.nuspec index fa9946f2..ef269f5a 100644 --- 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$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.Security.Cookies/Microsoft.Owin.Security.Cookies.nuspec b/src/Microsoft.Owin.Security.Cookies/Microsoft.Owin.Security.Cookies.nuspec index b644a5b4..26e7757e 100644 --- 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$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.Security.Facebook/Microsoft.Owin.Security.Facebook.nuspec b/src/Microsoft.Owin.Security.Facebook/Microsoft.Owin.Security.Facebook.nuspec index a3276739..e7c2605e 100644 --- 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$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.Security.Google/Microsoft.Owin.Security.Google.nuspec b/src/Microsoft.Owin.Security.Google/Microsoft.Owin.Security.Google.nuspec index 148ac42f..6b041864 100644 --- 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$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.Security.Jwt/Microsoft.Owin.Security.Jwt.nuspec b/src/Microsoft.Owin.Security.Jwt/Microsoft.Owin.Security.Jwt.nuspec index 4da7593b..c9bdf019 100644 --- 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$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.Security.MicrosoftAccount/Microsoft.Owin.Security.MicrosoftAccount.nuspec b/src/Microsoft.Owin.Security.MicrosoftAccount/Microsoft.Owin.Security.MicrosoftAccount.nuspec index fb573e11..9cdf3281 100644 --- 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$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.Security.OAuth/Microsoft.Owin.Security.OAuth.nuspec b/src/Microsoft.Owin.Security.OAuth/Microsoft.Owin.Security.OAuth.nuspec index ab8c1a76..02743c47 100644 --- 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$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.Security.OpenIdConnect/Microsoft.Owin.Security.OpenIdConnect.nuspec b/src/Microsoft.Owin.Security.OpenIdConnect/Microsoft.Owin.Security.OpenIdConnect.nuspec index a99ffacf..5568820c 100644 --- 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$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.Security.Twitter/Microsoft.Owin.Security.Twitter.nuspec b/src/Microsoft.Owin.Security.Twitter/Microsoft.Owin.Security.Twitter.nuspec index 802c3e23..4c10e722 100644 --- 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$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.Security.WsFederation/Microsoft.Owin.Security.WsFederation.nuspec b/src/Microsoft.Owin.Security.WsFederation/Microsoft.Owin.Security.WsFederation.nuspec index db31b68a..3d63188c 100644 --- 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$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.Security/Microsoft.Owin.Security.nuspec b/src/Microsoft.Owin.Security/Microsoft.Owin.Security.nuspec index 641a6801..66127b87 100644 --- a/src/Microsoft.Owin.Security/Microsoft.Owin.Security.nuspec +++ b/src/Microsoft.Owin.Security/Microsoft.Owin.Security.nuspec @@ -6,7 +6,7 @@ $authors$ $authors$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.SelfHost/Microsoft.Owin.SelfHost.nuspec b/src/Microsoft.Owin.SelfHost/Microsoft.Owin.SelfHost.nuspec index c9ae012c..024a0bb0 100644 --- a/src/Microsoft.Owin.SelfHost/Microsoft.Owin.SelfHost.nuspec +++ b/src/Microsoft.Owin.SelfHost/Microsoft.Owin.SelfHost.nuspec @@ -6,7 +6,7 @@ $authors$ $authors$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.StaticFiles/Microsoft.Owin.StaticFiles.nuspec b/src/Microsoft.Owin.StaticFiles/Microsoft.Owin.StaticFiles.nuspec index b3db5560..677000bd 100644 --- a/src/Microsoft.Owin.StaticFiles/Microsoft.Owin.StaticFiles.nuspec +++ b/src/Microsoft.Owin.StaticFiles/Microsoft.Owin.StaticFiles.nuspec @@ -6,7 +6,7 @@ $authors$ $authors$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin.Testing/Microsoft.Owin.Testing.nuspec b/src/Microsoft.Owin.Testing/Microsoft.Owin.Testing.nuspec index 267f90ef..e232ffc2 100644 --- a/src/Microsoft.Owin.Testing/Microsoft.Owin.Testing.nuspec +++ b/src/Microsoft.Owin.Testing/Microsoft.Owin.Testing.nuspec @@ -6,7 +6,7 @@ $authors$ $authors$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/Microsoft.Owin/Microsoft.Owin.nuspec b/src/Microsoft.Owin/Microsoft.Owin.nuspec index a0b9257e..29b2ee42 100644 --- a/src/Microsoft.Owin/Microsoft.Owin.nuspec +++ b/src/Microsoft.Owin/Microsoft.Owin.nuspec @@ -6,7 +6,7 @@ $authors$ $authors$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$ diff --git a/src/OwinHost/OwinHost.nuspec b/src/OwinHost/OwinHost.nuspec index 66c7f04f..28220e3e 100644 --- a/src/OwinHost/OwinHost.nuspec +++ b/src/OwinHost/OwinHost.nuspec @@ -6,7 +6,7 @@ $authors$ $authors$ © Microsoft Corporation. All rights reserved. - $licenseUrl$ + Apache-2.0 $projectUrl$ true $title$