From 341c9a7e5f5f2357e50a43d91f0cee4f18ef4a30 Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Thu, 9 Nov 2023 11:28:35 -0800 Subject: [PATCH] Fix release build by making the internal SDK parameter optional (#20658) --- build.psm1 | 2 +- tools/releaseBuild/azureDevOps/compliance.yml | 1 + tools/releaseBuild/azureDevOps/releaseBuild.yml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build.psm1 b/build.psm1 index a53a13db90..55110cd9cf 100644 --- 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 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 434d17df45..3be90bbefb 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: