Skip to content

Commit 85e17c4

Browse files
authored
[net10.0] Merge main to net10.0 (#30299)
### Description of Change Bring latest changes from main to net10.0 branch
2 parents 3f26a59 + 19c501c commit 85e17c4

File tree

350 files changed

+6462
-10460
lines changed

Some content is hidden

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

350 files changed

+6462
-10460
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": "10.0.0-prerelease.25214.3",
27+
"version": "10.0.0-prerelease.25327.1",
2828
"commands": [
2929
"xharness"
3030
],

.github/copilot-instructions.md

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,20 @@ dotnet cake --target=dotnet-pack
110110
- `src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests.csproj`
111111
- `src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj`
112112

113+
### Code Formatting
114+
115+
Before committing any changes, format the codebase using the following command to ensure consistent code style:
116+
117+
```bash
118+
dotnet format Microsoft.Maui.sln --no-restore --exclude Templates/src --exclude-diagnostics CA1822
119+
```
120+
121+
This command:
122+
- Formats all code files according to the repository's `.editorconfig` settings
123+
- Excludes the Templates/src directory from formatting
124+
- Excludes the CA1822 diagnostic (member can be marked as static)
125+
- Uses `--no-restore` for faster execution when dependencies are already restored
126+
113127
### Local Development with Branch-Specific .NET
114128

115129
For compatibility with specific branches:
@@ -160,6 +174,19 @@ Since coding agents function as both CI and pair programmers, they need to handl
160174
- Follow existing code documentation patterns
161175
- Update relevant docs in `docs/` folder when needed
162176

177+
### Opening PRs
178+
179+
All PRs are required to have this at the top of the description:
180+
181+
```
182+
<!-- Please let the below note in for people that find this PR -->
183+
> [!NOTE]
184+
> Are you waiting for the changes in this PR to be merged?
185+
> 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!
186+
```
187+
188+
Always put that at the top, without the block quotes. Without it, the users will NOT be able to try the PR and your work will have been in vain!
189+
163190
## Additional Resources
164191

165192
- [Development Guide](.github/DEVELOPMENT.md)
@@ -170,4 +197,4 @@ Since coding agents function as both CI and pair programmers, they need to handl
170197

171198
---
172199

173-
**Note for Future Updates:** This document should be expanded as new development patterns, tools, or workflows are discovered. Add sections for specific scenarios, debugging techniques, or tooling as they become relevant to the development process.
200+
**Note for Future Updates:** This document should be expanded as new development patterns, tools, or workflows are discovered. Add sections for specific scenarios, debugging techniques, or tooling as they become relevant to the development process.

.github/workflows/copilot-setup-steps.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
name: "Copilot Setup Steps"
22

3-
on: workflow_dispatch
3+
on:
4+
workflow_dispatch:
5+
push:
6+
paths:
7+
- .github/workflows/copilot-setup-steps.yml
8+
pull_request:
9+
paths:
10+
- .github/workflows/copilot-setup-steps.yml
411

512
jobs:
613
copilot-setup-steps:

.github/workflows/dotnet-format-daily.yml

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ on:
33
workflow_dispatch:
44
schedule:
55
- cron: 0 0 * * * # Every day at midnight (UTC)
6+
pull_request:
7+
paths:
8+
- .github/workflows/dotnet-format-daily.yml
69

710
permissions:
811
pull-requests: write
@@ -21,12 +24,38 @@ jobs:
2124
ref: ${{ matrix.branch }}
2225

2326
- name: Setup .NET Core SDK
24-
uses: actions/setup-dotnet@v3.2.0
27+
uses: actions/setup-dotnet@v4
2528
with:
26-
dotnet-version: 8.x
29+
dotnet-version: 9.x
30+
31+
- name: Run a pre-work build
32+
shell: pwsh
33+
continue-on-error: true
34+
run: .\build.ps1
35+
36+
- name: Add the local .NET to the envvars (PATH, DOTNET_ROOT)
37+
shell: pwsh
38+
run: |
39+
Add-Content -Path $env:GITHUB_PATH -Value "$env:GITHUB_WORKSPACE/.dotnet"
40+
Add-Content -Path $env:GITHUB_ENV -Value "DOTNET_ROOT=$env:GITHUB_WORKSPACE/.dotnet"
41+
Add-Content -Path $env:GITHUB_ENV -Value "DOTNET_INSTALL_DIR=$env:GITHUB_WORKSPACE/.dotnet"
42+
43+
- name: Ensure we are using the correct .NET
44+
shell: pwsh
45+
run: |
46+
dotnet --version
47+
dotnet --info
48+
dotnet workload --info
49+
50+
- name: Reset tracked files to clean workspace
51+
shell: bash
52+
run: |
53+
git reset --hard HEAD
2754
2855
- name: Run dotnet format
29-
run: dotnet format .\Microsoft.Maui.sln --no-restore --exclude Templates/src --exclude-diagnostics CA1822
56+
run: |
57+
dotnet restore Microsoft.Maui.sln
58+
dotnet format Microsoft.Maui.sln --exclude Templates/src --exclude-diagnostics CA1822
3059
3160
- name: Create Pull Request
3261
uses: dotnet/actions-create-pull-request@v4
@@ -39,7 +68,7 @@ jobs:
3968
labels: |
4069
t/housekeeping ♻︎
4170
area-infrastructure
42-
assignees: rmarinho, jsuarezruiz
43-
reviewers: rmarinho, jsuarezruiz
71+
assignees: rmarinho, jsuarezruiz, mattleibow
72+
reviewers: rmarinho, jsuarezruiz, mattleibow
4473
branch: housekeeping/fix-codeformatting/${{ matrix.branch }}
4574
base: ${{ matrix.branch }}

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
![.NET MAUI Weather App on all platforms](Assets/maui-weather-hero-sm.png)
1919

2020
## Current News
21+
* 2025 - [What's new in .NET MAUI for .NET 10](https://learn.microsoft.com/dotnet/maui/whats-new/dotnet-10)
2122
* November 13, 2024 - [What's new in .NET MAUI for .NET 9](https://learn.microsoft.com/dotnet/maui/whats-new/dotnet-9)
2223
* November 12, 2024 - [Announcing .NET 9](https://devblogs.microsoft.com/dotnet/announcing-dotnet-9/#.net-maui-–-enhancing-multi-platform-app-development)
2324
* October 22, 2024 - [.NET MAUI Welcomes Syncfusion Open-source Contributions](https://devblogs.microsoft.com/dotnet/dotnet-maui-welcomes-syncfusion-open-source-contributions/)

0 commit comments

Comments
 (0)