[release/10.0.1xx-preview6] Merge net10.0 to preview 6

.config/dotnet-tools.json

@@ -24,7 +24,7 @@
       "rollForward": false
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "10.0.0-prerelease.25214.3",
+      "version": "10.0.0-prerelease.25327.1",
       "commands": [
         "xharness"
       ],

.github/copilot-instructions.md

@@ -110,6 +110,20 @@ dotnet cake --target=dotnet-pack
   - `src/Controls/tests/Core.UnitTests/Controls.Core.UnitTests.csproj`
   - `src/Controls/tests/Xaml.UnitTests/Controls.Xaml.UnitTests.csproj`
 
+### Code Formatting
+
+Before committing any changes, format the codebase using the following command to ensure consistent code style:
+
+```bash
+dotnet format Microsoft.Maui.sln --no-restore --exclude Templates/src --exclude-diagnostics CA1822
+```
+
+This command:
+- Formats all code files according to the repository's `.editorconfig` settings
+- Excludes the Templates/src directory from formatting
+- Excludes the CA1822 diagnostic (member can be marked as static)
+- Uses `--no-restore` for faster execution when dependencies are already restored
+
 ### Local Development with Branch-Specific .NET
 
 For compatibility with specific branches:
@@ -160,6 +174,19 @@ Since coding agents function as both CI and pair programmers, they need to handl
 - Follow existing code documentation patterns
 - Update relevant docs in `docs/` folder when needed
 
+### Opening PRs
+
+All PRs are required to have this at the top of the description:
+
+```
+<!-- Please let the below note in for people that find this PR -->
+> [!NOTE]
+> Are you waiting for the changes in this PR to be merged?
+> 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!
+```
+
+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!
+
 ## Additional Resources
 
 - [Development Guide](.github/DEVELOPMENT.md)
@@ -170,4 +197,4 @@ Since coding agents function as both CI and pair programmers, they need to handl
 
 ---
 
-**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.
+**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

@@ -1,6 +1,13 @@
 name: "Copilot Setup Steps"
 
-on: workflow_dispatch
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
+  pull_request:
+    paths:
+      - .github/workflows/copilot-setup-steps.yml
 
 jobs:
   copilot-setup-steps:

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

@@ -3,6 +3,9 @@ on:
   workflow_dispatch:
   schedule:
     - cron: 0 0 * * * # Every day at midnight (UTC)
+  pull_request:
+    paths:
+      - .github/workflows/dotnet-format-daily.yml
 
 permissions:
   pull-requests: write
@@ -21,12 +24,38 @@ jobs:
           ref: ${{ matrix.branch }}
 
       - name: Setup .NET Core SDK
-        uses: actions/setup-dotnet@v3.2.0
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.x
+          dotnet-version: 9.x
+
+      - name: Run a pre-work build
+        shell: pwsh
+        continue-on-error: true
+        run: .\build.ps1
+
+      - name: Add the local .NET to the envvars (PATH, DOTNET_ROOT)
+        shell: pwsh
+        run: |
+          Add-Content -Path $env:GITHUB_PATH -Value "$env:GITHUB_WORKSPACE/.dotnet"
+          Add-Content -Path $env:GITHUB_ENV -Value "DOTNET_ROOT=$env:GITHUB_WORKSPACE/.dotnet"
+          Add-Content -Path $env:GITHUB_ENV -Value "DOTNET_INSTALL_DIR=$env:GITHUB_WORKSPACE/.dotnet"
+
+      - name: Ensure we are using the correct .NET
+        shell: pwsh
+        run: |
+          dotnet --version
+          dotnet --info
+          dotnet workload --info
+
+      - name: Reset tracked files to clean workspace
+        shell: bash
+        run: |
+          git reset --hard HEAD
 
       - name: Run dotnet format
-        run: dotnet format .\Microsoft.Maui.sln --no-restore --exclude Templates/src --exclude-diagnostics CA1822
+        run: |
+          dotnet restore Microsoft.Maui.sln 
+          dotnet format Microsoft.Maui.sln --exclude Templates/src --exclude-diagnostics CA1822
 
       - name: Create Pull Request
         uses: dotnet/actions-create-pull-request@v4
@@ -39,7 +68,7 @@ jobs:
           labels: |
             t/housekeeping ♻︎
             area-infrastructure
-          assignees: rmarinho, jsuarezruiz
-          reviewers: rmarinho, jsuarezruiz
+          assignees: rmarinho, jsuarezruiz, mattleibow
+          reviewers: rmarinho, jsuarezruiz, mattleibow
           branch: housekeeping/fix-codeformatting/${{ matrix.branch }}
           base: ${{ matrix.branch }}

README.md

@@ -18,6 +18,7 @@
 ![.NET MAUI Weather App on all platforms](Assets/maui-weather-hero-sm.png)
 
 ## Current News
+* 2025 - [What's new in .NET MAUI for .NET 10](https://learn.microsoft.com/dotnet/maui/whats-new/dotnet-10)
 * November 13, 2024 - [What's new in .NET MAUI for .NET 9](https://learn.microsoft.com/dotnet/maui/whats-new/dotnet-9)
 * November 12, 2024 - [Announcing .NET 9](https://devblogs.microsoft.com/dotnet/announcing-dotnet-9/#.net-maui-–-enhancing-multi-platform-app-development)
 * October 22, 2024 - [.NET MAUI Welcomes Syncfusion Open-source Contributions](https://devblogs.microsoft.com/dotnet/dotnet-maui-welcomes-syncfusion-open-source-contributions/)

eng/Version.Details.xml

@@ -140,17 +140,17 @@
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>6b71c64e75168c7704e2e789c7920a3b681af364</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="10.0.0-prerelease.25214.3">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="10.0.0-prerelease.25327.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>3195dcce969c29fc109081c31d68622f5ce6de06</Sha>
+      <Sha>1ca2b4a2e528b631134501ab611e68cd24f0f7c0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="10.0.0-prerelease.25214.3">
+    <Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="10.0.0-prerelease.25327.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>3195dcce969c29fc109081c31d68622f5ce6de06</Sha>
+      <Sha>1ca2b4a2e528b631134501ab611e68cd24f0f7c0</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="10.0.0-prerelease.25214.3">
+    <Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="10.0.0-prerelease.25327.1">
       <Uri>https://github.com/dotnet/xharness</Uri>
-      <Sha>3195dcce969c29fc109081c31d68622f5ce6de06</Sha>
+      <Sha>1ca2b4a2e528b631134501ab611e68cd24f0f7c0</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>

eng/Versions.props

@@ -62,7 +62,7 @@
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>8.0.148</SamsungTizenSdkPackageVersion>
     <!-- wasdk -->
-    <MicrosoftWindowsAppSDKPackageVersion>1.7.250513003</MicrosoftWindowsAppSDKPackageVersion>
+    <MicrosoftWindowsAppSDKPackageVersion>1.7.250606001</MicrosoftWindowsAppSDKPackageVersion>
     <MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsPackageVersion>
     <MicrosoftGraphicsWin2DPackageVersion>1.3.2</MicrosoftGraphicsWin2DPackageVersion>
     <MicrosoftWindowsWebView2PackageVersion>1.0.3179.45</MicrosoftWindowsWebView2PackageVersion>
@@ -97,8 +97,8 @@
     <MicrosoftJSInteropPreviousPackageVersion>$(MicrosoftAspNetCorePackageVersion)</MicrosoftJSInteropPreviousPackageVersion>
     <!-- Other packages -->
     <MicrosoftCodeAnalysisNetAnalyzersVersion>9.0.0-preview*</MicrosoftCodeAnalysisNetAnalyzersVersion>
-    <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
-    <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
+    <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>4.14.0</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
+    <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>4.14.0</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
     <MicrosoftIoRecyclableMemoryStreamVersion>3.0.1</MicrosoftIoRecyclableMemoryStreamVersion>
     <SystemNumericsVectorsVersion>4.6.1</SystemNumericsVectorsVersion>
     <SystemMemoryPackageVersion>4.5.5</SystemMemoryPackageVersion>
@@ -126,9 +126,9 @@
     <_HarfBuzzSharpVersion>8.3.0.1</_HarfBuzzSharpVersion>
     <_SkiaSharpNativeAssetsVersion>0.0.0-commit.e57e2a11dac4ccc72bea52939dede49816842005.1728</_SkiaSharpNativeAssetsVersion>
     <MicrosoftTemplateEngineTasksVersion>7.0.120</MicrosoftTemplateEngineTasksVersion>
-    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>10.0.0-prerelease.25214.3</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
-    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>10.0.0-prerelease.25214.3</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
-    <MicrosoftDotNetXHarnessCLIVersion>10.0.0-prerelease.25214.3</MicrosoftDotNetXHarnessCLIVersion>
+    <MicrosoftDotNetXHarnessTestRunnersCommonVersion>10.0.0-prerelease.25327.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
+    <MicrosoftDotNetXHarnessTestRunnersXunitVersion>10.0.0-prerelease.25327.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
+    <MicrosoftDotNetXHarnessCLIVersion>10.0.0-prerelease.25327.1</MicrosoftDotNetXHarnessCLIVersion>
     <TizenUIExtensionsVersion>0.9.2</TizenUIExtensionsVersion>
     <SvgSkiaPackageVersion>2.0.0.4</SvgSkiaPackageVersion>
     <FizzlerPackageVersion>1.3.0</FizzlerPackageVersion>
@@ -172,6 +172,7 @@
     <JavaJdkVersion>17.0.12</JavaJdkVersion>
     <!-- Android SDK package versions and info -->
     <!-- Build Tools and CmdLine Tools versions -->
+    <AndroidSdkPlatformToolsVersion>35.0.2</AndroidSdkPlatformToolsVersion>
     <AndroidSdkBuildToolsVersion>33.0.0</AndroidSdkBuildToolsVersion>
     <AndroidSdkCmdLineToolsVersion>13.0</AndroidSdkCmdLineToolsVersion>
     <!-- Device Type for creating AVD's -->

eng/automation/guardian/tsaoptions-v2.json

@@ -5,7 +5,7 @@
     ],
     "instanceUrl": "https://devdiv.visualstudio.com/",
     "projectName": "DevDiv",
-    "areaPath": "DevDiv\\VS Client - Runtime SDKs\\MAUI",
+    "areaPath": "DevDiv\\.NET MAUI\\MAUI",
     "iterationPath": "DevDiv",
     "allTools": true
 }

eng/cake/dotnet.cake

@@ -486,7 +486,26 @@ Task("VSCode")
 
         UseLocalNuGetCacheFolder();
 
-        StartVisualStudioCodeForDotNet();
+        StartVisualStudioCodeForDotNet(false);
+    });
+
+Task("Insiders")
+    .Description("Provisions .NET, and launches an instance of Visual Studio Code using it.")
+    .IsDependentOn("Clean")
+    .IsDependentOn("dotnet")
+    .IsDependentOn("dotnet-buildtasks")
+    .IsDependentOn("dotnet-pack") // Run conditionally
+    .Does(() =>
+    {
+        if (pendingException != null)
+        {
+            Error($"{pendingException}");
+            Error("!!!!BUILD TASKS FAILED: !!!!!");
+        }
+
+        UseLocalNuGetCacheFolder();
+
+        StartVisualStudioCodeForDotNet(true);
     });
 
 // Tasks for Local Development
@@ -632,7 +651,7 @@ void UseLocalNuGetCacheFolder(bool reset = false)
     SetEnvironmentVariable("NUGET_PACKAGES", packages.FullPath);
 }
 
-void StartVisualStudioCodeForDotNet()
+void StartVisualStudioCodeForDotNet(bool useInsiders)
 {
     if (IsCIBuild())
     {
@@ -645,7 +664,9 @@ void StartVisualStudioCodeForDotNet()
         SetDotNetEnvironmentVariables();
     }
 
-    StartProcess("code", new ProcessSettings{ EnvironmentVariables = GetDotNetEnvironmentVariables() });
+    string codeProcessName = useInsiders ? "code-insiders" : "code";
+
+    StartProcess(codeProcessName, new ProcessSettings{ EnvironmentVariables = GetDotNetEnvironmentVariables() });
 }
 
 void StartVisualStudioForDotNet()