Skip to content

Commit bc8ab4e

Browse files
committed
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
1 parent 194ad00 commit bc8ab4e

File tree

5 files changed

+15
-17
lines changed

5 files changed

+15
-17
lines changed

.azure/pipelines/ci.yml

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ stages:
132132
-arch x64
133133
-pack
134134
-all
135-
-buildNative
136135
/bl:artifacts/log/build.x64.binlog
137136
$(_BuildArgs)
138137
$(_InternalRuntimeDownloadArgs)
@@ -145,7 +144,6 @@ stages:
145144
-arch x86
146145
-pack
147146
-all
148-
-buildNative
149147
-noBuildJava
150148
/p:OnlyPackPlatformSpecificPackages=true
151149
/bl:artifacts/log/build.x86.binlog
@@ -504,7 +502,7 @@ stages:
504502
jobDisplayName: "Test: Windows Server 2016 x64"
505503
agentOs: Windows
506504
isTestingJob: true
507-
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)
508506
beforeBuild:
509507
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
510508
displayName: Setup IISExpress test certificates and schema
@@ -643,11 +641,11 @@ stages:
643641
timeoutInMinutes: 180
644642
steps:
645643
# Build the shared framework
646-
- 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
647645
displayName: Build shared fx
648646
- script: .\restore.cmd -ci /p:BuildInteropProjects=true
649-
displayName: Restore
650-
- 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
651649
displayName: Run build.cmd helix target
652650
env:
653651
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -667,11 +665,11 @@ stages:
667665
timeoutInMinutes: 180
668666
steps:
669667
# Build the shared framework
670-
- 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
671669
displayName: Build shared fx
672670
- script: .\restore.cmd -ci /p:BuildInteropProjects=true
673-
displayName: Restore
674-
- 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
675673
displayName: Run build.cmd helix target
676674
env:
677675
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -694,7 +692,7 @@ stages:
694692
# Build the shared framework
695693
- script: ./restore.sh -ci
696694
displayName: Restore
697-
- 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
698696
displayName: Run build.sh helix arm64 target
699697
env:
700698
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

.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

docs/BuildFromSource.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ On macOS/Linux:
160160
./build.sh
161161
```
162162

163-
By default, all of the C# projects are built. Some C# projects require NodeJS to be installed to compile JavaScript assets which are then checked in as source. If NodeJS is detected on the path, the NodeJS projects will be compiled as part of building C# projects. If NodeJS is not detected on the path, the JavaScript assets checked in previously will be used instead. To disable building NodeJS projects, specify /p:BuildNodeJs=false on the command line.
163+
By default, all of the C# projects are built. Some C# projects require NodeJS to be installed to compile JavaScript assets which are then checked in as source. If NodeJS is detected on the path, the NodeJS projects will be compiled as part of building C# projects. If NodeJS is not detected on the path, the JavaScript assets checked in previously will be used instead. To disable building NodeJS projects, specify `-noBuildNodeJS` or `--no-build-nodejs` on the command line.
164164

165165
### Using `dotnet` on command line in this repo
166166

eng/scripts/CodeCheck.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ try {
4848
if ($ci) {
4949
# Install dotnet.exe
5050
if ($DotNetRuntimeSourceFeed -or $DotNetRuntimeSourceFeedKey) {
51-
& $repoRoot/restore.cmd -ci -NoBuildNodeJS -DotNetRuntimeSourceFeed $DotNetRuntimeSourceFeed -DotNetRuntimeSourceFeedKey $DotNetRuntimeSourceFeedKey
51+
& $repoRoot/restore.cmd -ci -noBuildNodeJS -DotNetRuntimeSourceFeed $DotNetRuntimeSourceFeed -DotNetRuntimeSourceFeedKey $DotNetRuntimeSourceFeedKey
5252
}
5353
else{
54-
& $repoRoot/restore.cmd -ci -NoBuildNodeJS
54+
& $repoRoot/restore.cmd -ci -noBuildNodeJS
5555
}
5656
}
5757

eng/targets/Npm.Common.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<Output TaskParameter="ExitCode" PropertyName="ErrorCode"/>
3737
</Exec>
3838

39-
<Error Text="Building *.npmproj but NodeJS was not detected on path. Ensure NodeJS is on path or disable building NodeJS projects with /p:BuildNodeJs=false. Skipping NodeJS projects will also skip managed projects depending on them, including Components, Mvc and Analysers." Condition="'$(ErrorCode)' != '0'"/>
39+
<Error Text="Building *.npmproj but NodeJS was not detected on path. Ensure NodeJS is on path or disable building NodeJS projects with -noBuildNodeJS or --no-build-nodejs. Skipping NodeJS projects will also skip managed projects depending on them, including Components, Mvc and Analysers." Condition="'$(ErrorCode)' != '0'"/>
4040
</Target>
4141

4242
<Target Name="Restore">

0 commit comments

Comments
 (0)