Remove bundled Chocolatey CLI

InstallerExtras/CustomMessages.iss

@@ -8,7 +8,6 @@ PortInst=Perform a portable installation
 RegInst=Perform a regular installation
 RegStartMmenuIcon=Create a shortcut on the Start menu
 RegDesktopIcon=Create a shortcut on the Desktop
-ChocoInstall=Install Chocolatey (for the current user only)
 PackageBundleName=UniGetUI package bundle
 
 ; Armenian
@@ -18,7 +17,6 @@ Armenian.PortInst=Կատարել շարժական տեղադրում
 Armenian.RegInst=Կատարել սովորական տեղադրում
 Armenian.RegStartMmenuIcon=Ստեղծեք դյուրանցում Start ընտրացանկում
 Armenian.RegDesktopIcon=Ստեղծեք դյուրանցում աշխատասեղանի վրա
-Armenian.ChocoInstall=Ինստալացնել Chocolatey (for the current user only)
 Armenian.PackageBundleName=UniGetUI փաթեթի փաթեթ
 
 ; BrazilianPortuguese
@@ -28,7 +26,6 @@ BrazilianPortuguese.PortInst=Realizar uma instalação portátil
 BrazilianPortuguese.RegInst=Realizar uma instalação regular
 BrazilianPortuguese.RegStartMmenuIcon=Criar um atalho no menu Iniciar
 BrazilianPortuguese.RegDesktopIcon=Criar um atalho na área de trabalh
-BrazilianPortuguese.ChocoInstall=Instalar Chocolatey (for the current user only)
 BrazilianPortuguese.PackageBundleName=Coleção de pacotes UniGetUI
 
 ; Catalan
@@ -38,7 +35,6 @@ Catalan.PortInst=Feu una instal·lació portàtil
 Catalan.RegInst=Feu una instal·lació regular
 Catalan.RegStartMmenuIcon=Creeu una drecera al menú Inici
 Catalan.RegDesktopIcon=Creeu una drecera a l'Escriptori
-Catalan.ChocoInstall=Instal·lar el Chocolatey (només per a l'usuari actual)
 Catalan.PackageBundleName=Col·lecció de paquets de l'UniGetUI
 
 ; Corsican
@@ -48,7 +44,6 @@ Corsican.PortInst=Eseguite una installazione portable
 Corsican.RegInst=Eseguite una installazione regulare
 Corsican.RegStartMmenuIcon=Create una scorciatoia nant'à u menu Start
 Corsican.RegDesktopIcon=Create una scorciatoia nant'à u Desktop
-Corsican.ChocoInstall=Stallà Chocolatey (for the current user only)
 Corsican.PackageBundleName=Raccolta di pacchetti UniGetUI
 
 ; Czech
@@ -58,7 +53,6 @@ Czech.PortInst=Proveďte přenosnou instalaci
 Czech.RegInst=Proveďte běžnou instalaci
 Czech.RegStartMmenuIcon=Vytvořte zástupce v nabídce Start
 Czech.RegDesktopIcon=Vytvořte zástupce na ploše
-Czech.ChocoInstall=Nainstalovat Chocolatey (for the current user only)
 Czech.PackageBundleName=Kolekce balíčků UniGetUI
 
 ; Danish
@@ -68,7 +62,6 @@ Danish.PortInst=Udfør en bærbar installation
 Danish.RegInst=Udfør en almindelig installation
 Danish.RegStartMmenuIcon=Opret en genvej på Start-menuen
 Danish.RegDesktopIcon=Opret en genvej på skrivebordet
-Danish.ChocoInstall=Installer Chocolatey (for the current user only)
 Danish.PackageBundleName=Samling af UniGetUI-pakker
 
 ; Dutch
@@ -78,7 +71,6 @@ Dutch.PortInst=Voer een draagbare installatie uit
 Dutch.RegInst=Voer een normale installatie uit
 Dutch.RegStartMmenuIcon=Maak een snelkoppeling in het Startmenu
 Dutch.RegDesktopIcon=Maak een snelkoppeling op het bureaublad
-Dutch.ChocoInstall=Installeer Chocolatey (for the current user only)
 Dutch.PackageBundleName=Verzameling UniGetUI-pakketten
 
 ; Finnish
@@ -88,7 +80,6 @@ Finnish.PortInst=Suorita kannettava asennus
 Finnish.RegInst=Suorita tavallinen asennus
 Finnish.RegStartMmenuIcon=Luo pikakuvake Käynnistä-valikkoon
 Finnish.RegDesktopIcon=Luo pikakuvake työpöydälle
-Finnish.ChocoInstall=Asenna Chocolatey (for the current user only)
 Finnish.PackageBundleName=Kokoelma UniGetUI-paketteja
 
 ; French
@@ -98,7 +89,6 @@ French.PortInst=Effectuer une installation portable
 French.RegInst=Effectuer une installation normale
 French.RegStartMmenuIcon=Créer un raccourci dans le menu Démarrer
 French.RegDesktopIcon=Créer un raccourci sur le bureau
-French.ChocoInstall=Installer Chocolatey (for the current user only)
 French.PackageBundleName=Collection de packages UniGetUI
 
 ; German
@@ -108,7 +98,6 @@ German.PortInst=Führe eine portable Installation durch
 German.RegInst=Führe eine normale Installation durch
 German.RegStartMmenuIcon=Erstelle eine Verknüpfung im Startmenü
 German.RegDesktopIcon=Erstelle eine Verknüpfung auf dem Desktop
-German.ChocoInstall=Chocolatey installieren (for the current user only)
 German.PackageBundleName=Sammlung von UniGetUI-Paketen
 
 ; Hebrew
@@ -118,7 +107,6 @@ Hebrew.PortInst=בצע התקנה ניידת
 Hebrew.RegInst=בצע התקנה רגילה
 Hebrew.RegStartMmenuIcon=צור קיצור דרך בתפריט התחל
 Hebrew.RegDesktopIcon=צור קיצור דרך בשולחן העבודה
-Hebrew.ChocoInstall=להתקין את Chocolatey (for the current user only)
 Hebrew.PackageBundleName=אוסף חבילות UniGetUI
 
 ; Icelandic
@@ -128,7 +116,6 @@ Hebrew.PackageBundleName=אוסף חבילות UniGetUI
 ;Icelandic.RegInst=Framkvæma reglulega uppsetningu
 ;Icelandic.RegStartMmenuIcon=Búa til flýtileið á Start valmyndinni
 ;Icelandic.RegDesktopIcon=Búa til flýtileið á skjáborðinu
-;Icelandic.ChocoInstall=Setja upp Chocolatey (for the current user only)
 ;Icelandic.PackageBundleName=Safn af UniGetUI pakka
 
 ; Italian
@@ -138,7 +125,6 @@ Italian.PortInst=Esegui installazione portatile
 Italian.RegInst=Esegui installazione normale
 Italian.RegStartMmenuIcon=Crea una scorciatoia nel menu Start
 Italian.RegDesktopIcon=Crea una scorciatoia sul Desktop
-Italian.ChocoInstall=Installa Chocolatey (for the current user only)
 Italian.PackageBundleName=Raccolta di pacchetti UniGetUI
 
 ; Japanese
@@ -148,7 +134,6 @@ Japanese.PortInst=ポータブル インストールを実行する
 Japanese.RegInst=通常のインストールを実行します
 Japanese.RegStartMmenuIcon=スタート メニューにショートカットを作成する
 Japanese.RegDesktopIcon=デスクトップにショートカットを作成する
-Japanese.ChocoInstall=Chocolatey をインストールする (for the current user only)
 Japanese.PackageBundleName=UniGetUI パッケージのコレクション
 
 ; Korean
@@ -158,7 +143,6 @@ Korean.PortInst=이동식 설치 수행
 Korean.RegInst=일반 설치 수행
 Korean.RegStartMmenuIcon=시작 메뉴에 바로가기 만들기
 Korean.RegDesktopIcon=바탕화면에 바로가기 생성
-Korean.ChocoInstall=초콜릿 설치 (for the current user only)
 Korean.PackageBundleName=UniGetUI 패키지 컬렉션
 
 ; Norwegian
@@ -168,7 +152,6 @@ Norwegian.PortInst=Utfør en bærbar installasjon
 Norwegian.RegInst=Utfør en vanlig installasjon
 Norwegian.RegStartMmenuIcon=Lag en snarvei på Start-menyen
 Norwegian.RegDesktopIcon=Lag en snarvei på skrivebordet
-Norwegian.ChocoInstall=Installer Chocolatey (for the current user only)
 Norwegian.PackageBundleName=Samling av UniGetUI-pakker
 
 ; Polish
@@ -178,7 +161,6 @@ Polish.PortInst=Przeprowadź instalację przenośną
 Polish.RegInst=Przeprowadź zwykłą instalację
 Polish.RegStartMmenuIcon=Utwórz skrót w menu Start
 Polish.RegDesktopIcon=Utwórz skrót na pulpicie
-Polish.ChocoInstall=Zainstaluj Chocolatey (for the current user only)
 Polish.PackageBundleName=Kolekcja pakietów UniGetUI
 
 ; Portuguese
@@ -188,7 +170,6 @@ Portuguese.PortInst=Execute uma instalação portátil
 Portuguese.RegInst=Execute uma instalação regular
 Portuguese.RegStartMmenuIcon=Criar um atalho no menu Iniciar
 Portuguese.RegDesktopIcon=Criar um atalho na área de trabalho
-Portuguese.ChocoInstall=Instalar o Chocolatey (for the current user only)
 Portuguese.PackageBundleName=Coleção de pacotes UniGetUI
 
 ; Russian
@@ -198,7 +179,6 @@ Russian.PortInst=Выполнить переносную установку
 Russian.RegInst=Выполнить обычную установку
 Russian.RegStartMmenuIcon=Создать ярлык в меню «Пуск»
 Russian.RegDesktopIcon=Создать ярлык на рабочем столе
-Russian.ChocoInstall=Установить Chocolatey (for the current user only)
 Russian.PackageBundleName=
 
 ; Slovenian
@@ -208,7 +188,6 @@ Slovenian.PortInst=Izvedite prenosno namestitev
 Slovenian.RegInst=Izvedite običajno namestitev
 Slovenian.RegStartMmenuIcon=Ustvarite bližnjico v meniju Start
 Slovenian.RegDesktopIcon=Ustvarite bližnjico na namizju
-Slovenian.ChocoInstall=Namesti Chocolatey (for the current user only)
 Slovenian.PackageBundleName=Коллекция пакетов UniGetUI
 
 ; Spanish
@@ -218,7 +197,6 @@ Spanish.PortInst=Realizar una instalación portátil
 Spanish.RegInst=Realizar una instalación regular
 Spanish.RegStartMmenuIcon=Crear un acceso directo en el menú Inicio
 Spanish.RegDesktopIcon=Crear un atajo en el escritorio
-Spanish.ChocoInstall=Instalar Chocolatey (solo para el usuario actual)
 Spanish.PackageBundleName=Coleción de paquetes del UniGetUI
 
 ; Turkish
@@ -228,7 +206,6 @@ Turkish.PortInst=Taşınabilir bir kurulum gerçekleştirin
 Turkish.RegInst=Normal bir kurulum gerçekleştir
 Turkish.RegStartMmenuIcon=Başlat menüsünde bir kısayol oluştur
 Turkish.RegDesktopIcon=Masaüstünde bir kısayol oluştur
-Turkish.ChocoInstall=Chocolatey'i yükleyin (for the current user only)
 Turkish.PackageBundleName=UniGetUI paketlerinin toplanması
 
 ; Ukrainian
@@ -238,5 +215,4 @@ Ukrainian.PortInst=Виконати переносне встановлення
 Ukrainian.RegInst=Виконайте звичайну установку
 Ukrainian.RegStartMmenuIcon=Створити ярлик у меню «Пуск».
 Ukrainian.RegDesktopIcon=Створити ярлик на робочому столі
-Ukrainian.ChocoInstall=Встановити Chocolatey (for the current user only)
 Ukrainian.PackageBundleName=Колекція пакетів UniGetUI

UniGetUI.iss

@@ -197,7 +197,6 @@ Name: "portableinstall"; Description: "{cm:PortInst}"; GroupDescription: "{cm:In
 Name: "regularinstall"; Description: "{cm:RegInst}"; GroupDescription: "{cm:InstallType}"; Flags: exclusive   
 Name: "regularinstall\startmenuicon"; Description: "{cm:RegStartMmenuIcon}"; GroupDescription: "{cm:ShCuts}"; 
 Name: "regularinstall\desktopicon"; Description: "{cm:RegDesktopIcon}"; GroupDescription: "{cm:ShCuts}";
-Name: "regularinstall\chocoinstall"; Description: "{cm:ChocoInstall}"; GroupDescription: "{cm:ShCuts}";
 
 [Registry]
 Root: HKCU; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "WingetUI"; ValueData: """{app}\UniGetUI.exe"" --daemon"; Flags: uninsdeletevalue noerror; Tasks: regularinstall;
@@ -224,8 +223,6 @@ Source: "unigetui_bin\IntegrityTree.json"; DestDir: "{app}"; Flags: createallsub
 ; Deploy executable files
 Source: "unigetui_bin\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion; BeforeInstall: TripleKill('WingetUI.exe', 'UniGetUI.exe', 'choco.exe');
 Source: "unigetui_bin\*"; DestDir: "{app}"; Flags: createallsubdirs ignoreversion recursesubdirs;
-; Deploy chocolatey (unless disabled)
-Source: "src\UniGetUI.PackageEngine.Managers.Chocolatey\choco-cli\*"; DestDir: "{userpf}\..\UniGetUI\Chocolatey"; Flags: createallsubdirs ignoreversion recursesubdirs uninsneveruninstall; Tasks: regularinstall\chocoinstall; Check: not CmdLineParamExists('/NoChocolatey');
 ; Make installation portable (if required)
 Source: "InstallerExtras\ForceUniGetUIPortable"; DestDir: "{app}"; Tasks: portableinstall
 
@@ -238,7 +235,6 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: re
 ; Filename: "powershell.exe"; Parameters: "-ExecutionPolicy Bypass -File -NonInteractive ""{tmp}\EnsureWinGet.ps1"""; StatusMsg: "Ensuring WinGet is properly installed... (this may take a while)"; WorkingDir: {app}; Check: not CmdLineParamExists('/NoWinGet'); Flags: runhidden
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: runasoriginaluser nowait postinstall; Check: not CmdLineParamExists('/NoAutoStart');
 Filename: "{app}\{#MyAppExeName}"; Parameters: "--migrate-wingetui-to-unigetui"; StatusMsg: "Removing old icons...";
-Filename: "{app}\{#MyAppExeName}"; Parameters: "--enable-setting UseSystemChocolatey"; Check: CmdLineParamExists('/EnableSystemChocolatey');
 
 
 [UninstallRun]    

cli-arguments.md

@@ -47,8 +47,8 @@ The installer is inno-setup based. It supports [all Inno Setup command-line para
 | `/NoRunOnStartup` | Will not register UniGetUI to start minimized at login (v3.1.6+) |
 | `/NoVCRedist` | Will not install MS Visual C++ Redistributable x64 (v3.1.2+) |
 | `/NoEdgeWebView` | Will not install Microsoft Edge WebView Runtime (v3.1.2+) |
-| `/NoChocolatey` | Do NOT install chocolatey within UniGetUI | 
-| `/EnableSystemChocolatey` | Force UniGetUI to use system chocolatey |
+| `/NoChocolatey` | Deprecated no-op kept for compatibility. UniGetUI no longer bundles Chocolatey. | 
+| `/EnableSystemChocolatey` | Deprecated no-op kept for compatibility. UniGetUI now uses system Chocolatey only. |
 | `/NoWinGet` | Do NOT install WinGet and Microsoft.WinGet.Client if not installed **(not recommended)** | 
 | `/ALLUSERS` | Will force the installer to install per-machine (requires administrator privileges) |
 | `/CURRENTUSER` | Will force the installer to install per-user | 

src/UniGetUI.Avalonia/Infrastructure/AvaloniaAutoUpdater.cs

@@ -212,7 +212,7 @@ private static async Task LaunchInstallerAndQuitAsync(string installerLocation)
             StartInfo = new ProcessStartInfo
             {
                 FileName = installerLocation,
-                Arguments = "/SILENT /SUPPRESSMSGBOXES /NORESTART /SP- /NoVCRedist /NoEdgeWebView /NoWinGet /NoChocolatey",
+                Arguments = "/SILENT /SUPPRESSMSGBOXES /NORESTART /SP- /NoVCRedist /NoEdgeWebView /NoWinGet",
                 UseShellExecute = true,
                 CreateNoWindow = true,
             },

src/UniGetUI.Avalonia/Views/Pages/SettingsPages/PackageManagerPage.axaml.cs

@@ -430,21 +430,6 @@ private void BuildExtraControls(CheckboxCard_Dict disableNotifsCard)
                 });
                 break;
 
-            case "Chocolatey":
-                disableNotifsCard.CornerRadius = new CornerRadius(8, 8, 0, 0);
-                disableNotifsCard.BorderThickness = new Thickness(1, 1, 1, 0);
-                ExtraControls.Children.Add(disableNotifsCard);
-
-                var chocoSysChoco = new CheckboxCard
-                {
-                    Text = CoreTools.AutoTranslated("Use system Chocolatey"),
-                    SettingName = CoreSettings.K.UseSystemChocolatey,
-                    CornerRadius = new CornerRadius(0, 0, 8, 8),
-                };
-                chocoSysChoco.StateChanged += (_, _) => _ = ViewModel.ReloadManagerCommand.ExecuteAsync(null);
-                ExtraControls.Children.Add(chocoSysChoco);
-                break;
-
             case "vcpkg":
                 disableNotifsCard.CornerRadius = new CornerRadius(8, 8, 0, 0);
                 disableNotifsCard.BorderThickness = new Thickness(1, 1, 1, 0);

src/UniGetUI.Core.Settings/SettingsEngine_Names.cs

@@ -18,8 +18,6 @@ public enum K
         ForceLegacyBundledWinGet,
         DisableNewWinGetTroubleshooter,
         DisableUpdateVcpkgGitPorts,
-        ChocolateySymbolicLinkCreated,
-        UseSystemChocolatey,
         DisableSelectingUpdatesByDefault,
         DisableAutoCheckforUpdates,
         AskToDeleteNewDesktopShortcuts,
@@ -38,6 +36,7 @@ public enum K
         DisableAUPOnBattery,
         CustomVcpkgRoot,
         AlreadyWarnedAboutAdmin,
+        AlreadyWarnedAboutChocolateyMigration,
         ShownTelemetryBanner,
         CollapseNavMenuOnWideScreen,
         EnablePackageBackup_LOCAL,
@@ -118,8 +117,6 @@ public static string ResolveKey(K key)
             K.ForceLegacyBundledWinGet => "ForceLegacyBundledWinGet",
             K.DisableNewWinGetTroubleshooter => "DisableNewWinGetTroubleshooter",
             K.DisableUpdateVcpkgGitPorts => "DisableUpdateVcpkgGitPorts",
-            K.ChocolateySymbolicLinkCreated => "ChocolateySymbolicLinkCreated",
-            K.UseSystemChocolatey => "UseSystemChocolatey",
             K.DisableSelectingUpdatesByDefault => "DisableSelectingUpdatesByDefault",
             K.DisableAutoCheckforUpdates => "DisableAutoCheckforUpdates",
             K.AskToDeleteNewDesktopShortcuts => "AskToDeleteNewDesktopShortcuts",
@@ -138,6 +135,7 @@ public static string ResolveKey(K key)
             K.DisableAUPOnBattery => "DisableAUPOnBattery",
             K.CustomVcpkgRoot => "CustomVcpkgRoot",
             K.AlreadyWarnedAboutAdmin => "AlreadyWarnedAboutAdmin",
+            K.AlreadyWarnedAboutChocolateyMigration => "AlreadyWarnedAboutChocolateyMigration",
             K.ShownTelemetryBanner => "ShownTelemetryBanner",
             K.CollapseNavMenuOnWideScreen => "CollapseNavMenuOnWideScreen",
             K.EnablePackageBackup_LOCAL => "EnablePackageBackup",

src/UniGetUI.Interface.Telemetry.Tests/TelemetryHandlerTests.cs

@@ -103,13 +103,12 @@
         Settings.Set(Settings.K.DoCacheAdminRights, false);
         Settings.Set(Settings.K.DoCacheAdminRightsForBatches, false);
         Settings.Set(Settings.K.ForceLegacyBundledWinGet, false);
-        Settings.Set(Settings.K.UseSystemChocolatey, false);
         File.WriteAllText(_portableMarkerPath, string.Empty);
         CoreData.WasDaemon = true;
 
         int activeSettings = TelemetryHandler.ComputeActiveSettingsBitmask();
 
-        Assert.Equal(12339, activeSettings);
+        Assert.Equal(6195, activeSettings);
     }
 
     [Fact]
@@ -136,16 +135,16 @@
             Convert.ToBase64String(Encoding.UTF8.GetBytes("telemetry-user:telemetry-pass")),
             captured.Authorization?.Parameter
         );
         Assert.NotEmpty(root.GetProperty("eventID").GetString());
         Assert.NotEqual(default, root.GetProperty("eventDate").GetDateTime());
         Assert.Equal(KnownInstallId, root.GetProperty("installID").GetString());
         Assert.True(root.TryGetProperty("enabledManagers", out _));
         Assert.True(root.TryGetProperty("foundManagers", out _));
-        Assert.Equal(12339, root.GetProperty("activeSettings").GetInt32());
+        Assert.Equal(6195, root.GetProperty("activeSettings").GetInt32());
         Assert.Equal("UniGetUI", root.GetProperty("application").GetProperty("name").GetString());
         Assert.Equal("NotApplicable", root.GetProperty("application").GetProperty("dataSource").GetString());
         Assert.Equal("Free", root.GetProperty("application").GetProperty("pricing").GetString());
         Assert.NotEmpty(root.GetProperty("platform").GetProperty("name").GetString());
     }
 
     [Fact]

src/UniGetUI.Interface.Telemetry/TelemetryHandler.cs

@@ -73,7 +73,7 @@
 
     private static readonly HttpClient _httpClient;
 
     static TelemetryHandler()
     {
         _httpClient = new HttpClient(CoreTools.GenericHttpClientParameters)
         {
@@ -95,7 +95,6 @@
         Settings.K.DoCacheAdminRights,
         Settings.K.DoCacheAdminRightsForBatches,
         Settings.K.ForceLegacyBundledWinGet,
-        Settings.K.UseSystemChocolatey,
     ];
 
     // -------------------------------------------------------------------------