Skip to content

Commit 3959238

Browse files
committed
Merge remote-tracking branch 'upstream/main' into BlazorAutoCheck
2 parents f4f8240 + 754e56e commit 3959238

File tree

98 files changed

+3187
-1148
lines changed

Some content is hidden

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

98 files changed

+3187
-1148
lines changed

.azure/pipelines/ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,7 @@ extends:
540540
jobDisplayName: "Test: Windows Server x64"
541541
agentOs: Windows
542542
isAzDOTestingJob: true
543+
continueOnError: true
543544
# Just uploading artifacts/logs/ files can take 15 minutes. Doubling the cancel timeout for this job.
544545
cancelTimeoutInMinutes: 30
545546
buildArgs: -all -pack -test -binaryLog /p:SkipHelixReadyTests=true /p:SkipIISNewHandlerTests=true /p:SkipIISTests=true
@@ -748,4 +749,4 @@ extends:
748749
enableSigningValidation: false
749750
enableNugetValidation: false
750751
publishInstallersAndChecksums: true
751-
publishAssetsImmediately: true
752+
publishAssetsImmediately: true

.azure/pipelines/jobs/default-build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ parameters:
6262
isAzDOTestingJob: false
6363
enablePublishTestResults: ''
6464
enableSbom: true
65+
continueOnError: false
6566
variables: []
6667

6768
configuration: 'Release'
@@ -207,13 +208,15 @@ jobs:
207208
- script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -Configuration $(BuildConfiguration) $(BuildScriptArgs)
208209
/p:DotNetSignType=$(_SignType)
209210
displayName: Run build.cmd
211+
continueOnError: ${{ parameters.continueOnError }}
210212
env:
211213
COMPlus_DbgEnableMiniDump: 1
212214
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
213215
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
214216
- ${{ if ne(parameters.agentOs, 'Windows') }}:
215217
- script: $(BuildDirectory)/build.sh --ci --configuration $(BuildConfiguration) $(BuildScriptArgs)
216218
displayName: Run build.sh
219+
continueOnError: ${{ parameters.continueOnError }}
217220
env:
218221
COMPlus_DbgEnableMiniDump: 1
219222
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
@@ -443,13 +446,15 @@ jobs:
443446
- script: $(BuildDirectory)\build.cmd -ci -prepareMachine -nativeToolsOnMachine -Configuration $(BuildConfiguration) $(BuildScriptArgs)
444447
/p:DotNetSignType=$(_SignType)
445448
displayName: Run build.cmd
449+
continueOnError: ${{ parameters.continueOnError }}
446450
env:
447451
COMPlus_DbgEnableMiniDump: 1
448452
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"
449453
DotNetBuildsInternalReadSasToken: $(dotnetbuilds-internal-container-read-token)
450454
- ${{ if ne(parameters.agentOs, 'Windows') }}:
451455
- script: $(BuildDirectory)/build.sh --ci --configuration $(BuildConfiguration) $(BuildScriptArgs)
452456
displayName: Run build.sh
457+
continueOnError: ${{ parameters.continueOnError }}
453458
env:
454459
COMPlus_DbgEnableMiniDump: 1
455460
COMPlus_DbgMiniDumpName: "$(System.DefaultWorkingDirectory)/dotnet-%d.%t.core"

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
/eng/ @dotnet/aspnet-build @wtgodbe
1515
/eng/Versions.props @dotnet/aspnet-build @wtgodbe
1616
/eng/Version.Details.xml @dotnet/aspnet-build @wtgodbe
17-
/eng/SourceBuild* @dotnet/source-build
1817
/src/Caching/ @captainsafia @halter73 @mgravell
1918
/src/Components/ @dotnet/aspnet-blazor-eng
2019
/src/DefaultBuilder/ @halter73

.github/policies/resourceManagement.yml

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -232,9 +232,13 @@ configuration:
232232
- isActivitySender:
233233
user: dotnet-maestro[bot]
234234
issueAuthor: False
235-
- titleContains:
236-
pattern: Update dependencies
237-
isRegex: False
235+
- or:
236+
- titleContains:
237+
pattern: Update dependencies
238+
isRegex: False
239+
- titleContains:
240+
pattern: Source code updates
241+
isRegex: False
238242
- targetsBranch:
239243
branch: main
240244
then:
@@ -642,13 +646,36 @@ configuration:
642646
- titleContains:
643647
pattern: Update .NET SDK
644648
isRegex: False
649+
- targetsBranch:
650+
branch: main
645651
then:
646652
- addLabel:
647653
label: area-infrastructure
648654
- addLabel:
649655
label: 'Type: Dependency Update :arrow_up_small:'
650656
- approvePullRequest:
651657
comment: Auto-approving SDK update.
652-
description: '[Infrastructure PRs] Add area-infrastructure label to SDK update Pull Requests'
658+
- enableAutoMerge:
659+
mergeMethod: "squash"
660+
description: '[Infrastructure PRs] Add area-infrastructure label to SDK update Pull Requests & enable auto-merge'
661+
- if:
662+
- payloadType: Pull_Request
663+
- isAction:
664+
action: Opened
665+
- isActivitySender:
666+
user: dependabot[bot]
667+
issueAuthor: False
668+
- targetsBranch:
669+
branch: main
670+
then:
671+
- addLabel:
672+
label: area-infrastructure
673+
- addLabel:
674+
label: 'Type: Dependency Update :arrow_up_small:'
675+
- approvePullRequest:
676+
comment: Auto-approving dependabot update.
677+
- enableAutoMerge:
678+
mergeMethod: "squash"
679+
description: '[Infrastructure PRs] Add area-infrastructure label to dependabot update Pull Requests & enable auto-merge'
653680
onFailure:
654681
onSuccess:

.github/workflows/backport.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ permissions:
1414

1515
jobs:
1616
backport:
17-
uses: dotnet/arcade/.github/workflows/backport-base.yml@e80f44b15b3050d868dc8fb58d0fa514ca8c7451 # 2025-01-13
17+
uses: dotnet/arcade/.github/workflows/backport-base.yml@11c848003df85813f4821fec2d43290fd4ca8594 # 2025-01-13
1818
with:
1919
pr_description_template: |
2020
Backport of #%source_pr_number% to %target_branch%

.github/workflows/inter-branch-merge-flow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ permissions:
1010

1111
jobs:
1212
Merge:
13-
uses: dotnet/arcade/.github/workflows/backport-base.yml@e80f44b15b3050d868dc8fb58d0fa514ca8c7451 # 2024-06-24
13+
uses: dotnet/arcade/.github/workflows/backport-base.yml@11c848003df85813f4821fec2d43290fd4ca8594 # 2024-06-24
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
# Workflow template imported and updated from:
2+
# https://github.com/dotnet/issue-labeler/wiki/Onboarding
3+
#
4+
# See labeler.md for more information
5+
#
6+
# Regularly restore the prediction models from cache to prevent cache eviction
7+
name: "Labeler: Cache Retention"
8+
9+
# For more information about GitHub's action cache limits and eviction policy, see:
10+
# https://docs.github.com/actions/writing-workflows/choosing-what-your-workflow-does/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy
11+
12+
on:
13+
schedule:
14+
- cron: "32 16 * * *" # 16:32 every day (arbitrary time daily)
15+
16+
workflow_dispatch:
17+
inputs:
18+
cache_key:
19+
description: "The cache key suffix to use for restoring the model from cache. Defaults to 'ACTIVE'."
20+
required: true
21+
default: "ACTIVE"
22+
23+
env:
24+
CACHE_KEY: ${{ inputs.cache_key || 'ACTIVE' }}
25+
26+
jobs:
27+
restore-cache:
28+
# Do not automatically run the workflow on forks outside the 'dotnet' org
29+
if: ${{ github.event_name == 'workflow_dispatch' || github.repository_owner == 'dotnet' }}
30+
runs-on: ubuntu-latest
31+
strategy:
32+
fail-fast: false
33+
matrix:
34+
type: ["issues", "pulls"]
35+
steps:
36+
- uses: dotnet/issue-labeler/restore@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
37+
with:
38+
type: ${{ matrix.type }}
39+
cache_key: ${{ env.CACHE_KEY }}
40+
fail-on-cache-miss: true
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# Workflow template imported and updated from:
2+
# https://github.com/dotnet/issue-labeler/wiki/Onboarding
3+
#
4+
# See labeler.md for more information
5+
#
6+
# Predict labels for Issues using a trained model
7+
name: "Labeler: Predict (Issues)"
8+
9+
on:
10+
# Only automatically predict area labels when issues are first opened
11+
issues:
12+
types: opened
13+
14+
# Allow dispatching the workflow via the Actions UI, specifying ranges of numbers
15+
workflow_dispatch:
16+
inputs:
17+
issues:
18+
description: "Issue Numbers (comma-separated list of ranges)."
19+
required: true
20+
cache_key:
21+
description: "The cache key suffix to use for restoring the model. Defaults to 'ACTIVE'."
22+
required: true
23+
default: "ACTIVE"
24+
25+
env:
26+
# Do not allow failure for jobs triggered automatically (as this causes red noise on the workflows list)
27+
ALLOW_FAILURE: ${{ github.event_name == 'workflow_dispatch' }}
28+
29+
LABEL_PREFIX: "area-"
30+
THRESHOLD: 0.40
31+
DEFAULT_LABEL: "needs-area-label"
32+
33+
jobs:
34+
predict-issue-label:
35+
# Do not automatically run the workflow on forks outside the 'dotnet' org
36+
if: ${{ github.event_name == 'workflow_dispatch' || github.repository_owner == 'dotnet' }}
37+
runs-on: ubuntu-latest
38+
permissions:
39+
issues: write
40+
steps:
41+
- name: "Restore issues model from cache"
42+
id: restore-model
43+
uses: dotnet/issue-labeler/restore@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
44+
with:
45+
type: issues
46+
fail-on-cache-miss: ${{ env.ALLOW_FAILURE }}
47+
quiet: true
48+
49+
- name: "Predict issue labels"
50+
id: prediction
51+
if: ${{ steps.restore-model.outputs.cache-hit == 'true' }}
52+
uses: dotnet/issue-labeler/predict@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
53+
with:
54+
issues: ${{ inputs.issues || github.event.issue.number }}
55+
label_prefix: ${{ env.LABEL_PREFIX }}
56+
threshold: ${{ env.THRESHOLD }}
57+
default_label: ${{ env.DEFAULT_LABEL }}
58+
env:
59+
GITHUB_TOKEN: ${{ github.token }}
60+
continue-on-error: ${{ !env.ALLOW_FAILURE }}
Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
# Workflow template imported and updated from:
2+
# https://github.com/dotnet/issue-labeler/wiki/Onboarding
3+
#
4+
# See labeler.md for more information
5+
#
6+
# Predict labels for Pull Requests using a trained model
7+
name: "Labeler: Predict (Pulls)"
8+
9+
on:
10+
# Per to the following documentation:
11+
# https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request_target
12+
#
13+
# The `pull_request_target` event runs in the context of the base of the pull request, rather
14+
# than in the context of the merge commit, as the `pull_request` event does. This prevents
15+
# execution of unsafe code from the head of the pull request that could alter the repository
16+
# or steal any secrets you use in your workflow. This event allows your workflow to do things
17+
# like label or comment on pull requests from forks.
18+
#
19+
# Only automatically predict area labels when pull requests are first opened
20+
pull_request_target:
21+
types: opened
22+
23+
# Configure the branches that need to have PRs labeled
24+
branches:
25+
- main
26+
27+
# Allow dispatching the workflow via the Actions UI, specifying ranges of numbers
28+
workflow_dispatch:
29+
inputs:
30+
pulls:
31+
description: "Pull Request Numbers (comma-separated list of ranges)."
32+
required: true
33+
cache_key:
34+
description: "The cache key suffix to use for restoring the model. Defaults to 'ACTIVE'."
35+
required: true
36+
default: "ACTIVE"
37+
38+
env:
39+
# Do not allow failure for jobs triggered automatically (this can block PR merge)
40+
ALLOW_FAILURE: ${{ github.event_name == 'workflow_dispatch' }}
41+
42+
LABEL_PREFIX: "area-"
43+
THRESHOLD: 0.40
44+
DEFAULT_LABEL: "needs-area-label"
45+
46+
jobs:
47+
predict-pull-label:
48+
# Do not automatically run the workflow on forks outside the 'dotnet' org
49+
if: ${{ github.event_name == 'workflow_dispatch' || github.repository_owner == 'dotnet' }}
50+
runs-on: ubuntu-latest
51+
permissions:
52+
pull-requests: write
53+
steps:
54+
- name: "Restore pulls model from cache"
55+
id: restore-model
56+
uses: dotnet/issue-labeler/restore@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
57+
with:
58+
type: pulls
59+
fail-on-cache-miss: ${{ env.ALLOW_FAILURE }}
60+
quiet: true
61+
62+
- name: "Predict pull labels"
63+
id: prediction
64+
if: ${{ steps.restore-model.outputs.cache-hit == 'true' }}
65+
uses: dotnet/issue-labeler/predict@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
66+
with:
67+
pulls: ${{ inputs.pulls || github.event.number }}
68+
label_prefix: ${{ env.LABEL_PREFIX }}
69+
threshold: ${{ env.THRESHOLD }}
70+
default_label: ${{ env.DEFAULT_LABEL }}
71+
env:
72+
GITHUB_TOKEN: ${{ github.token }}
73+
continue-on-error: ${{ !env.ALLOW_FAILURE }}
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# Workflow template imported and updated from:
2+
# https://github.com/dotnet/issue-labeler/wiki/Onboarding
3+
#
4+
# See labeler.md for more information
5+
#
6+
# Promote a model from staging to 'ACTIVE', backing up the currently 'ACTIVE' model
7+
name: "Labeler: Promotion"
8+
9+
on:
10+
# Dispatched via the Actions UI, promotes the staged models from
11+
# a staged slot into the prediction environment
12+
workflow_dispatch:
13+
inputs:
14+
issues:
15+
description: "Issues: Promote Model"
16+
type: boolean
17+
required: true
18+
pulls:
19+
description: "Pulls: Promote Model"
20+
type: boolean
21+
required: true
22+
staged_key:
23+
description: "The cache key suffix to use for promoting a staged model to 'ACTIVE'. Defaults to 'staged'."
24+
required: true
25+
default: "staged"
26+
backup_key:
27+
description: "The cache key suffix to use for backing up the currently active model. Defaults to 'backup'."
28+
default: "backup"
29+
30+
permissions:
31+
actions: write
32+
33+
jobs:
34+
promote-issues:
35+
if: ${{ inputs.issues }}
36+
runs-on: ubuntu-latest
37+
steps:
38+
- name: "Promote Model for Issues"
39+
uses: dotnet/issue-labeler/promote@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
40+
with:
41+
type: "issues"
42+
staged_key: ${{ inputs.staged_key }}
43+
backup_key: ${{ inputs.backup_key }}
44+
45+
promote-pulls:
46+
if: ${{ inputs.pulls }}
47+
runs-on: ubuntu-latest
48+
steps:
49+
- name: "Promote Model for Pull Requests"
50+
uses: dotnet/issue-labeler/promote@46125e85e6a568dc712f358c39f35317366f5eed # v2.0.0
51+
with:
52+
type: "pulls"
53+
staged_key: ${{ inputs.staged_key }}
54+
backup_key: ${{ inputs.backup_key }}

0 commit comments

Comments
 (0)