Merge branch 'v4-dev' into v4-dev-xmr-rm-obsolete-redirects

twbs · Dec 22, 2018 · 3783f33 · 3783f33
2 parents c3b1497 + 74987d9
commit 3783f33
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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" />

diff --git a/site/_includes/header.html b/site/_includes/header.html
@@ -4,6 +4,9 @@
 <meta name="author" content="{{ site.authors }}">
 <meta name="generator" content="Jekyll v{{ jekyll.version }}">
 
+<meta name="docsearch:language" content="en">
+<meta name="docsearch:version" content="{{ site.docs_version }}">
+
 <title>
   {%- if page.title -%}
     {{ page.title | smartify }} · {{ site.title | smartify }}