From 66a70746de7a1b6f13ae5ff9c744ea5f6d25cb56 Mon Sep 17 00:00:00 2001
From: Travis Plunk <tplunk@microsoft.com>
Date: Fri, 10 Nov 2023 18:54:30 +0000
Subject: [PATCH] Merged PR 28440: [backport/v7.4.0] Fix release build by
 making the internal SDK parameter optional (#20658)

Fix release build by making the internal SDK parameter optional (#20658)
---
 build.psm1                                      | 5 +++--
 tools/releaseBuild/azureDevOps/compliance.yml   | 1 +
 tools/releaseBuild/azureDevOps/releaseBuild.yml | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.psm1 b/build.psm1
index aa6741ed0c..74c5dcdec7 100644
--- a/build.psm1
+++ b/build.psm1
@@ -19,8 +19,9 @@ $script:Options = $null
 $dotnetMetadata = Get-Content $PSScriptRoot/DotnetRuntimeMetadata.json | ConvertFrom-Json
 $dotnetCLIChannel = $dotnetMetadata.Sdk.Channel
 $dotnetCLIQuality = $dotnetMetadata.Sdk.Quality
-$dotnetAzureFeed = $env:__DONET_RUNTIME_FEED ?? $dotnetMetadata.Sdk.azureFeed
-$dotnetAzureFeedSecret = $env:__DONET_RUNTIME_FEED_KEY
+# __DOTNET_RUNTIME_FEED and __DOTNET_RUNTIME_FEED_KEY are private variables used in release builds
+$dotnetAzureFeed = if ([string]::IsNullOrWhiteSpace($env:__DOTNET_RUNTIME_FEED)) { $dotnetMetadata.Sdk.azureFeed } else { $env:__DOTNET_RUNTIME_FEED }
+$dotnetAzureFeedSecret = $env:__DOTNET_RUNTIME_FEED_KEY
 $dotnetSDKVersionOveride = $dotnetMetadata.Sdk.sdkImageOverride
 $dotnetCLIRequiredVersion = $(Get-Content $PSScriptRoot/global.json | ConvertFrom-Json).Sdk.Version
 
diff --git a/tools/releaseBuild/azureDevOps/compliance.yml b/tools/releaseBuild/azureDevOps/compliance.yml
index 1940ff6ca8..3624f1e108 100644
--- a/tools/releaseBuild/azureDevOps/compliance.yml
+++ b/tools/releaseBuild/azureDevOps/compliance.yml
@@ -23,6 +23,7 @@ parameters:
 - name: InternalSDKBlobURL
   displayName: URL to the blob havibg internal .NET SDK
   type: string
+  default: ' '
 
 variables:
   - name: DOTNET_CLI_TELEMETRY_OPTOUT
diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml
index 6074c9ab98..7a34a663db 100644
--- a/tools/releaseBuild/azureDevOps/releaseBuild.yml
+++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml
@@ -21,6 +21,7 @@ parameters:
   - name: InternalSDKBlobURL
     displayName: URL to the blob having internal .NET SDK
     type: string
+    default: ' '
 
 resources:
   repositories: