Merge pull request #3638 from chocolatey/hotfix/2.4.3

(release) 2.4.3

Author: gep13

.git-blame-ignore-revs

@@ -478,3 +478,5 @@ e9515c247972ecf22ece68e080ae96ef0e8ebd6c
 #(maint) formatting 
 f6393c625416250e87294bb4f20b94495a1ed923
 
+#(maint) Update file license headers
+b8f37f3f0da4ec1b1d4675e0526fdfd7c6c4f645

.github/workflows/build.yml

@@ -11,7 +11,7 @@ on:
 jobs:
   # Build using mono on Ubuntu
   ubuntu-build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v3
       with:
@@ -26,7 +26,7 @@ jobs:
         chmod +x build.sh
         $GITHUB_WORKSPACE//build.sh --verbosity=diagnostic --target=CI --testExecutionType=unit
     - name: Upload Ubuntu build results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       # Always upload build results
       if: ${{ always() }}
       with:
@@ -52,7 +52,7 @@ jobs:
       shell: powershell
       run: ./build.ps1 --verbosity=diagnostic --target=CI --testExecutionType=unit --shouldRunOpenCover=false --shouldBuildMsi=true
     - name: Upload Windows build results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       # Always upload build results
       if: ${{ always() }}
       with:
@@ -92,7 +92,7 @@ jobs:
         chmod +x build.sh
         $GITHUB_WORKSPACE//build.sh --verbosity=diagnostic --target=CI --testExecutionType=unit
     - name: Upload MacOS build results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       # Always upload build results
       if: ${{ always() }}
       with:

.github/workflows/stale.yml

@@ -12,6 +12,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
+      # Action GitHub repository: https://github.com/actions/stale
       - uses: actions/stale@v9
         id: stale
         with:
@@ -20,13 +21,14 @@ jobs:
           exempt-all-assignees: false
           exempt-draft-pr: true
           stale-issue-label: "Pending Closure"
-          stale-pr-label: 'Pending Closure'
-          only-labels: '0 - Waiting on User'
+          stale-pr-label: "Pending Closure"
+          only-labels: "0 - Waiting on User"
           close-issue-label: "No Response / Stale"
+          close-issue-reason: "not_planned"
           close-pr-label: "No Response / Stale"
-          exempt-issue-labels: 'Security / CVE,2 - Working,3 - Review'
-          exempt-pr-labels: 'Security / CVE,2 - Working,3 - Review'
-          labels-to-remove-when-unstale: '0 - Waiting on User,Pending closure'
+          exempt-issue-labels: "Security,2 - Working,3 - Review"
+          exempt-pr-labels: "Security,2 - Working,3 - Review"
+          labels-to-remove-when-unstale: "0 - Waiting on User,Pending closure"
           remove-stale-when-updated: true
           stale-issue-message: |
             Is this still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?
@@ -37,13 +39,18 @@ jobs:
             As this issue seems to have been inactive for quite some time now, it has been automatically closed.
             If you feel this is a valid issue, please feel free to re-open the issue if / when a pull request
             has been added.
-            Thank you for your contribution.
 
+            Thank you for your contribution.
+          stale-pr-message: |
+            Is this still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?
+            This pull request will be closed in 14 days if it continues to be inactive.
           close-pr-message: |
             Dear contributor,
 
             As this PR seems to have been inactive for 30 days after changes / additional information
             was requested, it has been automatically closed.
+
             If you feel the changes are still valid, please re-open the PR once all changes or additional information
             that was requested has been added.
+
             Thank you for your contribution.

.github/workflows/test.yml

@@ -26,7 +26,7 @@ jobs:
         chmod +x build.sh
         $GITHUB_WORKSPACE//build.sh --verbosity=diagnostic --target=test --testExecutionType=all
     - name: Upload Ubuntu build results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       # Always upload build results
       if: ${{ always() }}
       with:
@@ -50,7 +50,7 @@ jobs:
     - name: Test with NUnit on .Net Framework
       run: .\build.bat  --verbosity=diagnostic --target=test --testExecutionType=all --shouldRunOpenCover=false
     - name: Upload Windows build results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       # Always upload build results
       if: ${{ always() }}
       with:
@@ -78,7 +78,7 @@ jobs:
           chmod +x build.sh
           $GITHUB_WORKSPACE//build.sh --verbosity=diagnostic --target=test --testExecutionType=all
     - name: Upload MacOS build results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       # Always upload build results
       if: ${{ always() }}
       with:

.teamcity/settings.kts

@@ -72,7 +72,9 @@ object Chocolatey : BuildType({
 
     triggers {
         vcs {
-            branchFilter = ""
+            branchFilter = """
+                -:support/*
+            """.trimIndent()
         }
     }
 

docs/legal/CREDITS.md

@@ -6,14 +6,14 @@
   - [Contributors](#contributors)
 - [Third Party Licenses - Development](#third-party-licenses---development)
 - [Third Party Licenses - Runtime](#third-party-licenses---runtime)
-  - [7-Zip @ 24.08](#7-zip--2408)
+  - [7-Zip @ 24.09](#7-zip--2409)
   - [AlphaFS @ 2.1.3](#alphafs--213)
   - [Checksum @ 0.3.1](#checksum--031)
   - [log4net @ 2.0.12](#log4net--2012)
   - [Microsoft.Bcl.HashCode @ 1.1.1](#microsoftbclhashcode--111)
   - [Microsoft.Web.Xdt @ 3.1.0](#microsoftwebxdt--310)
   - [Newtonsoft.Json @ 13.0.1](#newtonsoftjson--1301)
-  - [Chocolatey.NuGet.Client @ 3.4.2](#chocolateynugetclient--342)
+  - [Chocolatey.NuGet.Client @ 3.4.3](#chocolateynugetclient--343)
   - [Rhino.Licensing @ 1.4.1 (modified)](#rhinolicensing--141-modified)
   - [Shim Generator (shimgen) @ 2.0.0](#shim-generator-shimgen--200)
   - [SimpleInjector @ 2.8.3](#simpleinjector--283)
@@ -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 @ 24.08
+### 7-Zip @ 24.09
 
 Chocolatey uses [7-Zip](http://www.7-zip.org/) for uncompressing archives.
 [License terms](http://www.7-zip.org/license.txt):
@@ -799,7 +799,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 ```
 
-### Chocolatey.NuGet.Client @ 3.4.2
+### Chocolatey.NuGet.Client @ 3.4.3
 
 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):

recipe.cake

@@ -1,4 +1,4 @@
-#load nuget:?package=Chocolatey.Cake.Recipe&version=0.28.4
+#load nuget:?package=Chocolatey.Cake.Recipe&version=0.29.0
 #tool nuget:?package=WiX&version=3.11.2
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -58,32 +58,6 @@ Func<List<ILMergeConfig>> getILMergeConfigs = () =>
         PrimaryAssemblyName = BuildParameters.Paths.Directories.PublishedLibraries + "/chocolatey/chocolatey.dll",
         AssemblyPaths = assembliesToILMerge });
 
-    if (DirectoryExists(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/"))
-    {
-        var no7zAssembliesToILMerge = GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/*.{exe|dll}")
-                                    - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/choco.exe")
-                                    - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/System.Management.Automation.dll")
-                                    - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/chocolatey.tests*.dll")
-                                    - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/{Moq|nunit|Should|testcentric}*.dll")
-                                    - GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/Chocolatey.PowerShell.dll");
-
-        Information("The following assemblies have been selected to be ILMerged for choco.exe No7zip Version...");
-        foreach (var assemblyToILMerge in no7zAssembliesToILMerge)
-        {
-            Information(assemblyToILMerge.FullPath);
-        }
-
-        mergeConfigs.Add(new ILMergeConfig() {
-            KeyFile = BuildParameters.StrongNameKeyPath,
-            LogFile = BuildParameters.Paths.Directories.Build + "/ilmerge-chocono7zipexe.log",
-            TargetPlatform = targetPlatform,
-            Target = "exe",
-            Internalize = BuildParameters.RootDirectoryPath + "/src/chocolatey.console/ilmerge.internalize.ignore.txt",
-            Output = BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip_merged/choco.exe",
-            PrimaryAssemblyName = BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/choco.exe",
-            AssemblyPaths = no7zAssembliesToILMerge });
-    }
-
     return mergeConfigs;
 };
 
@@ -93,11 +67,6 @@ Func<FilePathCollection> getScriptsToVerify = () =>
                         GetFiles(BuildParameters.Paths.Directories.NuGetNuspecDirectory + "/**/*.{ps1|psm1|psd1}") +
                         GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/**/*.{ps1|psm1|psd1}");
 
-    if (DirectoryExists(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip"))
-    {
-        scriptsToVerify += GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip/**/*.{ps1|psm1|psd1}");
-    }
-
     Information("The following PowerShell scripts have been selected to be verified...");
     foreach (var scriptToVerify in scriptsToVerify)
     {
@@ -129,14 +98,6 @@ Func<FilePathCollection> getFilesToSign = () =>
                     + GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/tools/chocolateyInstall/redirects/*.exe")
                     + GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "/tools/chocolateyInstall/helpers/Chocolatey.PowerShell.dll");
 
-    if (DirectoryExists(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip"))
-    {
-        filesToSign += GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip/tools/chocolateyInstall/choco.exe")
-                    + GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip/tools/chocolateyInstall/tools/{checksum|shimgen}.exe")
-                    + GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip/tools/chocolateyInstall/redirects/*.exe")
-                    + GetFiles(BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip/tools/chocolateyInstall/helpers/Chocolatey.PowerShell.dll");
-    }
-
     Information("The following assemblies have been selected to be signed...");
     foreach (var fileToSign in filesToSign)
     {
@@ -215,136 +176,6 @@ Task("Prepare-Chocolatey-Packages")
     }
 });
 
-Task("Build-ChocolateyNo7zip")
-    .WithCriteria(() => BuildParameters.Configuration == "ReleaseOfficial", "Skipping No7zip because this isn't an official release")
-    .IsDependentOn("Build")
-    .IsDependentOn("Test")
-    .IsDependeeOf("Run-ILMerge")
-    .Does<BuildData>(data => RequireTool(ToolSettings.MSBuildExtensionPackTool, () =>
-{
-    Information("Building {0} with No7zip", BuildParameters.SolutionFilePath);
-
-    CleanDirectory(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/");
-
-    var no7zLogPath = BuildParameters.Paths.Files.BuildLogFilePath.ToString().Replace("\\.(\\S+)$", "-no7zip.${1}");
-
-    if (BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows)
-    {
-        var msbuildSettings = new MSBuildSettings()
-            {
-                ToolPath = ToolSettings.MSBuildToolPath
-            }
-            .SetPlatformTarget(ToolSettings.BuildPlatformTarget)
-            .UseToolVersion(ToolSettings.BuildMSBuildToolVersion)
-            .WithProperty("OutputPath", MakeAbsolute(new DirectoryPath(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/")).FullPath)
-            .WithProperty("TreatWarningsAsErrors", BuildParameters.TreatWarningsAsErrors.ToString())
-            .WithTarget("Build")
-            .SetMaxCpuCount(ToolSettings.MaxCpuCount)
-            .SetConfiguration("ReleaseOfficialNo7zip")
-            .WithLogger(
-                Context.Tools.Resolve("MSBuild.ExtensionPack.Loggers.dll").FullPath,
-                "XmlFileLogger",
-                string.Format(
-                    "logfile=\"{0}\";invalidCharReplacement=_;verbosity=Detailed;encoding=UTF-8",
-                    no7zLogPath
-                )
-            );
-
-        MSBuild(BuildParameters.SolutionFilePath, msbuildSettings);
-    }
-
-    if (FileExists(no7zLogPath))
-    {
-        BuildParameters.BuildProvider.UploadArtifact(no7zLogPath);
-    }
-}));
-
-Task("Prepare-ChocolateyNo7zip-Package")
-    .WithCriteria(() => BuildParameters.Configuration == "ReleaseOfficial", "Skipping No7zip because this isn't an official release")
-    .WithCriteria(() => BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows, "Skipping because not running on Windows")
-    .WithCriteria(() => BuildParameters.ShouldRunChocolatey, "Skipping because execution of Chocolatey has been disabled")
-    .IsDependentOn("Build-ChocolateyNo7zip")
-    .IsDependeeOf("Sign-Assemblies")
-    .IsDependeeOf("Verify-PowerShellScripts")
-    .IsDependeeOf("Create-ChocolateyNo7zip-Package")
-    .Does(() =>
-{
-    var nuspecDirectory = BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip";
-    // Copy the Nuget/Chocolatey directory from Root Folder to temp/nuspec/chocolatey-no7zip
-    EnsureDirectoryExists(nuspecDirectory);
-    CopyFiles(GetFiles("./nuspec/chocolatey/**/*"), nuspecDirectory, true);
-
-    // Copy legal documents
-    CopyFile(BuildParameters.RootDirectoryPath + "/docs/legal/CREDITS.md", nuspecDirectory + "/tools/chocolateyInstall/CREDITS.txt");
-    CopyFile(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/LICENSE.txt", nuspecDirectory + "/tools/chocolateyInstall/LICENSE.txt");
-
-    // Copy choco.exe.manifest
-    CopyFile(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/choco.exe.manifest", nuspecDirectory + "/tools/chocolateyInstall/choco.exe.manifest");
-
-    // Copy external file resources
-    EnsureDirectoryExists(nuspecDirectory + "/tools/chocolateyInstall/helpers");
-    CopyFiles(GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/helpers/**/*"), nuspecDirectory + "/tools/chocolateyInstall/helpers", true);
-    EnsureDirectoryExists(nuspecDirectory + "/tools/chocolateyInstall/redirects");
-    CopyFiles(GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/redirects/**/*"), nuspecDirectory + "/tools/chocolateyInstall/redirects", true);
-    EnsureDirectoryExists(nuspecDirectory + "/tools/chocolateyInstall/tools");
-    CopyFiles(GetFiles(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip/tools/**/*"), nuspecDirectory + "/tools/chocolateyInstall/tools", true);
-
-    // Copy merged choco.exe
-    CopyFile(BuildParameters.Paths.Directories.PublishedApplications + "/choco-no7zip_merged/choco.exe", nuspecDirectory + "/tools/chocolateyInstall/choco.exe");
-
-    // Copy Chocolatey.PowerShell.dll and help.xml file
-    CopyFile(BuildParameters.Paths.Directories.PublishedLibraries + "/Chocolatey.PowerShell/Chocolatey.PowerShell.dll", nuspecDirectory + "/tools/chocolateyInstall/helpers/Chocolatey.PowerShell.dll");
-    CopyFile(BuildParameters.Paths.Directories.PublishedLibraries + "/Chocolatey.PowerShell/Chocolatey.PowerShell.dll-help.xml", nuspecDirectory + "/tools/chocolateyInstall/helpers/Chocolatey.PowerShell.dll-help.xml");
-
-    // Tidy up logs and config folder which are not required
-    var logsDirectory = nuspecDirectory + "/tools/chocolateyInstall/logs";
-    var configDirectory = nuspecDirectory + "/tools/chocolateyInstall/config";
-
-    if (DirectoryExists(logsDirectory))
-    {
-        DeleteDirectory(logsDirectory, new DeleteDirectorySettings {
-            Recursive = true,
-            Force = true
-        });
-    }
-
-    if (DirectoryExists(configDirectory))
-    {
-        DeleteDirectory(configDirectory, new DeleteDirectorySettings {
-            Recursive = true,
-            Force = true
-        });
-    }
-});
-
-Task("Create-ChocolateyNo7zip-Package")
-    .WithCriteria(() => BuildParameters.Configuration == "ReleaseOfficial", "Skipping No7zip because this isn't an official release")
-    .WithCriteria(() => BuildParameters.ShouldRunChocolatey, "Skipping because execution of Chocolatey has been disabled")
-    .WithCriteria(() => BuildParameters.BuildAgentOperatingSystem == PlatformFamily.Windows, "Skipping because not running on Windows")
-    .IsDependentOn("Prepare-ChocolateyNo7zip-Package")
-    .IsDependeeOf("Package")
-    .Does(() =>
-{
-    var nuspecDirectory = BuildParameters.Paths.Directories.ChocolateyNuspecDirectory + "-no7zip/";
-    var nuspecFile = nuspecDirectory + "chocolatey.nuspec";
-
-    ChocolateyPack(nuspecFile, new ChocolateyPackSettings {
-        AllowUnofficial = true,
-        Version = BuildParameters.Version.PackageVersion,
-        OutputDirectory = nuspecDirectory,
-        WorkingDirectory = BuildParameters.Paths.Directories.PublishedApplications
-    });
-
-    MoveFile(
-        nuspecDirectory + "chocolatey." + BuildParameters.Version.PackageVersion + ".nupkg",
-        BuildParameters.Paths.Directories.ChocolateyPackages + "/chocolatey-no7zip." + BuildParameters.Version.PackageVersion + ".nupkg"
-    );
-
-    // Due to the fact that we have chosen to ignore the no7zip package via the chocolateyNupkgGlobbingPattern, it will
-    // no longer be automatically uploaded via Chocolatey.Cake.Recipe, so we need to handle that work here.
-    BuildParameters.BuildProvider.UploadArtifact(BuildParameters.Paths.Directories.ChocolateyPackages + "/chocolatey-no7zip." + BuildParameters.Version.PackageVersion + ".nupkg");
-});
-
 Task("Prepare-NuGet-Packages")
     .WithCriteria(() => BuildParameters.ShouldRunNuGet, "Skipping because execution of NuGet has been disabled")
     .IsDependeeOf("Create-NuGet-Packages")
@@ -441,7 +272,7 @@ BuildParameters.SetParameters(context: Context,
                             shouldRunNuGet: IsRunningOnWindows(),
                             shouldAuthenticodeSignPowerShellScripts: IsRunningOnWindows(),
                             shouldPublishAwsLambdas: false,
-                            chocolateyNupkgGlobbingPattern: "/**/chocolatey[!-no7zip]*.nupkg");
+                            chocolateyNupkgGlobbingPattern: "/**/chocolatey*.nupkg");
 
 ToolSettings.SetToolSettings(context: Context);