Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use License Expression #378

Merged
merged 1 commit into from
Sep 3, 2020
Merged

Use License Expression #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion build/Katana.version.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 1 addition & 4 deletions build/Sakefile.shade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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=''
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.Cors/Microsoft.Owin.Cors.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.Diagnostics/Microsoft.Owin.Diagnostics.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.FileSystems/Microsoft.Owin.FileSystems.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.Host.HttpListener/Microsoft.Owin.Host.HttpListener.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.Host.SystemWeb/Microsoft.Owin.Host.SystemWeb.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.Hosting/Microsoft.Owin.Hosting.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.Security.ActiveDirectory/Microsoft.Owin.Security.ActiveDirectory.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.Security.Cookies/Microsoft.Owin.Security.Cookies.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.Security.Facebook/Microsoft.Owin.Security.Facebook.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.Security.Google/Microsoft.Owin.Security.Google.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.Security.Jwt/Microsoft.Owin.Security.Jwt.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.Security.MicrosoftAccount/Microsoft.Owin.Security.MicrosoftAccount.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.Security.OAuth/Microsoft.Owin.Security.OAuth.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.Security.OpenIdConnect/Microsoft.Owin.Security.OpenIdConnect.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.Security.Twitter/Microsoft.Owin.Security.Twitter.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.Security.WsFederation/Microsoft.Owin.Security.WsFederation.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.Security/Microsoft.Owin.Security.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.SelfHost/Microsoft.Owin.SelfHost.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.StaticFiles/Microsoft.Owin.StaticFiles.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin.Testing/Microsoft.Owin.Testing.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Owin/Microsoft.Owin.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/OwinHost/OwinHost.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down