Skip to content

Commit e1d8313

Browse files
committed
Merge remote-tracking branch 'upstream/main' into BlazorTestPreload
2 parents fb5704d + 063ba34 commit e1d8313

File tree

1,838 files changed

+75607
-15538
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,838 files changed

+75607
-15538
lines changed

.azure/pipelines/ci-public.yml

Lines changed: 49 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,15 @@ pr:
1919
branches:
2020
include:
2121
- '*'
22+
paths:
23+
exclude:
24+
- .devcontainer/*
25+
- .github/*
26+
- .vscode/*
27+
- docs/*
28+
- '**/*.md'
29+
- LICENSE.TXT
30+
- THIRD-PARTY-NOTICES.TXT
2231

2332
parameters:
2433
# Choose whether to skip tests when running pipeline manually.
@@ -38,6 +47,8 @@ parameters:
3847
variables:
3948
- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
4049
value: true
50+
- name: GRADLE_USER_HOME
51+
value: $(Build.SourcesDirectory)/.gradle
4152
- name: _TeamName
4253
value: AspNetCore
4354
- name: _PublishUsingPipelines
@@ -65,8 +76,6 @@ variables:
6576
value: /bl:artifacts/log/Release/Build.CodeSign.binlog
6677
- name: WindowsInstallersLogArgs
6778
value: /bl:artifacts/log/Release/Build.Installers.binlog
68-
- name: WindowsArm64InstallersLogArgs
69-
value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
7079
- name: _SignType
7180
value: ''
7281
- name: _InternalRuntimeDownloadArgs
@@ -194,29 +203,14 @@ stages:
194203
-sign
195204
-buildInstallers
196205
-noBuildNative
197-
/p:DotNetSignType=$(_SignType)
198-
$(_BuildArgs)
199-
$(_InternalRuntimeDownloadArgs)
200-
$(WindowsInstallersLogArgs)
201-
displayName: Build Installers
202-
203-
# Windows installers bundle and sharedfx msi for arm64
204-
- script: ./eng/build.cmd
205-
-ci
206-
-prepareMachine
207-
-noBuildRepoTasks
208-
-arch arm64
209-
-sign
210-
-buildInstallers
211-
-noBuildNative
212206
-publish
213207
/p:DotNetSignType=$(_SignType)
214208
/p:AssetManifestFileName=aspnetcore-win.xml
215209
$(_BuildArgs)
216210
$(_PublishArgs)
217211
$(_InternalRuntimeDownloadArgs)
218-
$(WindowsArm64InstallersLogArgs)
219-
displayName: Build ARM64 Installers
212+
$(WindowsInstallersLogArgs)
213+
displayName: Build Installers
220214

221215
artifacts:
222216
- name: Windows_Logs_Attempt_$(System.JobAttempt)
@@ -559,11 +553,11 @@ stages:
559553
publishOnError: true
560554
includeForks: true
561555

562-
# Helix x64
556+
# Helix x64 subset 1
563557
- template: jobs/default-build.yml
564558
parameters:
565-
jobName: Helix_x64
566-
jobDisplayName: 'Tests: Helix x64'
559+
jobName: Helix_x64_Subset_1
560+
jobDisplayName: 'Tests: Helix x64 Subset 1'
567561
agentOs: Windows
568562
timeoutInMinutes: 240
569563
steps:
@@ -573,17 +567,46 @@ stages:
573567
/p:VsTestUseMSBuildOutput=false
574568
displayName: Build shared fx
575569
# -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
576-
- script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -noBuildRepoTasks -noBuildNative -noBuild -test
570+
- script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -all -noBuildRepoTasks -noBuildNative -noBuild -test
577571
-projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true
572+
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
573+
/p:VsTestUseMSBuildOutput=false /p:RunTemplateTests=false /p:HelixSubset=1
574+
displayName: Run build.cmd helix target
575+
env:
576+
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
577+
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
578+
579+
artifacts:
580+
- name: Helix_Subset_1_Logs_Attempt_$(System.JobAttempt)
581+
path: artifacts/log/
582+
publishOnError: true
583+
includeForks: true
584+
585+
# Helix x64 subset 2
586+
- template: jobs/default-build.yml
587+
parameters:
588+
jobName: Helix_x64_Subset_2
589+
jobDisplayName: 'Tests: Helix x64 Subset 2'
590+
agentOs: Windows
591+
timeoutInMinutes: 240
592+
steps:
593+
# Build the shared framework
594+
- script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64
578595
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
579596
/p:VsTestUseMSBuildOutput=false
597+
displayName: Build shared fx
598+
# -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
599+
- script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -all -noBuildRepoTasks -noBuildNative -noBuild -test
600+
-projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true
601+
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
602+
/p:VsTestUseMSBuildOutput=false /p:RunTemplateTests=false /p:HelixSubset=2
580603
displayName: Run build.cmd helix target
581604
env:
582605
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
583606
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
584607

585608
artifacts:
586-
- name: Helix_Logs_Attempt_$(System.JobAttempt)
609+
- name: Helix_Subset_2_Logs_Attempt_$(System.JobAttempt)
587610
path: artifacts/log/
588611
publishOnError: true
589612
includeForks: true
@@ -632,8 +655,8 @@ stages:
632655
platform:
633656
name: 'Managed'
634657
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64'
635-
buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
636-
skipPublishValidation: true
658+
buildScript: './eng/build.sh'
659+
buildArguments: '--source-build $(_InternalRuntimeDownloadArgs)'
637660
jobProperties:
638661
timeoutInMinutes: 120
639662
variables:

0 commit comments

Comments
 (0)