From 45cb1f3b913aa962a19c63b469af7c6e114e0cca Mon Sep 17 00:00:00 2001
From: Cory Knox <me@coryknox.dev>
Date: Tue, 1 Aug 2023 16:57:56 -0700
Subject: [PATCH 1/3] (#3286) Do not remove any files on MSI uninstall

The MSI previously included logic to remove *some* Chocolatey files.
This would leave Chocolatey in a broken state, but not actually removed.
This commit removes the entries from the MSI, so an "uninstall" of the
MSI is merely a removal of the installer's entry from Add/Remove
Programs.
---
 src/chocolatey.install/chocolatey.wxs | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/chocolatey.install/chocolatey.wxs b/src/chocolatey.install/chocolatey.wxs
index 68afd6cb67..1730b25c07 100644
--- a/src/chocolatey.install/chocolatey.wxs
+++ b/src/chocolatey.install/chocolatey.wxs
@@ -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>

From 8219e2f6ec6a135c37eb4ad41953edcf83727261 Mon Sep 17 00:00:00 2001
From: Cory Knox <me@coryknox.dev>
Date: Tue, 1 Aug 2023 16:59:21 -0700
Subject: [PATCH 2/3] (#3286) Prevent MSI Upgrades

Currently it's not possible to upgrade Chocolatey with the MSI. This
commit adds functionality to the MSI that will error instead of blindly
allowing an upgrade that doesn't do anything.
---
 src/chocolatey.install/chocolatey.en-us.wxl | 3 ++-
 src/chocolatey.install/chocolatey.wxs       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/chocolatey.install/chocolatey.en-us.wxl b/src/chocolatey.install/chocolatey.en-us.wxl
index 485b3db669..2cdbbed213 100644
--- a/src/chocolatey.install/chocolatey.en-us.wxl
+++ b/src/chocolatey.install/chocolatey.en-us.wxl
@@ -5,5 +5,6 @@
     <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="UpgradeNotAllowed" Overridable="yes">UPGRADE FAILURE: Chocolatey CLI cannot be upgraded via the MSI. Please run 'choco upgrade chocolatey' from an elevated terminal window.</String>
     <String Id="ToolsFolderDescription" Overridable="yes">Sets the location for the Tools Folder</String>
-</WixLocalization>
\ No newline at end of file
+</WixLocalization>
diff --git a/src/chocolatey.install/chocolatey.wxs b/src/chocolatey.install/chocolatey.wxs
index 1730b25c07..5ea061104d 100644
--- a/src/chocolatey.install/chocolatey.wxs
+++ b/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 -->

From b2812ab0bc0401a1ac1e81ded354ade32672a07e Mon Sep 17 00:00:00 2001
From: Cory Knox <me@coryknox.dev>
Date: Wed, 2 Aug 2023 08:55:21 -0700
Subject: [PATCH 3/3] (#3286) Adjust wording of upgrade failure message

---
 src/chocolatey.install/chocolatey.en-us.wxl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/chocolatey.install/chocolatey.en-us.wxl b/src/chocolatey.install/chocolatey.en-us.wxl
index 2cdbbed213..d2f18d85d4 100644
--- a/src/chocolatey.install/chocolatey.en-us.wxl
+++ b/src/chocolatey.install/chocolatey.en-us.wxl
@@ -4,7 +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="UpgradeNotAllowed" Overridable="yes">UPGRADE FAILURE: Chocolatey CLI cannot be upgraded via the MSI. Please run 'choco upgrade chocolatey' from an elevated terminal window.</String>
-    <String Id="ToolsFolderDescription" Overridable="yes">Sets the location for the Tools Folder</String>
+    <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>