Skip to content

Commit 54722a5

Browse files
dougbudougbu
authored
A quick collection of quick fixes (#20993)
* Quick fix: Simplify devBuilds.yml - remove an excess build step * Quick fix: Move `SetupNugetSources` script invocations above `parameters.beforeBuild` - ensure NuGet.config is ready for all internal builds - remove now-duplicate `SetupNugetSources` invocations wherever default-build.yml is used * Quick fix: Clean up SiteExtensions/build.cmd - quote all rooted paths - check `%ERRORLEVEL%` after every `CALL` - nits: - add a few more `ECHO` commands - wrap long lines * Quick fix: Ensure `$(BuildNative)` is always set correctly - fix problems using `-all` or `/p:BuildAllProjects=true` without `-buildNative` - ensure `$(BuildNative)` is `false` where it's not supported - move some duplicated settings into eng/Common.props and `<Import />` the new file - remove now-duplicated parts of conditions using `$(BuildNative)` * Quick fix: Consistently use `--build-*` - avoid `/p:Build*` on the command line (except with eng/scripts/ci-source-build.sh) - nits: - remove now-useless `-buildNative` with `-all` - expand and correct a couple of related comments and messages * Quick fix: Support `-all` together with `-projects` - remove need to specify `/p:BuildAllProjects=true` - nit: simplify some Boolean logic
1 parent 2589a63 commit 54722a5

20 files changed

+136
-154
lines changed

‎.azure/pipelines/ci.yml

Lines changed: 9 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ variables:
4848
- group: DotNet-MSRC-Storage
4949
- name: _InternalRuntimeDownloadArgs
5050
value: -DotNetRuntimeSourceFeed https://dotnetclimsrc.blob.core.windows.net/dotnet -DotNetRuntimeSourceFeedKey $(dotnetclimsrc-read-sas-token-base64) /p:DotNetAssetRootAccessTokenSuffix='$(dotnetclimsrc-read-sas-token-base64)'
51-
# The code signing doesn't use the aspnet build scripts, so the msbuild parameers have
51+
# The code signing doesn't use the aspnet build scripts, so the msbuild parameters have
5252
# to be passed directly. This is awkward, since we pass the same info above, but we have
5353
# to have it in two different forms
5454
- name: _InternalRuntimeDownloadCodeSignArgs
@@ -100,14 +100,6 @@ stages:
100100
jobDisplayName: Code check
101101
agentOs: Windows
102102
steps:
103-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
104-
- task: PowerShell@2
105-
displayName: Setup Private Feeds Credentials
106-
inputs:
107-
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
108-
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
109-
env:
110-
Token: $(dn-bot-dnceng-artifact-feeds-rw)
111103
- powershell: ./eng/scripts/CodeCheck.ps1 -ci $(_InternalRuntimeDownloadArgs)
112104
displayName: Run eng/scripts/CodeCheck.ps1
113105
artifacts:
@@ -135,21 +127,11 @@ stages:
135127
# This is intentional to workaround https://github.com/dotnet/arcade/issues/1957 which always re-submits for code-signing, even
136128
# if they have already been signed. This results in slower builds due to re-submitting the same .nupkg many times for signing.
137129
# The sign settings have been configured to
138-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
139-
- task: PowerShell@2
140-
displayName: Setup Private Feeds Credentials
141-
inputs:
142-
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
143-
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
144-
env:
145-
Token: $(dn-bot-dnceng-artifact-feeds-rw)
146-
147130
- script: ./build.cmd
148131
-ci
149132
-arch x64
150133
-pack
151134
-all
152-
-buildNative
153135
/bl:artifacts/log/build.x64.binlog
154136
$(_BuildArgs)
155137
$(_InternalRuntimeDownloadArgs)
@@ -162,7 +144,6 @@ stages:
162144
-arch x86
163145
-pack
164146
-all
165-
-buildNative
166147
-noBuildJava
167148
/p:OnlyPackPlatformSpecificPackages=true
168149
/bl:artifacts/log/build.x86.binlog
@@ -325,14 +306,6 @@ stages:
325306
agentOs: Linux
326307
useHostedUbuntu: false
327308
steps:
328-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
329-
- task: Bash@3
330-
displayName: Setup Private Feeds Credentials
331-
inputs:
332-
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
333-
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
334-
env:
335-
Token: $(dn-bot-dnceng-artifact-feeds-rw)
336309
- script: ./build.sh
337310
--ci
338311
--arch x64
@@ -529,7 +502,7 @@ stages:
529502
jobDisplayName: "Test: Windows Server 2016 x64"
530503
agentOs: Windows
531504
isTestingJob: true
532-
buildArgs: -all -pack -test -BuildNative "/p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs)
505+
buildArgs: -all -pack -test "/p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs)
533506
beforeBuild:
534507
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
535508
displayName: Setup IISExpress test certificates and schema
@@ -565,14 +538,6 @@ stages:
565538
agentOs: Windows
566539
isTestingJob: true
567540
steps:
568-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
569-
- task: PowerShell@2
570-
displayName: Setup Private Feeds Credentials
571-
inputs:
572-
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
573-
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
574-
env:
575-
Token: $(dn-bot-dnceng-artifact-feeds-rw)
576541
- script: ./build.cmd -ci -all -pack $(_InternalRuntimeDownloadArgs)
577542
displayName: Build Repo
578543
- script: ./src/ProjectTemplates/build.cmd -ci -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/template.pack.binlog"
@@ -676,11 +641,11 @@ stages:
676641
timeoutInMinutes: 180
677642
steps:
678643
# Build the shared framework
679-
- script: ./build.cmd -ci -all -pack -arch x64 -buildNative /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.build.x64.binlog
644+
- script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.build.x64.binlog
680645
displayName: Build shared fx
681646
- script: .\restore.cmd -ci /p:BuildInteropProjects=true
682-
displayName: Restore
683-
- script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildInteropProjects=true /p:BuildNative=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
647+
displayName: Restore interop projects
648+
- script: .\build.cmd -ci -NoRestore -test -all -projects eng\helix\helix.proj /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
684649
displayName: Run build.cmd helix target
685650
env:
686651
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -700,12 +665,11 @@ stages:
700665
timeoutInMinutes: 180
701666
steps:
702667
# Build the shared framework
703-
- script: ./build.cmd -ci -all -pack -arch x64 -buildNative /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.daily.build.x64.binlog
668+
- script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.daily.build.x64.binlog
704669
displayName: Build shared fx
705-
# Build the x86 shared framework
706670
- script: .\restore.cmd -ci /p:BuildInteropProjects=true
707-
displayName: Restore
708-
- script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildInteropProjects=true /p:BuildNative=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
671+
displayName: Restore interop projects
672+
- script: .\build.cmd -ci -NoRestore -test -all -projects eng\helix\helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
709673
displayName: Run build.cmd helix target
710674
env:
711675
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -728,7 +692,7 @@ stages:
728692
# Build the shared framework
729693
- script: ./restore.sh -ci
730694
displayName: Restore
731-
- script: ./build.sh -ci --arch arm64 -test --no-build-nodejs -projects $(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:BuildAllProjects=true /p:BuildNative=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
695+
- script: ./build.sh -ci --arch arm64 -test --no-build-nodejs --all -projects $(Build.SourcesDirectory)/eng/helix/helix.proj /p:IsHelixJob=true /p:IsHelixDaily=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
732696
displayName: Run build.sh helix arm64 target
733697
env:
734698
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

‎.azure/pipelines/devBuilds.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ stages:
3131
steps:
3232
- script: git submodule init
3333
- script: git submodule update --recursive
34-
- script: cd ./src/Components
3534
- script: ./build.cmd
3635
-ci
3736
-arch x64
3837
/bl:artifacts/log/build.components.x64.binlog
3938
displayName: Build x64
39+
workingDirectory: ./src/Components
4040
artifacts:
4141
- name: Windows_Logs
4242
path: artifacts/log/
@@ -56,12 +56,12 @@ stages:
5656
steps:
5757
- script: git submodule init
5858
- script: git submodule update --recursive
59-
- script: cd ./src/Servers
6059
- script: ./build.cmd
6160
-ci
6261
-arch x64
6362
/bl:artifacts/log/build.servers.x64.binlog
6463
displayName: Build x64
64+
workingDirectory: ./src/Servers
6565
artifacts:
6666
- name: Windows_Logs
6767
path: artifacts/log/
@@ -81,12 +81,12 @@ stages:
8181
steps:
8282
- script: git submodule init
8383
- script: git submodule update --recursive
84-
- script: cd ./src/ProjectTemplates
8584
- script: ./build.cmd
8685
-ci
8786
-arch x64
8887
/bl:artifacts/log/build.projectTemplates.x64.binlog
8988
displayName: Build x64
89+
workingDirectory: ./src/ProjectTemplates
9090
artifacts:
9191
- name: Windows_Logs
9292
path: artifacts/log/

‎.azure/pipelines/jobs/codesign-xplat.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,6 @@ jobs:
2828
contents: '**/*.nupkg'
2929
targetFolder: $(Build.SourcesDirectory)/artifacts/packages/$(BuildConfiguration)/shipping/
3030
flattenFolders: true
31-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
32-
- task: PowerShell@2
33-
displayName: Setup Private Feeds Credentials
34-
inputs:
35-
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
36-
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
37-
env:
38-
Token: $(dn-bot-dnceng-artifact-feeds-rw)
3931
- powershell: .\eng\common\build.ps1
4032
-ci
4133
-restore

‎.azure/pipelines/jobs/default-build.yml

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -171,27 +171,28 @@ jobs:
171171

172172
- ${{ parameters.beforeBuild }}
173173

174-
- ${{ if ne(parameters.steps, '')}}:
175-
- ${{ parameters.steps }}
176-
- ${{ if eq(parameters.steps, '')}}:
177-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
178-
- ${{ if eq(parameters.agentOs, 'Windows') }}:
179-
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
180-
- task: PowerShell@2
181-
displayName: Setup Private Feeds Credentials
182-
inputs:
183-
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
184-
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
185-
env:
186-
Token: $(dn-bot-dnceng-artifact-feeds-rw)
187-
- ${{ if ne(parameters.agentOs, 'Windows') }}:
188-
- task: Bash@3
174+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
175+
- ${{ if eq(parameters.agentOs, 'Windows') }}:
176+
- ${{ if ne(variables['System.TeamProject'], 'public') }}:
177+
- task: PowerShell@2
189178
displayName: Setup Private Feeds Credentials
190179
inputs:
191-
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
192-
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
180+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
181+
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
193182
env:
194183
Token: $(dn-bot-dnceng-artifact-feeds-rw)
184+
- ${{ if ne(parameters.agentOs, 'Windows') }}:
185+
- task: Bash@3
186+
displayName: Setup Private Feeds Credentials
187+
inputs:
188+
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh
189+
arguments: $(Build.SourcesDirectory)/NuGet.config $Token
190+
env:
191+
Token: $(dn-bot-dnceng-artifact-feeds-rw)
192+
193+
- ${{ if ne(parameters.steps, '')}}:
194+
- ${{ parameters.steps }}
195+
- ${{ if eq(parameters.steps, '')}}:
195196
- ${{ if eq(parameters.buildScript, '') }}:
196197
- ${{ if eq(parameters.agentOs, 'Windows') }}:
197198
- script: .\$(BuildDirectory)\build.cmd -ci /p:DotNetSignType=$(_SignType) -Configuration $(BuildConfiguration) $(BuildScriptArgs)

‎.azure/pipelines/quarantined-tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ jobs:
3131
timeoutInMinutes: 240
3232
steps:
3333
# Build the shared framework
34-
- script: ./build.cmd -ci -all -pack -arch x64 -buildNative /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.build.x64.binlog
34+
- script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.build.x64.binlog
3535
displayName: Build shared fx
3636
- script: .\restore.cmd -ci /p:BuildInteropProjects=true
37-
displayName: Restore
38-
- script: .\build.cmd -ci -NoRestore -test -noBuildJava -projects eng\helix\helix.proj /p:RunQuarantinedTests=true /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildInteropProjects=true /p:BuildNative=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
37+
displayName: Restore interop projects
38+
- script: .\build.cmd -ci -NoRestore -test -noBuildJava -all -projects eng\helix\helix.proj /p:RunQuarantinedTests=true /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true /p:RunTemplateTests=true /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log -bl
3939
displayName: Run build.cmd helix target
4040
env:
4141
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

‎Directory.Build.props

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<Project>
2+
<Import Project="eng\Common.props" />
3+
24
<PropertyGroup>
35
<RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
46
<RepositoryUrl>https://github.com/dotnet/aspnetcore</RepositoryUrl>
@@ -121,12 +123,7 @@
121123

122124
<!-- Compilation options which apply to all languages. Language-specific options should be set in eng/targets/$(lang).Common.props -->
123125
<PropertyGroup>
124-
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('Windows'))">win</TargetOsName>
125-
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('OSX'))">osx</TargetOsName>
126-
<TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('Linux'))">linux</TargetOsName>
127126
<BuildArchitecture>$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</BuildArchitecture>
128-
<TargetArchitecture Condition="'$(TargetArchitecture)' == ''">x64</TargetArchitecture>
129-
<TargetRuntimeIdentifier>$(TargetOsName)-$(TargetArchitecture)</TargetRuntimeIdentifier>
130127

131128
<!-- This defines the list of RIDs supported by the ASP.NET Core shared framework. -->
132129
<SupportedRuntimeIdentifiers>
@@ -179,7 +176,7 @@
179176
<!-- Projects which reference Microsoft.AspNetCore.Mvc.Testing should import this targets file to ensure dependency .deps.json files are copied into test output. -->
180177
<MvcTestingTargets>$(MSBuildThisFileDirectory)src\Mvc\Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.targets</MvcTestingTargets>
181178
<!-- IIS native projects can only be built on Windows for x86 and x64. -->
182-
<BuildIisNativeProjects Condition="'$(BuildNative)' == 'true' AND '$(TargetOsName)' == 'win' AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64')">true</BuildIisNativeProjects>
179+
<BuildIisNativeProjects Condition=" $(BuildNative) AND ('$(TargetArchitecture)' == 'x86' OR '$(TargetArchitecture)' == 'x64') ">true</BuildIisNativeProjects>
183180
<!-- This property is shared by several projects to layout the AspNetCore.App targeting pack for installers -->
184181
<TargetingPackLayoutRoot>$(ArtifactsObjDir)TargetingPack.Layout\$(Configuration)\</TargetingPackLayoutRoot>
185182
<!-- This property is shared by several projects to layout the AspNetCore.App shared framework for installers -->

‎build.ps1

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,15 +185,16 @@ if ($DumpProcesses -or $CI) {
185185
if ($All) {
186186
$MSBuildArguments += '/p:BuildAllProjects=true'
187187
}
188-
elseif ($Projects) {
188+
189+
if ($Projects) {
189190
if (![System.IO.Path]::IsPathRooted($Projects))
190191
{
191192
$Projects = Join-Path (Get-Location) $Projects
192193
}
193194
$MSBuildArguments += "/p:ProjectToBuild=$Projects"
194195
}
195196
# When adding new sub-group build flags, add them to this check.
196-
elseif((-not $BuildNative) -and (-not $BuildManaged) -and (-not $BuildNodeJS) -and (-not $BuildInstallers) -and (-not $BuildJava)) {
197+
elseif (-not ($All -or $BuildNative -or $BuildManaged -or $BuildNodeJS -or $BuildInstallers -or $BuildJava)) {
197198
Write-Warning "No default group of projects was specified, so building the 'managed' and its dependent subsets of projects. Run ``build.cmd -help`` for more details."
198199

199200
# This goal of this is to pick a sensible default for `build.cmd` with zero arguments.
@@ -203,7 +204,7 @@ elseif((-not $BuildNative) -and (-not $BuildManaged) -and (-not $BuildNodeJS) -a
203204
}
204205

205206
if ($BuildManaged -or ($All -and (-not $NoBuildManaged))) {
206-
if ((-not $BuildNodeJS) -and (-not $NoBuildNodeJS)) {
207+
if (-not ($BuildNodeJS -or $NoBuildNodeJS)) {
207208
$node = Get-Command node -ErrorAction Ignore -CommandType Application
208209

209210
if ($node) {

‎build.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Options:
6565
--no-build-repo-tasks Suppress building RepoTasks.
6666
6767
--all Build all project types.
68-
--[no-]build-native Build native projects (C, C++).
68+
--[no-]build-native Build native projects (C, C++). Ignored in most cases i.e. with `dotnet msbuild`.
6969
--[no-]build-managed Build managed projects (C#, F#, VB).
7070
--[no-]build-nodejs Build NodeJS projects (TypeScript, JS).
7171
--[no-]build-java Build Java projects.
@@ -74,7 +74,7 @@ Options:
7474
--ci Apply CI specific settings and environment variables.
7575
--binarylog|-bl Use a binary logger
7676
--verbosity|-v MSBuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]
77-
77+
7878
--dotnet-runtime-source-feed Additional feed that can be used when downloading .NET runtimes
7979
--dotnet-runtime-source-feed-key Key for feed that can be used when downloading .NET runtimes
8080
@@ -223,9 +223,11 @@ done
223223

224224
if [ "$build_all" = true ]; then
225225
msbuild_args[${#msbuild_args[*]}]="-p:BuildAllProjects=true"
226-
elif [ ! -z "$build_projects" ]; then
226+
fi
227+
228+
if [ ! -z "$build_projects" ]; then
227229
msbuild_args[${#msbuild_args[*]}]="-p:ProjectToBuild=$build_projects"
228-
elif [ -z "$build_managed" ] && [ -z "$build_nodejs" ] && [ -z "$build_java" ] && [ -z "$build_native" ] && [ -z "$build_installers" ]; then
230+
elif [ "$build_all" != true ] && [ -z "$build_managed$build_nodejs$build_java$build_native$build_installers" ]; then
229231
# This goal of this is to pick a sensible default for `build.sh` with zero arguments.
230232
# We believe the most common thing our contributors will work on is C#, so if no other build group was picked, build the C# projects.
231233
__warn "No default group of projects was specified, so building the 'managed' and its dependent subset of projects. Run ``build.sh --help`` for more details."
@@ -287,7 +289,7 @@ msbuild_args[${#msbuild_args[*]}]="-verbosity:$verbosity"
287289

288290
# Set up additional runtime args
289291
toolset_build_args=()
290-
if [ ! -z "$dotnet_runtime_source_feed" ] || [ ! -z "$dotnet_runtime_source_feed_key" ]; then
292+
if [ ! -z "$dotnet_runtime_source_feed$dotnet_runtime_source_feed_key" ]; then
291293
runtimeFeedArg="/p:DotNetRuntimeSourceFeed=$dotnet_runtime_source_feed"
292294
runtimeFeedKeyArg="/p:DotNetRuntimeSourceFeedKey=$dotnet_runtime_source_feed_key"
293295
msbuild_args[${#msbuild_args[*]}]=$runtimeFeedArg

0 commit comments

Comments
 (0)