[net10.0] Update net10 #31296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

rmarinho merged 100 commits into net10.0 from update-main-net10

Sep 17, 2025

.azuredevops/policies/branchClassification.yml

-Original file line number
+Diff line change
@@ -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

.github/ISSUE_TEMPLATE/bug-report.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -42,13 +42,15 @@ 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-rc.1
             - 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.110 SR11
             - 9.0.100 SR10
             - 9.0.90 SR9
             - 9.0.82 SR8.2
@@ Expand Down Expand Up / @@ -130,13 +132,15 @@ body: @@
             - 9.0.82 SR8.2
             - 9.0.90 SR9
             - 9.0.100 SR10
+            - 9.0.110 SR11
             - 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
+            - 10.0.0-rc.1
         validations:
           required: true
       - type: dropdown
@@ Expand Down @@

Directory.Build.props

-Original file line number
+Diff line change
@@ Expand Up / @@ -230,6 +230,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>
@@ Expand Down @@

Microsoft.Maui-dev.sln

-Original file line number
+Diff line change
@@ Expand Up @@
     EndProject
     Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.Embedding", "src\Controls\samples\Controls.Sample.Embedding\Maui.Controls.Sample.Embedding.csproj", "{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}"
     EndProject
+    Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.ManualTests", "src\Controls\tests\ManualTests\Controls.ManualTests.csproj", "{E2BFD1F1-07A8-8DBE-3661-894D0FE37D9C}"
+    EndProject
     Global
     	GlobalSection(SolutionConfigurationPlatforms) = preSolution
     		Debug|Any CPU = Debug|Any CPU
@@ Expand Down Expand Up / @@ -617,6 +619,10 @@ Global @@
     		{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
     		{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}.Release|Any CPU.Build.0 = Release|Any CPU
     		{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}.Release|Any CPU.Deploy.0 = Release|Any CPU
+    		{E2BFD1F1-07A8-8DBE-3661-894D0FE37D9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    		{E2BFD1F1-07A8-8DBE-3661-894D0FE37D9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    		{E2BFD1F1-07A8-8DBE-3661-894D0FE37D9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    		{E2BFD1F1-07A8-8DBE-3661-894D0FE37D9C}.Release|Any CPU.Build.0 = Release|Any CPU
     	EndGlobalSection
     	GlobalSection(SolutionProperties) = preSolution
     		HideSolutionNode = FALSE
@@ Expand Down Expand Up / @@ -727,6 +733,7 @@ Global @@
     		{23FEFC89-5D2F-491C-BBE0-0E73AFD8BA47} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
     		{55905937-1399-46DB-BA38-E426801CB759} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
     		{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9} = {E1082E26-D700-4127-9329-66D673FD2D55}
+    		{E2BFD1F1-07A8-8DBE-3661-894D0FE37D9C} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
     	EndGlobalSection
     	GlobalSection(ExtensibilityGlobals) = postSolution
     		SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50}
@@ Expand Down @@

Microsoft.Maui.sln

-Original file line number
+Diff line change
@@ Expand Up @@
     EndProject
     Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample.Embedding", "src\Controls\samples\Controls.Sample.Embedding\Maui.Controls.Sample.Embedding.csproj", "{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}"
     EndProject
+    Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.ManualTests", "src\Controls\tests\ManualTests\Controls.ManualTests.csproj", "{E2BFD1F1-07A8-8DBE-3661-894D0FE37D9C}"
+    EndProject
     Global
     	GlobalSection(SolutionConfigurationPlatforms) = preSolution
     		Debug|Any CPU = Debug|Any CPU
@@ Expand Down Expand Up / @@ -630,6 +632,10 @@ Global @@
     		{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}.Release|Any CPU.ActiveCfg = Release|Any CPU
     		{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}.Release|Any CPU.Build.0 = Release|Any CPU
     		{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9}.Release|Any CPU.Deploy.0 = Release|Any CPU
+    		{E2BFD1F1-07A8-8DBE-3661-894D0FE37D9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    		{E2BFD1F1-07A8-8DBE-3661-894D0FE37D9C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    		{E2BFD1F1-07A8-8DBE-3661-894D0FE37D9C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    		{E2BFD1F1-07A8-8DBE-3661-894D0FE37D9C}.Release|Any CPU.Build.0 = Release|Any CPU
     	EndGlobalSection
     	GlobalSection(SolutionProperties) = preSolution
     		HideSolutionNode = FALSE
@@ Expand Down Expand Up / @@ -743,6 +749,7 @@ Global @@
     		{6AEE83CC-08CA-466A-BA86-774BE88A541B} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
     		{F1BC506B-3A9E-4779-994E-339AFB21C9B9} = {7AC28763-9C68-4BF9-A1BA-25CBFFD2D15C}
     		{4ADCBA87-30DB-44F5-85E9-94A4F4132FD9} = {E1082E26-D700-4127-9329-66D673FD2D55}
+    		{E2BFD1F1-07A8-8DBE-3661-894D0FE37D9C} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
     	EndGlobalSection
     	GlobalSection(ExtensibilityGlobals) = postSolution
     		SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50}
@@ Expand Down @@

eng/BannedSymbols.txt

-Original file line number
+Diff line change
@@ -1,5 +1,6 @@
     M:Microsoft.Extensions.DependencyInjection.Extensions.ServiceCollectionDescriptorExtensions.TryAddSingleton`2(Microsoft.Extensions.DependencyInjection.IServiceCollection);Use a Factory method to create the service instead
     M:Android.Content.Res.ColorStateList.#ctor(System.Int32[][],System.Int32[]);Use Microsoft.Maui.PlatformInterop.Get*ColorStateList() Java methods instead
+    M:Android.Widget.ImageView.GetScaleType();Use PlatformInterop.IsImageViewCenterCrop instead (or add a new method)
     P:Microsoft.Maui.MauiWinUIApplication.Services;Use the IPlatformApplication.Current.Services instead
     P:Microsoft.Maui.MauiWinUIApplication.Application;Use the IPlatformApplication.Current.Application instead
     P:Microsoft.UI.Xaml.Window.AppWindow;This API doesn't have null safety. Use GetAppWindow() and make sure to account for the possibility that GetAppWindow() might be null.
@@ Expand Down @@

eng/pipelines/azure-pipelines-public.yml

-Original file line number
+Diff line change
@@ -0,0 +1,226 @@
+    trigger:
+      batch: true
+      branches:
+        include:
+        - main
+        - net10.0
+        - release/*
+        - inflight/*
+      paths:
+        include:
+        - '*'
+        exclude:
+        - '**.md'
+        - eng/Version.Details.xml
+        - .github/*
+        - docs/*
+        - LICENSE.TXT
+        - PATENTS.TXT
+        - THIRD-PARTY-NOTICES.TXT
+    pr:
+      branches:
+        include:
+        - main
+        - net10.0
+        - release/*
+        - inflight/*
+      paths:
+        include:
+        - '*'
+        exclude:
+        - '**.md'
+        - eng/Version.Details.xml
+        - .github/*
+        - docs/*
+        - LICENSE.TXT
+        - PATENTS.TXT
+        - THIRD-PARTY-NOTICES.TXT
+    variables:
+    - template: /eng/common/templates/variables/pool-providers.yml@self
+    - template: /eng/pipelines/common/variables.yml@self
+    - template: /eng/pipelines/arcade/variables.yml@self
+    parameters:
+    - name: PackPlatform
+      type: object
+      default:
+        name: NetCore-Public
+        image: 1es-windows-2022
+        os: windows
+    - name: BuildConfigurations
+      type: object
+      default:
+      - Debug
+      - Release
+    - name: BuildPlatforms
+      type: object
+      default:
+      - name: NetCore-Public
+        image: 1es-windows-2022
+        os: Windows
+        buildScript: $(_buildScript)
+        sln: '$(Build.SourcesDirectory)/Microsoft.Maui.sln'
+      - name: Azure Pipelines
+        vmImage: $(HostedMacImage)
+        os: macOS
+        buildScript: $(_buildScriptMacOS)
+        sln: '$(Build.SourcesDirectory)/Microsoft.Maui-mac.slnf'
+    stages:
+    - template: /eng/pipelines/arcade/stage-helix-tests.yml@self
+      parameters:
+        runAsPublic: true
+        prepareSteps:
+        - template: /eng/pipelines/common/provision.yml@self
+          parameters:
+            checkoutDirectory: '$(System.DefaultWorkingDirectory)'
+            skipJdk: false
+            skipAndroidCommonSdks: false
+            skipAndroidPlatformApis: false
+            onlyAndroidPlatformDefaultApis: true
+            skipAndroidEmulatorImages: true
+            skipAndroidCreateAvds: true
+            skipProvisioning: true
+            skipXcode: true
+    - template: /eng/pipelines/arcade/stage-pack.yml@self
+      parameters:
+        pool: ${{ parameters.PackPlatform }}
+        runAsPublic: true
+        prepareSteps:
+        - template: /eng/pipelines/common/provision.yml@self
+          parameters:
+            checkoutDirectory: '$(System.DefaultWorkingDirectory)'
+            skipJdk: false
+            skipAndroidCommonSdks: false
+            skipAndroidPlatformApis: false
+            onlyAndroidPlatformDefaultApis: true
+            skipAndroidEmulatorImages: true
+            skipAndroidCreateAvds: true
+            skipProvisioning: true
+            skipXcode: true
+    - template: /eng/pipelines/arcade/stage-build.yml@self
+      parameters:
+        buildConfigurations: ${{ parameters.BuildConfigurations }}
+        buildPlatforms: ${{ parameters.BuildPlatforms }}
+        runAsPublic: ${{ eq(variables['_RunAsPublic'], 'true') }}
+        prepareSteps:
+        - template: /eng/pipelines/common/provision.yml@self
+          parameters:
+            checkoutDirectory: '$(System.DefaultWorkingDirectory)'
+            skipJdk: false
+            skipAndroidCommonSdks: false
+            skipAndroidPlatformApis: false
+            onlyAndroidPlatformDefaultApis: true
+            skipAndroidEmulatorImages: true
+            skipAndroidCreateAvds: true
+            skipProvisioning: true
+            skipXcode: true
+    - template: /eng/pipelines/arcade/stage-unit-tests.yml@self
+      parameters:
+        jobMatrix:
+        - name: win_unit_tests
+          displayName: Windows Unit Tests
+          pool: ${{ parameters.PackPlatform }}
+          timeout: 90
+          testOS: Windows
+        - name: mac_unit_tests
+          displayName: macOS Unit Tests
+          pool:
+            name: Azure Pipelines
+            vmImage: $(HostedMacImage)
+            os: macOS
+          timeout: 90
+          testOS: macOS
+        publishTaskPrefix: ''
+    - template: /eng/pipelines/arcade/stage-integration-tests.yml@self
+      parameters:
+        stageDependsOn: Pack
+        publishTaskPrefix: ''
+        jobMatrix:
+        - name: win_sample_tests
+          pool: ${{ parameters.PackPlatform }}
+          timeout: 120
+          testCategory: Samples
+        - name: mac_sample_tests
+          pool:
+            name: Azure Pipelines
+            vmImage: $(HostedMacImage)
+            os: macOS
+          timeout: 120
+          testCategory: Samples
+        - name: win_wintemplate_tests
+          pool: ${{ parameters.PackPlatform }}
+          timeout: 120
+          testCategory: WindowsTemplates
+        # - name: mac_wintemplate_tests
+        #   pool:
+        #     name: Azure Pipelines
+        #     vmImage: $(HostedMacImage)
+        #     os: macOS
+        #   timeout: 120
+        #   testCategory: WindowsTemplates
+        - name: win_buildtemplate_tests
+          pool: ${{ parameters.PackPlatform }}
+          timeout: 120
+          testCategory: Build
+        - name: mac_buildtemplate_tests
+          pool:
+            name: Azure Pipelines
+            vmImage: $(HostedMacImage)
+            os: macOS
+          timeout: 240
+          testCategory: Build
+        - name: win_blazortemplate_tests
+          pool: ${{ parameters.PackPlatform }}
+          timeout: 120
+          testCategory: Blazor
+        - name: mac_blazortemplate_tests
+          pool:
+            name: Azure Pipelines
+            vmImage: $(HostedMacImage)
+            os: macOS
+          timeout: 120
+          testCategory: Blazor
+        - name: win_multitemplate_tests
+          pool: ${{ parameters.PackPlatform }}
+          timeout: 120
+          testCategory: MultiProject
+        - name: mac_multitemplate_tests
+          pool:
+            name: Azure Pipelines
+            vmImage: $(HostedMacImage)
+            os: macOS
+          timeout: 120
+          testCategory: MultiProject
+        # TODO: macOSTemplates and AOT template categories
+        - name: mac_runandroid_tests
+          pool:
+            name: Azure Pipelines
+            vmImage: $(HostedMacImage)
+            os: macOS
+          timeout: 180
+          testCategory: RunOnAndroid
+        - name: mac_runios_tests
+          pool:
+            name: Azure Pipelines
+            vmImage: $(HostedMacImage)
+            os: macOS
+          timeout: 180
+          testCategory: RunOniOS

eng/pipelines/common/device-tests-jobs.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,6 @@ parameters: @@
       versions: []
       provisionatorChannel: 'latest'
       skipProvisioning: true
-      agentPoolAccessToken: ''
       artifactName: 'nuget'
       artifactItemPattern: '**/*.nupkg'
       checkoutDirectory: $(System.DefaultWorkingDirectory)
@@ Expand Down Expand Up / @@ -41,7 +40,6 @@ jobs: @@
             targetFrameworkVersion: ${{ parameters.targetFrameworkVersion.tfm }}
             packageid: ${{ parameters.project.packageid }}
             provisionatorChannel: ${{ parameters.provisionatorChannel }}
-            agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
             artifactName: ${{ parameters.artifactName }}
             artifactItemPattern: ${{ parameters.artifactItemPattern }}
             checkoutDirectory: ${{ parameters.checkoutDirectory }}
@@ Expand Down Expand Up / @@ -95,7 +93,6 @@ jobs: @@
               targetFrameworkVersion: ${{ parameters.targetFrameworkVersion.tfm }}
               packageid: ${{ parameters.project.packageid }}
               provisionatorChannel: ${{ parameters.provisionatorChannel }}
-              agentPoolAccessToken: ${{ parameters.agentPoolAccessToken }}
               artifactName: ${{ parameters.artifactName }}
               artifactItemPattern: ${{ parameters.artifactItemPattern }}
               checkoutDirectory: ${{ parameters.checkoutDirectory }}
@@ Expand Down @@

eng/pipelines/common/device-tests-steps.yml

-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ parameters: @@
       cakeArgs: '' # additional cake args
       deviceTestConfiguration: '' # Indicates the configuration to use for Android. We're slowly enabling this for all projects
       provisionatorChannel: 'latest'
-      agentPoolAccessToken: ''
       artifactName: 'nuget'
       artifactItemPattern: '**/*.nupkg'
       checkoutDirectory: $(System.DefaultWorkingDirectory)
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[net10.0] Update net10 #31296

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Uh oh!