Skip to content

Commit b0f4606

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 b29de9c commit b0f4606

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
@@ -503,7 +501,7 @@ stages:
503501
jobDisplayName: "Test: Windows Server 2016 x64"
504502
agentOs: Windows
505503
isTestingJob: true
506-
buildArgs: -all -pack -test -BuildNative "/p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs)
504+
buildArgs: -all -pack -test "/p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true /p:SkipIISExpressTests=true /p:SkipIISNewShimTests=true /p:RunTemplateTests=false" $(_InternalRuntimeDownloadArgs)
507505
beforeBuild:
508506
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
509507
displayName: Setup IISExpress test certificates and schema
@@ -642,11 +640,11 @@ stages:
642640
timeoutInMinutes: 180
643641
steps:
644642
# Build the shared framework
645-
- script: ./build.cmd -ci -all -pack -arch x64 -buildNative /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.build.x64.binlog
643+
- script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.build.x64.binlog
646644
displayName: Build shared fx
647645
- script: .\restore.cmd -ci /p:BuildInteropProjects=true
648-
displayName: Restore
649-
- 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
646+
displayName: Restore interop projects
647+
- 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
650648
displayName: Run build.cmd helix target
651649
env:
652650
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -666,11 +664,11 @@ stages:
666664
timeoutInMinutes: 180
667665
steps:
668666
# Build the shared framework
669-
- script: ./build.cmd -ci -all -pack -arch x64 -buildNative /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.daily.build.x64.binlog
667+
- script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/helix.daily.build.x64.binlog
670668
displayName: Build shared fx
671669
- script: .\restore.cmd -ci /p:BuildInteropProjects=true
672-
displayName: Restore
673-
- 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
670+
displayName: Restore interop projects
671+
- 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
674672
displayName: Run build.cmd helix target
675673
env:
676674
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -693,7 +691,7 @@ stages:
693691
# Build the shared framework
694692
- script: ./restore.sh -ci
695693
displayName: Restore
696-
- 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
694+
- 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
697695
displayName: Run build.sh helix arm64 target
698696
env:
699697
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)