Merge pull request #3781 from chocolatey/hotfix/2.5.1

(release) 2.5.1

Author: AdmiringWorm

.github/workflows/build.yml

@@ -76,16 +76,9 @@ jobs:
           code_drop\Packages\Chocolatey\*.nupkg
           code_drop\MsBuild.log
           code_drop\MSIs\en-US\chocolatey-*.msi
-  #  - uses: coverallsapp/github-action@master
-  #    with:
-  #      github-token: ${{ secrets.GITHUB_TOKEN }}
-  #      path-to-lcov: |
-  #        code_drop\TestCoverage\lcov.info
-  #      flag-name: run-${{ matrix.os }}
-  #      parallel: true
   # Build using mono on MacOS
   macos-build:
-    runs-on: macos-latest
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v3
       with:
@@ -118,11 +111,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: Cache Tools
-        uses: actions/cache@v4
-        with:
-          path: tools
-          key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
       - name: Set up Docker Buildx
@@ -134,19 +122,3 @@ jobs:
           file: docker/Dockerfile.linux
           push: false
           tags: chocolatey/choco:latest
-          build-args: |
-            "github_actions=true"
-            "github_ref=${{ github.ref }}"
-            "github_repository=${{ github.repository }}"
-            "github_base_ref=${{ github.base_ref }}"
-            "github_head_ref=${{ github.head_ref }}"
-            "github_run_number=${{ github.run_number }}"
-  #upload-code-coverage-results:
-  #  needs: [ubuntu-build, windows-build, macos-build]
-  #  runs-on: ubuntu-latest
-  #  steps:
-  #  - name: Coveralls Finished
-  #    uses: coverallsapp/github-action@master
-  #    with:
-  #      github-token: ${{ secrets.GITHUB_TOKEN }}
-  #      parallel-finished: true

.github/workflows/test.yml

@@ -71,7 +71,7 @@ jobs:
           code_drop\MsBuild.log
   # Build and test using mono on MacOS
   macos-build:
-    runs-on: macos-latest
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v3
       with:

docker/Dockerfile.linux

@@ -1,21 +1,12 @@
-ARG monoversion="6.12"
-FROM mono:${monoversion} as build
+FROM debian:bookworm AS build
 
-ARG github_actions="false"
-ARG github_ref
-ARG github_repository
-ARG github_base_ref
-ARG github_head_ref
-ARG github_run_number
+RUN apt update; \
+    apt install gnupg dirmngr apt-transport-https ca-certificates -y; \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF; \
+    sh -c 'echo "deb https://download.mono-project.com/repo/debian stable-buster main" > /etc/apt/sources.list.d/mono-official-stable.list'
 
-ENV GITHUB_REF=$github_ref
-ENV GITHUB_REPOSITORY=$github_repository
-ENV GITHUB_BASE_REF=$github_base_ref
-ENV GITHUB_HEAD_REF=$github_head_ref
-ENV GITHUB_RUN_NUMBER=$github_run_number
-
-RUN echo deb http://archive.debian.org/debian buster-backports main | tee /etc/apt/sources.list.d/buster-backports.list; \
-    apt-get update && apt-get install -t buster-backports git -y
+RUN apt update; \
+    apt install git mono-complete curl -y
 
 RUN curl -o packages-microsoft-prod.deb https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb; \
     dpkg -i packages-microsoft-prod.deb; \
@@ -29,10 +20,7 @@ RUN chmod +x *.sh
 
 ARG buildscript="build.sh"
 
-RUN if [ "$github_actions" = "true" ]; then \
-    export GITHUB_ACTIONS=$github_actions; \
-  fi; \
-  if [ "$buildscript" = "build.official.sh" ]; then \
+RUN if [ "$buildscript" = "build.official.sh" ]; then \
     export CHOCOLATEY_OFFICIAL_KEY="/usr/local/src/choco/chocolatey.official.snk"; \
     ./$buildscript; \
     cp docker/choco_official_wrapper code_drop/temp/_PublishedApps/choco/choco_wrapper; \
@@ -42,10 +30,16 @@ RUN if [ "$github_actions" = "true" ]; then \
   fi;
 
 
-ARG monoversion="6.12"
-FROM mono:${monoversion} as install
+FROM debian:bookworm AS install
+
+RUN apt update; \
+    apt install gnupg dirmngr apt-transport-https ca-certificates -y; \
+    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF; \
+    sh -c 'echo "deb https://download.mono-project.com/repo/debian stable-buster main" > /etc/apt/sources.list.d/mono-official-stable.list'
+
+RUN apt update; \
+    apt install mono-complete -y
 
-ARG monoversion="6.12"
 LABEL org.opencontainers.image.url="https://chocolatey.org/"
 LABEL org.opencontainers.image.documentation="https://docs.chocolatey.org/"
 LABEL org.opencontainers.image.source="https://github.com/chocolatey/choco"
@@ -54,9 +48,9 @@ LABEL org.opencontainers.image.licenses="Apache-2.0"
 LABEL org.opencontainers.image.title="Chocolatey"
 LABEL org.opencontainers.image.description="Chocolatey Client running on Mono"
 LABEL org.opencontainers.image.authors="https://chocolatey.org/support"
-LABEL org.opencontainers.image.base.name="index.docker.io/library/mono:${monoversion}"
+LABEL org.opencontainers.image.base.name="index.docker.io/library/debian:bookworm"
 
-ENV ChocolateyInstall /opt/chocolatey
+ENV ChocolateyInstall=/opt/chocolatey
 
 COPY --from=build /usr/local/src/choco/code_drop/temp/_PublishedApps/choco /opt/chocolatey
 

docker/README.md

@@ -22,7 +22,6 @@ To build the Linux image yourself, follow these steps:
 1. Run the docker build command. `docker build -t choco:latest-linux -f docker/Dockerfile.linux .` (the trailing . is important)
     * To build a official version, use this command: `docker build -t chocolatey/choco:latest-linux -f docker/Dockerfile.linux . --build-arg buildscript=build.official.sh`
     * To build a debug version, add the argument `--build-arg buildscript=build.debug.sh`
-    * To change the version of mono used, add the argument `--build-arg monoversion=mono-tag`
 1. Run your new image using the command `docker run -ti --rm choco:latest-linux /bin/bash`
 1. Test choco by running `choco -h`. You should see the help message from choco.exe.
 

docs/legal/CREDITS.json

@@ -4,12 +4,12 @@
     "link": "https://github.com/chocolatey/choco",
     "licenseName": "LICENSE",
     "licenseLink": "https://github.com/chocolatey/choco/blob/master/LICENSE",
-    "version": "2.5.0",
+    "version": "2.5.1",
     "dependencies": [
         {
             "name": "7-Zip",
             "link": "https://www.7-zip.org/",
-            "version": "24.09",
+            "version": "25.01",
             "licenses": [
                 {
                     "type": "OTHER",

docs/legal/CREDITS.md

@@ -29,7 +29,7 @@ Chocolatey uses a number of 3rd party components. Their details are below.
     * [[email protected]](#systemruntimecompilerservicesunsafe453)
     * [[email protected]](#systemthreadingtasksextensions454)
   * [Other](#other)
-    * [7-Zip@24.09](#7-zip2409)
+    * [7-Zip@25.01](#7-zip2501)
     * [Shim Generator (shimgen)@2.0.0](#shim-generator-\(shimgen\)200)
 
 ## Open Source License Types (Reference)
@@ -339,15 +339,15 @@ https://www.apache.org/licenses/LICENSE-2.0
 
 #### [email protected]
 
-[System.Runtime.CompilerServices.Unsafe](https://www.nuget.org/packages/System.Runtime.CompilerServices.Unsafe/4.5.3) - [License terms.](https://github.com/dotnet/corefx/blob/master/LICENSE.TXT)
+[System.Runtime.CompilerServices.Unsafe](https://www.nuget.org/packages/System.Runtime.CompilerServices.Unsafe/4.5.3) - [License terms.](https://github.com/dotnet/corefx/blob/b8b81a66738bb10ef0790023598396861d92b2c4/LICENSE.TXT)
 
 #### [email protected]
 
-[System.Threading.Tasks.Extensions](https://www.nuget.org/packages/System.Threading.Tasks.Extensions/4.5.4) - [License terms.](https://github.com/dotnet/corefx/blob/master/LICENSE.TXT)
+[System.Threading.Tasks.Extensions](https://www.nuget.org/packages/System.Threading.Tasks.Extensions/4.5.4) - [License terms.](https://github.com/dotnet/corefx/blob/b8b81a66738bb10ef0790023598396861d92b2c4/LICENSE.TXT)
 
 ### Other
 
-#### 7-Zip@24.09
+#### 7-Zip@25.01
 
 [7-Zip](https://www.7-zip.org/) - [License terms.](https://www.7-zip.org/license.txt)
 

docs/legal/CREDITS.pdf

@@ -3,15 +3,16 @@
   License for use and distribution
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-  7-Zip Copyright (C) 1999-2023 Igor Pavlov.
+  7-Zip Copyright (C) 1999-2025 Igor Pavlov.
 
   The licenses for files are:
 
-    1) 7z.dll:
+    - 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 "BSD 2-clause License" for some code
+    - All other files: the "GNU LGPL".
 
   Redistributions in binary form must reproduce related license information from this file.
 
@@ -20,8 +21,8 @@
     organization. You don't need to register or pay for 7-Zip.
 
 
-  GNU LGPL information
-  --------------------
+GNU LGPL information
+--------------------
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -39,52 +40,107 @@
 
 
 
-  BSD 3-clause License
-  --------------------
+BSD 3-clause License in 7-Zip code
+----------------------------------
 
-    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":
+  The "BSD 3-clause License" is used for the following code in 7z.dll
+    1) 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".
+    2) ZSTD data decompression.
+       that code was developed using original zstd decoder code as reference code.
+       The original zstd decoder code was developed by Facebook Inc,
+       that also uses the "BSD 3-clause License".
 
-    ----
-    Copyright (c) 2015-2016, Apple Inc. All rights reserved.
+  Copyright (c) 2015-2016, Apple Inc. All rights reserved.
+  Copyright (c) Facebook, Inc. All rights reserved.
+  Copyright (c) 2023-2025 Igor Pavlov.
 
-    Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Text of the "BSD 3-clause License"
+----------------------------------
 
-    1.  Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
 
-    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.
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
 
-    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.
+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.
 
-    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.
-    ----
+3. Neither the name of the copyright holder nor the names of its 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 HOLDER 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:
+BSD 2-clause License in 7-Zip code
+----------------------------------
 
-      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.
+  The "BSD 2-clause License" is used for the XXH64 code in 7-Zip.
 
+  XXH64 code in 7-Zip was derived from the original XXH64 code developed by Yann Collet.
 
-  --
-  Igor Pavlov
+  Copyright (c) 2012-2021 Yann Collet.
+  Copyright (c) 2023-2025 Igor Pavlov.
+
+Text of the "BSD 2-clause License"
+----------------------------------
+
+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.
+
+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 HOLDER 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
+  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.
+
+--