Skip to content

Commit 8b16da7

Browse files
praveenkumarkarunanithipraveenkumarkarunanithi
committed
Merge remote-tracking branch 'upstream/main' into fix-32995
2 parents 37e6cea + 43db9d7 commit 8b16da7

File tree

511 files changed

+28667
-1775
lines changed

Some content is hidden

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

511 files changed

+28667
-1775
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"rollForward": false
2525
},
2626
"microsoft.dotnet.xharness.cli": {
27-
"version": "11.0.0-prerelease.26064.3",
27+
"version": "11.0.0-prerelease.26107.1",
2828
"commands": [
2929
"xharness"
3030
],

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@
1818

1919
# avoid overriding GitInfo.txt on merge
2020
GitInfo.txt merge=ours
21+
22+
.github/workflows/*.lock.yml linguist-generated=true merge=ours

‎.github/ISSUE_TEMPLATE/bug-report.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ body:
4242
label: Version with bug
4343
description: In what version do you see this issue? Run `dotnet workload list` to find your version.
4444
options:
45+
- 11.0.0-preview.1
46+
- 10.0.40
4547
- 10.0.30
4648
- 10.0.20
4749
- 10.0.11
@@ -159,6 +161,8 @@ body:
159161
- 10.0.11
160162
- 10.0.20
161163
- 10.0.30
164+
- 10.0.40
165+
- 11.0.0-preview.1
162166
validations:
163167
required: true
164168
- type: dropdown

‎.github/agent-pr-session/pr-32289.md‎

Lines changed: 0 additions & 202 deletions
This file was deleted.

0 commit comments

Comments
 (0)