Skip to content

Commit 514df9e

Browse files
dougbudougbu
committed
Restore creation of binary logs on Windows in CI runs
This reverts part of commit d5849f3. - was "[master] Update dependencies from dotnet/arcade dotnet/aspnetcore-tooling (#21630)" In addition, move binary log files that weren't there down into artifacts/log/Release/ - give all .binlog files unique names
1 parent d58947f commit 514df9e

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed

‎.azure/pipelines/ci.yml‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ stages:
127127
# The sign settings have been configured to
128128
- script: ./build.cmd
129129
-ci
130-
-nobl
131130
-arch x64
132131
-pack
133132
-all
133+
/bl:artifacts/log/Release/build.x64.binlog
134134
$(_BuildArgs)
135135
$(_InternalRuntimeDownloadArgs)
136136
displayName: Build x64
@@ -139,20 +139,19 @@ stages:
139139
# This is going to actually build x86 native assets.
140140
- script: ./build.cmd
141141
-ci
142-
-nobl
143142
-arch x86
144143
-pack
145144
-all
146145
-noBuildJava
147146
/p:OnlyPackPlatformSpecificPackages=true
147+
/bl:artifacts/log/Release/build.x86.binlog
148148
$(_BuildArgs)
149149
$(_InternalRuntimeDownloadArgs)
150150
displayName: Build x86
151151

152152
# This is in a separate build step with -forceCoreMsbuild to workaround MAX_PATH limitations - https://github.com/Microsoft/msbuild/issues/53
153153
- script: .\src\SiteExtensions\build.cmd
154154
-ci
155-
-nobl
156155
-pack
157156
-noBuildDeps
158157
$(_BuildArgs)
@@ -165,20 +164,20 @@ stages:
165164
# Sign check is disabled because it is run in a separate step below, after installers are built.
166165
- script: ./build.cmd
167166
-ci
168-
-nobl
169167
-noBuild
170168
-noRestore
171169
-sign
170+
/bl:artifacts/log/Release/build.codesign.binlog
172171
/p:DotNetSignType=$(_SignType)
173172
$(_BuildArgs)
174173
displayName: Code sign packages
175174

176175
# Windows installers bundle both x86 and x64 assets
177176
- script: ./build.cmd
178177
-ci
179-
-nobl
180178
-sign
181179
-buildInstallers
180+
/bl:artifacts/log/Release/installers.msbuild.binlog
182181
/p:DotNetSignType=$(_SignType)
183182
/p:AssetManifestFileName=aspnetcore-win-x64-x86.xml
184183
$(_BuildArgs)
@@ -218,6 +217,7 @@ stages:
218217
-pack
219218
-noBuildNodeJS
220219
-noBuildJava
220+
/bl:artifacts/log/Release/build.win-arm.binlog
221221
/p:DotNetSignType=$(_SignType)
222222
/p:OnlyPackPlatformSpecificPackages=true
223223
/p:AssetManifestFileName=aspnetcore-win-arm.xml
@@ -247,6 +247,7 @@ stages:
247247
-pack
248248
-noBuildNodeJS
249249
-noBuildJava
250+
/bl:artifacts/log/Release/build.win-arm64.binlog
250251
/p:DotNetSignType=$(_SignType)
251252
/p:OnlyPackPlatformSpecificPackages=true
252253
/p:AssetManifestFileName=aspnetcore-win-arm64.xml
@@ -497,7 +498,7 @@ stages:
497498
- powershell: "& ./src/Servers/IIS/tools/UpdateIISExpressCertificate.ps1; & ./src/Servers/IIS/tools/update_schema.ps1"
498499
displayName: Setup IISExpress test certificates and schema
499500
afterBuild:
500-
- powershell: "& ./build.ps1 -CI -nobl -NoBuild -Test /p:RunQuarantinedTests=true"
501+
- powershell: "& ./build.ps1 -CI -NoBuild -Test /p:RunQuarantinedTests=true /bl:artifacts/log/Release/test.quarantined.binlog"
501502
displayName: Run Quarantined Tests
502503
continueOnError: true
503504
- task: PublishTestResults@2
@@ -528,11 +529,11 @@ stages:
528529
agentOs: Windows
529530
isTestingJob: true
530531
steps:
531-
- script: ./build.cmd -ci -nobl -all -pack $(_InternalRuntimeDownloadArgs)
532+
- script: ./build.cmd -ci -all -pack $(_InternalRuntimeDownloadArgs)
532533
displayName: Build Repo
533-
- script: ./src/ProjectTemplates/build.cmd -ci -nobl -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true"
534+
- script: ./src/ProjectTemplates/build.cmd -ci -pack -NoRestore -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/Release/template.pack.binlog"
534535
displayName: Pack Templates
535-
- script: ./src/ProjectTemplates/build.cmd -ci -nobl -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true"
536+
- script: ./src/ProjectTemplates/build.cmd -ci -test -NoRestore -NoBuild -NoBuilddeps "/p:RunTemplateTests=true /bl:artifacts/log/Release/template.test.binlog"
536537
displayName: Test Templates
537538
artifacts:
538539
- name: Windows_Test_Templates_Dumps
@@ -631,11 +632,11 @@ stages:
631632
timeoutInMinutes: 180
632633
steps:
633634
# Build the shared framework
634-
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
635+
- script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/Release/helix.build.x64.binlog
635636
displayName: Build shared fx
636-
- script: .\restore.cmd -ci -nobl /p:BuildInteropProjects=true
637+
- script: .\restore.cmd -ci /p:BuildInteropProjects=true /bl:artifacts/log/Release/helix.restore.interop.binlog
637638
displayName: Restore interop projects
638-
- script: .\build.cmd -ci -nobl -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
639+
- 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
639640
displayName: Run build.cmd helix target
640641
env:
641642
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -655,11 +656,11 @@ stages:
655656
timeoutInMinutes: 180
656657
steps:
657658
# Build the shared framework
658-
- script: ./build.cmd -ci -nobl -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
659+
- script: ./build.cmd -ci -all -pack -arch x64 /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /bl:artifacts/log/Release/helix.daily.build.x64.binlog
659660
displayName: Build shared fx
660-
- script: .\restore.cmd -ci -nobl /p:BuildInteropProjects=true
661+
- script: .\restore.cmd -ci /p:BuildInteropProjects=true /bl:artifacts/log/Release/helix.restore.interop.binlog
661662
displayName: Restore interop projects
662-
- script: .\build.cmd -ci -nobl -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
663+
- 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
663664
displayName: Run build.cmd helix target
664665
env:
665666
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ jobs:
198198
- ${{ if eq(parameters.steps, '')}}:
199199
- ${{ if eq(parameters.buildScript, '') }}:
200200
- ${{ if eq(parameters.agentOs, 'Windows') }}:
201-
- script: $(BuildDirectory)\build.cmd -ci -nobl -Configuration $(BuildConfiguration) $(BuildScriptArgs) /p:DotNetSignType=$(_SignType)
201+
- script: $(BuildDirectory)\build.cmd -ci -Configuration $(BuildConfiguration) $(BuildScriptArgs) /p:DotNetSignType=$(_SignType)
202202
displayName: Run build.cmd
203203
- ${{ if ne(parameters.agentOs, 'Windows') }}:
204204
- script: $(BuildDirectory)/build.sh --ci --nobl --configuration $(BuildConfiguration) $(BuildScriptArgs)

‎.azure/pipelines/quarantined-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ jobs:
3333
# Build the shared framework
3434
- 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
36-
- script: .\restore.cmd -ci /p:BuildInteropProjects=true
36+
- script: .\restore.cmd -ci /p:BuildInteropProjects=true /bl:artifacts/log/helix.restore.interop.binlog
3737
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
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
3939
displayName: Run build.cmd helix target
4040
env:
4141
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

‎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 -nobl -noBuildNodeJS -DotNetRuntimeSourceFeed $DotNetRuntimeSourceFeed -DotNetRuntimeSourceFeedKey $DotNetRuntimeSourceFeedKey
51+
& $repoRoot/restore.cmd -ci -noBuildNodeJS -DotNetRuntimeSourceFeed $DotNetRuntimeSourceFeed -DotNetRuntimeSourceFeedKey $DotNetRuntimeSourceFeedKey
5252
}
5353
else{
54-
& $repoRoot/restore.cmd -ci -nobl -noBuildNodeJS
54+
& $repoRoot/restore.cmd -ci -noBuildNodeJS
5555
}
5656
}
5757

0 commit comments

Comments
 (0)