(#977) Ensure that the correct public key is used

When attempting to load the Chocolatey GUI Licensed Extension assembly, we need to ensure that the correct public key token is used. In previous versions of Chocolatey.Lib, the resolve_or_load_assembly method made assumptions that meant that this wasn't necessary, but a recent change over there has meant that it is now required. Without passing in this information, the Chocolatey GUI Licensed Extension assembly can't be located, and as a result, none of the licensed functionality currently works within Chocolatey GUI.
chocolatey · Jan 26, 2023 · 5e440fe · 5e440fe
1 parent 3b5d4e4
commit 5e440fe
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/Source/ChocolateyGui.Common.Windows/Bootstrapper.cs b/Source/ChocolateyGui.Common.Windows/Bootstrapper.cs
@@ -103,7 +103,13 @@ protected override void Configure()
 
             Logger = Log.Logger = logConfig.CreateLogger();
 
-            Container = AutoFacConfiguration.RegisterAutoFac(LicensedChocolateyGuiAssemblySimpleName, LicensedGuiAssemblyLocation);
+#if FORCE_CHOCOLATEY_OFFICIAL_KEY
+            var chocolateyGuiPublicKey = OfficialChocolateyGuiPublicKey;
+#else
+            var chocolateyGuiPublicKey = UnofficialChocolateyGuiPublicKey;
+#endif
+
+            Container = AutoFacConfiguration.RegisterAutoFac(LicensedChocolateyGuiAssemblySimpleName, LicensedGuiAssemblyLocation, chocolateyGuiPublicKey);
         }
 
         protected override async void OnStartup(object sender, StartupEventArgs e)

diff --git a/Source/ChocolateyGui.Common/Startup/AutoFacConfiguration.cs b/Source/ChocolateyGui.Common/Startup/AutoFacConfiguration.cs
@@ -20,7 +20,7 @@ public static class AutoFacConfiguration
             "Microsoft.Maintainability",
             "CA1506:AvoidExcessiveClassCoupling",
             Justification = "This is really a requirement due to required registrations.")]
-        public static IContainer RegisterAutoFac(string chocolateyGuiAssemblySimpleName, string licensedGuiAssemblyLocation)
+        public static IContainer RegisterAutoFac(string chocolateyGuiAssemblySimpleName, string licensedGuiAssemblyLocation, string publicKey)
         {
             var builder = new ContainerBuilder();
             builder.RegisterAssemblyModules(System.Reflection.Assembly.GetCallingAssembly());
@@ -32,7 +32,7 @@ public static IContainer RegisterAutoFac(string chocolateyGuiAssemblySimpleName,
                 {
                     var licensedGuiAssembly = AssemblyResolution.resolve_or_load_assembly(
                         chocolateyGuiAssemblySimpleName,
-                        chocolatey.infrastructure.app.ApplicationParameters.OfficialChocolateyPublicKey,
+                        publicKey,
                         licensedGuiAssemblyLocation);
 
                     if (licensedGuiAssembly != null)

diff --git a/Source/ChocolateyGuiCli/Bootstrapper.cs b/Source/ChocolateyGuiCli/Bootstrapper.cs
@@ -72,7 +72,13 @@ internal static void Configure()
 
             Logger = Log.Logger = logConfig.CreateLogger();
 
-            Container = AutoFacConfiguration.RegisterAutoFac(LicensedChocolateyGuiAssemblySimpleName, LicensedGuiAssemblyLocation);
+#if FORCE_CHOCOLATEY_OFFICIAL_KEY
+            var chocolateyGuiPublicKey = OfficialChocolateyGuiPublicKey;
+#else
+            var chocolateyGuiPublicKey = UnofficialChocolateyGuiPublicKey;
+#endif
+
+            Container = AutoFacConfiguration.RegisterAutoFac(LicensedChocolateyGuiAssemblySimpleName, LicensedGuiAssemblyLocation, chocolateyGuiPublicKey);
         }
     }
 }