Skip to content

Commit 9910e6f

Browse files
marafmaraf
committed
Merge remote-tracking branch 'upstream/main' into BlazorBenchPreload
2 parents d1a1aaf + b83721c commit 9910e6f

File tree

855 files changed

+23005
-2569
lines changed

Some content is hidden

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

855 files changed

+23005
-2569
lines changed

‎.azure/pipelines/ci-public.yml‎

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ parameters:
4747
variables:
4848
- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
4949
value: true
50+
- name: GRADLE_USER_HOME
51+
value: $(Build.SourcesDirectory)/.gradle
5052
- name: _TeamName
5153
value: AspNetCore
5254
- name: _PublishUsingPipelines
@@ -568,11 +570,11 @@ stages:
568570
publishOnError: true
569571
includeForks: true
570572

571-
# Helix x64
573+
# Helix x64 subset 1
572574
- template: jobs/default-build.yml
573575
parameters:
574-
jobName: Helix_x64
575-
jobDisplayName: 'Tests: Helix x64'
576+
jobName: Helix_x64_Subset_1
577+
jobDisplayName: 'Tests: Helix x64 Subset 1'
576578
agentOs: Windows
577579
timeoutInMinutes: 240
578580
steps:
@@ -582,17 +584,46 @@ stages:
582584
/p:VsTestUseMSBuildOutput=false
583585
displayName: Build shared fx
584586
# -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
585-
- script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -noBuildRepoTasks -noBuildNative -noBuild -test
587+
- script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -all -noBuildRepoTasks -noBuildNative -noBuild -test
586588
-projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true
589+
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
590+
/p:VsTestUseMSBuildOutput=false /p:RunTemplateTests=false /p:HelixSubset=1
591+
displayName: Run build.cmd helix target
592+
env:
593+
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
594+
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
595+
596+
artifacts:
597+
- name: Helix_Subset_1_Logs_Attempt_$(System.JobAttempt)
598+
path: artifacts/log/
599+
publishOnError: true
600+
includeForks: true
601+
602+
# Helix x64 subset 2
603+
- template: jobs/default-build.yml
604+
parameters:
605+
jobName: Helix_x64_Subset_2
606+
jobDisplayName: 'Tests: Helix x64 Subset 2'
607+
agentOs: Windows
608+
timeoutInMinutes: 240
609+
steps:
610+
# Build the shared framework
611+
- script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64
587612
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
588613
/p:VsTestUseMSBuildOutput=false
614+
displayName: Build shared fx
615+
# -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
616+
- script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -all -noBuildRepoTasks -noBuildNative -noBuild -test
617+
-projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true
618+
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
619+
/p:VsTestUseMSBuildOutput=false /p:RunTemplateTests=false /p:HelixSubset=2
589620
displayName: Run build.cmd helix target
590621
env:
591622
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
592623
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
593624

594625
artifacts:
595-
- name: Helix_Logs_Attempt_$(System.JobAttempt)
626+
- name: Helix_Subset_2_Logs_Attempt_$(System.JobAttempt)
596627
path: artifacts/log/
597628
publishOnError: true
598629
includeForks: true

‎.azure/pipelines/ci.yml‎

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ parameters:
3131
variables:
3232
- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
3333
value: true
34+
- name: GRADLE_USER_HOME
35+
value: $(Build.SourcesDirectory)/.gradle
3436
- name: _TeamName
3537
value: AspNetCore
3638
- name: _PublishUsingPipelines
@@ -622,8 +624,8 @@ extends:
622624
# Helix x64
623625
- template: .azure/pipelines/jobs/default-build.yml@self
624626
parameters:
625-
jobName: Helix_x64
626-
jobDisplayName: 'Tests: Helix x64'
627+
jobName: Helix_x64_Subset_1
628+
jobDisplayName: 'Tests: Helix x64 Subset 1'
627629
agentOs: Windows
628630
timeoutInMinutes: 240
629631
steps:
@@ -634,16 +636,45 @@ extends:
634636
MSBUILDUSESERVER: "1"
635637
displayName: Build shared fx
636638
# -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
637-
- script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -noBuildRepoTasks -noBuildNative -noBuild -test
638-
-projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true
639+
- script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -all -noBuildRepoTasks -noBuildNative -noBuild -test
640+
-projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true /p:HelixSubset=1
641+
/p:CrossgenOutput=false /p:RunTemplateTests=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
642+
displayName: Run build.cmd helix target
643+
env:
644+
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
645+
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
646+
647+
artifacts:
648+
- name: Helix_Logs_Subset_1_Attempt_$(System.JobAttempt)
649+
path: artifacts/log/
650+
publishOnError: true
651+
includeForks: true
652+
653+
# Helix x64
654+
- template: .azure/pipelines/jobs/default-build.yml@self
655+
parameters:
656+
jobName: Helix_x64_Subset_2
657+
jobDisplayName: 'Tests: Helix x64 Subset 2'
658+
agentOs: Windows
659+
timeoutInMinutes: 240
660+
steps:
661+
# Build the shared framework
662+
- script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64
639663
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
664+
env:
665+
MSBUILDUSESERVER: "1"
666+
displayName: Build shared fx
667+
# -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
668+
- script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -all -noBuildRepoTasks -noBuildNative -noBuild -test
669+
-projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true /p:HelixSubset=2
670+
/p:CrossgenOutput=false /p:RunTemplateTests=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
640671
displayName: Run build.cmd helix target
641672
env:
642673
HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues
643674
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
644675

645676
artifacts:
646-
- name: Helix_Logs_Attempt_$(System.JobAttempt)
677+
- name: Helix_Logs_Subset_2_Attempt_$(System.JobAttempt)
647678
path: artifacts/log/
648679
publishOnError: true
649680
includeForks: true
@@ -745,7 +776,8 @@ extends:
745776
- Windows_Test
746777
- MacOS_Test
747778
- Linux_Test
748-
- Helix_x64
779+
- Helix_x64_Subset_1
780+
- Helix_x64_Subset_2
749781
- ${{ if eq(variables.enableSourceIndex, 'true') }}:
750782
- SourceIndexStage1
751783
- Source_Build_Managed

‎.azure/pipelines/components-e2e-tests.yml‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,24 @@ pr:
1818
include:
1919
- '*'
2020
paths:
21+
include:
22+
- eng/*
23+
- src/Components/*
24+
- src/Extensions/*
25+
- src/Framework/*
26+
- src/Hosting/*
27+
- src/Http/*
28+
- src/Middleware/HttpLogging/*
29+
- src/Middleware/HttpOverrides/*
30+
- src/Middleware/HttpsPolicy/*
31+
- src/Middleware/Localization/*
32+
- src/Middleware/Session/*
33+
- src/Middleware/StaticFiles/*
34+
- src/Middleware/WebSockets/*
35+
- src/Servers/*
36+
- src/SignalR/*
2137
exclude:
22-
- .devcontainer/*
23-
- .github/*
24-
- .vscode/*
25-
- docs/*
2638
- '**/*.md'
27-
- LICENSE.TXT
28-
- THIRD-PARTY-NOTICES.TXT
2939

3040
variables:
3141
- name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE

‎.azure/pipelines/identitymodel-helix-matrix.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ extends:
3737
compiled:
3838
enabled: false
3939
justificationForDisabling: 'This is a test-only pipeline. The same product code is already scanned in the main pipeline (aspnetcore-ci)'
40+
featureFlags:
41+
autoEnablePREfastWithNewRuleset: false
4042

4143
stages:
4244
- stage: build

‎.azure/pipelines/report-green.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# This CI job only runs on PRs where all other jobs are skipped.
2+
# This allows Build Analysis to report green. Without this, no jobs would run,
3+
# causing Build Analysis to hang indefinitely (or until someone commented "ba-g {justification}" on the PR).
4+
5+
# Only run this on PRs
6+
trigger: none
7+
# Run for all branches, only on paths that no-op other jobs
8+
pr:
9+
autoCancel: true
10+
branches:
11+
include:
12+
- '*'
13+
paths:
14+
include:
15+
- .devcontainer/*
16+
- .github/*
17+
- .vscode/*
18+
- docs/*
19+
- '**/*.md'
20+
- LICENSE.TXT
21+
- THIRD-PARTY-NOTICES.TXT
22+
23+
# ABG - Always Be Green
24+
jobs:
25+
- template: /eng/common/templates/jobs/jobs.yml
26+
parameters:
27+
enableTelemetry: true
28+
helixRepo: dotnet/aspnetcore
29+
jobs:
30+
- job: Report_Green
31+
enableSBOM: false
32+
pool:
33+
vmImage: ubuntu-22.04
34+
steps:
35+
- powershell: |
36+
exit 0
37+
displayName: Exit 0

‎.azure/pipelines/template-tests-pr.yml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# Configure which branches trigger builds
2+
# We want to run template tests on release/8.0 and later as well as on certain PRs
3+
trigger:
4+
batch: true
5+
branches:
6+
include:
7+
- main
8+
- release/*
9+
10+
# Run PR validation on branches that include Helix tests
11+
pr:
12+
autoCancel: true
13+
branches:
14+
include:
15+
- main
16+
- release/*
17+
paths:
18+
include:
19+
- src/ProjectTemplates/*
20+
- src/Components/*
21+
- src/Mvc/*
22+
23+
variables:
24+
- name: _UseHelixOpenQueues
25+
value: ${{ ne(variables['System.TeamProject'], 'internal') }}
26+
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
27+
- group: DotNet-HelixApi-Access
28+
- template: /eng/common/templates/variables/pool-providers.yml
29+
30+
jobs:
31+
- template: jobs/default-build.yml
32+
parameters:
33+
jobName: Helix_templates_x64
34+
jobDisplayName: 'Tests: Helix template tests x64'
35+
agentOs: Windows
36+
timeoutInMinutes: 180
37+
steps:
38+
- script: git submodule update --init
39+
displayName: Update submodules
40+
# Build the shared framework
41+
- script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64
42+
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /p:VsTestUseMSBuildOutput=false
43+
displayName: Build shared fx
44+
# -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
45+
- script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -all -noBuildRepoTasks -noBuildNative -noBuild -test
46+
-projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true
47+
/p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
48+
/p:VsTestUseMSBuildOutput=false /p:OnlyTestProjectTemplates=true
49+
displayName: Run build.cmd helix target
50+
env:
51+
SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
52+
artifacts:
53+
- name: Helix_logs
54+
path: artifacts/log/
55+
publishOnError: true

‎.editorconfig‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -464,12 +464,6 @@ dotnet_diagnostic.IDE0161.severity = silent
464464
# IDE0005: Remove unused usings. Ignore for shared src files since imports for those depend on the projects in which they are included.
465465
dotnet_diagnostic.IDE0005.severity = silent
466466

467-
[{**/microsoft.dotnet.hotreload.agent*/**.cs}]
468-
# IDE0005: Remove unused usings. Ignore for shared src files coming from nuget package.
469-
dotnet_diagnostic.IDE0005.severity = silent
470-
# IDE0073: A source file is missing a required header. Ignore for shared src files coming from nuget package.
471-
dotnet_diagnostic.IDE0073.severity = silent
472-
473467

474468
# Verify settings
475469
[*.{received,verified}.{txt,xml,json}]

‎.github/copilot-instructions.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,11 @@
3232
## Running tests
3333

3434
* To build and run tests in the repo, use the `build.sh` script that is located in each subdirectory within the `src` folder. For example, to run the build with tests in the `src/Http` directory, run `./src/Http/build.sh -test`.
35+
36+
## .NET Environment
37+
38+
* Before running any `dotnet` commands in this repository, always activate the locally installed .NET environment first by running the appropriate activation script from the repository root:
39+
* On Windows: `. ./activate.ps1` (from repository root)
40+
* On Linux/Mac: `source activate.sh` (from repository root)
41+
* If not in the repository root, navigate there first or use the full path to the activation script.
42+
* This ensures that the correct version of .NET SDK is used for the repository.

‎.github/policies/resourceManagement.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -441,18 +441,18 @@ configuration:
441441
branch: main
442442
then:
443443
- addMilestone:
444-
milestone: 10.0-preview7
444+
milestone: 10.0-rc1
445445
description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
446446
- if:
447447
- payloadType: Pull_Request
448448
- isAction:
449449
action: Closed
450450
- targetsBranch:
451-
branch: release/10.0-preview6
451+
branch: release/10.0-preview7
452452
then:
453453
- removeMilestone
454454
- addMilestone:
455-
milestone: 10.0-preview6
455+
milestone: 10.0-preview7
456456
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
457457
- if:
458458
- payloadType: Issues

0 commit comments

Comments
 (0)