Skip to content

Commit 8d11670

Browse files
committed
Merge branch 'main' into hubconnection-fire-and-forget
2 parents a43e88e + e983910 commit 8d11670

File tree

1,531 files changed

+255030
-105331
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,531 files changed

+255030
-105331
lines changed

.azure/pipelines/ci-public.yml

Lines changed: 6 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,6 @@ variables:
7979
value: true
8080
- template: /eng/common/templates/variables/pool-providers.yml
8181

82-
resources:
83-
containers:
84-
- container: debpkg
85-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
86-
87-
- container: rpmpkg
88-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
89-
9082
stages:
9183
- stage: build
9284
displayName: Build
@@ -313,43 +305,13 @@ stages:
313305
--ci
314306
--arch x64
315307
--pack
308+
--build-installers
316309
--all
317310
--no-build-java
318311
-p:OnlyPackPlatformSpecificPackages=true
319312
$(_BuildArgs)
320313
$(_InternalRuntimeDownloadArgs)
321314
displayName: Run build.sh
322-
- script: ./eng/build.sh
323-
--ci
324-
--nobl
325-
--arch x64
326-
--build-installers
327-
--no-build-deps
328-
--no-build-nodejs
329-
-p:OnlyPackPlatformSpecificPackages=true
330-
-p:BuildRuntimeArchive=false
331-
-p:LinuxInstallerType=deb
332-
$(_BuildArgs)
333-
$(_InternalRuntimeDownloadArgs)
334-
displayName: Build Debian installers
335-
target: debpkg
336-
- script: ./eng/build.sh
337-
--ci
338-
--nobl
339-
--arch x64
340-
--build-installers
341-
--no-build-deps
342-
--no-build-nodejs
343-
--publish
344-
-p:OnlyPackPlatformSpecificPackages=true
345-
-p:BuildRuntimeArchive=false
346-
-p:LinuxInstallerType=rpm
347-
-p:AssetManifestFileName=aspnetcore-Linux_x64.xml
348-
$(_BuildArgs)
349-
$(_PublishArgs)
350-
$(_InternalRuntimeDownloadArgs)
351-
displayName: Build RPM installers
352-
target: rpmpkg
353315
artifacts:
354316
- name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
355317
path: artifacts/log/
@@ -404,29 +366,13 @@ stages:
404366
--ci
405367
--arch arm64
406368
--pack
369+
--build-installers
407370
--all
408371
--no-build-java
409372
-p:OnlyPackPlatformSpecificPackages=true
410373
$(_BuildArgs)
411374
$(_InternalRuntimeDownloadArgs)
412375
displayName: Run build.sh
413-
- script: ./eng/build.sh
414-
--ci
415-
--nobl
416-
--arch arm64
417-
--build-installers
418-
--no-build-deps
419-
--no-build-nodejs
420-
--publish
421-
-p:OnlyPackPlatformSpecificPackages=true
422-
-p:BuildRuntimeArchive=false
423-
-p:LinuxInstallerType=rpm
424-
-p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
425-
$(_BuildArgs)
426-
$(_PublishArgs)
427-
$(_InternalRuntimeDownloadArgs)
428-
displayName: Build RPM installers
429-
target: rpmpkg
430376
artifacts:
431377
- name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
432378
path: artifacts/log/
@@ -646,12 +592,15 @@ stages:
646592
jobName: Local_Windows
647593
jobDisplayName: 'Test: Windows local development validation'
648594
agentOs: Windows
595+
isAzDOTestingJob: true
649596
timeoutInMinutes: 240
650597
steps:
651598
- script: git submodule update --init
652599
displayName: Update submodules
653600
- script: ./restore.cmd
654601
displayName: Run restore.cmd
602+
- powershell: ./eng/build.ps1 -all -noBuildJava -noBuildNodeJS "-WarnAsError:false"
603+
displayName: Build (No NodeJS)
655604
- script: npm run build
656605
displayName: Build JS
657606
- script: ./eng/build.cmd -all -noBuildJava -pack -c Debug
@@ -664,6 +613,7 @@ stages:
664613
-NoBuild
665614
-NoBuildDeps
666615
-configuration Release
616+
-bl
667617
displayName: Run project template tests
668618

669619
artifacts:

.azure/pipelines/ci.yml

Lines changed: 53 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@ parameters:
2727
default: false
2828
displayName: Skip tests?
2929
type: boolean
30-
# Choose whether to enable binlogs when running pipeline manually.
31-
# Binary logs are enabled by default in public builds and aren't designed to be disabled there.
32-
- name: produceBinlogs
33-
default: false
34-
displayName: Produce binlogs?
35-
type: boolean
3630

3731
variables:
3832
- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
@@ -44,9 +38,13 @@ variables:
4438
- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}:
4539
- name: PostBuildSign
4640
value: false
41+
- name: _ArcadePublishNonWindowsArg
42+
value: ''
4743
- ${{ else }}:
4844
- name: PostBuildSign
4945
value: true
46+
- name: _ArcadePublishNonWindowsArg
47+
value: --publish
5048
- name: _UseHelixOpenQueues
5149
value: ${{ ne(variables['System.TeamProject'], 'internal') }}
5250
- ${{ if and(notin(variables['Build.Reason'], 'PullRequest'), eq(variables['Build.SourceBranch'], 'refs/heads/main')) }}:
@@ -63,39 +61,23 @@ variables:
6361
# The following extra properties are not set when testing. Use with final build.[cmd,sh] of asset-producing jobs.
6462
- name: _PublishArgs
6563
value: /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
66-
- ${{ if ne(parameters.produceBinlogs, 'true') }}:
67-
# Do not log most Windows steps in official builds; this is the slowest job. Site extensions step always logs.
68-
- name: WindowsArm64LogArgs
69-
value: -ExcludeCIBinaryLog
70-
- name: Windows64LogArgs
71-
value: -ExcludeCIBinaryLog
72-
- name: Windows86LogArgs
73-
value: -ExcludeCIBinaryLog
74-
- name: WindowsSignLogArgs
75-
value: -ExcludeCIBinaryLog
76-
- name: WindowsInstallersLogArgs
77-
value: -ExcludeCIBinaryLog
78-
- name: WindowsArm64InstallersLogArgs
79-
value: -ExcludeCIBinaryLog
8064
- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
8165
- name: _BuildArgs
8266
value: '/p:SkipTestBuild=true /p:PostBuildSign=$(PostBuildSign)'
8367
- name: _PublishArgs
8468
value: ''
85-
- ${{ if or(in(variables['Build.Reason'], 'PullRequest'), eq(parameters.produceBinlogs, 'true')) }}:
86-
# Write binary logs for all main Windows build steps except the x86 one in public and PR builds.
87-
- name: WindowsArm64LogArgs
88-
value: /bl:artifacts/log/Release/Build.arm64.binlog
89-
- name: Windows64LogArgs
90-
value: /bl:artifacts/log/Release/Build.x64.binlog
91-
- name: Windows86LogArgs
92-
value: -ExcludeCIBinaryLog
93-
- name: WindowsSignLogArgs
94-
value: /bl:artifacts/log/Release/Build.CodeSign.binlog
95-
- name: WindowsInstallersLogArgs
96-
value: /bl:artifacts/log/Release/Build.Installers.binlog
97-
- name: WindowsArm64InstallersLogArgs
98-
value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
69+
- name: WindowsArm64LogArgs
70+
value: /bl:artifacts/log/Release/Build.arm64.binlog
71+
- name: Windows64LogArgs
72+
value: /bl:artifacts/log/Release/Build.x64.binlog
73+
- name: Windows86LogArgs
74+
value: -ExcludeCIBinaryLog
75+
- name: WindowsSignLogArgs
76+
value: /bl:artifacts/log/Release/Build.CodeSign.binlog
77+
- name: WindowsInstallersLogArgs
78+
value: /bl:artifacts/log/Release/Build.Installers.binlog
79+
- name: WindowsArm64InstallersLogArgs
80+
value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
9981
- name: _InternalRuntimeDownloadArgs
10082
value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal
10183
-RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
@@ -121,12 +103,6 @@ variables:
121103
- template: /eng/common/templates-official/variables/pool-providers.yml@self
122104

123105
resources:
124-
containers:
125-
- container: debpkg
126-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
127-
128-
- container: rpmpkg
129-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
130106
repositories:
131107
# Repo: 1ESPipelineTemplates/1ESPipelineTemplates
132108
- repository: 1esPipelines
@@ -144,6 +120,10 @@ extends:
144120
os: windows
145121
spotBugs:
146122
enabled: false
123+
policheck:
124+
enabled: true
125+
tsa:
126+
enabled: true
147127
containers:
148128
alpine319WithNode:
149129
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
@@ -317,7 +297,7 @@ extends:
317297
--pack
318298
--all
319299
--no-build-java
320-
--publish
300+
$(_ArcadePublishNonWindowsArg)
321301
-p:OnlyPackPlatformSpecificPackages=true
322302
-p:AssetManifestFileName=aspnetcore-MacOS_arm64.xml
323303
$(_BuildArgs)
@@ -347,7 +327,7 @@ extends:
347327
--pack
348328
--all
349329
--no-build-java
350-
--publish
330+
$(_ArcadePublishNonWindowsArg)
351331
-p:OnlyPackPlatformSpecificPackages=true
352332
-p:AssetManifestFileName=aspnetcore-MacOS_x64.xml
353333
$(_BuildArgs)
@@ -373,48 +353,18 @@ extends:
373353
jobDisplayName: "Build: Linux x64"
374354
agentOs: Linux
375355
useHostedUbuntu: false
376-
steps:
377-
- script: ./eng/build.sh
378-
--ci
379-
--arch x64
380-
--pack
381-
--all
382-
--no-build-java
383-
-p:OnlyPackPlatformSpecificPackages=true
384-
$(_BuildArgs)
385-
$(_InternalRuntimeDownloadArgs)
386-
displayName: Run build.sh
387-
- script: ./eng/build.sh
388-
--ci
389-
--nobl
390-
--arch x64
391-
--build-installers
392-
--no-build-deps
393-
--no-build-nodejs
394-
-p:OnlyPackPlatformSpecificPackages=true
395-
-p:BuildRuntimeArchive=false
396-
-p:LinuxInstallerType=deb
397-
$(_BuildArgs)
398-
$(_InternalRuntimeDownloadArgs)
399-
displayName: Build Debian installers
400-
target: debpkg
401-
- script: ./eng/build.sh
402-
--ci
403-
--nobl
404-
--arch x64
405-
--build-installers
406-
--no-build-deps
407-
--no-build-nodejs
408-
--publish
409-
-p:OnlyPackPlatformSpecificPackages=true
410-
-p:BuildRuntimeArchive=false
411-
-p:LinuxInstallerType=rpm
412-
-p:AssetManifestFileName=aspnetcore-Linux_x64.xml
413-
$(_BuildArgs)
414-
$(_PublishArgs)
415-
$(_InternalRuntimeDownloadArgs)
416-
displayName: Build RPM installers
417-
target: rpmpkg
356+
buildArgs:
357+
--arch x64
358+
--pack
359+
--all
360+
--build-installers
361+
--no-build-java
362+
$(_ArcadePublishNonWindowsArg)
363+
-p:OnlyPackPlatformSpecificPackages=true
364+
-p:AssetManifestFileName=aspnetcore-Linux_x64.xml
365+
$(_BuildArgs)
366+
$(_PublishArgs)
367+
$(_InternalRuntimeDownloadArgs)
418368
artifacts:
419369
- name: Linux_x64_Logs_Attempt_$(System.JobAttempt)
420370
path: artifacts/log/
@@ -439,7 +389,7 @@ extends:
439389
--pack
440390
--all
441391
--no-build-java
442-
--publish
392+
$(_ArcadePublishNonWindowsArg)
443393
-p:OnlyPackPlatformSpecificPackages=true
444394
-p:AssetManifestFileName=aspnetcore-Linux_arm.xml
445395
$(_BuildArgs)
@@ -464,34 +414,18 @@ extends:
464414
jobName: Linux_arm64_build
465415
jobDisplayName: "Build: Linux ARM64"
466416
agentOs: Linux
467-
steps:
468-
- script: ./eng/build.sh
469-
--ci
470-
--arch arm64
471-
--pack
472-
--all
473-
--no-build-java
474-
-p:OnlyPackPlatformSpecificPackages=true
475-
$(_BuildArgs)
476-
$(_InternalRuntimeDownloadArgs)
477-
displayName: Run build.sh
478-
- script: ./eng/build.sh
479-
--ci
480-
--nobl
481-
--arch arm64
482-
--build-installers
483-
--no-build-deps
484-
--no-build-nodejs
485-
--publish
486-
-p:OnlyPackPlatformSpecificPackages=true
487-
-p:BuildRuntimeArchive=false
488-
-p:LinuxInstallerType=rpm
489-
-p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
490-
$(_BuildArgs)
491-
$(_PublishArgs)
492-
$(_InternalRuntimeDownloadArgs)
493-
displayName: Build RPM installers
494-
target: rpmpkg
417+
buildArgs:
418+
--arch arm64
419+
--pack
420+
--all
421+
--build-installers
422+
--no-build-java
423+
$(_ArcadePublishNonWindowsArg)
424+
-p:OnlyPackPlatformSpecificPackages=true
425+
-p:AssetManifestFileName=aspnetcore-Linux_arm64.xml
426+
$(_BuildArgs)
427+
$(_PublishArgs)
428+
$(_InternalRuntimeDownloadArgs)
495429
artifacts:
496430
- name: Linux_arm64_Logs_Attempt_$(System.JobAttempt)
497431
path: artifacts/log/
@@ -518,7 +452,7 @@ extends:
518452
--pack
519453
--all
520454
--no-build-java
521-
--publish
455+
$(_ArcadePublishNonWindowsArg)
522456
-p:OnlyPackPlatformSpecificPackages=true
523457
-p:AssetManifestFileName=aspnetcore-Linux_musl_x64.xml
524458
$(_BuildArgs)
@@ -552,7 +486,7 @@ extends:
552486
--pack
553487
--all
554488
--no-build-java
555-
--publish
489+
$(_ArcadePublishNonWindowsArg)
556490
-p:OnlyPackPlatformSpecificPackages=true
557491
-p:AssetManifestFileName=aspnetcore-Linux_musl_arm.xml
558492
$(_BuildArgs)
@@ -585,7 +519,7 @@ extends:
585519
--pack
586520
--all
587521
--no-build-java
588-
--publish
522+
$(_ArcadePublishNonWindowsArg)
589523
-p:OnlyPackPlatformSpecificPackages=true
590524
-p:AssetManifestFileName=aspnetcore-Linux_musl_arm64.xml
591525
$(_BuildArgs)
@@ -708,12 +642,15 @@ extends:
708642
jobName: Local_Windows
709643
jobDisplayName: 'Test: Windows local development validation'
710644
agentOs: Windows
645+
isAzDOTestingJob: true
711646
timeoutInMinutes: 240
712647
steps:
713648
- script: git submodule update --init
714649
displayName: Update submodules
715650
- script: ./restore.cmd
716651
displayName: Run restore.cmd
652+
- script: ./eng/build.cmd -all -noBuildJava -noBuildNodeJS
653+
displayName: Build (No NodeJS)
717654
- script: npm run build
718655
displayName: Build JS
719656
- script: ./eng/build.cmd -all -noBuildJava -pack -c Debug

0 commit comments

Comments
 (0)