Merged PR 28440: [backport/v7.4.0] Fix release build by making the in…

…ternal SDK parameter optional (#20658) Fix release build by making the internal SDK parameter optional (#20658)
PowerShell · Nov 10, 2023 · 8fb2e4c · 8fb2e4c
1 parent 4cef91a
commit 8fb2e4c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/build.psm1 b/build.psm1
@@ -20,7 +20,7 @@ $dotnetMetadata = Get-Content $PSScriptRoot/DotnetRuntimeMetadata.json | Convert
 $dotnetCLIChannel = $dotnetMetadata.Sdk.Channel
 $dotnetCLIQuality = $dotnetMetadata.Sdk.Quality
 # __DOTNET_RUNTIME_FEED and __DOTNET_RUNTIME_FEED_KEY are private variables used in release builds
-$dotnetAzureFeed = if (-not $env:__DOTNET_RUNTIME_FEED ) { $dotnetMetadata.Sdk.azureFeed } else { $env:__DOTNET_RUNTIME_FEED }
+$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
@@ -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
@@ -21,6 +21,7 @@ parameters:
   - name: InternalSDKBlobURL
     displayName: URL to the blob having internal .NET SDK
     type: string
+    default: ' '
 
 resources:
   repositories: