Merge branch 'stable'

* stable: (GH-584) Warn on Missing/Outdated Licensed DLL (GH-584) Do not error if unable to load type
chocolatey · Feb 12, 2016 · ac02da5 · ac02da5
2 parents 8ae225b + ae70ddf
commit ac02da5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/chocolatey.console/Program.cs b/src/chocolatey.console/Program.cs
@@ -64,7 +64,7 @@ private static void Main(string[] args)
                         license.AssemblyLoaded = true;
                         license.Assembly = licensedAssembly;
                         license.Version = VersionInformation.get_current_informational_version(licensedAssembly);
-                        Type licensedComponent = licensedAssembly.GetType(ApplicationParameters.LicensedComponentRegistry, throwOnError: true, ignoreCase: true);
+                        Type licensedComponent = licensedAssembly.GetType(ApplicationParameters.LicensedComponentRegistry, throwOnError: false, ignoreCase: true);
                         SimpleInjectorContainer.add_component_registry_class(licensedComponent);
                     }
                     catch (Exception ex)

diff --git a/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs b/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs
@@ -411,13 +411,13 @@ private static void set_licensed_options(ChocolateyConfiguration config, Chocola
         {
             if (license.AssemblyLoaded)
             {
-                Type licensedConfigBuilder = license.Assembly.GetType(ApplicationParameters.LicensedConfigurationBuilder, throwOnError: true, ignoreCase: true);
+                Type licensedConfigBuilder = license.Assembly.GetType(ApplicationParameters.LicensedConfigurationBuilder, throwOnError: false, ignoreCase: true);
 
                 if (licensedConfigBuilder == null)
                 {
-                    "chocolatey".Log().Error(
-                        @"Type expected for registering components was null. Unable to provide 
- name due to it being null.");
+                    "chocolatey".Log().Warn(ChocolateyLoggers.Important,
+@"Unable to set licensed configuration. This is likely related to a 
+ missing or outdated licensed DLL.");
                     return;
                 }
                 try

diff --git a/src/chocolatey/infrastructure/registration/SimpleInjectorContainer.cs b/src/chocolatey/infrastructure/registration/SimpleInjectorContainer.cs
@@ -81,9 +81,9 @@ private static void load_component_registry(Type componentRegistry, Container co
         {
             if (componentRegistry == null)
             {
-                "chocolatey".Log().Error(
-                    @"Type expected for registering components was null. Unable to provide 
- name due to it being null.");
+                "chocolatey".Log().Warn(ChocolateyLoggers.Important,
+@"Unable to register licensed components. This is likely related to a 
+ missing or outdated licensed DLL.");
                 return;
             }
             try