From 06447e4fef4c8405f5c5ae96c384bf7679934c6b Mon Sep 17 00:00:00 2001
From: Charlie Poole <charliepoole@gmail.com>
Date: Sat, 7 Jan 2023 11:01:05 -0800
Subject: [PATCH] Use NUnit-specific environment variable names

---
 appveyor.yml             |  8 ++++----
 cake/build-settings.cake | 20 +++++++++++++++++---
 cake/constants.cake      |  9 ++++++---
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 1b3b9d1a1..9e9b2a45b 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -18,11 +18,11 @@ artifacts:
 - path: package\*.zip
 
 environment:
-  MYGET_API_KEY:
+  NUNIT_MYGET_API_KEY:
     secure: wtAvJDVl2tfwiVcyLExFHLvZVfUWiQRHsfdHBFCNEATeCHo1Nd8JP642PfY8xhji
-  NUGET_API_KEY:
-    secure: PVHROoT0SmGkr9CHgrKapuA0/CcJGHSP63M3fZaNLvcEVbBnzYLeCwpc0PZHhdvD
-  CHOCO_API_KEY:
+  NUNIT_NUGET_API_KEY:
+    secure: xwXh6lXIun0EFVNqJV03DX3DuT1yW9419ljqNPrkm6SdsKoJm13QqoxY4EuqzyVs
+  NUNIT_CHOCO_API_KEY:
     secure: aDsu1U+umVYFVybjkBVtVQsatSj3QKbD7VkGQci9mNF3493g9Giao/GABISIaHjT
   GITHUB_ACCESS_TOKEN:
     secure: RJ6sKRBZzwXz8JQvj8zcp45mkHNDad1UlvmfCsiVx63V9/pXHcm2Y2Lg/G/Vyhlz
\ No newline at end of file
diff --git a/cake/build-settings.cake b/cake/build-settings.cake
index 7320b7fe7..7627a4a35 100644
--- a/cake/build-settings.cake
+++ b/cake/build-settings.cake
@@ -19,6 +19,10 @@ public class BuildSettings
 
         BuildVersion = new BuildVersion(context);
 
+        MyGetApiKey = GetApiKey(MYGET_API_KEY, FALLBACK_MYGET_API_KEY);
+        NuGetApiKey = GetApiKey(NUGET_API_KEY, FALLBACK_NUGET_API_KEY);
+        ChocolateyApiKey = GetApiKey(CHOCO_API_KEY, FALLBACK_CHOCO_API_KEY);
+
         Net35Test = new PackageTest(
             "Net35Test",
             "Run mock-assembly.dll under .NET 3.5",
@@ -175,9 +179,9 @@ public class BuildSettings
     public bool ShouldPublishToChocolatey => !IsPreRelease || LABELS_WE_PUBLISH_ON_CHOCOLATEY.Contains(PreReleaseLabel);
     public bool IsProductionRelease => !IsPreRelease || LABELS_WE_RELEASE_ON_GITHUB.Contains(PreReleaseLabel);
 
-    public string MyGetApiKey => _context.EnvironmentVariable(MYGET_API_KEY);
-    public string NuGetApiKey => _context.EnvironmentVariable(NUGET_API_KEY);
-    public string ChocolateyApiKey => _context.EnvironmentVariable(CHOCO_API_KEY);
+    public string MyGetApiKey { get; }
+    public string NuGetApiKey { get; }
+    public string ChocolateyApiKey { get; }
 
     public string GitHubAccessToken => _context.EnvironmentVariable(GITHUB_ACCESS_TOKEN);
 
@@ -291,6 +295,16 @@ public class BuildSettings
         Console.WriteLine($"  NetCore Runner:  {NETCORE_CONSOLE_PROJECT}");
     }
 
+    private string GetApiKey(string name, string fallback=null)
+    {
+        var apikey = _context.EnvironmentVariable(name);
+
+        if (string.IsNullOrEmpty(apikey) && fallback != null)
+            apikey = _context.EnvironmentVariable(fallback);
+
+        return apikey;
+    }
+
     private void ShowApiKeyAvailability(string apikey)
     {
         if (string.IsNullOrEmpty(apikey))
diff --git a/cake/constants.cake b/cake/constants.cake
index 5fb98e041..6169afadb 100644
--- a/cake/constants.cake
+++ b/cake/constants.cake
@@ -77,9 +77,12 @@ private const string NUGET_PUSH_URL = "https://api.nuget.org/v3/index.json";
 private const string CHOCO_PUSH_URL = "https://push.chocolatey.org/";
 
 // Environment Variable names holding API keys
-private const string MYGET_API_KEY = "MYGET_API_KEY";
-private const string NUGET_API_KEY = "NUGET_API_KEY";
-private const string CHOCO_API_KEY = "CHOCO_API_KEY";
+private const string MYGET_API_KEY = "NUNIT_MYGET_API_KEY";
+private const string NUGET_API_KEY = "NUNIT_NUGET_API_KEY";
+private const string CHOCO_API_KEY = "NUNIT_CHOCO_API_KEY";
+private const string FALLBACK_MYGET_API_KEY = "MYGET_API_KEY";
+private const string FALLBACK_NUGET_API_KEY = "NUGET_API_KEY";
+private const string FALLBACK_CHOCO_API_KEY = "CHOCO_API_KEY";
 
 // GitHub Information
 private const string GITHUB_OWNER = "nunit";