From dee3ab427cb9b73639e38a60e1cbb59dc99fedf4 Mon Sep 17 00:00:00 2001
From: Jesse Mandel <jesse.mandel@gmail.com>
Date: Sat, 22 Dec 2018 07:09:51 -0800
Subject: Update nuspec and build script (#27894)

Update nuspec and build script to support `<license />` instead of the deprecated `<licenseUrl />`
---
 nuget/MyGet.ps1             | 9 +++++----
 nuget/bootstrap.nuspec      | 4 +++-
 nuget/bootstrap.sass.nuspec | 4 +++-
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'nuget')

diff --git a/nuget/MyGet.ps1 b/nuget/MyGet.ps1
index 71110b5c1e..e1e9904670 100644
--- a/nuget/MyGet.ps1
+++ b/nuget/MyGet.ps1
@@ -1,16 +1,17 @@
 # set env vars usually set by MyGet (enable for local testing)
 #$env:SourcesPath = '..'
-#$env:NuGet = "./nuget.exe" #https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
+#$env:NuGet = "./nuget.exe" # https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
 
 $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
 $bsversionParts = ((Get-Content $env:SourcesPath\package.json) -join "`n" | ConvertFrom-Json).version.split('-', 2) # split the version on the '-'
 $bsversion = $bsversionParts[0]
 
-if ($bsversionParts.Length -gt 1)
-{
-    $bsversion += '-' + $bsversionParts[1].replace('.', '').replace('-', '_')   # strip out invalid chars from the PreRelease part
+if ($bsversionParts.Length -gt 1) {
+  $bsversion += '-' + $bsversionParts[1].replace('.', '').replace('-', '_') # strip out invalid chars from the PreRelease part
 }
 
 # create packages
diff --git a/nuget/bootstrap.nuspec b/nuget/bootstrap.nuspec
index 1af72d399f..7f31af1a81 100644
--- a/nuget/bootstrap.nuspec
+++ b/nuget/bootstrap.nuspec
@@ -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>
@@ -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" />
diff --git a/nuget/bootstrap.sass.nuspec b/nuget/bootstrap.sass.nuspec
index 0e71eb6f7c..1793d58bf9 100644
--- a/nuget/bootstrap.sass.nuspec
+++ b/nuget/bootstrap.sass.nuspec
@@ -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>
@@ -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" />
-- 
cgit v1.2.3