Skip to content

Commit f1aa344

Browse files
authored
Merge branch 'main' into darc-main-d75a7637-e73b-481d-a0f6-b9a465ed1c8d
2 parents 2e56e2b + 88b5927 commit f1aa344

File tree

427 files changed

+7007
-1539
lines changed

Some content is hidden

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

427 files changed

+7007
-1539
lines changed

.azure/pipelines/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,14 @@ variables:
7979
- name: WindowsArm64InstallersLogArgs
8080
value: /bl:artifacts/log/Release/Build.Installers.Arm64.binlog
8181
- name: _InternalRuntimeDownloadArgs
82-
value: -RuntimeSourceFeed https://ci.dot.net/internal
82+
value: -RuntimeSourceFeed https://dotnetbuilds.blob.core.windows.net/internal
8383
-RuntimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
8484
/p:DotNetAssetRootAccessTokenSuffix='$(dotnetbuilds-internal-container-read-token-base64)'
8585
# The code signing doesn't use the aspnet build scripts, so the msbuild parameters have to be passed directly. This
8686
# is awkward but necessary because the eng/common/ build scripts don't add the msbuild properties automatically.
8787
- name: _InternalRuntimeDownloadCodeSignArgs
8888
value: $(_InternalRuntimeDownloadArgs)
89-
/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal
89+
/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal
9090
/p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
9191
- group: DotNet-HelixApi-Access
9292
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:

.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/policies/resourceManagement.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# Policybot docs live at https://eng.ms/docs/more/github-inside-microsoft/policies/resource-management
12
id:
23
name: GitOps.PullRequestIssueManagement
34
description: GitOps.PullRequestIssueManagement primitive
@@ -377,18 +378,18 @@ configuration:
377378
branch: main
378379
then:
379380
- addMilestone:
380-
milestone: 10.0-preview2
381+
milestone: 10.0-preview3
381382
description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
382383
- if:
383384
- payloadType: Pull_Request
384385
- isAction:
385386
action: Closed
386387
- targetsBranch:
387-
branch: release/10.0-preview1
388+
branch: release/10.0-preview2
388389
then:
389390
- removeMilestone
390391
- addMilestone:
391-
milestone: 10.0-preview1
392+
milestone: 10.0-preview2
392393
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
393394
- if:
394395
- payloadType: Issues
@@ -550,7 +551,7 @@ configuration:
550551
then:
551552
- removeMilestone
552553
- addMilestone:
553-
milestone: 9.0.3
554+
milestone: 9.0.4
554555
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0 branch'
555556
- if:
556557
- payloadType: Pull_Request
@@ -561,7 +562,7 @@ configuration:
561562
then:
562563
- removeMilestone
563564
- addMilestone:
564-
milestone: 8.0.14
565+
milestone: 8.0.15
565566
description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
566567
- if:
567568
- payloadType: Issues

0 commit comments

Comments
 (0)