Skip to content

Commit f2c013a

Browse files
committed
merge main
2 parents 4742d63 + c7415ff commit f2c013a

File tree

1,442 files changed

+57649
-30094
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,442 files changed

+57649
-30094
lines changed

.azure/pipelines/ci-public.yml

Lines changed: 12 additions & 62 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/
@@ -446,7 +392,7 @@ stages:
446392
jobName: Linux_musl_x64_build
447393
jobDisplayName: "Build: Linux Musl x64"
448394
agentOs: Linux
449-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
395+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
450396
buildArgs:
451397
--arch x64
452398
--os-name linux-musl
@@ -480,7 +426,7 @@ stages:
480426
jobDisplayName: "Build: Linux Musl ARM"
481427
agentOs: Linux
482428
useHostedUbuntu: false
483-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
429+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
484430
buildArgs:
485431
--arch arm
486432
--os-name linux-musl
@@ -513,7 +459,7 @@ stages:
513459
jobDisplayName: "Build: Linux Musl ARM64"
514460
agentOs: Linux
515461
useHostedUbuntu: false
516-
container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
462+
container: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
517463
buildArgs:
518464
--arch arm64
519465
--os-name linux-musl
@@ -624,11 +570,13 @@ stages:
624570
# Build the shared framework
625571
- script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64
626572
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
573+
/p:VsTestUseMSBuildOutput=false
627574
displayName: Build shared fx
628575
# -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
629576
- script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -noBuildRepoTasks -noBuildNative -noBuild -test
630577
-projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true
631578
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
579+
/p:VsTestUseMSBuildOutput=false
632580
displayName: Run build.cmd helix target
633581
env:
634582
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
@@ -669,6 +617,8 @@ stages:
669617
-configuration Release
670618
-bl
671619
displayName: Run project template tests
620+
- powershell: . ./activate.ps1; ./src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 -Verbose
621+
displayName: Run Blazor web app test script
672622

673623
artifacts:
674624
- name: Local_Windows_x64_Logs_Attempt_$(System.JobAttempt)
@@ -681,9 +631,9 @@ stages:
681631
parameters:
682632
platform:
683633
name: 'Managed'
684-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
685-
buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
686-
skipPublishValidation: true
634+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64'
635+
buildScript: './eng/build.sh'
636+
buildArguments: '--source-build $(_InternalRuntimeDownloadArgs)'
687637
jobProperties:
688638
timeoutInMinutes: 120
689639
variables:

0 commit comments

Comments
 (0)