Merge branch 'main' into fix-30070

Author: jsuarezruiz

.azuredevops/policies/branchClassification.yml

@@ -0,0 +1,14 @@
+description: Branch classification configuration for repository
+resource: repository
+configuration:
+  branchClassificationSettings:
+    defaultClassification: nonproduction
+    ruleset:
+      - name: prod-branches
+        branchNames:
+          - main
+          - release/*
+          - net10.0
+          - net9.0
+          - inflight/current
+        classification: production

.config/1espt/PipelineAutobaseliningConfig.yml

@@ -0,0 +1,34 @@
+## 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.
+
+pipelines:
+  1095:
+    retail:
+      source:
+        credscan:
+          lastModifiedDate: 2024-11-20
+        policheck:
+          lastModifiedDate: 2024-11-20
+        eslint:
+          lastModifiedDate: 2024-11-20
+        psscriptanalyzer:
+          lastModifiedDate: 2024-11-20
+        armory:
+          lastModifiedDate: 2024-11-20
+      binary:
+        credscan:
+          lastModifiedDate: 2024-11-20
+        binskim:
+          lastModifiedDate: 2025-02-18
+  1445:
+    retail:
+      source:
+        credscan:
+          lastModifiedDate: 2025-04-29
+        policheck:
+          lastModifiedDate: 2025-04-29
+        eslint:
+          lastModifiedDate: 2025-04-29
+        psscriptanalyzer:
+          lastModifiedDate: 2025-04-29
+        armory:
+          lastModifiedDate: 2025-04-29

.github/CODE_OF_CONDUCT.md

@@ -3,4 +3,4 @@
 This project has adopted the code of conduct defined by the Contributor Covenant
 to clarify expected behavior in our community.
 
-For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/about/policies/code-of-conduct).
+For more information, see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).

.github/CONTRIBUTING.md

@@ -22,7 +22,7 @@ Have a look at our [Development Guide](DEVELOPMENT.md) to learn about setting up
 
 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. 
 
-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:
+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:
 
 - We do not use the `private` keyword, as it is the default accessibility level in C#.
 - We use hard tabs over spaces.
@@ -55,7 +55,7 @@ If a BenchmarkDotNet test case is not possible, share before & after profiling i
 
 ## Proposals/Enhancements/Suggestions
 
-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.
+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.
 
 ## Review Process
 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

@@ -42,11 +42,16 @@ body:
       label: Version with bug
       description: In what version do you see this issue? Run `dotnet workload list` to find your version.
       options:
+        - 10.0.0-preview.7
+        - 10.0.0-preview.6
         - 10.0.0-preview.5
         - 10.0.0-preview.4
         - 10.0.0-preview.3
         - 10.0.0-preview.2
         - 10.0.0-preview.1
+        - 9.0.100 SR10
+        - 9.0.90 SR9
+        - 9.0.82 SR8.2
         - 9.0.81 SR8.1
         - 9.0.80 SR8
         - 9.0.70 SR7
@@ -122,11 +127,16 @@ body:
         - 9.0.70 SR7
         - 9.0.80 SR8
         - 9.0.81 SR8.1
+        - 9.0.82 SR8.2
+        - 9.0.90 SR9
+        - 9.0.100 SR10
         - 10.0.0-preview.1
         - 10.0.0-preview.2
         - 10.0.0-preview.3
         - 10.0.0-preview.4
         - 10.0.0-preview.5
+        - 10.0.0-preview.6
+        - 10.0.0-preview.7
     validations:
       required: true
   - type: dropdown

.github/ISSUE_TEMPLATE/config.yml

@@ -3,8 +3,8 @@ contact_links:
   - name: .NET MAUI Community Support
     url: https://learn.microsoft.com/answers/topics/dotnet-maui.html
     about: Please ask and answer questions here.
-  - name: Bug report or feature request for Visual Studio for Windows and Mac
-    url: https://learn.microsoft.com/visualstudio/ide/how-to-report-a-problem-with-visual-studio?view=vs-2022
+  - name: Bug report or feature request for Visual Studio
+    url: https://learn.microsoft.com/visualstudio/ide/how-to-report-a-problem-with-visual-studio
     about: Use Visual Studio's Report a Problem feature for issues and suggestions with Visual Studio tooling
   - name: Bug report or feature request for Visual Studio Code (including C# Dev Kit)
     url: https://github.com/microsoft/vscode-dotnettools/issues

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

@@ -35,6 +35,7 @@ jobs:
           echo "$GITHUB_WORKSPACE/.dotnet" >> "$GITHUB_PATH"
           echo "DOTNET_ROOT=$GITHUB_WORKSPACE/.dotnet" >> "$GITHUB_ENV"
           echo "DOTNET_INSTALL_DIR=$GITHUB_WORKSPACE/.dotnet" >> "$GITHUB_ENV"
+          echo "DOTNET_SYSTEM_NET_SECURITY_NOREVOCATIONCHECKBYDEFAULT=true" >> "$GITHUB_ENV"
 
       - name: Ensure we are using the correct .NET
         shell: pwsh

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

@@ -1,26 +1,2 @@
 {
-    "inputs": [
-        {
-            "type": "promptString",
-            "id": "github-key",
-            "password": true, // Encrypted at-rest
-            "description": "GitHub PAT"
-        }
-    ],
-    "servers": {
-       "github": {
-            "command": "docker",
-            "args": [
-                "run",
-                "-i",
-                "--rm",
-                "-e",
-                "GITHUB_PERSONAL_ACCESS_TOKEN",
-                "ghcr.io/github/github-mcp-server"
-            ],
-            "env": {
-                "GITHUB_PERSONAL_ACCESS_TOKEN": "${input:github-key}"
-            }
-        }
-    }
 }

.vscode/mcp.json

@@ -218,6 +218,17 @@
     <MauiEmbeddingPlatforms Condition="'$(IncludeMacCatalystTargetFrameworks)' == 'true'">net$(_MauiDotNetVersion)-maccatalyst;$(MauiEmbeddingPlatforms)</MauiEmbeddingPlatforms>
     <MauiEmbeddingPlatforms Condition="'$(IncludeIosTargetFrameworks)' == 'true'">net$(_MauiDotNetVersion)-ios;$(MauiEmbeddingPlatforms)</MauiEmbeddingPlatforms>
 
+    <!-- App: Manual Test Sample TFMs (no Tizen yet) -->
+    <MauiManualTestsPlatforms Condition="'$(IncludeWindowsTargetFrameworks)' == 'true'">$(WindowsMauiPlatforms);$(MauiDeviceTestsPlatforms)</MauiManualTestsPlatforms>
+    <MauiManualTestsPlatforms Condition="'$(IncludeAndroidTargetFrameworks)' == 'true'">net$(_MauiDotNetVersion)-android;$(MauiDeviceTestsPlatforms)</MauiManualTestsPlatforms>
+    <MauiManualTestsPlatforms Condition="'$(IncludeMacCatalystTargetFrameworks)' == 'true'">net$(_MauiDotNetVersion)-maccatalyst;$(MauiDeviceTestsPlatforms)</MauiManualTestsPlatforms>
+    <MauiManualTestsPlatforms Condition="'$(IncludeIosTargetFrameworks)' == 'true'">net$(_MauiDotNetVersion)-ios;$(MauiDeviceTestsPlatforms)</MauiManualTestsPlatforms>
+    <MauiManualTestsPreviousPlatforms Condition="'$(IncludeTizenTargetFrameworks)' == 'true'">net$(_MauiPreviousDotNetVersion)-tizen;$(MauiManualTestsPreviousPlatforms)</MauiManualTestsPreviousPlatforms>
+    <MauiManualTestsPreviousPlatforms Condition="'$(IncludeWindowsTargetFrameworks)' == 'true'">$(WindowsMauiPreviousPlatforms);$(MauiManualTestsPreviousPlatforms)</MauiManualTestsPreviousPlatforms>
+    <MauiManualTestsPreviousPlatforms Condition="'$(IncludeAndroidTargetFrameworks)' == 'true'">net$(_MauiPreviousDotNetVersion)-android;$(MauiManualTestsPreviousPlatforms)</MauiManualTestsPreviousPlatforms>
+    <MauiManualTestsPreviousPlatforms Condition="'$(IncludeMacCatalystTargetFrameworks)' == 'true'">net$(_MauiPreviousDotNetVersion)-maccatalyst;$(MauiManualTestsPreviousPlatforms)</MauiManualTestsPreviousPlatforms>
+    <MauiManualTestsPreviousPlatforms Condition="'$(IncludeIosTargetFrameworks)' == 'true'">net$(_MauiPreviousDotNetVersion)-ios;$(MauiManualTestsPreviousPlatforms)</MauiManualTestsPreviousPlatforms>
+
     <!-- Library: Graphics TFMs -->
     <MauiGraphicsPlatforms>$(MauiPlatforms)</MauiGraphicsPlatforms>
     <MauiGraphicsPlatforms Condition="'$(IncludeMacOSTargetFrameworks)' == 'true'">$(MauiGraphicsPlatforms);net$(_MauiDotNetVersion)-macos$(MacosTargetFrameworkVersion)</MauiGraphicsPlatforms>