Skip to content

Commit 2241b38

Browse files
committed
Merge remote-tracking branch 'dotnet/main' into ApiDiff
2 parents 7446164 + 98eef97 commit 2241b38

File tree

2,648 files changed

+87065
-107138
lines changed

Some content is hidden

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

2,648 files changed

+87065
-107138
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.25201.1",
6+
"version": "1.1.0-beta.25222.5",
77
"commands": [
88
"darc"
99
]

.devcontainer/devcontainer.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
]
1212
}
1313
},
14+
"features": {
15+
"ghcr.io/devcontainers/features/sshd:1": {
16+
"version": "latest"
17+
}
18+
},
1419
// Use 'postCreateCommand' to run commands after the container is created.
1520
"postCreateCommand": "bash -i ${containerWorkspaceFolder}/.devcontainer/scripts/post-creation.sh",
1621
// Add the locally installed dotnet to the path to ensure that it is activated

.editorconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ dotnet_diagnostic.SA1601.severity = none
456456
dotnet_diagnostic.SA1633.severity = none
457457

458458
# Additional rules for test source code for template engine
459-
[test/{Microsoft.TemplateEngine.*,dotnet-new.Tests}/**.cs]
459+
[test/{Microsoft.TemplateEngine.*,dotnet-new.IntegrationTests}/**.cs]
460460
# Test methods should not be skipped
461461
dotnet_diagnostic.xUnit1004.severity = warning
462462
# Elements should appear in the correct order

.github/policies/untriaged-label.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
id: untriaged
2+
name: GitOps.PullRequestIssueManagement
3+
description: Manage the 'untriaged' label on issues
4+
resource: repository
5+
6+
configuration:
7+
resourceManagementConfiguration:
8+
eventResponderTasks:
9+
- description: Add untriaged label to new/reopened issues without a milestone
10+
if:
11+
- payloadType: Issues
12+
- isOpen
13+
- not:
14+
isPartOfAnyMilestone
15+
- or:
16+
- isAction:
17+
action: Opened
18+
- isAction:
19+
action: Reopened
20+
- not:
21+
hasLabel:
22+
label: untriaged
23+
then:
24+
- addLabel:
25+
label: untriaged
26+
27+
- description: Remove untriaged label from issues when closed or added to a milestone
28+
if:
29+
- payloadType: Issues
30+
- or:
31+
- isAction:
32+
action: Closed
33+
- isPartOfAnyMilestone
34+
- hasLabel:
35+
label: untriaged
36+
then:
37+
- removeLabel:
38+
label: untriaged
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: "Labeler: Build Predictor App"
2+
3+
on:
4+
# Allow dispatching the workflow via the Actions UI
5+
workflow_dispatch:
6+
inputs:
7+
rebuild:
8+
description: "Force a rebuild of the app"
9+
type: boolean
10+
11+
jobs:
12+
build-predictor:
13+
permissions:
14+
actions: write
15+
uses: dotnet/issue-labeler/.github/workflows/build-predictor.yml@f0c098669828a134c0313adf3f58c1909e555d86 # v1.0.1
16+
with:
17+
rebuild: ${{ inputs.rebuild }}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: "Labeler: Cache Retention"
2+
3+
on:
4+
schedule:
5+
- cron: "39 3 * * *" # 3:39 every day (arbitrary time daily, modified to different values in each repository)
6+
7+
workflow_dispatch:
8+
9+
jobs:
10+
cache-retention:
11+
# Do not run the workflow on forks outside the 'dotnet' org
12+
if: ${{ github.repository_owner == 'dotnet' }}
13+
uses: dotnet/issue-labeler/.github/workflows/cache-retention.yml@f0c098669828a134c0313adf3f58c1909e555d86 # v1.0.1
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: "Labeler: Predict Issue Labels"
2+
3+
on:
4+
# Only automatically predict area labels when issues are originally opened
5+
issues:
6+
types: opened
7+
8+
# Allow dispatching the workflow via the Actions UI, specifying ranges of numbers
9+
workflow_dispatch:
10+
inputs:
11+
issue_numbers:
12+
description: "Issue Numbers (comma-separated list of ranges)"
13+
type: string
14+
model_cache_key:
15+
description: "The cache key suffix to use for loading the model"
16+
type: string
17+
required: true
18+
default: "LIVE"
19+
20+
jobs:
21+
predict-issues:
22+
# Do not run the workflow on forks outside the 'dotnet' org
23+
if: ${{ github.repository_owner == 'dotnet' && (inputs.issue_numbers || github.event.issue.number) }}
24+
permissions:
25+
issues: write
26+
uses: dotnet/issue-labeler/.github/workflows/predict-issues.yml@f0c098669828a134c0313adf3f58c1909e555d86 # v1.0.1
27+
with:
28+
model_cache_key: ${{ inputs.model_cache_key }}
29+
issue_numbers: ${{ inputs.issue_numbers || github.event.issue.number }}
30+
label_prefix: "Area-"
31+
threshold: 0.40
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: "Labeler: Predict Pull Labels"
2+
3+
on:
4+
# Per to the following documentation:
5+
# https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#pull_request_target
6+
#
7+
# The `pull_request_target` event runs in the context of the base of the pull request, rather
8+
# than in the context of the merge commit, as the `pull_request` event does. This prevents
9+
# execution of unsafe code from the head of the pull request that could alter the repository
10+
# or steal any secrets you use in your workflow. This event allows your workflow to do things
11+
# like label or comment on pull requests from forks.
12+
#
13+
# Only automatically predict area labels when pull requests are first opened
14+
pull_request_target:
15+
types: opened
16+
branches:
17+
- 'main'
18+
19+
# Allow dispatching the workflow via the Actions UI, specifying ranges of numbers
20+
workflow_dispatch:
21+
inputs:
22+
pull_numbers:
23+
description: "Pull Numbers (comma-separated list of ranges)"
24+
type: string
25+
model_cache_key:
26+
description: "The cache key suffix to use for loading the model"
27+
type: string
28+
required: true
29+
default: "LIVE"
30+
31+
jobs:
32+
predict-pulls:
33+
# Do not run the workflow on forks outside the 'dotnet' org
34+
if: ${{ github.repository_owner == 'dotnet' && (inputs.pull_numbers || github.event.number) }}
35+
permissions:
36+
pull-requests: write
37+
uses: dotnet/issue-labeler/.github/workflows/predict-pulls.yml@f0c098669828a134c0313adf3f58c1909e555d86 # v1.0.1
38+
with:
39+
model_cache_key: ${{ inputs.model_cache_key }}
40+
pull_numbers: ${{ inputs.pull_numbers || github.event.number }}
41+
label_prefix: "Area-"
42+
threshold: 0.40

.github/workflows/labeler-promote.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: "Labeler: Promote Models"
2+
3+
on:
4+
# Dispatched via the Actions UI, promotes the staged models from
5+
# a staging slot into the prediction environment
6+
workflow_dispatch:
7+
inputs:
8+
promote_issues:
9+
description: "Issues: Promote Model"
10+
type: boolean
11+
required: true
12+
promote_pulls:
13+
description: "Pulls: Promote Model"
14+
type: boolean
15+
required: true
16+
model_cache_key:
17+
description: "The cache key suffix to promote into the 'LIVE' cache"
18+
type: string
19+
required: true
20+
default: "staging"
21+
backup_cache_key:
22+
description: "The cache key suffix to use for backing up the currently promoted model"
23+
type: string
24+
default: "backup"
25+
26+
permissions:
27+
actions: write
28+
29+
jobs:
30+
labeler-promote-issues:
31+
if: ${{ inputs.promote_issues }}
32+
uses: dotnet/issue-labeler/.github/workflows/promote-issues.yml@f0c098669828a134c0313adf3f58c1909e555d86 # v1.0.1
33+
with:
34+
model_cache_key: ${{ inputs.model_cache_key }}
35+
backup_cache_key: ${{ inputs.backup_cache_key }}
36+
37+
labeler-promote-pulls:
38+
if: ${{ inputs.promote_pulls }}
39+
uses: dotnet/issue-labeler/.github/workflows/promote-pulls.yml@f0c098669828a134c0313adf3f58c1909e555d86 # v1.0.1
40+
with:
41+
model_cache_key: ${{ inputs.model_cache_key }}
42+
backup_cache_key: ${{ inputs.backup_cache_key }}

.github/workflows/labeler-train.yml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
name: "Labeler: Train Models"
2+
3+
on:
4+
# Dispatched via the Actions UI, stages new models for promotion consideration
5+
# Each step of the workflow can be run independently: Download, Train, and Test
6+
workflow_dispatch:
7+
inputs:
8+
download_issues:
9+
description: "Issues: Download Data"
10+
type: boolean
11+
default: true
12+
train_issues:
13+
description: "Issues: Train Model"
14+
type: boolean
15+
default: true
16+
test_issues:
17+
description: "Issues: Test Model"
18+
type: boolean
19+
default: true
20+
download_pulls:
21+
description: "Pulls: Download Data"
22+
type: boolean
23+
default: true
24+
train_pulls:
25+
description: "Pulls: Train Model"
26+
type: boolean
27+
default: true
28+
test_pulls:
29+
description: "Pulls: Test Model"
30+
type: boolean
31+
default: true
32+
33+
data_limit:
34+
description: "Max number of items to include in the model"
35+
type: number
36+
37+
cache_key_suffix:
38+
description: "The cache key suffix to use for staging data/models (use 'LIVE' to bypass staging)"
39+
type: string
40+
required: true
41+
default: "staging"
42+
43+
jobs:
44+
labeler-train:
45+
permissions:
46+
issues: read
47+
pull-requests: read
48+
actions: write
49+
uses: dotnet/issue-labeler/.github/workflows/train.yml@f0c098669828a134c0313adf3f58c1909e555d86 # v1.0.1
50+
with:
51+
download_issues: ${{ inputs.download_issues }}
52+
train_issues: ${{ inputs.train_issues }}
53+
test_issues: ${{ inputs.test_issues }}
54+
download_pulls: ${{ inputs.download_pulls }}
55+
train_pulls: ${{ inputs.train_pulls }}
56+
test_pulls: ${{ inputs.test_pulls }}
57+
data_limit: ${{ inputs.data_limit && fromJSON(inputs.data_limit) || 0 }}
58+
cache_key_suffix: ${{ inputs.cache_key_suffix }}
59+
label_prefix: "Area-"
60+
threshold: 0.40

0 commit comments

Comments
 (0)