From d41a777fc613fcb59d2fc34278b6bde6a217a14f Mon Sep 17 00:00:00 2001
From: Rob Reynolds <ferventcoder@gmail.com>
Date: Thu, 21 Mar 2019 18:46:38 -0500
Subject: [PATCH 1/6] (doc) update copyright year

---
 .uppercut                                  | 2 +-
 nuget/chocolatey.lib/chocolatey.lib.nuspec | 2 +-
 nuget/chocolatey/chocolatey.nuspec         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.uppercut b/.uppercut
index b921cde72e..a795ff61b0 100644
--- a/.uppercut
+++ b/.uppercut
@@ -22,7 +22,7 @@
   <property name="version.nuget.prerelease" value="" overwrite="false" />
   <property name="version.use.build_date" value="false" overwrite="false" />
   <property name="assembly.description" value="${project.name} is a product of ${company.name} - All Rights Reserved." overwrite="false" />
-  <property name="assembly.copyright" value="Copyright © 2017 - 2018 ${company.name} Copyright © 2011 - 2017, RealDimensions Software, LLC - All Rights Reserved." overwrite="false" />
+  <property name="assembly.copyright" value="Copyright © 2017 - 2019 ${company.name} Copyright © 2011 - 2017, RealDimensions Software, LLC - All Rights Reserved." overwrite="false" />
   <property name="sign.project_with_key" value="true" overwrite="false" />
 
   <!-- Build Features Overrides -->
diff --git a/nuget/chocolatey.lib/chocolatey.lib.nuspec b/nuget/chocolatey.lib/chocolatey.lib.nuspec
index 1b6ae75bbd..ddc8cdc32a 100644
--- a/nuget/chocolatey.lib/chocolatey.lib.nuspec
+++ b/nuget/chocolatey.lib/chocolatey.lib.nuspec
@@ -10,7 +10,7 @@
     <iconUrl>https://raw.githubusercontent.com/chocolatey/choco/master/docs/logo/chocolateyicon.gif</iconUrl>
     <licenseUrl>https://raw.githubusercontent.com/chocolatey/choco/master/LICENSE</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <copyright>2017 Chocolatey Software, Inc, 2011- 2017 RealDimensions Software, LLC</copyright>
+    <copyright>2017-2019 Chocolatey Software, Inc, 2011- 2017 RealDimensions Software, LLC</copyright>
     <tags>apt-get machine repository chocolatey</tags>
     <summary>Chocolatey is the package manager for Windows (like apt-get but for Windows)</summary>
     <description>
diff --git a/nuget/chocolatey/chocolatey.nuspec b/nuget/chocolatey/chocolatey.nuspec
index a641cd4f98..398e4e4e4c 100644
--- a/nuget/chocolatey/chocolatey.nuspec
+++ b/nuget/chocolatey/chocolatey.nuspec
@@ -11,7 +11,7 @@
     <iconUrl>https://raw.githubusercontent.com/chocolatey/choco/master/docs/logo/chocolateyicon.gif</iconUrl>
     <licenseUrl>https://raw.githubusercontent.com/chocolatey/choco/master/LICENSE</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <copyright>2017 Chocolatey Software, Inc, 2011- 2017 RealDimensions Software, LLC</copyright>
+    <copyright>2017-2019 Chocolatey Software, Inc, 2011- 2017 RealDimensions Software, LLC</copyright>
     <!--<projectSourceUrl>https://github.com/chocolatey/choco</projectSourceUrl>
     <docsUrl>https://chocolatey.org/docs</docsUrl>
     <mailingListUrl>https://groups.google.com/forum/#!forum/chocolatey</mailingListUrl>

From ab663e3e7dd496e74aa43af35d49ee2d6ab7ea73 Mon Sep 17 00:00:00 2001
From: Rob Reynolds <ferventcoder@gmail.com>
Date: Thu, 21 Mar 2019 18:49:56 -0500
Subject: [PATCH 2/6] (maint) ensure config for removing nuget cache

Grab the current configuration settings to ensure the cacheLocation can
be found to remove the nuget cache, if the older method signature is
called.
---
 src/chocolatey/infrastructure.app/runners/GenericRunner.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/chocolatey/infrastructure.app/runners/GenericRunner.cs b/src/chocolatey/infrastructure.app/runners/GenericRunner.cs
index d132d47f52..62f7030ded 100644
--- a/src/chocolatey/infrastructure.app/runners/GenericRunner.cs
+++ b/src/chocolatey/infrastructure.app/runners/GenericRunner.cs
@@ -31,6 +31,7 @@ namespace chocolatey.infrastructure.app.runners
     using configuration;
     using domain;
     using infrastructure.commands;
+    using infrastructure.configuration;
     using logging;
     using Console = System.Console;
     using Environment = System.Environment;
@@ -182,7 +183,7 @@ public void run(ChocolateyConfiguration config, Container container, bool isCons
         /// <param name="container">The container.</param>
         private void remove_nuget_cache(Container container)
         {
-            remove_nuget_cache(container, null);
+            remove_nuget_cache(container, Config.get_configuration_settings());
         }
 
         /// <summary>

From c8c28093ac68cff6aa59728ac1d1065996b96a13 Mon Sep 17 00:00:00 2001
From: Rob Reynolds <ferventcoder@gmail.com>
Date: Thu, 21 Mar 2019 19:15:37 -0500
Subject: [PATCH 3/6] (maint) formatting

---
 .../commands/ChocolateyInstallCommand.cs      |  4 ++--
 .../commands/ChocolateyUpgradeCommand.cs      | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs
index 04594f5563..a4ab6d117a 100644
--- a/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs
+++ b/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs
@@ -156,12 +156,12 @@ public virtual void configure_argument_parser(OptionSet optionSet, ChocolateyCon
                      option => configuration.Features.StopOnFirstPackageFailure = option != null
                      )
                  .Add("exitwhenrebootdetected|exit-when-reboot-detected",
-                     "Exit When Reboot Detected - Stop running install, upgrade, or uninstall when a reboot request is detected. Requires '{0}' feature to be turned on. Will exit with either {1} or {2}.  Overrides the default feature '{3}' set to '{4}'.  Available in 0.10.12+.".format_with
+                     "Exit When Reboot Detected - Stop running install, upgrade, or uninstall when a reboot request is detected. Requires '{0}' feature to be turned on. Will exit with either {1} or {2}. Overrides the default feature '{3}' set to '{4}'. Available in 0.10.12+.".format_with
                      (ApplicationParameters.Features.UsePackageExitCodes, ApplicationParameters.ExitCodes.ErrorFailNoActionReboot, ApplicationParameters.ExitCodes.ErrorInstallSuspend, ApplicationParameters.Features.ExitOnRebootDetected, configuration.Features.ExitOnRebootDetected.to_string()),
                      option => configuration.Features.ExitOnRebootDetected = option != null
                      )
                  .Add("ignoredetectedreboot|ignore-detected-reboot",
-                     "Ignore Detected Reboot - Ignore any detected reboots if found. Overrides the default feature '{0}' set to '{1}'.  Available in 0.10.12+.".format_with
+                     "Ignore Detected Reboot - Ignore any detected reboots if found. Overrides the default feature '{0}' set to '{1}'. Available in 0.10.12+.".format_with
                      (ApplicationParameters.Features.ExitOnRebootDetected, configuration.Features.ExitOnRebootDetected.to_string()),
                      option =>
                      {
diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyUpgradeCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyUpgradeCommand.cs
index e839263887..f6b59e720c 100644
--- a/src/chocolatey/infrastructure.app/commands/ChocolateyUpgradeCommand.cs
+++ b/src/chocolatey/infrastructure.app/commands/ChocolateyUpgradeCommand.cs
@@ -185,23 +185,23 @@ public virtual void configure_argument_parser(OptionSet optionSet, ChocolateyCon
                      )
                  .Add("userememberedargs|userememberedarguments|userememberedoptions|use-remembered-args|use-remembered-arguments|use-remembered-options",
                      "Use Remembered Options for Upgrade - use the arguments and options used during install for upgrade. Does not override arguments being passed at runtime. Overrides the default feature '{0}' set to '{1}'. Available in 0.10.4+.".format_with(ApplicationParameters.Features.UseRememberedArgumentsForUpgrades, configuration.Features.UseRememberedArgumentsForUpgrades.to_string()),
-                    option =>
-                    {
-                        if (option != null) configuration.Features.UseRememberedArgumentsForUpgrades = true;
-                    })
+                     option =>
+                     {
+                         if (option != null) configuration.Features.UseRememberedArgumentsForUpgrades = true;
+                     })
                  .Add("ignorerememberedargs|ignorerememberedarguments|ignorerememberedoptions|ignore-remembered-args|ignore-remembered-arguments|ignore-remembered-options",
                      "Ignore Remembered Options for Upgrade - ignore the arguments and options used during install for upgrade. Overrides the default feature '{0}' set to '{1}'. Available in 0.10.4+.".format_with(ApplicationParameters.Features.UseRememberedArgumentsForUpgrades, configuration.Features.UseRememberedArgumentsForUpgrades.to_string()),
-                    option =>
-                    {
-                        if (option != null) configuration.Features.UseRememberedArgumentsForUpgrades = false;
-                    })
+                     option =>
+                     {
+                         if (option != null) configuration.Features.UseRememberedArgumentsForUpgrades = false;
+                     })
                  .Add("exitwhenrebootdetected|exit-when-reboot-detected",
-                     "Exit When Reboot Detected - Stop running install, upgrade, or uninstall when a reboot request is detected. Requires '{0}' feature to be turned on. Will exit with either {1} or {2}.  Overrides the default feature '{3}' set to '{4}'.  Available in 0.10.12+.".format_with
+                     "Exit When Reboot Detected - Stop running install, upgrade, or uninstall when a reboot request is detected. Requires '{0}' feature to be turned on. Will exit with either {1} or {2}. Overrides the default feature '{3}' set to '{4}'. Available in 0.10.12+.".format_with
                          (ApplicationParameters.Features.UsePackageExitCodes, ApplicationParameters.ExitCodes.ErrorFailNoActionReboot, ApplicationParameters.ExitCodes.ErrorInstallSuspend, ApplicationParameters.Features.ExitOnRebootDetected, configuration.Features.ExitOnRebootDetected.to_string()),
                      option => configuration.Features.ExitOnRebootDetected = option != null
                      )
                  .Add("ignoredetectedreboot|ignore-detected-reboot",
-                     "Ignore Detected Reboot - Ignore any detected reboots if found. Overrides the default feature '{0}' set to '{1}'.  Available in 0.10.12+.".format_with
+                     "Ignore Detected Reboot - Ignore any detected reboots if found. Overrides the default feature '{0}' set to '{1}'. Available in 0.10.12+.".format_with
                          (ApplicationParameters.Features.ExitOnRebootDetected, configuration.Features.ExitOnRebootDetected.to_string()),
                      option =>
                      {

From 0668f3ae554ba92fcad20cf4771b03793fd5ab32 Mon Sep 17 00:00:00 2001
From: Rob Reynolds <ferventcoder@gmail.com>
Date: Thu, 21 Mar 2019 19:22:05 -0500
Subject: [PATCH 4/6] (GH-1771) Download nupkg, extract nuspec

Previously, when Chocolatey was downloading a nupkg, it would rely on
the metadata information from an OData feed to be returned properly.
Unfortunately, not all packaging repositories that support OData
repositories return this data in a proper manner. Due to this aspect,
download the nupkg first and extract the nuspec from that file instead
or using the metedata returned from the `DataServicePackage` (which
is simply an XML stream from a URL).
---
 .../nuget/ChocolateyLocalPackageRepository.cs          | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/chocolatey/infrastructure.app/nuget/ChocolateyLocalPackageRepository.cs b/src/chocolatey/infrastructure.app/nuget/ChocolateyLocalPackageRepository.cs
index e2f1464a41..f9fa26e164 100644
--- a/src/chocolatey/infrastructure.app/nuget/ChocolateyLocalPackageRepository.cs
+++ b/src/chocolatey/infrastructure.app/nuget/ChocolateyLocalPackageRepository.cs
@@ -21,6 +21,7 @@ namespace chocolatey.infrastructure.app.nuget
     using System.IO;
     using System.Linq;
     using System.Runtime.Versioning;
+    using System.Threading;
     using NuGet;
 
     // ReSharper disable InconsistentNaming
@@ -50,10 +51,15 @@ public ChocolateyLocalPackageRepository(IPackagePathResolver pathResolver, IFile
         public override void AddPackage(IPackage package)
         {
             string packageFilePath = GetPackageFilePath(package);
+            FileSystem.AddFileWithCheck(packageFilePath, package.GetStream);
+            // allow the file to finish being written 
+            Thread.Sleep(200);
             if (PackageSaveMode.HasFlag(PackageSaveModes.Nuspec))
             {
+                // don't trust the package metadata to be complete - extract from the downloaded nupkg
+                var zipPackage = new OptimizedZipPackage(FileSystem, packageFilePath);
                 string manifestFilePath = GetManifestFilePath(package.Id, package.Version);
-                Manifest manifest = Manifest.Create(package);
+                Manifest manifest = Manifest.Create(zipPackage);
                 manifest.Metadata.ReferenceSets = Enumerable.ToList<ManifestReferenceSet>(Enumerable.Select<IGrouping<FrameworkName, IPackageAssemblyReference>, ManifestReferenceSet>(Enumerable.GroupBy<IPackageAssemblyReference, FrameworkName>(package.AssemblyReferences, (Func<IPackageAssemblyReference, FrameworkName>)(f => f.TargetFramework)), (Func<IGrouping<FrameworkName, IPackageAssemblyReference>, ManifestReferenceSet>)(g => new ManifestReferenceSet()
                 {
                     TargetFramework = g.Key == (FrameworkName)null ? (string)null : VersionUtility.GetFrameworkString(g.Key),
@@ -64,8 +70,6 @@ public override void AddPackage(IPackage package)
                 })));
                 FileSystem.AddFileWithCheck(manifestFilePath, manifest.Save);
             }
-
-            FileSystem.AddFileWithCheck(packageFilePath, package.GetStream);
         }
 
         private string GetManifestFilePath(string packageId, SemanticVersion version)

From 553eaa26430173f7738741b2955ae9746f51bd6a Mon Sep 17 00:00:00 2001
From: Rob Reynolds <ferventcoder@gmail.com>
Date: Thu, 21 Mar 2019 19:51:08 -0500
Subject: [PATCH 5/6] (GH-1770) Feature - usePackageRepositoryOptimizations

Add a feature turned on by default named
`usePackageRepositoryOptimizations` that uses the new methods for
querying. Also allow turning off per install/upgrade command with
`--disable-repository-optimizations`. When turned off or disabled,
Chocolatey will query for available packages for
install/upgrade/outdated using the older methods. This allows
compatibility with repositories that error or do not support the
optimizations.
---
 .../infrastructure.app/ApplicationParameters.cs   |  1 +
 .../builders/ConfigurationBuilder.cs              |  1 +
 .../commands/ChocolateyInstallCommand.cs          | 10 ++++++++++
 .../commands/ChocolateyOutdatedCommand.cs         | 10 ++++++++++
 .../commands/ChocolateyUpgradeCommand.cs          | 10 ++++++++++
 .../configuration/ChocolateyConfiguration.cs      |  1 +
 .../infrastructure.app/services/NugetService.cs   | 15 ++++++++++++---
 7 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/chocolatey/infrastructure.app/ApplicationParameters.cs b/src/chocolatey/infrastructure.app/ApplicationParameters.cs
index 8298a63912..26091af576 100644
--- a/src/chocolatey/infrastructure.app/ApplicationParameters.cs
+++ b/src/chocolatey/infrastructure.app/ApplicationParameters.cs
@@ -180,6 +180,7 @@ public static class Features
             public static readonly string LogWithoutColor = "logWithoutColor";
             public static readonly string ExitOnRebootDetected = "exitOnRebootDetected";
             public static readonly string LogValidationResultsOnWarnings = "logValidationResultsOnWarnings";
+            public static readonly string UsePackageRepositoryOptimizations = "usePackageRepositoryOptimizations";
         }
 
         public static class Messages
diff --git a/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs b/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs
index f1ca867f3a..d505ec14ab 100644
--- a/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs
+++ b/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs
@@ -304,6 +304,7 @@ private static void set_feature_flags(ChocolateyConfiguration config, ConfigFile
             config.Features.RemovePackageInformationOnUninstall = set_feature_flag(ApplicationParameters.Features.RemovePackageInformationOnUninstall, configFileSettings, defaultEnabled: false, description: "Remove Stored Package Information On Uninstall - When a package is uninstalled, should the stored package information also be removed?  Available in 0.10.9+.");
             config.Features.LogWithoutColor = set_feature_flag(ApplicationParameters.Features.LogWithoutColor, configFileSettings, defaultEnabled: false, description: "Log without color - Do not show colorization in logging output. Available in 0.10.9+.");
             config.Features.LogValidationResultsOnWarnings = set_feature_flag(ApplicationParameters.Features.LogValidationResultsOnWarnings, configFileSettings, defaultEnabled: true, description: "Log validation results on warnings - Should the validation results be logged if there are warnings? Available in 0.10.12+.");
+            config.Features.UsePackageRepositoryOptimizations = set_feature_flag(ApplicationParameters.Features.UsePackageRepositoryOptimizations, configFileSettings, defaultEnabled: true, description: "Use Package Repository Optimizations - Turn on optimizations for reducing bandwidth with repository queries during package install/upgrade/outdated operations. Should generally be left enabled, unless a repository needs to support older methods of query. When disabled, this makes queries similar to the way they were done in Chocolatey v0.10.11 and before. Available in 0.10.14+.");
             config.Features.ScriptsCheckLastExitCode = set_feature_flag(ApplicationParameters.Features.ScriptsCheckLastExitCode, configFileSettings, defaultEnabled: false, description: "Scripts Check $LastExitCode (external commands) - Leave this off unless you absolutely need it while you fix your package scripts  to use `throw 'error message'` or `Set-PowerShellExitCode #` instead of `exit #`. This behavior started in 0.9.10 and produced hard to find bugs. If the last external process exits successfully but with an exit code of not zero, this could cause hard to detect package failures. Available in 0.10.3+. Will be removed in 0.11.0.");
             config.PromptForConfirmation = !set_feature_flag(ApplicationParameters.Features.AllowGlobalConfirmation, configFileSettings, defaultEnabled: false, description: "Prompt for confirmation in scripts or bypass.");
         }
diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs
index a4ab6d117a..dc13c8237b 100644
--- a/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs
+++ b/src/chocolatey/infrastructure.app/commands/ChocolateyInstallCommand.cs
@@ -170,6 +170,16 @@ public virtual void configure_argument_parser(OptionSet optionSet, ChocolateyCon
                              configuration.Features.ExitOnRebootDetected = false;
                          }
                      })
+                .Add("disable-repository-optimizations|disable-package-repository-optimizations",
+                     "Disable Package Repository Optimizations - Do not use optimizations for reducing bandwidth with repository queries during package install/upgrade/outdated operations. Should not generally be used, unless a repository needs to support older methods of query. When used, this makes queries similar to the way they were done in Chocolatey v0.10.11 and before. Overrides the default feature '{0}' set to '{1}'. Available in 0.10.14+.".format_with
+                        (ApplicationParameters.Features.UsePackageRepositoryOptimizations, configuration.Features.UsePackageRepositoryOptimizations.to_string()),
+                     option =>
+                     {
+                         if (option != null)
+                         {
+                             configuration.Features.UsePackageRepositoryOptimizations = false;
+                         }
+                     })
                 ;
 
             //todo: package name can be a url / installertype
diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyOutdatedCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyOutdatedCommand.cs
index 835ad38f2a..37e58b3e90 100644
--- a/src/chocolatey/infrastructure.app/commands/ChocolateyOutdatedCommand.cs
+++ b/src/chocolatey/infrastructure.app/commands/ChocolateyOutdatedCommand.cs
@@ -58,6 +58,16 @@ public virtual void configure_argument_parser(OptionSet optionSet, ChocolateyCon
                 .Add("ignore-unfound",
                     "Ignore Unfound Packages - Ignore packages that are not found on the sources used (or the defaults). Overrides the default feature '{0}' set to '{1}'. Available in 0.10.9+.".format_with(ApplicationParameters.Features.IgnoreUnfoundPackagesOnUpgradeOutdated, configuration.Features.IgnoreUnfoundPackagesOnUpgradeOutdated.to_string()),
                     option => configuration.Features.IgnoreUnfoundPackagesOnUpgradeOutdated = option != null)
+                .Add("disable-repository-optimizations|disable-package-repository-optimizations",
+                    "Disable Package Repository Optimizations - Do not use optimizations for reducing bandwidth with repository queries during package install/upgrade/outdated operations. Should not generally be used, unless a repository needs to support older methods of query. When disabled, this makes queries similar to the way they were done in Chocolatey v0.10.11 and before. Overrides the default feature '{0}' set to '{1}'. Available in 0.10.14+.".format_with
+                        (ApplicationParameters.Features.UsePackageRepositoryOptimizations, configuration.Features.UsePackageRepositoryOptimizations.to_string()),
+                    option =>
+                    {
+                        if (option != null)
+                        {
+                            configuration.Features.UsePackageRepositoryOptimizations = false;
+                        }
+                    })
                 ;
         }
 
diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyUpgradeCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyUpgradeCommand.cs
index f6b59e720c..bd8dabbd13 100644
--- a/src/chocolatey/infrastructure.app/commands/ChocolateyUpgradeCommand.cs
+++ b/src/chocolatey/infrastructure.app/commands/ChocolateyUpgradeCommand.cs
@@ -210,6 +210,16 @@ public virtual void configure_argument_parser(OptionSet optionSet, ChocolateyCon
                              configuration.Features.ExitOnRebootDetected = false;
                          }
                      })
+                 .Add("disable-repository-optimizations|disable-package-repository-optimizations",
+                     "Disable Package Repository Optimizations - Do not use optimizations for reducing bandwidth with repository queries during package install/upgrade/outdated operations. Should not generally be used, unless a repository needs to support older methods of query. When disabled, this makes queries similar to the way they were done in Chocolatey v0.10.11 and before. Overrides the default feature '{0}' set to '{1}'. Available in 0.10.14+.".format_with
+                         (ApplicationParameters.Features.UsePackageRepositoryOptimizations, configuration.Features.UsePackageRepositoryOptimizations.to_string()),
+                     option =>
+                     {
+                         if (option != null)
+                         {
+                             configuration.Features.UsePackageRepositoryOptimizations = false;
+                         }
+                     })
                 ;
         }
 
diff --git a/src/chocolatey/infrastructure.app/configuration/ChocolateyConfiguration.cs b/src/chocolatey/infrastructure.app/configuration/ChocolateyConfiguration.cs
index 63ceba52a0..e661e8092e 100644
--- a/src/chocolatey/infrastructure.app/configuration/ChocolateyConfiguration.cs
+++ b/src/chocolatey/infrastructure.app/configuration/ChocolateyConfiguration.cs
@@ -394,6 +394,7 @@ public sealed class FeaturesConfiguration
         public bool RemovePackageInformationOnUninstall { get; set; }
         public bool ExitOnRebootDetected { get; set; }
         public bool LogValidationResultsOnWarnings { get; set; }
+        public bool UsePackageRepositoryOptimizations { get; set; }
 
         //todo remove in 0.11.0
         public bool ScriptsCheckLastExitCode { get; set; }
diff --git a/src/chocolatey/infrastructure.app/services/NugetService.cs b/src/chocolatey/infrastructure.app/services/NugetService.cs
index ae4d49a47e..52ebaf4fd0 100644
--- a/src/chocolatey/infrastructure.app/services/NugetService.cs
+++ b/src/chocolatey/infrastructure.app/services/NugetService.cs
@@ -471,7 +471,10 @@ public virtual ConcurrentDictionary<string, PackageResult> install_run(Chocolate
                     continue;
                 }
 
-                IPackage availablePackage = find_package(packageName, version, config, packageManager.SourceRepository);
+                IPackage availablePackage = config.Features.UsePackageRepositoryOptimizations ? 
+                    find_package(packageName, version, config, packageManager.SourceRepository) 
+                    : packageManager.SourceRepository.FindPackage(packageName, version, config.Prerelease, allowUnlisted: false);
+
                 if (availablePackage == null)
                 {
                     var logMessage = @"{0} not installed. The package was not found with the source(s) listed.
@@ -692,7 +695,10 @@ public virtual ConcurrentDictionary<string, PackageResult> upgrade_run(Chocolate
                     config.Prerelease = true;
                 }
 
-                IPackage availablePackage = find_package(packageName, version, config, packageManager.SourceRepository);
+                IPackage availablePackage = config.Features.UsePackageRepositoryOptimizations ? 
+                    find_package(packageName, version, config, packageManager.SourceRepository) 
+                    : packageManager.SourceRepository.FindPackage(packageName, version, config.Prerelease, allowUnlisted: false);
+
                 config.Prerelease = originalPrerelease;
 
                 if (availablePackage == null)
@@ -917,7 +923,10 @@ public virtual ConcurrentDictionary<string, PackageResult> get_outdated(Chocolat
                     config.Prerelease = true;
                 }
 
-                var latestPackage = find_package(packageName, null, config, repository);
+                SemanticVersion version =  null;
+                var latestPackage = config.Features.UsePackageRepositoryOptimizations ? 
+                    find_package(packageName, null, config, packageManager.SourceRepository) 
+                    : packageManager.SourceRepository.FindPackage(packageName, version, config.Prerelease, allowUnlisted: false);
 
                 if (latestPackage == null)
                 {

From 1ff4ab24f80f2ba0cd11c83f2ee8906791f2ced1 Mon Sep 17 00:00:00 2001
From: Rob Reynolds <ferventcoder@gmail.com>
Date: Thu, 21 Mar 2019 20:01:13 -0500
Subject: [PATCH 6/6] (GH-1774) log on failing repo

When attempting packaging operations like install/upgrade and a
repositories fails, log a warning and continue on. #612 implemented
some of the fixes for ignoring failing repositories, but apparently
that didn't apply when querying those repositories outside of the
package manager that was implemented with #1397.
---
 .../services/NugetService.cs                  | 57 +++++++++++--------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/src/chocolatey/infrastructure.app/services/NugetService.cs b/src/chocolatey/infrastructure.app/services/NugetService.cs
index 52ebaf4fd0..f1b1493855 100644
--- a/src/chocolatey/infrastructure.app/services/NugetService.cs
+++ b/src/chocolatey/infrastructure.app/services/NugetService.cs
@@ -968,36 +968,43 @@ private IPackage find_package(string packageName, SemanticVersion version, Choco
 
                 foreach (var packageRepository in aggregateRepository.Repositories.or_empty_list_if_null())
                 {
-                    this.Log().Debug("Using '" + packageRepository.Source + "'.");
-                    this.Log().Debug("- Supports prereleases? '" + packageRepository.SupportsPrereleasePackages + "'.");
-                    this.Log().Debug("- Is ServiceBased? '" + (packageRepository is IServiceBasedRepository) + "'.");
+                    try
+                    {
+                        this.Log().Debug("Using '" + packageRepository.Source + "'.");
+                        this.Log().Debug("- Supports prereleases? '" + packageRepository.SupportsPrereleasePackages + "'.");
+                        this.Log().Debug("- Is ServiceBased? '" + (packageRepository is IServiceBasedRepository) + "'.");
 
-                    // search based on lower case id - similar to PackageRepositoryExtensions.FindPackagesByIdCore()
-                    IQueryable<IPackage> combinedResults = packageRepository.GetPackages().Where(x => x.Id.ToLower() == packageName);
+                        // search based on lower case id - similar to PackageRepositoryExtensions.FindPackagesByIdCore()
+                        IQueryable<IPackage> combinedResults = packageRepository.GetPackages().Where(x => x.Id.ToLower() == packageName);
 
-                    if (config.Prerelease && packageRepository.SupportsPrereleasePackages)
-                    {
-                        combinedResults = combinedResults.Where(p => p.IsAbsoluteLatestVersion);
-                    }
-                    else
-                    {
-                        combinedResults = combinedResults.Where(p => p.IsLatestVersion);
-                    }
+                        if (config.Prerelease && packageRepository.SupportsPrereleasePackages)
+                        {
+                            combinedResults = combinedResults.Where(p => p.IsAbsoluteLatestVersion);
+                        }
+                        else
+                        {
+                            combinedResults = combinedResults.Where(p => p.IsLatestVersion);
+                        }
 
-                    if (!(packageRepository is IServiceBasedRepository))
-                    {
-                        combinedResults = combinedResults
-                            .Where(PackageExtensions.IsListed)
-                            .Where(p => config.Prerelease || p.IsReleaseVersion())
-                            .distinct_last(PackageEqualityComparer.Id, PackageComparer.Version)
-                            .AsQueryable();
-                    }
+                        if (!(packageRepository is IServiceBasedRepository))
+                        {
+                            combinedResults = combinedResults
+                                .Where(PackageExtensions.IsListed)
+                                .Where(p => config.Prerelease || p.IsReleaseVersion())
+                                .distinct_last(PackageEqualityComparer.Id, PackageComparer.Version)
+                                .AsQueryable();
+                        }
 
-                    var packageRepositoryResults = combinedResults.ToList();
-                    if (packageRepositoryResults.Count() != 0)
+                        var packageRepositoryResults = combinedResults.ToList();
+                        if (packageRepositoryResults.Count() != 0)
+                        {
+                            this.Log().Debug("Package '{0}' found on source '{1}'".format_with(packageName, packageRepository.Source));
+                            packageResults.AddRange(packageRepositoryResults);
+                        }
+                    }
+                    catch (Exception e)
                     {
-                        this.Log().Debug("Package '{0}' found on source '{1}'".format_with(packageName, packageRepository.Source));
-                        packageResults.AddRange(packageRepositoryResults);
+                       this.Log().Warn("Error retrieving packages from source '{0}':{1} {2}".format_with(packageRepository.Source, Environment.NewLine, e.Message));
                     }
                 }