Merge branch 'master' into develop

* master:
  (maint) Update GitReleaseManager configuration
  (#3291) Update Chocolatey.NuGet.Client libraries to 3.4.2
  (#3286) Adjust wording of upgrade failure message
  (#3286) Prevent MSI Upgrades
  (#3286) Do not remove any files on MSI uninstall
  (#3285) Upgrade 7z to 23.01

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):

gitreleasemanager.yaml

@@ -6,6 +6,7 @@ issue-labels-include:
 - Bug
 - Improvement
 - Documentation
+- Dependency Change
 issue-labels-exclude:
 - Internal Refactoring
 - BuildAutomation

src/chocolatey.install/chocolatey.en-us.wxl

@@ -4,6 +4,7 @@
     <String Id="NewerVersionInstalled" Overridable="yes">A newer version of Chocolatey is already installed.</String>
     <String Id="ProfileAdditionDescription" Overridable="yes">Add the Chocolatey Helpers to your PowerShell Profile to enable tab-completions.
 Defaults to adding to the AllUsersAllHosts profile.</String>
-    <String Id="RequiresDotNet48" Overridable="yes">This application requires .NET Framework 4.8. Please install the .NET Framework then run this installer again.</String>
-    <String Id="ToolsFolderDescription" Overridable="yes">Sets the location for the Tools Folder</String>
-</WixLocalization>
+    <String Id="RequiresDotNet48" Overridable="yes">Chocolatey CLI requires .NET Framework 4.8. Please install the .NET Framework then run this installer again.</String>
+    <String Id="UpgradeNotAllowed" Overridable="yes">The Chocolatey CLI MSI is intended for installation only. Please run 'choco upgrade chocolatey' from an elevated terminal window to upgrade.</String>
+    <String Id="ToolsFolderDescription" Overridable="yes">Sets the location for the Tools Folder.</String>
+</WixLocalization>

src/chocolatey.install/chocolatey.wxs

@@ -11,7 +11,7 @@
 
   <Product Name="$(var.ProductName)" Id="*" UpgradeCode="$(var.ProductCode)" Language="1033" Manufacturer="$(var.ProductVendor)" Codepage="1252" Version="$(var.ProductVersion)">
     <Package Id='*' Platform='x86' Keywords='Installer' Description="$(var.ProductName)" Comments="$(var.ProductSummary)" InstallScope="perMachine" InstallerVersion="200" Compressed="yes" />
-    <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="!(loc.NewerVersionInstalled)" />
+    <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="!(loc.NewerVersionInstalled)" Disallow="yes" DisallowUpgradeErrorMessage="!(loc.UpgradeNotAllowed)" />
     <Media Id="1" Cabinet="$(var.ArtifactName).cab" EmbedCab="yes" />
 
     <!-- Installation Properties -->
@@ -23,10 +23,6 @@
     <Property Id="ARPNOREPAIR" Value="yes" Secure="yes" />      <!-- Remove repair from post-install options, as it will not work with the script method -->
     <Property Id="ARPNOMODIFY" Value="yes" Secure="yes" />      <!-- Remove modify from post-install options, as it will not work with the script method -->
 
-    <CustomAction Id="SetHelpersDirectoryPath" Property="HelpersDirectoryPath" Value="[INSTALLDIR]\\helpers" />
-    <CustomAction Id="SetRedirectsDirectoryPath" Property="RedirectsDirectoryPath" Value="[INSTALLDIR]\\redirects" />
-    <CustomAction Id="SetToolsDirectoryPath" Property="ToolsDirectoryPath" Value="[INSTALLDIR]\\tools" />
-
     <PropertyRef Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" />
     <Condition Message="!(loc.RequiresDotNet48)">
       <![CDATA[Installed OR WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED]]>
@@ -35,17 +31,13 @@
     <!-- Custom Actions to Install Chocolatey -->
     <SetProperty Id="InstallChocolatey"
       Before="InstallChocolatey"
-      Sequence="execute" 
+      Sequence="execute"
       Value="&quot;[SystemFolder]\WindowsPowerShell\v1.0\powershell.exe&quot; -NoProfile -ExecutionPolicy Bypass -Command &quot;$env:ChocolateyInstall='[INSTALLDIR]'; &amp; '[#ChocolateyInstall]' -ChocolateyDownloadUrl '[#ChocolateyNupkg]' -UseNativeUnzip&quot;" />
     <CustomAction Id="InstallChocolatey" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="deferred" Return="check" Impersonate="yes" />
 
     <!-- Custom Additions to the InstallExecuteSequence (e.g. the actions above) -->
     <InstallExecuteSequence>
       <Custom Action="InstallChocolatey" After="InstallFiles"><![CDATA[NOT Installed]]></Custom>
-      <!-- Set these values during the uninstall such that we can remove the folders -->
-      <Custom Action="SetHelpersDirectoryPath" Before="CostInitialize"><![CDATA[Installed]]></Custom>
-      <Custom Action="SetRedirectsDirectoryPath" Before="CostInitialize"><![CDATA[Installed]]></Custom>
-      <Custom Action="SetToolsDirectoryPath" Before="CostInitialize"><![CDATA[Installed]]></Custom>
     </InstallExecuteSequence>
 
     <!-- Installation Layout - primarily 'temporary' install files, unlike most MSI installers, as we run the standard install script -->
@@ -54,14 +46,6 @@
         <Directory Id="INSTALLDIR" Name="chocolatey">
           <Component Id="ChocolateyInstallDirectory" Guid="{9E538CD6-6F07-43E5-B8E2-ED31995F3D1C}" Win64="no">
             <CreateFolder />
-            <RemoveFile Id="ChocoEXE" On="uninstall" Name="choco.exe" />
-            <RemoveFile Id="ChocoIgnore" On="uninstall" Name="choco.exe.ignore" />
-            <RemoveFile Id="ChocoManifest" On="uninstall" Name="choco.exe.manifest" />
-            <RemoveFile Id="ChocoCredits" On="uninstall" Name="CREDITS.txt" />
-            <RemoveFile Id="ChocoLicense" On="uninstall" Name="LICENSE.txt" />
-            <util:RemoveFolderEx Id="HelpersDirectory" On="uninstall" Property="HelpersDirectoryPath" />
-            <util:RemoveFolderEx Id="RedirectsDirectory" On="uninstall" Property="RedirectsDirectoryPath" />
-            <util:RemoveFolderEx Id="ToolsDirectory" On="uninstall" Property="ToolsDirectoryPath" />
             <Environment Id="ChocolateyInstallEnvVar" Action="set" Name="ChocolateyInstall" Permanent="no" System="yes" Value="[INSTALLDIR]" />
           </Component>
         </Directory>

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.

src/chocolatey.tests.integration/chocolatey.tests.integration.csproj

@@ -80,22 +80,22 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Chocolatey.NuGet.Common">
-      <HintPath>..\packages\Chocolatey.NuGet.Common.3.4.0\lib\net472\Chocolatey.NuGet.Common.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.Common.3.4.2\lib\net472\Chocolatey.NuGet.Common.dll</HintPath>
     </Reference>
     <Reference Include="Chocolatey.NuGet.Configuration">
-      <HintPath>..\packages\Chocolatey.NuGet.Configuration.3.4.0\lib\net472\Chocolatey.NuGet.Configuration.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.Configuration.3.4.2\lib\net472\Chocolatey.NuGet.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Chocolatey.NuGet.Frameworks">
-      <HintPath>..\packages\Chocolatey.NuGet.Frameworks.3.4.0\lib\net472\Chocolatey.NuGet.Frameworks.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.Frameworks.3.4.2\lib\net472\Chocolatey.NuGet.Frameworks.dll</HintPath>
     </Reference>
     <Reference Include="Chocolatey.NuGet.Packaging">
-      <HintPath>..\packages\Chocolatey.NuGet.Packaging.3.4.0\lib\net472\Chocolatey.NuGet.Packaging.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.Packaging.3.4.2\lib\net472\Chocolatey.NuGet.Packaging.dll</HintPath>
     </Reference>
     <Reference Include="Chocolatey.NuGet.Protocol">
-      <HintPath>..\packages\Chocolatey.NuGet.Protocol.3.4.0\lib\net472\Chocolatey.NuGet.Protocol.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.Protocol.3.4.2\lib\net472\Chocolatey.NuGet.Protocol.dll</HintPath>
     </Reference>
     <Reference Include="Chocolatey.NuGet.Versioning">
-      <HintPath>..\packages\Chocolatey.NuGet.Versioning.3.4.0\lib\net472\Chocolatey.NuGet.Versioning.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.Versioning.3.4.2\lib\net472\Chocolatey.NuGet.Versioning.dll</HintPath>
     </Reference>
     <Reference Include="FluentAssertions, Version=6.11.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <HintPath>..\packages\FluentAssertions.6.11.0\lib\net47\FluentAssertions.dll</HintPath>

src/chocolatey.tests.integration/packages.config

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Chocolatey.NuGet.Common" version="3.4.0" targetFramework="net48" />
-  <package id="Chocolatey.NuGet.Configuration" version="3.4.0" targetFramework="net48" />
-  <package id="Chocolatey.NuGet.Frameworks" version="3.4.0" targetFramework="net48" />
-  <package id="Chocolatey.NuGet.Packaging" version="3.4.0" targetFramework="net48" />
-  <package id="Chocolatey.NuGet.Protocol" version="3.4.0" targetFramework="net48" />
-  <package id="Chocolatey.NuGet.Versioning" version="3.4.0" targetFramework="net48" />
+  <package id="Chocolatey.NuGet.Common" version="3.4.2" targetFramework="net48" />
+  <package id="Chocolatey.NuGet.Configuration" version="3.4.2" targetFramework="net48" />
+  <package id="Chocolatey.NuGet.Frameworks" version="3.4.2" targetFramework="net48" />
+  <package id="Chocolatey.NuGet.Packaging" version="3.4.2" targetFramework="net48" />
+  <package id="Chocolatey.NuGet.Protocol" version="3.4.2" targetFramework="net48" />
+  <package id="Chocolatey.NuGet.Versioning" version="3.4.2" targetFramework="net48" />
   <package id="FluentAssertions" version="6.11.0" targetFramework="net48" />
   <package id="FluentAssertions.Analyzers" version="0.19.1" targetFramework="net48" developmentDependency="true" />
   <package id="log4net" version="2.0.12" targetFramework="net48" />

src/chocolatey.tests/chocolatey.tests.csproj

@@ -79,43 +79,43 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Chocolatey.NuGet.Commands">
-      <HintPath>..\packages\Chocolatey.NuGet.Commands.3.4.0\lib\net472\Chocolatey.NuGet.Commands.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.Commands.3.4.2\lib\net472\Chocolatey.NuGet.Commands.dll</HintPath>
     </Reference>
     <Reference Include="Chocolatey.NuGet.Common">
-      <HintPath>..\packages\Chocolatey.NuGet.Common.3.4.0\lib\net472\Chocolatey.NuGet.Common.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.Common.3.4.2\lib\net472\Chocolatey.NuGet.Common.dll</HintPath>
     </Reference>
     <Reference Include="Chocolatey.NuGet.Configuration">
-      <HintPath>..\packages\Chocolatey.NuGet.Configuration.3.4.0\lib\net472\Chocolatey.NuGet.Configuration.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.Configuration.3.4.2\lib\net472\Chocolatey.NuGet.Configuration.dll</HintPath>
     </Reference>
     <Reference Include="Chocolatey.NuGet.Credentials">
-      <HintPath>..\packages\Chocolatey.NuGet.Credentials.3.4.0\lib\net472\Chocolatey.NuGet.Credentials.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.Credentials.3.4.2\lib\net472\Chocolatey.NuGet.Credentials.dll</HintPath>
     </Reference>
     <Reference Include="Chocolatey.NuGet.DependencyResolver.Core">
-      <HintPath>..\packages\Chocolatey.NuGet.DependencyResolver.Core.3.4.0\lib\net472\Chocolatey.NuGet.DependencyResolver.Core.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.DependencyResolver.Core.3.4.2\lib\net472\Chocolatey.NuGet.DependencyResolver.Core.dll</HintPath>
     </Reference>
     <Reference Include="Chocolatey.NuGet.Frameworks">
-      <HintPath>..\packages\Chocolatey.NuGet.Frameworks.3.4.0\lib\net472\Chocolatey.NuGet.Frameworks.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.Frameworks.3.4.2\lib\net472\Chocolatey.NuGet.Frameworks.dll</HintPath>
     </Reference>
     <Reference Include="Chocolatey.NuGet.LibraryModel">
-      <HintPath>..\packages\Chocolatey.NuGet.LibraryModel.3.4.0\lib\net472\Chocolatey.NuGet.LibraryModel.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.LibraryModel.3.4.2\lib\net472\Chocolatey.NuGet.LibraryModel.dll</HintPath>
     </Reference>
     <Reference Include="Chocolatey.NuGet.PackageManagement">
-      <HintPath>..\packages\Chocolatey.NuGet.PackageManagement.3.4.0\lib\net472\Chocolatey.NuGet.PackageManagement.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.PackageManagement.3.4.2\lib\net472\Chocolatey.NuGet.PackageManagement.dll</HintPath>
     </Reference>
     <Reference Include="Chocolatey.NuGet.Packaging">
-      <HintPath>..\packages\Chocolatey.NuGet.Packaging.3.4.0\lib\net472\Chocolatey.NuGet.Packaging.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.Packaging.3.4.2\lib\net472\Chocolatey.NuGet.Packaging.dll</HintPath>
     </Reference>
     <Reference Include="Chocolatey.NuGet.ProjectModel">
-      <HintPath>..\packages\Chocolatey.NuGet.ProjectModel.3.4.0\lib\net472\Chocolatey.NuGet.ProjectModel.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.ProjectModel.3.4.2\lib\net472\Chocolatey.NuGet.ProjectModel.dll</HintPath>
     </Reference>
     <Reference Include="Chocolatey.NuGet.Protocol">
-      <HintPath>..\packages\Chocolatey.NuGet.Protocol.3.4.0\lib\net472\Chocolatey.NuGet.Protocol.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.Protocol.3.4.2\lib\net472\Chocolatey.NuGet.Protocol.dll</HintPath>
     </Reference>
     <Reference Include="Chocolatey.NuGet.Resolver">
-      <HintPath>..\packages\Chocolatey.NuGet.Resolver.3.4.0\lib\net472\Chocolatey.NuGet.Resolver.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.Resolver.3.4.2\lib\net472\Chocolatey.NuGet.Resolver.dll</HintPath>
     </Reference>
     <Reference Include="Chocolatey.NuGet.Versioning">
-      <HintPath>..\packages\Chocolatey.NuGet.Versioning.3.4.0\lib\net472\Chocolatey.NuGet.Versioning.dll</HintPath>
+      <HintPath>..\packages\Chocolatey.NuGet.Versioning.3.4.2\lib\net472\Chocolatey.NuGet.Versioning.dll</HintPath>
     </Reference>
     <Reference Include="FluentAssertions, Version=6.11.0.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
       <HintPath>..\packages\FluentAssertions.6.11.0\lib\net47\FluentAssertions.dll</HintPath>