Merge branch 'stable'

* stable:
  (chocolateyGH-1949) Add missed compilation symbol official
  (chocolateyGH-1949) Use only official/unofficial on resolve

Author: ferventcoder

src/chocolatey.console/Program.cs

@@ -189,13 +189,15 @@ private static void add_assembly_resolver()
             {
                 var requestedAssembly = new AssemblyName(args.Name);
 
+#if FORCE_CHOCOLATEY_OFFICIAL_KEY
+                var chocolateyPublicKey = ApplicationParameters.OfficialChocolateyPublicKey;
+#else
+                var chocolateyPublicKey = ApplicationParameters.UnofficialChocolateyPublicKey;
+#endif
+
                 // There are things that are ILMerged into Chocolatey. Anything with
                 // the right public key except licensed should use the choco/chocolatey assembly
-                if ((requestedAssembly.get_public_key_token().is_equal_to(ApplicationParameters.OfficialChocolateyPublicKey)
-#if !FORCE_CHOCOLATEY_OFFICIAL_KEY
-                || requestedAssembly.get_public_key_token().is_equal_to(ApplicationParameters.UnofficialChocolateyPublicKey)
-#endif
-                )
+                if (requestedAssembly.get_public_key_token().is_equal_to(chocolateyPublicKey)
                     && !requestedAssembly.Name.is_equal_to(ApplicationParameters.LicensedChocolateyAssemblySimpleName)
                     && !requestedAssembly.Name.EndsWith(".resources", StringComparison.OrdinalIgnoreCase))
                 {
@@ -204,11 +206,7 @@ private static void add_assembly_resolver()
 
                 try
                 {
-                    if ((requestedAssembly.get_public_key_token().is_equal_to(ApplicationParameters.OfficialChocolateyPublicKey)
-#if !FORCE_CHOCOLATEY_OFFICIAL_KEY
-                    || requestedAssembly.get_public_key_token().is_equal_to(ApplicationParameters.UnofficialChocolateyPublicKey)
-#endif
-                    )
+                    if (requestedAssembly.get_public_key_token().is_equal_to(chocolateyPublicKey)
                         && requestedAssembly.Name.is_equal_to(ApplicationParameters.LicensedChocolateyAssemblySimpleName))
                     {
                         "chocolatey".Log().Debug(() => "Resolving reference to chocolatey.licensed...");

src/chocolatey.resources/chocolatey.resources.csproj

@@ -40,7 +40,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseOfficial|AnyCPU'">
     <OutputPath>bin\ReleaseOfficial\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;FORCE_CHOCOLATEY_OFFICIAL_KEY</DefineConstants>
     <Optimize>true</Optimize>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>

src/chocolatey/GetChocolatey.cs

@@ -68,11 +68,12 @@ private static void add_assembly_resolver()
 
                 // There are things that are ILMerged into Chocolatey. Anything with
                 // the right public key except licensed should use the choco/chocolatey assembly
-                if ((requestedAssembly.get_public_key_token().is_equal_to(ApplicationParameters.OfficialChocolateyPublicKey)
-#if !FORCE_CHOCOLATEY_OFFICIAL_KEY
-                || requestedAssembly.get_public_key_token().is_equal_to(ApplicationParameters.UnofficialChocolateyPublicKey)
+#if FORCE_CHOCOLATEY_OFFICIAL_KEY
+                var chocolateyPublicKey = ApplicationParameters.OfficialChocolateyPublicKey;
+#else
+                var chocolateyPublicKey = ApplicationParameters.UnofficialChocolateyPublicKey;
 #endif
-                )
+                if (requestedAssembly.get_public_key_token().is_equal_to(chocolateyPublicKey)
                     && !requestedAssembly.Name.is_equal_to(ApplicationParameters.LicensedChocolateyAssemblySimpleName)
                     && !requestedAssembly.Name.EndsWith(".resources", StringComparison.OrdinalIgnoreCase))
                 {
@@ -81,11 +82,7 @@ private static void add_assembly_resolver()
 
                 try
                 {
-                    if ((requestedAssembly.get_public_key_token().is_equal_to(ApplicationParameters.OfficialChocolateyPublicKey)
-#if !FORCE_CHOCOLATEY_OFFICIAL_KEY
-                    || requestedAssembly.get_public_key_token().is_equal_to(ApplicationParameters.UnofficialChocolateyPublicKey)
-#endif
-                    )
+                    if (requestedAssembly.get_public_key_token().is_equal_to(chocolateyPublicKey)
                         && requestedAssembly.Name.is_equal_to(ApplicationParameters.LicensedChocolateyAssemblySimpleName))
                     {
                         _logger.Debug("Resolving reference to chocolatey.licensed...");

src/chocolatey/chocolatey.csproj

@@ -53,7 +53,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseOfficial|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\ReleaseOfficial\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;FORCE_CHOCOLATEY_OFFICIAL_KEY</DefineConstants>
     <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
     <DocumentationFile>bin\Release\chocolatey.xml</DocumentationFile>
     <Optimize>true</Optimize>

src/chocolatey/infrastructure/licensing/License.cs

@@ -32,14 +32,14 @@ public static ChocolateyLicense validate_license()
             {
                 try
                 {
-                    var licensedAssembly = AssemblyResolution.resolve_or_load_assembly(ApplicationParameters.LicensedChocolateyAssemblySimpleName, ApplicationParameters.OfficialChocolateyPublicKey, ApplicationParameters.LicensedAssemblyLocation);
 
-#if !FORCE_CHOCOLATEY_OFFICIAL_KEY
-                    if (licensedAssembly == null)
-                    {
-                        licensedAssembly = AssemblyResolution.resolve_or_load_assembly(ApplicationParameters.LicensedChocolateyAssemblySimpleName, ApplicationParameters.UnofficialChocolateyPublicKey, ApplicationParameters.LicensedAssemblyLocation);
-                    }
+#if FORCE_CHOCOLATEY_OFFICIAL_KEY
+                    var chocolateyPublicKey = ApplicationParameters.OfficialChocolateyPublicKey;
+#else
+                    var chocolateyPublicKey = ApplicationParameters.UnofficialChocolateyPublicKey;
 #endif
+                    var licensedAssembly = AssemblyResolution.resolve_or_load_assembly(ApplicationParameters.LicensedChocolateyAssemblySimpleName, chocolateyPublicKey, ApplicationParameters.LicensedAssemblyLocation);
+
                     if (licensedAssembly == null) throw new ApplicationException("Unable to load licensed assembly.");
                     license.AssemblyLoaded = true;
                     license.Assembly = licensedAssembly;