Skip to content

Commit 926acb1

Browse files
kubaflokubaflo
authored
Merge branch 'main' into issue28656
2 parents 9c4591b + 2f22928 commit 926acb1

12,394 files changed

Lines changed: 344013 additions & 156596 deletions

File tree

Some content is hidden

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

‎.azuredevops/dependabot.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
version: 2
2+
3+
# Disabling dependabot on Azure DevOps as this is a mirrored repo. Updates should go through github.
4+
enable-campaigned-updates: false
5+
enable-security-updates: false

‎.azuredevops/policies/branchClassification.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
description: Branch classification configuration for repository
2+
resource: repository
3+
disabled: false
4+
configuration:
5+
branchClassificationSettings:
6+
defaultClassification: nonproduction
7+
ruleset:
8+
- name: prod-branches
9+
branchNames:
10+
- main
11+
- release/*
12+
- internal/release/*
13+
- net10.0
14+
- net9.0
15+
- inflight/current
16+
classification: production

‎.config/1espt/PipelineAutobaseliningConfig.yml‎

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.25167.9",
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/CODEOWNERS‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1 @@
11
* @dotnet/dotnet-maui-reviewers
2-
3-
# Blazor Desktop
4-
/src/BlazorWebView/ @dotnet/dotnet-maui-blazor-eng
5-
/src/Templates/src/templates/maui-blazor/ @dotnet/dotnet-maui-blazor-eng
6-
/src/Templates/src/templates/maui-blazor-solution/ @dotnet/dotnet-maui-blazor-eng
7-
8-
# Localization
9-
/eng/automation/LocProject.json @tj-devel709
10-
**/localize/*.json @tj-devel709
11-
**/*.resx @tj-devel709
12-
**.*.resx.lcl @tj-devel709

‎.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: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ First and foremost: if you are thinking about contributing a bigger change or fe
66

77
## Code of Conduct
88

9-
Please see our [Code of Conduct](CODE_OF_CONDUCT.md).
9+
Please see our [Code of Conduct](/.github/CODE_OF_CONDUCT.md).
1010

1111
## Prerequisite
1212

@@ -16,22 +16,22 @@ You will need to complete a Contribution License Agreement before any pull reque
1616

1717
Currently, we are in the beginning phases of building up MAUI. Yet, we are still very excited for you to join us during this exciting time :)
1818

19-
Have a look at our [Development Guide](DEVELOPMENT.md) to learn about setting up your development environment.
19+
Have a look at our [Development Guide](/.github/DEVELOPMENT.md) to learn about setting up your development environment.
2020

2121
### What to work on
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.
2929

30-
Read and follow our [Pull Request template](PULL_REQUEST_TEMPLATE.md).
30+
Read and follow our [Pull Request template](/.github/PULL_REQUEST_TEMPLATE.md).
3131

3232
### Pull Request Requirements
3333

34-
Please refer to our [Pull Request template](PULL_REQUEST_TEMPLATE.md).
34+
Please refer to our [Pull Request template](/.github/PULL_REQUEST_TEMPLATE.md).
3535

3636
Please check the "Allow edits from maintainers" checkbox on your pull request. This allows us to quickly make minor fixes and resolve conflicts for you.
3737

@@ -45,7 +45,7 @@ See [our profiling wiki](https://aka.ms/profile-maui) for instructions on how to
4545

4646
2. **Benchmark your change**: If you're making a performance-related change, please include benchmarks in your pull request. This will help us understand the impact of your change, and will help us avoid performance regressions in the future.
4747

48-
Provide before & after numbers using BenchmarkDotNet where possible. See our existing [BenchmarkDotNet project](../src/Core/tests/Benchmarks/) for examples.
48+
Provide before & after numbers using BenchmarkDotNet where possible. See our existing [BenchmarkDotNet project](/src/Core/tests/Benchmarks/) for examples.
4949

5050
If a BenchmarkDotNet test case is not possible, share before & after profiling information from Visual Studio, `dotnet-trace`, etc. Keep in mind that sampling profilers can be inaccurate, so someone from the .NET MAUI team may need to reproduce your results before merging your change.
5151

@@ -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/DEVELOPMENT.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,18 @@ Use ‘main’ for bug fixes that don’t require API changes. For new features
7474
7575
- [Testing Wiki](https://github.com/dotnet/maui/wiki/Testing)
7676
77+
## Generating PublicAPI Files
78+
79+
If you've added new public APIs and are getting build errors about missing API declarations, you'll need to update the PublicAPI files. You can generate the PublicAPI files manually by building a project with the `PublicApiType=Generate` property:
80+
81+
```dotnetcli
82+
dotnet build ./src/Controls/src/Core/Controls.Core.csproj /p:PublicApiType=Generate
83+
```
84+
85+
This approach will generate the `PublicAPI.Unshipped.txt` files for that specific project. You may need to run this for each project that has new public APIs.
86+
87+
**Note:** If you're still having troubles with PublicAPI errors, you can delete all the content in the relevant `PublicAPI.Unshipped.txt` files and then run the command above to regenerate them completely.
88+
7789

7890
## Stats
7991

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

Lines changed: 58 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,34 @@ 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
47+
- 10.0.30
48+
- 10.0.20
49+
- 10.0.11
50+
- 10.0.10
51+
- 10.0.1
52+
- 10.0.0
53+
- 10.0.0-rc.2
54+
- 10.0.0-rc.1
55+
- 10.0.0-preview.7
56+
- 10.0.0-preview.6
57+
- 10.0.0-preview.5
58+
- 10.0.0-preview.4
59+
- 10.0.0-preview.3
60+
- 10.0.0-preview.2
4561
- 10.0.0-preview.1
62+
- 9.0.110 SR12
63+
- 9.0.111 SR11.1
64+
- 9.0.110 SR11
65+
- 9.0.100 SR10
66+
- 9.0.90 SR9
67+
- 9.0.82 SR8.2
68+
- 9.0.81 SR8.1
69+
- 9.0.80 SR8
70+
- 9.0.70 SR7
71+
- 9.0.61 SR6.1
72+
- 9.0.60 SR6
4673
- 9.0.50 SR5
4774
- 9.0.40 SR4
4875
- 9.0.30 SR3
@@ -61,26 +88,7 @@ body:
6188
- 9.0.0-preview.3.10457
6289
- 9.0.0-preview.2.10293
6390
- 9.0.0-preview.1.9973
64-
- 8.0.100 SR10
65-
- 8.0.93 SR9.3
66-
- 8.0.92 SR9.2
67-
- 8.0.91 SR9.1
68-
- 8.0.90 SR9
69-
- 8.0.83 SR8.3
70-
- 8.0.82 SR8.2
71-
- 8.0.80 SR8
72-
- 8.0.71 SR7.1
73-
- 8.0.70 SR7
74-
- 8.0.61 SR6.1
75-
- 8.0.60 SR6
76-
- 8.0.40 SR5
77-
- 8.0.21 SR4.1
78-
- 8.0.20 SR4
79-
- 8.0.14 SR3.1
80-
- 8.0.10 SR3
81-
- 8.0.7 SR2
82-
- 8.0.6 SR1
83-
- 8.0.3 GA
91+
- .NET 8 (Out of support, please specify exact version)
8492
- Nightly / CI build (Please specify exact version)
8593
- Unknown/Other
8694
validations:
@@ -106,47 +114,9 @@ body:
106114
options:
107115
-
108116
- Unknown/Other
109-
- 6.0
110-
- 7.0.49
111-
- 7.0.52
112-
- 7.0.58
113-
- 7.0.59
114-
- 7.0.81
115-
- 7.0.86
116-
- 7.0.92
117-
- 7.0.96
118-
- 7.0.100
119-
- 7.0.101
120-
- 8.0.0-preview.1.7762
121-
- 8.0.0-preview.2.7871
122-
- 8.0.0-preview.3.8149
123-
- 8.0.0-preview.4.8333
124-
- 8.0.0-preview.5.8529
125-
- 8.0.0-preview.6.8686
126-
- 8.0.0-preview.7.8842
127-
- 8.0.0-rc.1.9171
128-
- 8.0.0-rc.2.9373
129-
- 8.0.0-rc.2.9511
130-
- 8.0.3 GA
131-
- 8.0.6 SR1
132-
- 8.0.7 SR2
133-
- 8.0.10 SR3
134-
- 8.0.14 SR3.1
135-
- 8.0.20 SR4
136-
- 8.0.21 SR4.1
137-
- 8.0.40 SR5
138-
- 8.0.60 SR6
139-
- 8.0.61 SR6.1
140-
- 8.0.70 SR7
141-
- 8.0.71 SR7.1
142-
- 8.0.80 SR8
143-
- 8.0.82 SR8.2
144-
- 8.0.83 SR8.3
145-
- 8.0.90 SR9
146-
- 8.0.91 SR9.1
147-
- 8.0.92 SR9.2
148-
- 8.0.93 SR9.3
149-
- 8.0.100 SR10
117+
- .NET 6 (Please specify exact version)
118+
- .NET 7 (Please specify exact version)
119+
- .NET 8 (Please specify exact version)
150120
- 9.0.0-preview.1.9973
151121
- 9.0.0-preview.2.10293
152122
- 9.0.0-preview.3.10457
@@ -165,7 +135,34 @@ body:
165135
- 9.0.30 SR3
166136
- 9.0.40 SR4
167137
- 9.0.50 SR5
138+
- 9.0.60 SR6
139+
- 9.0.61 SR6.1
140+
- 9.0.70 SR7
141+
- 9.0.80 SR8
142+
- 9.0.81 SR8.1
143+
- 9.0.82 SR8.2
144+
- 9.0.90 SR9
145+
- 9.0.100 SR10
146+
- 9.0.110 SR11
147+
- 9.0.111 SR11.1
148+
- 9.0.120 SR12
168149
- 10.0.0-preview.1
150+
- 10.0.0-preview.2
151+
- 10.0.0-preview.3
152+
- 10.0.0-preview.4
153+
- 10.0.0-preview.5
154+
- 10.0.0-preview.6
155+
- 10.0.0-preview.7
156+
- 10.0.0-rc.1
157+
- 10.0.0-rc.2
158+
- 10.0.0
159+
- 10.0.1
160+
- 10.0.10
161+
- 10.0.11
162+
- 10.0.20
163+
- 10.0.30
164+
- 10.0.40
165+
- 11.0.0-preview.1
169166
validations:
170167
required: true
171168
- type: dropdown

0 commit comments

Comments
 (0)