Skip to content

Commit 22224dc

Browse files
DeagleGrossDeagleGross
committed
merge main
2 parents 6f035d4 + 3b261f8 commit 22224dc

File tree

348 files changed

+17197
-2335
lines changed

Some content is hidden

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

348 files changed

+17197
-2335
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,7 @@ stages:
392392
jobName: Linux_musl_x64_build
393393
jobDisplayName: "Build: Linux Musl x64"
394394
agentOs: Linux
395-
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
396396
buildArgs:
397397
--arch x64
398398
--os-name linux-musl
@@ -426,7 +426,7 @@ stages:
426426
jobDisplayName: "Build: Linux Musl ARM"
427427
agentOs: Linux
428428
useHostedUbuntu: false
429-
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
430430
buildArgs:
431431
--arch arm
432432
--os-name linux-musl
@@ -459,7 +459,7 @@ stages:
459459
jobDisplayName: "Build: Linux Musl ARM64"
460460
agentOs: Linux
461461
useHostedUbuntu: false
462-
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
463463
buildArgs:
464464
--arch arm64
465465
--os-name linux-musl
@@ -629,7 +629,7 @@ stages:
629629
parameters:
630630
platform:
631631
name: 'Managed'
632-
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8'
632+
container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64'
633633
buildScript: './eng/build.sh --publish --no-build-repo-tasks $(_PublishArgs) $(_InternalRuntimeDownloadArgs)'
634634
skipPublishValidation: true
635635
jobProperties:

‎.azure/pipelines/ci.yml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,8 @@ extends:
125125
tsa:
126126
enabled: true
127127
containers:
128-
alpine319WithNode:
129-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
130-
mariner20CrossArmAlpine:
131-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
132-
mariner20CrossArm64Alpine:
133-
image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
128+
azureLinux30Net10BuildAmd64:
129+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-net10.0-build-amd64
134130
stages:
135131
- stage: build
136132
displayName: Build
@@ -445,7 +441,7 @@ extends:
445441
jobName: Linux_musl_x64_build
446442
jobDisplayName: "Build: Linux Musl x64"
447443
agentOs: Linux
448-
container: alpine319WithNode
444+
container: azureLinux30Net10BuildAmd64
449445
buildArgs:
450446
--arch x64
451447
--os-name linux-musl
@@ -479,7 +475,7 @@ extends:
479475
jobDisplayName: "Build: Linux Musl ARM"
480476
agentOs: Linux
481477
useHostedUbuntu: false
482-
container: mariner20CrossArmAlpine
478+
container: azureLinux30Net10BuildAmd64
483479
buildArgs:
484480
--arch arm
485481
--os-name linux-musl
@@ -512,7 +508,7 @@ extends:
512508
jobDisplayName: "Build: Linux Musl ARM64"
513509
agentOs: Linux
514510
useHostedUbuntu: false
515-
container: mariner20CrossArm64Alpine
511+
container: azureLinux30Net10BuildAmd64
516512
buildArgs:
517513
--arch arm64
518514
--os-name linux-musl

‎.azure/pipelines/localization.yml‎

Lines changed: 39 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,42 @@ parameters:
2525
variables:
2626
- name: _TeamName
2727
value: AspNetCore
28-
- template: /eng/common/templates/variables/pool-providers.yml
29-
30-
jobs:
31-
- ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.Reason'], 'Manual'))) }}:
32-
- template: /eng/common/templates/job/onelocbuild.yml
33-
parameters:
34-
CreatePr: ${{ or(ne(variables['Build.Reason'], 'Manual'), eq(parameters.createPr, 'true')) }}
35-
LclPackageId: 'LCL-JUNO-PROD-ASPNETCORE'
36-
LclSource: lclFilesFromPackage
37-
MirrorRepo: aspnetcore
28+
- template: /eng/common/templates-official/variables/pool-providers.yml@self
29+
30+
31+
resources:
32+
repositories:
33+
# Repo: 1ESPipelineTemplates/1ESPipelineTemplates
34+
- repository: 1esPipelines
35+
type: git
36+
name: 1ESPipelineTemplates/1ESPipelineTemplates
37+
ref: refs/tags/release
38+
39+
extends:
40+
template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
41+
parameters:
42+
sdl:
43+
sourceAnalysisPool:
44+
name: $(DncEngInternalBuildPool)
45+
image: 1es-windows-2022
46+
os: windows
47+
codeql:
48+
compiled:
49+
enabled: false
50+
justificationForDisabling: "This pipeline doesn't build any code. The product code is already scanned in the main pipeline (aspnetcore-ci)"
51+
pool:
52+
name: $(DncEngInternalBuildPool)
53+
image: 1es-windows-2022
54+
os: windows
55+
56+
stages:
57+
- stage: build
58+
displayName: Build
59+
jobs:
60+
- ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.Reason'], 'Manual'))) }}:
61+
- template: /eng/common/templates-official/job/onelocbuild.yml@self
62+
parameters:
63+
CreatePr: ${{ or(ne(variables['Build.Reason'], 'Manual'), eq(parameters.createPr, 'true')) }}
64+
LclPackageId: 'LCL-JUNO-PROD-ASPNETCORE'
65+
LclSource: lclFilesFromPackage
66+
MirrorRepo: aspnetcore

‎.github/CODEOWNERS‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Users referenced in this file will automatically be requested as reviewers for PRs that modify the given paths.
22
# See https://help.github.com/articles/about-code-owners/
33

4-
/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review
54
/global.json @dotnet/aspnet-build @wtgodbe
65
/.azure/ @dotnet/aspnet-build @wtgodbe
76
/.azuredevops/ @dotnet/aspnet-build @wtgodbe
@@ -13,39 +12,27 @@
1312
/.github/workflows/ @dotnet/aspnet-build @wtgodbe
1413
/docs/ @captainsafia @mkArtakMSFT
1514
/eng/ @dotnet/aspnet-build @wtgodbe
16-
/eng/common/ @dotnet-maestro-bot
17-
/eng/Versions.props @dotnet-maestro-bot @dotnet/aspnet-build @wtgodbe
18-
/eng/Version.Details.xml @dotnet-maestro-bot @dotnet/aspnet-build @wtgodbe
15+
/eng/Versions.props @dotnet/aspnet-build @wtgodbe
16+
/eng/Version.Details.xml @dotnet/aspnet-build @wtgodbe
1917
/eng/SourceBuild* @dotnet/source-build
2018
/src/Caching/ @captainsafia @halter73 @mgravell
21-
/src/Caching/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @captainsafia @halter73 @mgravell
2219
/src/Components/ @dotnet/aspnet-blazor-eng
23-
/src/Components/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @dotnet/aspnet-blazor-eng
2420
/src/DefaultBuilder/ @halter73
25-
/src/DefaultBuilder/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review
2621
/src/Grpc/ @JamesNK @captainsafia @mgravell
27-
/src/Grpc/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @JamesNK @captainsafia @mgravell
2822
/src/Hosting/ @halter73
29-
/src/Hosting/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review
3023
/src/Http/ @BrennanConroy @halter73 @captainsafia
31-
/src/Http/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @BrennanConroy
3224
/src/Http/Routing/ @halter73
33-
/src/Http/Routing/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @halter73
3425
/src/HttpClientFactory/ @captainsafia @halter73
35-
/src/HttpClientFactory/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @captainsafia @halter73
3626
/src/Installers/ @dotnet/aspnet-build @wtgodbe
3727
/src/JSInterop/ @dotnet/aspnet-blazor-eng
3828
/src/Middleware/ @BrennanConroy
39-
/src/Middleware/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @BrennanConroy
4029
/src/Mvc/ @dotnet/minimal-apis
41-
/src/Mvc/Mvc.ApiExplorer @captainsafia @halter73 @brunolins16
42-
/src/Mvc/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @dotnet/aspnet-blazor-eng
30+
/src/Mvc/Mvc.ApiExplorer @captainsafia @halter73
4331
/src/OpenApi @captainsafia @dotnet/minimal-apis
4432
/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/ @dotnet/aspnet-blazor-eng
4533
/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/ @dotnet/aspnet-blazor-eng
46-
/src/Security/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review
34+
/src/Security/ @halter73
4735
/src/Servers/ @halter73 @BrennanConroy @JamesNK @mgravell
48-
/src/Servers/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @halter73 @BrennanConroy @JamesNK @mgravell
4936
/src/SignalR/ @BrennanConroy @halter73
50-
/src/SignalR/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @BrennanConroy @halter73
5137
/src/submodules @dotnet/aspnet-build @wtgodbe
38+
/**/PublicAPI.*Shipped.txt @dotnet/aspnet-api-review @Rick-Anderson @tdykstra

‎.github/policies/resourceManagement.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -377,18 +377,18 @@ configuration:
377377
branch: main
378378
then:
379379
- addMilestone:
380-
milestone: 10.0-preview2
380+
milestone: 10.0-preview3
381381
description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
382382
- if:
383383
- payloadType: Pull_Request
384384
- isAction:
385385
action: Closed
386386
- targetsBranch:
387-
branch: release/10.0-preview1
387+
branch: release/10.0-preview2
388388
then:
389389
- removeMilestone
390390
- addMilestone:
391-
milestone: 10.0-preview1
391+
milestone: 10.0-preview2
392392
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
393393
- if:
394394
- payloadType: Issues
@@ -550,7 +550,7 @@ configuration:
550550
then:
551551
- removeMilestone
552552
- addMilestone:
553-
milestone: 9.0.2
553+
milestone: 9.0.3
554554
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
555555
- if:
556556
- payloadType: Pull_Request
@@ -561,7 +561,7 @@ configuration:
561561
then:
562562
- removeMilestone
563563
- addMilestone:
564-
milestone: 8.0.13
564+
milestone: 8.0.14
565565
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
566566
- if:
567567
- payloadType: Issues

‎.github/workflows/update-selenium-and-playwright-dependencies.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ permissions:
1111
pull-requests: write
1212

1313
jobs:
14-
update-jquery-validate:
14+
update-selenium-and-playwright:
1515
runs-on: ubuntu-latest
1616

1717
steps:

0 commit comments

Comments
 (0)