]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Backport: NuGet Changes v4-dev 34212/head
authorJesse Mandel <jesse.mandel@gmail.com>
Wed, 9 Nov 2022 07:17:19 +0000 (23:17 -0800)
committerGitHub <noreply@github.com>
Wed, 9 Nov 2022 07:17:19 +0000 (09:17 +0200)
Update authors and copyright to match npm, add repository reference. Also incorporates licensing expression change by @vanillajonathan (#37378)

Co-authored-by: Jesse Mandel <jesse.mandel@jdpa.com>
nuget/MyGet.ps1
nuget/bootstrap.nuspec
nuget/bootstrap.sass.nuspec

index e1e9904670801615d24f3a9e813016ae1c15da23..5213b0104ed2ef6b7da571559d92ce3c67e4cc67 100644 (file)
@@ -4,8 +4,6 @@
 
 $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]
index 5ed5918c8030515d6830d24091aeefc8d125e744..ba1fc6246d0396524a7f6f503b0d5b9471124af2 100644 (file)
@@ -5,16 +5,17 @@
     <!-- pulled from package.json -->
     <version>4</version>
     <title>Bootstrap CSS</title>
-    <authors>The Bootstrap Authors, Twitter Inc.</authors>
+    <authors>The Bootstrap Authors</authors>
     <owners>bootstrap</owners>
     <description>The most popular front-end framework for developing responsive, mobile first projects on the web.</description>
     <releaseNotes>https://blog.getbootstrap.com/</releaseNotes>
-    <summary>Bootstrap framework in CSS. Includes JavaScript</summary>
+    <summary>Bootstrap framework in CSS. Includes JavaScript.</summary>
     <language>en-us</language>
     <projectUrl>https://getbootstrap.com/</projectUrl>
+    <repository type="git" url="https://github.com/twbs/bootstrap.git" branch="v4-dev" />
     <icon>bootstrap.png</icon>
-    <license type="file">LICENSE.txt</license>
-    <copyright>Copyright 2017-2022</copyright>
+    <license type="expression">MIT</license>
+    <copyright>Copyright 2011-2022</copyright>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
       <dependency id="jQuery" version="[3.0.0,4)" />
@@ -26,7 +27,6 @@
     </contentFiles>
   </metadata>
   <files>
-    <file src="LICENSE.txt" target="" />
     <file src="nuget\bootstrap.png" target="" />
 
     <file src="dist\css\*.*" target="content\Content" />
index 29ddfb0454fcea15b96f4820b160b5803c48ced2..0d0ed0d2fa698bb1ed4005c0c376ebdaf4406e5a 100644 (file)
@@ -5,16 +5,17 @@
     <!-- pulled from package.json -->
     <version>4</version>
     <title>Bootstrap Sass</title>
-    <authors>The Bootstrap Authors, Twitter Inc.</authors>
+    <authors>The Bootstrap Authors</authors>
     <owners>bootstrap</owners>
     <description>The most popular front-end framework for developing responsive, mobile first projects on the web.</description>
     <releaseNotes>https://blog.getbootstrap.com/</releaseNotes>
     <summary>Bootstrap framework in Sass. Includes JavaScript</summary>
     <language>en-us</language>
     <projectUrl>https://getbootstrap.com/</projectUrl>
+    <repository type="git" url="https://github.com/twbs/bootstrap.git" branch="v4-dev" />
     <icon>bootstrap.png</icon>
-    <license type="file">LICENSE.txt</license>
-    <copyright>Copyright 2017-2022</copyright>
+    <license type="expression">MIT</license>
+    <copyright>Copyright 2011-2022</copyright>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <dependencies>
       <dependency id="jQuery" version="[3.0.0,4)" />
@@ -26,7 +27,6 @@
     </contentFiles>
   </metadata>
   <files>
-    <file src="LICENSE.txt" target="" />
     <file src="nuget\bootstrap.png" target="" />
 
     <file src="scss\**\*.scss" target="content\Content\bootstrap" />