Fix The Bad Things (#1662)

build.cake

@@ -43,7 +43,6 @@ var PLATFORM_SUPPORTS_VULKAN_TESTS = (IsRunningOnWindows () || IsRunningOnLinux
 var SUPPORT_VULKAN_VAR = Argument ("supportVulkan", EnvironmentVariable ("SUPPORT_VULKAN") ?? PLATFORM_SUPPORTS_VULKAN_TESTS);
 var SUPPORT_VULKAN = SUPPORT_VULKAN_VAR == "1" || SUPPORT_VULKAN_VAR.ToLower () == "true";
 
-var NuGetToolPath = Context.Tools.Resolve ("nuget.exe");
 var CakeToolPath = Context.Tools.Resolve ("Cake.exe");
 var MDocPath = Context.Tools.Resolve ("mdoc.exe");
 

cake/UtilsManaged.cake

@@ -4,7 +4,7 @@ void PackageNuGet(FilePath nuspecPath, DirectoryPath outputPath, bool allowDefau
     var settings = new NuGetPackSettings {
         OutputDirectory = MakeAbsolute(outputPath),
         BasePath = nuspecPath.GetDirectory(),
-        ToolPath = NuGetToolPath,
+        ToolPath = NUGET_EXE,
         Properties = new Dictionary<string, string> {
             // NU5048: The 'PackageIconUrl'/'iconUrl' element is deprecated. Consider using the 'PackageIcon'/'icon' element instead.
             // NU5105: The package version 'xxx' uses SemVer 2.0.0 or components of SemVer 1.0.0 that are not supported on legacy clients.

cake/msbuild.cake

@@ -15,7 +15,7 @@ void RunNuGetRestorePackagesConfig(FilePath sln)
     EnsureDirectoryExists(OUTPUT_NUGETS_PATH);
 
     var settings = new NuGetRestoreSettings {
-        ToolPath = NuGetToolPath,
+        ToolPath = NUGET_EXE,
         Source = NUGETS_SOURCES,
         NoCache = true,
         PackagesDirectory = dir.Combine("packages"),

cake/shared.cake

@@ -7,6 +7,7 @@ var CONFIGURATION = Argument("c", Argument("configuration", "Release"));
 
 var VS_INSTALL = Argument("vsinstall", EnvironmentVariable("VS_INSTALL"));
 var MSBUILD_EXE = Argument("msbuild", EnvironmentVariable("MSBUILD_EXE"));
+var NUGET_EXE = Argument("nuget", EnvironmentVariable("NUGET_EXE") ?? Context.Tools.Resolve ("nuget.exe"));
 
 var CAKE_ARGUMENTS = (IReadOnlyDictionary<string, string>)Context.Arguments
     .GetType()