diff --git a/docs/legal/CREDITS.md b/docs/legal/CREDITS.md index 3c064a42ea..317b2ae0fa 100644 --- a/docs/legal/CREDITS.md +++ b/docs/legal/CREDITS.md @@ -6,7 +6,7 @@ - [Contributors](#contributors) - [Third Party Licenses - Development](#third-party-licenses---development) - [Third Party Licenses - Runtime](#third-party-licenses---runtime) - - [7-Zip @ 21.07](#7-zip--2107) + - [7-Zip @ 23.01](#7-zip--2301) - [AlphaFS @ 2.1.3](#alphafs--213) - [Checksum @ 0.2.0](#checksum--020) - [log4net @ 2.0.12](#log4net--2012) @@ -73,7 +73,7 @@ We would like to credit other super sweet tools/frameworks that aid in the devel Chocolatey CLI (choco) uses a number of 3rd-party components. Their details are below. -### 7-Zip @ 21.07 +### 7-Zip @ 23.01 Chocolatey uses [7-Zip](http://www.7-zip.org/) for uncompressing archives. [License terms](http://www.7-zip.org/license.txt): @@ -84,7 +84,7 @@ Chocolatey uses [7-Zip](http://www.7-zip.org/) for uncompressing archives. License for use and distribution ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 7-Zip Copyright (C) 1999-2022 Igor Pavlov. + 7-Zip Copyright (C) 1999-2023 Igor Pavlov. The licenses for files are: @@ -707,7 +707,7 @@ Chocolatey uses [Microsoft.Web.Xdt](https://www.nuget.org/packages/Microsoft.Web It also applies even if Microsoft knew or should have known about the possibility of the damages. The above limitation or exclusion may not apply to you because your country may not allow the exclusion or limitation of incidental, consequential or other damages. ``` -### Chocolatey.NuGet.Client @ 3.4.0 +### Chocolatey.NuGet.Client @ 3.4.2 Chocolatey uses [NuGet.Client](https://github.com/NuGet/NuGet.Client) [(modified)](https://github.com/chocolatey/NuGet.Client) to work with packaging. [License terms](https://github.com/NuGet/NuGet.Client/blob/72f9f2b2eab28c9d91a22065c55aa7702abf7e01/LICENSE.txt): diff --git a/gitreleasemanager.yaml b/gitreleasemanager.yaml index 8234d9bb20..67025842b0 100644 --- a/gitreleasemanager.yaml +++ b/gitreleasemanager.yaml @@ -6,6 +6,7 @@ issue-labels-include: - Bug - Improvement - Documentation +- Dependency Change issue-labels-exclude: - Internal Refactoring - BuildAutomation diff --git a/src/chocolatey.install/chocolatey.en-us.wxl b/src/chocolatey.install/chocolatey.en-us.wxl index 485b3db669..d2f18d85d4 100644 --- a/src/chocolatey.install/chocolatey.en-us.wxl +++ b/src/chocolatey.install/chocolatey.en-us.wxl @@ -4,6 +4,7 @@ A newer version of Chocolatey is already installed. Add the Chocolatey Helpers to your PowerShell Profile to enable tab-completions. Defaults to adding to the AllUsersAllHosts profile. - This application requires .NET Framework 4.8. Please install the .NET Framework then run this installer again. - Sets the location for the Tools Folder - \ No newline at end of file + Chocolatey CLI requires .NET Framework 4.8. Please install the .NET Framework then run this installer again. + The Chocolatey CLI MSI is intended for installation only. Please run 'choco upgrade chocolatey' from an elevated terminal window to upgrade. + Sets the location for the Tools Folder. + diff --git a/src/chocolatey.install/chocolatey.wxs b/src/chocolatey.install/chocolatey.wxs index 68afd6cb67..5ea061104d 100644 --- a/src/chocolatey.install/chocolatey.wxs +++ b/src/chocolatey.install/chocolatey.wxs @@ -11,7 +11,7 @@ - + @@ -23,10 +23,6 @@ - - - - @@ -35,17 +31,13 @@ - - - - @@ -54,14 +46,6 @@ - - - - - - - - diff --git a/src/chocolatey.resources/tools/7z.dll b/src/chocolatey.resources/tools/7z.dll index 654f92ef96..7c1527a09e 100644 Binary files a/src/chocolatey.resources/tools/7z.dll and b/src/chocolatey.resources/tools/7z.dll differ diff --git a/src/chocolatey.resources/tools/7z.exe b/src/chocolatey.resources/tools/7z.exe index c8770bded3..a8e8480b0f 100644 Binary files a/src/chocolatey.resources/tools/7z.exe and b/src/chocolatey.resources/tools/7z.exe differ diff --git a/src/chocolatey.resources/tools/7zip.license.txt b/src/chocolatey.resources/tools/7zip.license.txt index d10eb27d6e..adaf805b8c 100644 --- a/src/chocolatey.resources/tools/7zip.license.txt +++ b/src/chocolatey.resources/tools/7zip.license.txt @@ -3,19 +3,20 @@ License for use and distribution ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 7-Zip Copyright (C) 1999-2016 Igor Pavlov. + 7-Zip Copyright (C) 1999-2023 Igor Pavlov. - Licenses for files are: + The licenses for files are: - 1) 7z.dll: GNU LGPL + unRAR restriction - 2) All other files: GNU LGPL + 1) 7z.dll: + - The "GNU LGPL" as main license for most of the code + - The "GNU LGPL" with "unRAR license restriction" for some code + - The "BSD 3-clause License" for some code + 2) All other files: the "GNU LGPL". - The GNU LGPL + unRAR restriction means that you must follow both - GNU LGPL rules and unRAR restriction rules. + Redistributions in binary form must reproduce related license information from this file. - - Note: - You can use 7-Zip on any computer, including a computer in a commercial + Note: + You can use 7-Zip on any computer, including a computer in a commercial organization. You don't need to register or pay for 7-Zip. @@ -32,21 +33,54 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - You can receive a copy of the GNU Lesser General Public License from + You can receive a copy of the GNU Lesser General Public License from http://www.gnu.org/ - unRAR restriction - ----------------- - The decompression engine for RAR archives was developed using source + + BSD 3-clause License + -------------------- + + The "BSD 3-clause License" is used for the code in 7z.dll that implements LZFSE data decompression. + That code was derived from the code in the "LZFSE compression library" developed by Apple Inc, + that also uses the "BSD 3-clause License": + + ---- + Copyright (c) 2015-2016, Apple Inc. All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the distribution. + + 3. Neither the name of the copyright holder(s) nor the names of any contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ---- + + + + + unRAR license restriction + ------------------------- + + The decompression engine for RAR archives was developed using source code of unRAR program. All copyrights to original unRAR code are owned by Alexander Roshal. The license for original unRAR code has the following restriction: - The unRAR sources cannot be used to re-create the RAR compression algorithm, - which is proprietary. Distribution of modified unRAR sources in separate form + The unRAR sources cannot be used to re-create the RAR compression algorithm, + which is proprietary. Distribution of modified unRAR sources in separate form or as a part of other software is permitted, provided that it is clearly stated in the documentation and source comments that the code may not be used to develop a RAR (WinRAR) compatible archiver. diff --git a/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj b/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj index e58bd13de2..c3be6cc3c1 100644 --- a/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj +++ b/src/chocolatey.tests.integration/chocolatey.tests.integration.csproj @@ -80,22 +80,22 @@ - ..\packages\Chocolatey.NuGet.Common.3.4.0\lib\net472\Chocolatey.NuGet.Common.dll + ..\packages\Chocolatey.NuGet.Common.3.4.2\lib\net472\Chocolatey.NuGet.Common.dll - ..\packages\Chocolatey.NuGet.Configuration.3.4.0\lib\net472\Chocolatey.NuGet.Configuration.dll + ..\packages\Chocolatey.NuGet.Configuration.3.4.2\lib\net472\Chocolatey.NuGet.Configuration.dll - ..\packages\Chocolatey.NuGet.Frameworks.3.4.0\lib\net472\Chocolatey.NuGet.Frameworks.dll + ..\packages\Chocolatey.NuGet.Frameworks.3.4.2\lib\net472\Chocolatey.NuGet.Frameworks.dll - ..\packages\Chocolatey.NuGet.Packaging.3.4.0\lib\net472\Chocolatey.NuGet.Packaging.dll + ..\packages\Chocolatey.NuGet.Packaging.3.4.2\lib\net472\Chocolatey.NuGet.Packaging.dll - ..\packages\Chocolatey.NuGet.Protocol.3.4.0\lib\net472\Chocolatey.NuGet.Protocol.dll + ..\packages\Chocolatey.NuGet.Protocol.3.4.2\lib\net472\Chocolatey.NuGet.Protocol.dll - ..\packages\Chocolatey.NuGet.Versioning.3.4.0\lib\net472\Chocolatey.NuGet.Versioning.dll + ..\packages\Chocolatey.NuGet.Versioning.3.4.2\lib\net472\Chocolatey.NuGet.Versioning.dll ..\packages\FluentAssertions.6.11.0\lib\net47\FluentAssertions.dll diff --git a/src/chocolatey.tests.integration/packages.config b/src/chocolatey.tests.integration/packages.config index ba66e4604b..d2a5ea1918 100644 --- a/src/chocolatey.tests.integration/packages.config +++ b/src/chocolatey.tests.integration/packages.config @@ -1,11 +1,11 @@  - - - - - - + + + + + + diff --git a/src/chocolatey.tests/chocolatey.tests.csproj b/src/chocolatey.tests/chocolatey.tests.csproj index f3abe1448b..75ec5e4ee0 100644 --- a/src/chocolatey.tests/chocolatey.tests.csproj +++ b/src/chocolatey.tests/chocolatey.tests.csproj @@ -79,43 +79,43 @@ - ..\packages\Chocolatey.NuGet.Commands.3.4.0\lib\net472\Chocolatey.NuGet.Commands.dll + ..\packages\Chocolatey.NuGet.Commands.3.4.2\lib\net472\Chocolatey.NuGet.Commands.dll - ..\packages\Chocolatey.NuGet.Common.3.4.0\lib\net472\Chocolatey.NuGet.Common.dll + ..\packages\Chocolatey.NuGet.Common.3.4.2\lib\net472\Chocolatey.NuGet.Common.dll - ..\packages\Chocolatey.NuGet.Configuration.3.4.0\lib\net472\Chocolatey.NuGet.Configuration.dll + ..\packages\Chocolatey.NuGet.Configuration.3.4.2\lib\net472\Chocolatey.NuGet.Configuration.dll - ..\packages\Chocolatey.NuGet.Credentials.3.4.0\lib\net472\Chocolatey.NuGet.Credentials.dll + ..\packages\Chocolatey.NuGet.Credentials.3.4.2\lib\net472\Chocolatey.NuGet.Credentials.dll - ..\packages\Chocolatey.NuGet.DependencyResolver.Core.3.4.0\lib\net472\Chocolatey.NuGet.DependencyResolver.Core.dll + ..\packages\Chocolatey.NuGet.DependencyResolver.Core.3.4.2\lib\net472\Chocolatey.NuGet.DependencyResolver.Core.dll - ..\packages\Chocolatey.NuGet.Frameworks.3.4.0\lib\net472\Chocolatey.NuGet.Frameworks.dll + ..\packages\Chocolatey.NuGet.Frameworks.3.4.2\lib\net472\Chocolatey.NuGet.Frameworks.dll - ..\packages\Chocolatey.NuGet.LibraryModel.3.4.0\lib\net472\Chocolatey.NuGet.LibraryModel.dll + ..\packages\Chocolatey.NuGet.LibraryModel.3.4.2\lib\net472\Chocolatey.NuGet.LibraryModel.dll - ..\packages\Chocolatey.NuGet.PackageManagement.3.4.0\lib\net472\Chocolatey.NuGet.PackageManagement.dll + ..\packages\Chocolatey.NuGet.PackageManagement.3.4.2\lib\net472\Chocolatey.NuGet.PackageManagement.dll - ..\packages\Chocolatey.NuGet.Packaging.3.4.0\lib\net472\Chocolatey.NuGet.Packaging.dll + ..\packages\Chocolatey.NuGet.Packaging.3.4.2\lib\net472\Chocolatey.NuGet.Packaging.dll - ..\packages\Chocolatey.NuGet.ProjectModel.3.4.0\lib\net472\Chocolatey.NuGet.ProjectModel.dll + ..\packages\Chocolatey.NuGet.ProjectModel.3.4.2\lib\net472\Chocolatey.NuGet.ProjectModel.dll - ..\packages\Chocolatey.NuGet.Protocol.3.4.0\lib\net472\Chocolatey.NuGet.Protocol.dll + ..\packages\Chocolatey.NuGet.Protocol.3.4.2\lib\net472\Chocolatey.NuGet.Protocol.dll - ..\packages\Chocolatey.NuGet.Resolver.3.4.0\lib\net472\Chocolatey.NuGet.Resolver.dll + ..\packages\Chocolatey.NuGet.Resolver.3.4.2\lib\net472\Chocolatey.NuGet.Resolver.dll - ..\packages\Chocolatey.NuGet.Versioning.3.4.0\lib\net472\Chocolatey.NuGet.Versioning.dll + ..\packages\Chocolatey.NuGet.Versioning.3.4.2\lib\net472\Chocolatey.NuGet.Versioning.dll ..\packages\FluentAssertions.6.11.0\lib\net47\FluentAssertions.dll diff --git a/src/chocolatey.tests/packages.config b/src/chocolatey.tests/packages.config index 9e11fd3366..b7fa57925b 100644 --- a/src/chocolatey.tests/packages.config +++ b/src/chocolatey.tests/packages.config @@ -1,18 +1,18 @@  - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/chocolatey/chocolatey.csproj b/src/chocolatey/chocolatey.csproj index cbc7c14524..a945314f6d 100644 --- a/src/chocolatey/chocolatey.csproj +++ b/src/chocolatey/chocolatey.csproj @@ -1,4 +1,4 @@ - + @@ -103,43 +103,43 @@ ..\packages\AlphaFS.2.1.3\lib\net40\AlphaFS.dll - ..\packages\Chocolatey.NuGet.Commands.3.4.0\lib\net472\Chocolatey.NuGet.Commands.dll + ..\packages\Chocolatey.NuGet.Commands.3.4.2\lib\net472\Chocolatey.NuGet.Commands.dll - ..\packages\Chocolatey.NuGet.Common.3.4.0\lib\net472\Chocolatey.NuGet.Common.dll + ..\packages\Chocolatey.NuGet.Common.3.4.2\lib\net472\Chocolatey.NuGet.Common.dll - ..\packages\Chocolatey.NuGet.Configuration.3.4.0\lib\net472\Chocolatey.NuGet.Configuration.dll + ..\packages\Chocolatey.NuGet.Configuration.3.4.2\lib\net472\Chocolatey.NuGet.Configuration.dll - ..\packages\Chocolatey.NuGet.Credentials.3.4.0\lib\net472\Chocolatey.NuGet.Credentials.dll + ..\packages\Chocolatey.NuGet.Credentials.3.4.2\lib\net472\Chocolatey.NuGet.Credentials.dll - ..\packages\Chocolatey.NuGet.DependencyResolver.Core.3.4.0\lib\net472\Chocolatey.NuGet.DependencyResolver.Core.dll + ..\packages\Chocolatey.NuGet.DependencyResolver.Core.3.4.2\lib\net472\Chocolatey.NuGet.DependencyResolver.Core.dll - ..\packages\Chocolatey.NuGet.Frameworks.3.4.0\lib\net472\Chocolatey.NuGet.Frameworks.dll + ..\packages\Chocolatey.NuGet.Frameworks.3.4.2\lib\net472\Chocolatey.NuGet.Frameworks.dll - ..\packages\Chocolatey.NuGet.LibraryModel.3.4.0\lib\net472\Chocolatey.NuGet.LibraryModel.dll + ..\packages\Chocolatey.NuGet.LibraryModel.3.4.2\lib\net472\Chocolatey.NuGet.LibraryModel.dll - ..\packages\Chocolatey.NuGet.PackageManagement.3.4.0\lib\net472\Chocolatey.NuGet.PackageManagement.dll + ..\packages\Chocolatey.NuGet.PackageManagement.3.4.2\lib\net472\Chocolatey.NuGet.PackageManagement.dll - ..\packages\Chocolatey.NuGet.Packaging.3.4.0\lib\net472\Chocolatey.NuGet.Packaging.dll + ..\packages\Chocolatey.NuGet.Packaging.3.4.2\lib\net472\Chocolatey.NuGet.Packaging.dll - ..\packages\Chocolatey.NuGet.ProjectModel.3.4.0\lib\net472\Chocolatey.NuGet.ProjectModel.dll + ..\packages\Chocolatey.NuGet.ProjectModel.3.4.2\lib\net472\Chocolatey.NuGet.ProjectModel.dll - ..\packages\Chocolatey.NuGet.Protocol.3.4.0\lib\net472\Chocolatey.NuGet.Protocol.dll + ..\packages\Chocolatey.NuGet.Protocol.3.4.2\lib\net472\Chocolatey.NuGet.Protocol.dll - ..\packages\Chocolatey.NuGet.Resolver.3.4.0\lib\net472\Chocolatey.NuGet.Resolver.dll + ..\packages\Chocolatey.NuGet.Resolver.3.4.2\lib\net472\Chocolatey.NuGet.Resolver.dll - ..\packages\Chocolatey.NuGet.Versioning.3.4.0\lib\net472\Chocolatey.NuGet.Versioning.dll + ..\packages\Chocolatey.NuGet.Versioning.3.4.2\lib\net472\Chocolatey.NuGet.Versioning.dll ..\packages\log4net.2.0.12\lib\net45\log4net.dll diff --git a/src/chocolatey/packages.config b/src/chocolatey/packages.config index fa3fff3c7e..3a576fa18d 100644 --- a/src/chocolatey/packages.config +++ b/src/chocolatey/packages.config @@ -1,19 +1,19 @@  - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/tests/chocolatey-tests/BundledApplications.Tests.ps1 b/tests/chocolatey-tests/BundledApplications.Tests.ps1 index 96f0c153f6..3c8e824abe 100644 --- a/tests/chocolatey-tests/BundledApplications.Tests.ps1 +++ b/tests/chocolatey-tests/BundledApplications.Tests.ps1 @@ -2,7 +2,7 @@ Describe 'Ensuring correct version of is installed' -Tag BundledApplications -ForEach @( @{ Name = 'shimgen' ; Version = '2.0.0' ; ChocolateyVersion = '2.0.0-alpha' ; IsSigned = $true } - @{ Name = '7z' ; Version = '21.07' ; ChocolateyVersion = '1.1.0' ; IsSigned = $false } + @{ Name = '7z' ; Version = '23.01' ; ChocolateyVersion = '2.2.1-alpha' ; IsSigned = $false } ) -Skip:(-not (Test-ChocolateyVersionEqualOrHigherThan "1.0.0")) { Context ' is correctly installed' -Skip:(-not (Test-ChocolateyVersionEqualOrHigherThan $ChocolateyVersion)) { BeforeAll {