(GH-866) Fix - packages.config fails on licensed config

Attempting install packages.config fails when choco attempts to copy the licensed config but can't find the licensed assembly. Ensure when the licensed assembly isn't found by normal means the assembly resolver will attempt to load it from its known location.
chocolatey · Aug 11, 2016 · f98f610 · f98f610
1 parent 2cbb40f
commit f98f610
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 0 deletions.
diff --git a/src/chocolatey.console/Program.cs b/src/chocolatey.console/Program.cs
@@ -178,6 +178,19 @@ private static void add_assembly_resolver()
                     return typeof(ConsoleApplication).Assembly;
                 }
 
+                try
+                {
+                    if (requestedAssembly.get_public_key_token().is_equal_to(ApplicationParameters.OfficialChocolateyPublicKey)
+                        && requestedAssembly.Name.is_equal_to("chocolatey.licensed"))
+                    {
+                        return Assembly.LoadFile(ApplicationParameters.LicensedAssemblyLocation).UnderlyingType;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    "chocolatey".Log().Warn("Unable to load chocolatey.licensed assembly. {0}".format_with(ex.Message));
+                }
+
                 return null;
             };
 

diff --git a/src/chocolatey/GetChocolatey.cs b/src/chocolatey/GetChocolatey.cs
@@ -59,6 +59,19 @@ private static void add_assembly_resolver()
                      return typeof(Lets).Assembly;
                 }
 
+                try
+                {
+                    if (requestedAssembly.get_public_key_token().is_equal_to(ApplicationParameters.OfficialChocolateyPublicKey)
+                        && requestedAssembly.Name.is_equal_to("chocolatey.licensed"))
+                    {
+                        return Assembly.LoadFile(ApplicationParameters.LicensedAssemblyLocation).UnderlyingType;
+                    }
+                }
+                catch (Exception ex)
+                {
+                    "chocolatey".Log().Warn("Unable to load chocolatey.licensed assembly. {0}".format_with(ex.Message));
+                }
+
                 return null;
             };