(#977) Change variable names to be more specific

To ensure that it is clear exactly which public keys are being referred to, but the variable names to include "Gui" in the name. That way, there is no ambiguity between the public keys used for Chocolatey CLI and Chocolatey GUI.
chocolatey · Jan 26, 2023 · 3b5d4e4 · 3b5d4e4
1 parent 0cdf96d
commit 3b5d4e4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Source/ChocolateyGui.Common.Windows/Bootstrapper.cs b/Source/ChocolateyGui.Common.Windows/Bootstrapper.cs
@@ -48,8 +48,8 @@ public class Bootstrapper : BootstrapperBase
         public static readonly string ChocolateyGuiCommonAssemblySimpleName = "ChocolateyGui.Common";
         public static readonly string ChocolateyGuiCommonWindowsAssemblySimpleName = "ChocolateyGui.Common.Windows";
 
-        public static readonly string UnofficialChocolateyPublicKey = "ffc115b9f4eb5c26";
-        public static readonly string OfficialChocolateyPublicKey = "dfd1909b30b79d8b";
+        public static readonly string UnofficialChocolateyGuiPublicKey = "ffc115b9f4eb5c26";
+        public static readonly string OfficialChocolateyGuiPublicKey = "dfd1909b30b79d8b";
 
         public static readonly string Name = "Chocolatey GUI";
 

diff --git a/Source/ChocolateyGui/App.xaml.cs b/Source/ChocolateyGui/App.xaml.cs
@@ -59,9 +59,9 @@ public App()
                     }
 
 #if FORCE_CHOCOLATEY_OFFICIAL_KEY
-                    var chocolateyGuiPublicKey = Bootstrapper.OfficialChocolateyPublicKey;
+                    var chocolateyGuiPublicKey = Bootstrapper.OfficialChocolateyGuiPublicKey;
 #else
-                    var chocolateyGuiPublicKey = Bootstrapper.UnofficialChocolateyPublicKey;
+                    var chocolateyGuiPublicKey = Bootstrapper.UnofficialChocolateyGuiPublicKey;
 #endif
 
                     if (AssemblyResolver.DoesPublicKeyTokenMatch(requestedAssembly, chocolateyGuiPublicKey)

diff --git a/Source/ChocolateyGuiCli/Bootstrapper.cs b/Source/ChocolateyGuiCli/Bootstrapper.cs
@@ -36,8 +36,8 @@ public static class Bootstrapper
         public static readonly string ChocolateyGuiCommonAssemblySimpleName = "ChocolateyGui.Common";
         public static readonly string ChocolateyGuiCommonWindowsAssemblySimpleName = "ChocolateyGui.Common.Windows";
 
-        public static readonly string UnofficialChocolateyPublicKey = "ffc115b9f4eb5c26";
-        public static readonly string OfficialChocolateyPublicKey = "dfd1909b30b79d8b";
+        public static readonly string UnofficialChocolateyGuiPublicKey = "ffc115b9f4eb5c26";
+        public static readonly string OfficialChocolateyGuiPublicKey = "dfd1909b30b79d8b";
 
         public static readonly string Name = "Chocolatey GUI";
 

diff --git a/Source/ChocolateyGuiCli/Program.cs b/Source/ChocolateyGuiCli/Program.cs
@@ -51,9 +51,9 @@ private static void AddAssemblyResolver()
                     }
 
 #if FORCE_CHOCOLATEY_OFFICIAL_KEY
-                    var chocolateyGuiPublicKey = Bootstrapper.OfficialChocolateyPublicKey;
+                    var chocolateyGuiPublicKey = Bootstrapper.OfficialChocolateyGuiPublicKey;
 #else
-                    var chocolateyGuiPublicKey = Bootstrapper.UnofficialChocolateyPublicKey;
+                    var chocolateyGuiPublicKey = Bootstrapper.UnofficialChocolateyGuiPublicKey;
 #endif
 
                     if (AssemblyResolver.DoesPublicKeyTokenMatch(requestedAssembly, chocolateyGuiPublicKey)