Skip to content

Commit 83ff9ad

Browse files
Merge branch 'dotnet:main' into fix-29455
2 parents 6459e8c + 6d86855 commit 83ff9ad

File tree

2,947 files changed

+73796
-28595
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,947 files changed

+73796
-28595
lines changed
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
description: Branch classification configuration for repository
2+
resource: repository
3+
configuration:
4+
branchClassificationSettings:
5+
defaultClassification: nonproduction
6+
ruleset:
7+
- name: prod-branches
8+
branchNames:
9+
- main
10+
- release/*
11+
- net10.0
12+
- net9.0
13+
- inflight/current
14+
classification: production
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
2+
3+
pipelines:
4+
1095:
5+
retail:
6+
source:
7+
credscan:
8+
lastModifiedDate: 2024-11-20
9+
policheck:
10+
lastModifiedDate: 2024-11-20
11+
eslint:
12+
lastModifiedDate: 2024-11-20
13+
psscriptanalyzer:
14+
lastModifiedDate: 2024-11-20
15+
armory:
16+
lastModifiedDate: 2024-11-20
17+
binary:
18+
credscan:
19+
lastModifiedDate: 2024-11-20
20+
binskim:
21+
lastModifiedDate: 2025-02-18
22+
1445:
23+
retail:
24+
source:
25+
credscan:
26+
lastModifiedDate: 2025-04-29
27+
policheck:
28+
lastModifiedDate: 2025-04-29
29+
eslint:
30+
lastModifiedDate: 2025-04-29
31+
psscriptanalyzer:
32+
lastModifiedDate: 2025-04-29
33+
armory:
34+
lastModifiedDate: 2025-04-29

.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": "9.0.0-prerelease.25214.1",
27+
"version": "9.0.0-prerelease.25317.3",
2828
"commands": [
2929
"xharness"
3030
],

.github/CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
This project has adopted the code of conduct defined by the Contributor Covenant
44
to clarify expected behavior in our community.
55

6-
For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/about/policies/code-of-conduct).
6+
For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).

.github/CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Have a look at our [Development Guide](DEVELOPMENT.md) to learn about setting up
2222

2323
If you're looking for something to work on, please browse our [backlog](https://github.com/dotnet/maui/issues?q=is%3Aopen+is%3Aissue+milestone%3ABacklog). Any issue that is not already assigned is up for grabs.
2424

25-
Follow the style used by the [.NET Foundation](https://github.com/dotnet/runtime/blob/master/docs/coding-guidelines/coding-style.md), with two primary exceptions:
25+
Follow the style used by the [.NET Foundation](https://github.com/dotnet/runtime/blob/main/docs/coding-guidelines/coding-style.md), with two primary exceptions:
2626

2727
- We do not use the `private` keyword, as it is the default accessibility level in C#.
2828
- We use hard tabs over spaces.
@@ -55,7 +55,7 @@ If a BenchmarkDotNet test case is not possible, share before & after profiling i
5555

5656
## Proposals/Enhancements/Suggestions
5757

58-
To propose a change or new feature, open an issue using the [Feature request template](https://github.com/dotnet/maui/issues/new?assignees=&labels=proposal-open%2C+t%2Fenhancement+➕&template=feature_request.md&title=[Enhancement]+YOUR+IDEA!). You may also use the [Spec template](https://github.com/dotnet/maui/issues/new?assignees=&labels=proposal-open%2C+t%2Fenhancement+➕&template=spec.md&title=[Spec]++) if you have an idea of what the API should look like. Be sure to also browse current issues and [discussions](https://github.com/dotnet/maui/discussions) that may be related to what you have in mind.
58+
To propose a change or new feature, open an issue using the [Feature request template](https://github.com/dotnet/maui/issues/new?template=feature-request.yml). You may also use the [Spec template](https://github.com/dotnet/maui/issues/new?template=spec.yml) if you have an idea of what the API should look like. Be sure to also browse current issues and [discussions](https://github.com/dotnet/maui/discussions) that may be related to what you have in mind.
5959

6060
## Review Process
6161
All pull requests need to be reviewed and tested by at least two members of the .NET MAUI team. We do our best to review pull requests in a timely manner, but please be patient! Two reviewers will be assigned and will start the review process as soon as possible. If there are any changes requested, the contributor should make them at their earliest convenience or let the reviewers know that they are unable to make further contributions. If the pull request requires only minor changes, then someone else may pick it up and finish it. We will do our best to make sure that all credit is retained for contributors.

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 24 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,20 @@ 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+
- 10.0.0-rc.1
46+
- 10.0.0-preview.7
47+
- 10.0.0-preview.6
48+
- 10.0.0-preview.5
4549
- 10.0.0-preview.4
4650
- 10.0.0-preview.3
4751
- 10.0.0-preview.2
4852
- 10.0.0-preview.1
53+
- 9.0.110 SR11
54+
- 9.0.100 SR10
55+
- 9.0.90 SR9
56+
- 9.0.82 SR8.2
57+
- 9.0.81 SR8.1
58+
- 9.0.80 SR8
4959
- 9.0.70 SR7
5060
- 9.0.61 SR6.1
5161
- 9.0.60 SR6
@@ -67,26 +77,7 @@ body:
6777
- 9.0.0-preview.3.10457
6878
- 9.0.0-preview.2.10293
6979
- 9.0.0-preview.1.9973
70-
- 8.0.100 SR10
71-
- 8.0.93 SR9.3
72-
- 8.0.92 SR9.2
73-
- 8.0.91 SR9.1
74-
- 8.0.90 SR9
75-
- 8.0.83 SR8.3
76-
- 8.0.82 SR8.2
77-
- 8.0.80 SR8
78-
- 8.0.71 SR7.1
79-
- 8.0.70 SR7
80-
- 8.0.61 SR6.1
81-
- 8.0.60 SR6
82-
- 8.0.40 SR5
83-
- 8.0.21 SR4.1
84-
- 8.0.20 SR4
85-
- 8.0.14 SR3.1
86-
- 8.0.10 SR3
87-
- 8.0.7 SR2
88-
- 8.0.6 SR1
89-
- 8.0.3 GA
80+
- .NET 8 (Out of support, please specify exact version)
9081
- Nightly / CI build (Please specify exact version)
9182
- Unknown/Other
9283
validations:
@@ -112,47 +103,9 @@ body:
112103
options:
113104
-
114105
- Unknown/Other
115-
- 6.0
116-
- 7.0.49
117-
- 7.0.52
118-
- 7.0.58
119-
- 7.0.59
120-
- 7.0.81
121-
- 7.0.86
122-
- 7.0.92
123-
- 7.0.96
124-
- 7.0.100
125-
- 7.0.101
126-
- 8.0.0-preview.1.7762
127-
- 8.0.0-preview.2.7871
128-
- 8.0.0-preview.3.8149
129-
- 8.0.0-preview.4.8333
130-
- 8.0.0-preview.5.8529
131-
- 8.0.0-preview.6.8686
132-
- 8.0.0-preview.7.8842
133-
- 8.0.0-rc.1.9171
134-
- 8.0.0-rc.2.9373
135-
- 8.0.0-rc.2.9511
136-
- 8.0.3 GA
137-
- 8.0.6 SR1
138-
- 8.0.7 SR2
139-
- 8.0.10 SR3
140-
- 8.0.14 SR3.1
141-
- 8.0.20 SR4
142-
- 8.0.21 SR4.1
143-
- 8.0.40 SR5
144-
- 8.0.60 SR6
145-
- 8.0.61 SR6.1
146-
- 8.0.70 SR7
147-
- 8.0.71 SR7.1
148-
- 8.0.80 SR8
149-
- 8.0.82 SR8.2
150-
- 8.0.83 SR8.3
151-
- 8.0.90 SR9
152-
- 8.0.91 SR9.1
153-
- 8.0.92 SR9.2
154-
- 8.0.93 SR9.3
155-
- 8.0.100 SR10
106+
- .NET 6 (Please specify exact version)
107+
- .NET 7 (Please specify exact version)
108+
- .NET 8 (Please specify exact version)
156109
- 9.0.0-preview.1.9973
157110
- 9.0.0-preview.2.10293
158111
- 9.0.0-preview.3.10457
@@ -174,10 +127,20 @@ body:
174127
- 9.0.60 SR6
175128
- 9.0.61 SR6.1
176129
- 9.0.70 SR7
130+
- 9.0.80 SR8
131+
- 9.0.81 SR8.1
132+
- 9.0.82 SR8.2
133+
- 9.0.90 SR9
134+
- 9.0.100 SR10
135+
- 9.0.110 SR11
177136
- 10.0.0-preview.1
178137
- 10.0.0-preview.2
179138
- 10.0.0-preview.3
180139
- 10.0.0-preview.4
140+
- 10.0.0-preview.5
141+
- 10.0.0-preview.6
142+
- 10.0.0-preview.7
143+
- 10.0.0-rc.1
181144
validations:
182145
required: true
183146
- type: dropdown

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ contact_links:
33
- name: .NET MAUI Community Support
44
url: https://learn.microsoft.com/answers/topics/dotnet-maui.html
55
about: Please ask and answer questions here.
6-
- name: Bug report or feature request for Visual Studio for Windows and Mac
7-
url: https://learn.microsoft.com/visualstudio/ide/how-to-report-a-problem-with-visual-studio?view=vs-2022
6+
- name: Bug report or feature request for Visual Studio
7+
url: https://learn.microsoft.com/visualstudio/ide/how-to-report-a-problem-with-visual-studio
88
about: Use Visual Studio's Report a Problem feature for issues and suggestions with Visual Studio tooling
99
- name: Bug report or feature request for Visual Studio Code (including C# Dev Kit)
1010
url: https://github.com/microsoft/vscode-dotnettools/issues

0 commit comments

Comments
 (0)