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

Jump to bottom

Update nuspec and build script #27894

Merged
merged 5 commits into from
Dec 22, 2018
Merged

Update nuspec and build script #27894

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d14b80
Update nuspec and build script to support <license /> instead of depr…
supergibbs Dec 21, 2018
7bf38b6
Merge branch 'v4-dev' into update_nuspec_license
XhmikosR Dec 22, 2018
2afcbd7
Update MyGet.ps1
XhmikosR Dec 22, 2018
cffd61a
Update bootstrap.nuspec
XhmikosR Dec 22, 2018
630f77e
Update bootstrap.sass.nuspec
XhmikosR Dec 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions nuget/MyGet.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

$nuget = $env:NuGet

Copy-Item $env:SourcesPath\LICENSE $env:SourcesPath\LICENSE.txt #has to be .txt extension, don't check in
XhmikosR marked this conversation as resolved.
Show resolved Hide resolved

# 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 '-'
$bsversion = $bsversionParts[0]
Expand Down
4 changes: 3 additions & 1 deletion nuget/bootstrap.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<language>en-us</language>
<projectUrl>https://getbootstrap.com/</projectUrl>
<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>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies>
Expand All @@ -22,6 +22,8 @@
<tags>css mobile-first responsive front-end framework web</tags>
</metadata>
<files>
<file src="LICENSE.txt" target="" />

<file src="dist\css\*.*" target="content\Content" />
<file src="dist\js\bootstrap*.js" target="content\Scripts" />
<file src="dist\js\bootstrap*.js.map" target="content\Scripts" />
Expand Down
4 changes: 3 additions & 1 deletion nuget/bootstrap.sass.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<language>en-us</language>
<projectUrl>https://getbootstrap.com/</projectUrl>
<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>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<dependencies>
Expand All @@ -22,6 +22,8 @@
<tags>css sass mobile-first responsive front-end framework web</tags>
</metadata>
<files>
<file src="LICENSE.txt" target="" />

<file src="scss\**\*.scss" target="content\Content\bootstrap" />
<file src="dist\js\bootstrap*.js" target="content\Scripts" />
<file src="dist\js\bootstrap*.js.map" target="content\Scripts" />
Expand Down