Skip to content

Commit fcbf0fe

Browse files
praveenkumarkarunanithipraveenkumarkarunanithi
authored
Merge branch 'dotnet:main' into fix-31446
2 parents 28bb5ac + 5662906 commit fcbf0fe

7,086 files changed

Lines changed: 185200 additions & 55846 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/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.25317.3",
27+
"version": "10.0.0-prerelease.25575.2",
2828
"commands": [
2929
"xharness"
3030
],

‎.github/CONTRIBUTING.md‎

Lines changed: 5 additions & 5 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,7 +16,7 @@ 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

@@ -27,11 +27,11 @@ Follow the style used by the [.NET Foundation](https://github.com/dotnet/runtime
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

‎.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: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,23 @@ 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.20
46+
- 10.0.11
47+
- 10.0.10
48+
- 10.0.1
49+
- 10.0.0
50+
- 10.0.0-rc.2
51+
- 10.0.0-rc.1
4552
- 10.0.0-preview.7
4653
- 10.0.0-preview.6
4754
- 10.0.0-preview.5
4855
- 10.0.0-preview.4
4956
- 10.0.0-preview.3
5057
- 10.0.0-preview.2
5158
- 10.0.0-preview.1
59+
- 9.0.110 SR12
60+
- 9.0.111 SR11.1
61+
- 9.0.110 SR11
5262
- 9.0.100 SR10
5363
- 9.0.90 SR9
5464
- 9.0.82 SR8.2
@@ -130,13 +140,23 @@ body:
130140
- 9.0.82 SR8.2
131141
- 9.0.90 SR9
132142
- 9.0.100 SR10
143+
- 9.0.110 SR11
144+
- 9.0.111 SR11.1
145+
- 9.0.120 SR12
133146
- 10.0.0-preview.1
134147
- 10.0.0-preview.2
135148
- 10.0.0-preview.3
136149
- 10.0.0-preview.4
137150
- 10.0.0-preview.5
138151
- 10.0.0-preview.6
139152
- 10.0.0-preview.7
153+
- 10.0.0-rc.1
154+
- 10.0.0-rc.2
155+
- 10.0.0
156+
- 10.0.1
157+
- 10.0.10
158+
- 10.0.11
159+
- 10.0.20
140160
validations:
141161
required: true
142162
- type: dropdown

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
<!-- Please let the below note in for people that find this PR -->
2-
> [!NOTE]
3-
> Are you waiting for the changes in this PR to be merged?
4-
> It would be very helpful if you could [test the resulting artifacts](https://github.com/dotnet/maui/wiki/Testing-PR-Builds) from this PR and let us know in a comment if this change resolves your issue. Thank you!
5-
61
<!--
72
!!!!!!! MAIN IS THE ONLY ACTIVE BRANCH. MAKE SURE THIS PR IS TARGETING MAIN. !!!!!!!
83
-->

0 commit comments

Comments
 (0)