0
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-26 23:54:23 +01:00

Update nuspec and build script (#27894)

Update nuspec and build script to support `<license />` instead of the deprecated `<licenseUrl />`
This commit is contained in:
Jesse Mandel 2018-12-22 07:09:51 -08:00 committed by XhmikosR
parent 2dda0a22e4
commit dee3ab427c
3 changed files with 11 additions and 6 deletions

View File

@ -4,12 +4,13 @@
$nuget = $env:NuGet $nuget = $env:NuGet
Copy-Item $env:SourcesPath\LICENSE $env:SourcesPath\LICENSE.txt # has to be .txt extension, don't check in
# parse the version number out of package.json # parse the version number out of package.json
$bsversionParts = ((Get-Content $env:SourcesPath\package.json) -join "`n" | ConvertFrom-Json).version.split('-', 2) # split the version on the '-' $bsversionParts = ((Get-Content $env:SourcesPath\package.json) -join "`n" | ConvertFrom-Json).version.split('-', 2) # split the version on the '-'
$bsversion = $bsversionParts[0] $bsversion = $bsversionParts[0]
if ($bsversionParts.Length -gt 1) if ($bsversionParts.Length -gt 1) {
{
$bsversion += '-' + $bsversionParts[1].replace('.', '').replace('-', '_') # strip out invalid chars from the PreRelease part $bsversion += '-' + $bsversionParts[1].replace('.', '').replace('-', '_') # strip out invalid chars from the PreRelease part
} }

View File

@ -12,7 +12,7 @@
<language>en-us</language> <language>en-us</language>
<projectUrl>https://getbootstrap.com/</projectUrl> <projectUrl>https://getbootstrap.com/</projectUrl>
<iconUrl>https://getbootstrap.com/docs/4.2/assets/img/favicons/apple-touch-icon.png</iconUrl> <iconUrl>https://getbootstrap.com/docs/4.2/assets/img/favicons/apple-touch-icon.png</iconUrl>
<licenseUrl>https://github.com/twbs/bootstrap/blob/master/LICENSE</licenseUrl> <license type="file">LICENSE.txt</license>
<copyright>Copyright 2017-2018</copyright> <copyright>Copyright 2017-2018</copyright>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies> <dependencies>
@ -22,6 +22,8 @@
<tags>css mobile-first responsive front-end framework web</tags> <tags>css mobile-first responsive front-end framework web</tags>
</metadata> </metadata>
<files> <files>
<file src="LICENSE.txt" target="" />
<file src="dist\css\*.*" target="content\Content" /> <file src="dist\css\*.*" target="content\Content" />
<file src="dist\js\bootstrap*.js" target="content\Scripts" /> <file src="dist\js\bootstrap*.js" target="content\Scripts" />
<file src="dist\js\bootstrap*.js.map" target="content\Scripts" /> <file src="dist\js\bootstrap*.js.map" target="content\Scripts" />

View File

@ -12,7 +12,7 @@
<language>en-us</language> <language>en-us</language>
<projectUrl>https://getbootstrap.com/</projectUrl> <projectUrl>https://getbootstrap.com/</projectUrl>
<iconUrl>https://getbootstrap.com/docs/4.2/assets/img/favicons/apple-touch-icon.png</iconUrl> <iconUrl>https://getbootstrap.com/docs/4.2/assets/img/favicons/apple-touch-icon.png</iconUrl>
<licenseUrl>https://github.com/twbs/bootstrap/blob/master/LICENSE</licenseUrl> <license type="file">LICENSE.txt</license>
<copyright>Copyright 2017-2018</copyright> <copyright>Copyright 2017-2018</copyright>
<requireLicenseAcceptance>false</requireLicenseAcceptance> <requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies> <dependencies>
@ -22,6 +22,8 @@
<tags>css sass mobile-first responsive front-end framework web</tags> <tags>css sass mobile-first responsive front-end framework web</tags>
</metadata> </metadata>
<files> <files>
<file src="LICENSE.txt" target="" />
<file src="scss\**\*.scss" target="content\Content\bootstrap" /> <file src="scss\**\*.scss" target="content\Content\bootstrap" />
<file src="dist\js\bootstrap*.js" target="content\Scripts" /> <file src="dist\js\bootstrap*.js" target="content\Scripts" />
<file src="dist\js\bootstrap*.js.map" target="content\Scripts" /> <file src="dist\js\bootstrap*.js.map" target="content\Scripts" />