Merge pull request #991 from gep13/update-to-latest-chocolatey-bits

(#990 #989) Update to latest chocolatey bits
chocolatey · Mar 20, 2023 · 9fbe0d0 · 9fbe0d0
2 parents 1ae765b + ea45903
commit 9fbe0d0
Show file tree

Hide file tree

Showing 18 changed files with 10 additions and 92 deletions.
diff --git a/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj b/Source/ChocolateyGui.Common.Windows/ChocolateyGui.Common.Windows.csproj
@@ -68,7 +68,7 @@
       <HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
     </Reference>
     <Reference Include="chocolatey">
-      <HintPath>..\packages\chocolatey.lib.2.0.0-alpha-20230317-982\lib\net48\chocolatey.dll</HintPath>
+      <HintPath>..\packages\chocolatey.lib.2.0.0-beta-20230320-998\lib\net48\chocolatey.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private Condition="'$(Configuration)' != 'Debug'">False</Private>
     </Reference>

diff --git a/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs b/Source/ChocolateyGui.Common.Windows/Services/ChocolateyService.cs
@@ -74,7 +74,6 @@ public async Task<IEnumerable<Package>> GetInstalledPackages()
                 config =>
                     {
                         config.CommandName = CommandNameType.list.ToString();
-                        config.ListCommand.LocalOnly = true;
                     });
 
             var chocoConfig = _choco.GetConfiguration();
@@ -227,9 +226,6 @@ public async Task<PackageOperationResult> InstallPackage(
                                 config.ApplyInstallArgumentsToDependencies = advancedInstallOptions.ApplyInstallArgumentsToDependencies;
                                 config.ApplyPackageParametersToDependencies = advancedInstallOptions.ApplyPackageParametersToDependencies;
                                 config.AllowDowngrade = advancedInstallOptions.AllowDowngrade;
-#pragma warning disable CS0618 // Type or member is obsolete
-                                config.AllowMultipleVersions = advancedInstallOptions.AllowMultipleVersions;
-#pragma warning restore CS0618 // Type or member is obsolete
                                 config.IgnoreDependencies = advancedInstallOptions.IgnoreDependencies;
                                 config.ForceDependencies = advancedInstallOptions.ForceDependencies;
                                 config.SkipPackageInstallProvider = advancedInstallOptions.SkipPowerShell;
@@ -278,7 +274,7 @@ public async Task<PackageResults> Search(string query, PackageSearchOptions opti
             _choco.Set(
                 config =>
                     {
-                        config.CommandName = CommandNameType.list.ToString();
+                        config.CommandName = "search";
                         config.Input = query;
                         config.AllVersions = options.IncludeAllVersions;
                         config.ListCommand.Page = options.CurrentPage;
@@ -653,9 +649,6 @@ private static Package GetMappedPackage(GetChocolatey choco, PackageResult packa
                 var packageInfo = packageInfoService.get_package_information(package.PackageMetadata);
                 mappedPackage.IsPinned = packageInfo.IsPinned;
                 mappedPackage.IsInstalled = !string.IsNullOrWhiteSpace(package.InstallLocation) || forceInstalled;
-#pragma warning disable CS0618 // Type or member is obsolete
-                mappedPackage.IsSideBySide = packageInfo.IsSideBySide;
-#pragma warning restore CS0618 // Type or member is obsolete
 
                 mappedPackage.IsPrerelease = mappedPackage.Version.IsPrerelease;
             }

diff --git a/Source/ChocolateyGui.Common.Windows/ViewModels/AdvancedInstallViewModel.cs b/Source/ChocolateyGui.Common.Windows/ViewModels/AdvancedInstallViewModel.cs
@@ -42,7 +42,6 @@ public class AdvancedInstallViewModel : ObservableBase, IClosableChildWindow<Adv
         private bool _applyInstallArgumentsToDependencies;
         private bool _applyPackageParametersToDependencies;
         private bool _allowDowngrade;
-        private bool _allowMultipleVersions;
         private bool _ignoreDependencies;
         private bool _forceDependencies;
         private bool _skipPowerShell;
@@ -226,12 +225,6 @@ public bool AllowDowngrade
             set { SetPropertyValue(ref _allowDowngrade, value); }
         }
 
-        public bool AllowMultipleVersions
-        {
-            get { return _allowMultipleVersions; }
-            set { SetPropertyValue(ref _allowMultipleVersions, value); }
-        }
-
         public bool IgnoreDependencies
         {
             get

diff --git a/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs b/Source/ChocolateyGui.Common.Windows/ViewModels/Items/PackageViewModel.cs
@@ -74,8 +74,6 @@ public class PackageViewModel :
 
         private bool _isPinned;
 
-        private bool _isSideBySide;
-
         private bool _isPrerelease;
 
         private string _language;
@@ -171,7 +169,7 @@ public string[] Authors
 
         public bool IsUninstallAllowed => _allowedCommandsService.IsUninstallCommandAllowed;
 
-        public bool CanUpdate => IsInstalled && !IsPinned && !IsSideBySide && IsOutdated;
+        public bool CanUpdate => IsInstalled && !IsPinned && IsOutdated;
 
         public bool IsUpgradeAllowed => _allowedCommandsService.IsUpgradeCommandAllowed;
 
@@ -262,22 +260,6 @@ public bool IsPinned
             }
         }
 
-        public bool IsSideBySide
-        {
-            get
-            {
-                return _isSideBySide;
-            }
-
-            set
-            {
-                if (SetPropertyValue(ref _isSideBySide, value))
-                {
-                    NotifyPropertyChanged(nameof(CanUpdate));
-                }
-            }
-        }
-
         public bool IsOutdated
         {
             get

diff --git a/Source/ChocolateyGui.Common.Windows/Views/AdvancedInstallView.xaml b/Source/ChocolateyGui.Common.Windows/Views/AdvancedInstallView.xaml
@@ -270,9 +270,6 @@
                             <mah:MetroHeader Header="{lang:Localize AdvancedChocolateyDialog_AllowDowngrade_Header}" Tag="{lang:Localize AdvancedChocolateyDialog_AllowDowngrade_ToolTip}">
                                 <mah:ToggleSwitch VerticalAlignment="Center" IsOn="{Binding AllowDowngrade}" />
                             </mah:MetroHeader>
-                            <mah:MetroHeader Background="{DynamicResource MahApps.Brushes.Gray10}" Header="{lang:Localize AdvancedChocolateyDialog_AllowMultipleVersions_Header}" Tag="{lang:Localize AdvancedChocolateyDialog_AllowMultipleVersions_ToolTip}">
-                                <mah:ToggleSwitch VerticalAlignment="Center" IsOn="{Binding AllowMultipleVersions}" />
-                            </mah:MetroHeader>
                             <mah:MetroHeader Header="{lang:Localize AdvancedChocolateyDialog_SkipPowerShell_Header}" Tag="{lang:Localize AdvancedChocolateyDialog_SkipPowerShell_ToolTip}">
                                 <mah:ToggleSwitch VerticalAlignment="Center" IsOn="{Binding SkipPowerShell}" />
                             </mah:MetroHeader>

diff --git a/Source/ChocolateyGui.Common.Windows/Views/LocalSourceView.xaml b/Source/ChocolateyGui.Common.Windows/Views/LocalSourceView.xaml
@@ -54,10 +54,6 @@
                                               ToolTip="{lang:Localize LocalSourceView_ToolTip_Pinned}"
                                               Kind="Pin" Margin="0 2"
                                               Visibility="{Binding IsPinned, Mode=OneWay, Converter={StaticResource BooleanToVisibility}}" />
-                    <iconPacks:PackIconEntypo Width="24" Height="24"
-                                              ToolTip="{lang:Localize LocalSourceView_ToolTip_InstalledSideBySide}"
-                                              Kind="Bookmarks" Margin="0 2"
-                                              Visibility="{Binding IsSideBySide, Mode=OneWay, Converter={StaticResource BooleanToVisibility}}" />
                 </StackPanel>
 
                 <TextBlock Grid.Row="2"
@@ -281,7 +277,6 @@
                                                 <DataTemplate DataType="{x:Type items:IPackageViewModel}">
                                                     <StackPanel Orientation="Horizontal">
                                                         <iconPacks:PackIconEntypo ToolTip="{lang:Localize LocalSourceView_ToolTip_Pinned}" Kind="Pin" Visibility="{Binding IsPinned, Converter={StaticResource BooleanToVisibilityHidden}}" />
-                                                        <iconPacks:PackIconEntypo ToolTip="{lang:Localize LocalSourceView_ToolTip_InstalledSideBySide}" Kind="Bookmarks" Visibility="{Binding IsSideBySide, Converter={StaticResource BooleanToVisibilityHidden}}" />
                                                         <TextBlock Text="{Binding Title}"/>
                                                     </StackPanel>
                                                 </DataTemplate>

diff --git a/Source/ChocolateyGui.Common.Windows/packages.config b/Source/ChocolateyGui.Common.Windows/packages.config
@@ -5,7 +5,7 @@
   <package id="BuildTools.FxCop" version="1.0.1" targetFramework="net40" />
   <package id="Caliburn.Micro" version="3.2.0" targetFramework="net48" />
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net48" />
-  <package id="chocolatey.lib" version="2.0.0-alpha-20230317-982" targetFramework="net48" />
+  <package id="chocolatey.lib" version="2.0.0-beta-20230320-998" targetFramework="net48" />
   <package id="ControlzEx" version="4.4.0" targetFramework="net48" />
   <package id="Fizzler" version="1.2.0" targetFramework="net48" />
   <package id="HarfBuzzSharp" version="2.6.1.4" targetFramework="net48" />

diff --git a/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj b/Source/ChocolateyGui.Common/ChocolateyGui.Common.csproj
@@ -55,7 +55,7 @@
       <HintPath>..\packages\AutoMapper.7.0.1\lib\net45\AutoMapper.dll</HintPath>
     </Reference>
     <Reference Include="chocolatey">
-      <HintPath>..\packages\chocolatey.lib.2.0.0-alpha-20230317-982\lib\net48\chocolatey.dll</HintPath>
+      <HintPath>..\packages\chocolatey.lib.2.0.0-beta-20230320-998\lib\net48\chocolatey.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private Condition="'$(Configuration)' != 'Debug'">False</Private>
     </Reference>

diff --git a/Source/ChocolateyGui.Common/Models/AdvancedInstall.cs b/Source/ChocolateyGui.Common/Models/AdvancedInstall.cs
@@ -33,8 +33,6 @@ public class AdvancedInstall
 
         public bool AllowDowngrade { get; set; }
 
-        public bool AllowMultipleVersions { get; set; }
-
         public bool IgnoreDependencies { get; set; }
 
         public bool ForceDependencies { get; set; }

diff --git a/Source/ChocolateyGui.Common/Models/Package.cs b/Source/ChocolateyGui.Common/Models/Package.cs
@@ -32,8 +32,6 @@ public class Package
 
         public bool IsPinned { get; set; }
 
-        public bool IsSideBySide { get; set; }
-
         public bool IsPrerelease { get; set; }
 
         public string Language { get; set; }

diff --git a/Source/ChocolateyGui.Common/Properties/Resources.Designer.cs b/Source/ChocolateyGui.Common/Properties/Resources.Designer.cs
diff --git a/Source/ChocolateyGui.Common/Properties/Resources.resx b/Source/ChocolateyGui.Common/Properties/Resources.resx
@@ -635,9 +635,6 @@ Or if there is a traditional way to show sorting by the Title in your language,
   <data name="RemoteSourceViewModel_FetchingPackages" xml:space="preserve">
     <value>Fetching packages...</value>
   </data>
-  <data name="LocalSourceView_ToolTip_InstalledSideBySide" xml:space="preserve">
-    <value>Installed Side by Side with another version of the same package.</value>
-  </data>
   <data name="LocalSourceView_ToolTip_Pinned" xml:space="preserve">
     <value>Pinned</value>
   </data>
@@ -1064,12 +1061,6 @@ Please contact your System Administrator to enable this operation.</value>
   <data name="AdvancedChocolateyDialog_AllowEmptyChecksums_ToolTip" xml:space="preserve">
     <value>Allow packages to have empty/missing checksums for downloaded resources from non-secure locations (HTTP, FTP). Using this switch is not recommended if using sources that download resources from the internet. Only overrides the value in the configuration when 'On' is specified.</value>
   </data>
-  <data name="AdvancedChocolateyDialog_AllowMultipleVersions_Header" xml:space="preserve">
-    <value>Allow Multiple Versions</value>
-  </data>
-  <data name="AdvancedChocolateyDialog_AllowMultipleVersions_ToolTip" xml:space="preserve">
-    <value>Should multiple versions of a package be installed?</value>
-  </data>
   <data name="AdvancedChocolateyDialog_ApplyInstallArgumentsToDependencies_Header" xml:space="preserve">
     <value>Apply Install Arguments to Dependencies</value>
   </data>

diff --git a/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs b/Source/ChocolateyGui.Common/ViewModels/Items/IPackageViewModel.cs
@@ -37,8 +37,6 @@ public interface IPackageViewModel
 
         bool IsPinned { get; set; }
 
-        bool IsSideBySide { get; set; }
-
         bool IsPrerelease { get; set; }
 
         string Language { get; set; }

diff --git a/Source/ChocolateyGui.Common/packages.config b/Source/ChocolateyGui.Common/packages.config
@@ -3,7 +3,7 @@
   <package id="Autofac" version="4.6.1" targetFramework="net452" />
   <package id="AutoMapper" version="7.0.1" targetFramework="net48" />
   <package id="BuildTools.FxCop" version="1.0.1" targetFramework="net452" />
-  <package id="chocolatey.lib" version="2.0.0-alpha-20230317-982" targetFramework="net48" />
+  <package id="chocolatey.lib" version="2.0.0-beta-20230320-998" targetFramework="net48" />
   <package id="LiteDB" version="5.0.15" targetFramework="net48" />
   <package id="log4net" version="2.0.12" targetFramework="net452" />
   <package id="Microsoft.VisualStudio.Threading" version="15.4.4" targetFramework="net452" />

diff --git a/Source/ChocolateyGui/ChocolateyGui.csproj b/Source/ChocolateyGui/ChocolateyGui.csproj
@@ -114,7 +114,7 @@
       <HintPath>..\packages\Caliburn.Micro.3.2.0\lib\net45\Caliburn.Micro.Platform.Core.dll</HintPath>
     </Reference>
     <Reference Include="chocolatey">
-      <HintPath>..\packages\chocolatey.lib.2.0.0-alpha-20230317-982\lib\net48\chocolatey.dll</HintPath>
+      <HintPath>..\packages\chocolatey.lib.2.0.0-beta-20230320-998\lib\net48\chocolatey.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private Condition="'$(Configuration)' != 'Debug'">False</Private>
     </Reference>

diff --git a/Source/ChocolateyGui/packages.config b/Source/ChocolateyGui/packages.config
@@ -5,7 +5,7 @@
   <package id="BuildTools.FxCop" version="1.0.1" targetFramework="net452" />
   <package id="Caliburn.Micro" version="3.2.0" targetFramework="net452" />
   <package id="Caliburn.Micro.Core" version="3.2.0" targetFramework="net452" />
-  <package id="chocolatey.lib" version="2.0.0-alpha-20230317-982" targetFramework="net48" />
+  <package id="chocolatey.lib" version="2.0.0-beta-20230320-998" targetFramework="net48" />
   <package id="ControlzEx" version="4.4.0" targetFramework="net48" />
   <package id="Fizzler" version="1.2.0" targetFramework="net48" />
   <package id="HarfBuzzSharp" version="2.6.1.4" targetFramework="net48" />

diff --git a/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj b/Source/ChocolateyGuiCli/ChocolateyGuiCli.csproj
@@ -57,7 +57,7 @@
       <HintPath>..\packages\Autofac.4.6.1\lib\net45\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="chocolatey">
-      <HintPath>..\packages\chocolatey.lib.2.0.0-alpha-20230317-982\lib\net48\chocolatey.dll</HintPath>
+      <HintPath>..\packages\chocolatey.lib.2.0.0-beta-20230320-998\lib\net48\chocolatey.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private Condition="'$(Configuration)' != 'Debug'">False</Private>
     </Reference>

diff --git a/Source/ChocolateyGuiCli/packages.config b/Source/ChocolateyGuiCli/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Autofac" version="4.6.1" targetFramework="net452" />
   <package id="BuildTools.FxCop" version="1.0.1" targetFramework="net452" />
-  <package id="chocolatey.lib" version="2.0.0-alpha-20230317-982" targetFramework="net48" />
+  <package id="chocolatey.lib" version="2.0.0-beta-20230320-998" targetFramework="net48" />
   <package id="LiteDB" version="5.0.15" targetFramework="net48" />
   <package id="log4net" version="2.0.12" targetFramework="net452" />
   <package id="Serilog" version="2.5.0" targetFramework="net48" />