Merge branch 'main' into ios_radiobutton_a11y

.github/workflows/backport.yml

@@ -0,0 +1,17 @@
+name: Backport PR to branch
+on:
+ issue_comment:
+ types: [created]
+ schedule:
+ # once a day at 13:00 UTC to cleanup old runs
+ - cron: '0 13 * * *'
+
+permissions:
+ contents: write
+ issues: write
+ pull-requests: write
+ actions: write
+
+jobs:
+ backport:
+ uses: dotnet/arcade/.github/workflows/backport-base.yml@main

Microsoft.Maui-mac.slnf

@@ -37,16 +37,17 @@
  "src\\Core\\maps\\src\\Maps.csproj",
  "src\\Core\\src\\Core.csproj",
  "src\\Core\\tests\\Benchmarks\\Core.Benchmarks.csproj",
+ "src\\Core\\tests\\DeviceTests.Shared\\Core.DeviceTests.Shared.csproj",
  "src\\Core\\tests\\DeviceTests\\Core.DeviceTests.csproj",
  "src\\Core\\tests\\UnitTests\\Core.UnitTests.csproj",
- "src\\Graphics\\src\\Graphics\\Graphics.csproj",
- "src\\Graphics\\src\\Graphics.Skia\\Graphics.Skia.csproj",
- "src\\Graphics\\src\\Text.Markdig\\Graphics.Text.Markdig.csproj",
  "src\\Essentials\\samples\\Sample.Server.WebAuthenticator\\Essentials.Sample.Server.WebAuthenticator.csproj",
  "src\\Essentials\\samples\\Samples\\Essentials.Sample.csproj",
  "src\\Essentials\\src\\Essentials.csproj",
  "src\\Essentials\\test\\DeviceTests\\Essentials.DeviceTests.csproj",
  "src\\Essentials\\test\\UnitTests\\Essentials.UnitTests.csproj",
+ "src\\Graphics\\src\\Graphics.Skia\\Graphics.Skia.csproj",
+ "src\\Graphics\\src\\Graphics\\Graphics.csproj",
+ "src\\Graphics\\src\\Text.Markdig\\Graphics.Text.Markdig.csproj",
  "src\\SingleProject\\Resizetizer\\src\\Resizetizer.csproj",
  "src\\SingleProject\\Resizetizer\\test\\UnitTests\\Resizetizer.UnitTests.csproj",
  "src\\Templates\\src\\Microsoft.Maui.Templates.csproj",
@@ -66,4 +67,4 @@
  "src\\Workload\\Microsoft.NET.Sdk.Maui\\Microsoft.NET.Sdk.Maui.csproj"
  ]
  }
-}
+}

Microsoft.Maui.sln

@@ -205,7 +205,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SharedSource", "SharedSourc
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Benchmarks.Droid", "src\Core\tests\Benchmarks.Droid\Benchmarks.Droid.csproj", "{5B56A734-D53C-4635-A53E-F889FCFCDD66}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maps", "src\Core\maps\src\Maps.csproj", "{E8728693-3537-4007-A4DB-9F9634548755}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maps", "src\Core\maps\src\Maps.csproj", "{E8728693-3537-4007-A4DB-9F9634548755}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Graphics", "Graphics", "{E4884871-4A1B-43BC-814F-E3D6E52B1673}"
 EndProject
@@ -255,6 +255,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GraphicsTester.Skia.Gtk", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Core.Design.UnitTests", "src\Controls\tests\Core.Design.UnitTests\Controls.Core.Design.UnitTests.csproj", "{F68932B0-81A2-4CC3-A4F7-28091EE91B23}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.DeviceTests.Shared", "src\Core\tests\DeviceTests.Shared\Core.DeviceTests.Shared.csproj", "{66CC98E3-6A1A-4C44-A23C-B575E82106EC}"
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Any CPU = Debug|Any CPU
@@ -637,6 +639,10 @@ Global
  {F68932B0-81A2-4CC3-A4F7-28091EE91B23}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {F68932B0-81A2-4CC3-A4F7-28091EE91B23}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {F68932B0-81A2-4CC3-A4F7-28091EE91B23}.Release|Any CPU.Build.0 = Release|Any CPU
+ {66CC98E3-6A1A-4C44-A23C-B575E82106EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {66CC98E3-6A1A-4C44-A23C-B575E82106EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {66CC98E3-6A1A-4C44-A23C-B575E82106EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {66CC98E3-6A1A-4C44-A23C-B575E82106EC}.Release|Any CPU.Build.0 = Release|Any CPU
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE
@@ -755,6 +761,7 @@ Global
  {F26D31D3-CE4C-4F32-A77F-E2905C948674} = {42AB9AE1-631D-4AD4-85B7-910FF0940BDB}
  {F351A992-18E4-473C-8ADD-2BA0BAA7B5A2} = {1BA0121E-0B83-4C8F-81BE-C293E7E35DCE}
  {F68932B0-81A2-4CC3-A4F7-28091EE91B23} = {25D0D27A-C5FE-443D-8B65-D6C987F4A80E}
+ {66CC98E3-6A1A-4C44-A23C-B575E82106EC} = {C564DDD6-DE79-45CD-88EA-3F690481572A}
  EndGlobalSection
  GlobalSection(ExtensibilityGlobals) = postSolution
  SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50}

_omnisharp.sln

@@ -12,7 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Controls", "Controls", "{45
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{E1082E26-D700-4127-9329-66D673FD2D55}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maui.Controls.Sample", "src\Controls\samples\Controls.Sample\Maui.Controls.Sample.csproj", "{B8DC1324-977C-46F1-B697-9064ADE6099A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maui.Controls.Sample", "src\Controls\samples\Controls.Sample\Maui.Controls.Sample.csproj", "{B8DC1324-977C-46F1-B697-9064ADE6099A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Compatibility", "Compatibility", "{123AA89E-1638-4E0E-B828-B8F9F9F906A2}"
 EndProject
@@ -90,9 +90,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtils.DeviceTests.Runne
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.DeviceTests", "src\Core\tests\DeviceTests\Core.DeviceTests.csproj", "{50BCB5CD-DC2A-42AA-B921-D99B19625CE1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Controls.Foldable", "src\Controls\Foldable\src\Controls.Foldable.csproj", "{F0A48792-ACD7-4B72-83EB-C56A70FA5A3A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Controls.Foldable", "src\Controls\Foldable\src\Controls.Foldable.csproj", "{F0A48792-ACD7-4B72-83EB-C56A70FA5A3A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Maps", "src\Core\maps\src\Maps.csproj", "{1C9F9D5A-2CF7-4ADB-A9F5-672ACC05B035}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Maps", "src\Core\maps\src\Maps.csproj", "{1C9F9D5A-2CF7-4ADB-A9F5-672ACC05B035}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Graphics", "Graphics", "{E4884871-4A1B-43BC-814F-E3D6E52B1673}"
 EndProject
@@ -104,6 +104,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Graphics", "src\Graphics\sr
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Graphics.Tests", "src\Graphics\tests\Graphics.Tests\Graphics.Tests.csproj", "{56BBFDBD-254F-42B6-9984-46E19C53FB00}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Core.DeviceTests.Shared", "src\Core\tests\DeviceTests.Shared\Core.DeviceTests.Shared.csproj", "{B000E53D-AB58-42E3-8964-2B3F30ECC886}"
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Any CPU = Debug|Any CPU
@@ -229,6 +231,10 @@ Global
  {56BBFDBD-254F-42B6-9984-46E19C53FB00}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {56BBFDBD-254F-42B6-9984-46E19C53FB00}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {56BBFDBD-254F-42B6-9984-46E19C53FB00}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B000E53D-AB58-42E3-8964-2B3F30ECC886}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B000E53D-AB58-42E3-8964-2B3F30ECC886}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B000E53D-AB58-42E3-8964-2B3F30ECC886}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B000E53D-AB58-42E3-8964-2B3F30ECC886}.Release|Any CPU.Build.0 = Release|Any CPU
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE
@@ -276,6 +282,7 @@ Global
  {936C47A9-A7EA-4FBD-8733-CED1D4100E69} = {E4884871-4A1B-43BC-814F-E3D6E52B1673}
  {CF056C95-51C4-4366-9D06-41D2B15EFEE4} = {42AB9AE1-631D-4AD4-85B7-910FF0940BDB}
  {56BBFDBD-254F-42B6-9984-46E19C53FB00} = {936C47A9-A7EA-4FBD-8733-CED1D4100E69}
+ {B000E53D-AB58-42E3-8964-2B3F30ECC886} = {C564DDD6-DE79-45CD-88EA-3F690481572A}
  EndGlobalSection
  GlobalSection(ExtensibilityGlobals) = postSolution
  SolutionGuid = {0B8ABEAD-D2B5-4370-A187-62B5ABE4EE50}

eng/Versions.props

@@ -38,12 +38,12 @@
  <MicrosoftAspNetCoreMetadataPackageVersion>6.0.10</MicrosoftAspNetCoreMetadataPackageVersion>
  <MicrosoftJSInteropPackageVersion>6.0.10</MicrosoftJSInteropPackageVersion>
  <!-- Other packages -->
- <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22524.2</MicrosoftCodeAnalysisNetAnalyzersVersion>
+ <MicrosoftCodeAnalysisNetAnalyzersVersion>7.0.0-preview1.22553.1</MicrosoftCodeAnalysisNetAnalyzersVersion>
  <MicrosoftCodeAnalysisPublicApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisPublicApiAnalyzersVersion>
  <MicrosoftCodeAnalysisBannedApiAnalyzersVersion>3.3.3</MicrosoftCodeAnalysisBannedApiAnalyzersVersion>
  <MicrosoftMauiGraphicsVersion>6.0.501</MicrosoftMauiGraphicsVersion>
  <SystemNumericsVectorsVersion>4.5.0</SystemNumericsVectorsVersion>
- <_MicrosoftWebWebView2Version>1.0.1370.28</_MicrosoftWebWebView2Version>
+ <_MicrosoftWebWebView2Version>1.0.1418.22</_MicrosoftWebWebView2Version>
  <!-- GLIDE - the android maven artifact in /src/Core/AndroidNative/maui/build.gradle -->
  <!-- must be kept in sync with the binding library version to it here: -->
  <_XamarinAndroidGlideVersion>4.13.2.2</_XamarinAndroidGlideVersion>

eng/cake/dotnet.cake

@@ -321,6 +321,7 @@ Task("dotnet-pack-docs")
  EnsureDirectoryExists(destDir);
  CleanDirectories(destDir);
 
+ // Get the docs for .NET MAUI
  foreach (var nupkg in GetFiles("./artifacts/Microsoft.Maui.*.Ref.*.nupkg"))
  {
  var d = $"{tempDir}/{nupkg.GetFilename()}";
@@ -330,6 +331,20 @@ Task("dotnet-pack-docs")
  CopyDirectory($"{d}/ref", $"{destDir}");
  }
 
+ // Get the docs for libraries separately distributed as NuGets
+ foreach (var pattern in NuGetOnlyPackages)
+ {
+ foreach (var nupkg in GetFiles($"./artifacts/{pattern}"))
+ {
+ var d = $"{tempDir}/{nupkg.GetFilename()}";
+ Unzip(nupkg, d);
+ DeleteFiles($"{d}/**/*.pri");
+ DeleteFiles($"{d}/**/*.aar");
+ DeleteFiles($"{d}/**/*.pdb");
+ CopyDirectory($"{d}/lib", $"{destDir}");
+ }
+ }
+
  CleanDirectories(tempDir);
  });
 

eng/pipelines/common/controlgallery-android.yml

@@ -8,6 +8,8 @@ steps:
  inputs:
  provisioning_script: $(provisionator.path)
  provisioning_extra_args: $(provisionator.extraArguments)
+ env:
+ AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
 
  - task: Bash@3
  displayName: 'Cake Provision'
@@ -70,4 +72,4 @@ steps:
  condition: always()
  inputs:
  PathtoPublish: '$(build.artifactstagingdirectory)'
- ArtifactName: OSXArtifacts
+ ArtifactName: OSXArtifacts

eng/pipelines/common/controlgallery-ios.yml

@@ -7,13 +7,17 @@ steps:
  condition: ne(variables['REQUIRED_XCODE'], '')
  inputs:
  provisioning_script: $(provisionator.xcode)
+ env:
+ AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
 
  - task: xamops.azdevex.provisionator-task.provisionator@1
  displayName: 'Provisionator'
  condition: eq(variables['provisioning'], 'true')
  inputs:
  provisioning_script: $(provisionator.path)
  provisioning_extra_args: $(provisionator.extraArguments)
+ env:
+ AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
 
  - script: |
  echo "##vso[task.prependpath]/Library/Frameworks/Mono.framework/Versions/Current/Commands/"

eng/pipelines/common/controlgallery-windows.yml

@@ -8,6 +8,8 @@ steps:
  inputs:
  provisioning_script: $(provisionator.path)
  provisioning_extra_args: $(provisionator.extraArguments)
+ env:
+ AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
 
  - powershell: |
  $(System.DefaultWorkingDirectory)/build.ps1 --target provision --TeamProject="$(System.TeamProject)"

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

@@ -6,12 +6,6 @@ parameters:
  provisionatorChannel: 'latest'
 
 steps:
- - template: agent-cleanser/v1.yml@xamarin-templates
- parameters:
- UninstallMono: false
- UninstallXamarinMac: false
- CleanseAgentToolsDotNet: true # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
-
  - template: provision.yml
  parameters:
  platform: macos

eng/pipelines/common/insertion.yml

@@ -3,7 +3,7 @@ parameters:
  vmImage: windows-latest 
 
 stages:
- - template: vs-insertion/stage/v1.yml@xamarin-templates
+ - template: vs-insertion/stage/v1.yml@yaml-templates
  parameters:
  dependsOn: nuget_signing
  approvalTimeoutInMinutes: 1
@@ -33,7 +33,7 @@ stages:
  dependsOn: nuget_signing
  condition: and(succeeded(), eq(variables.signingCondition, true))
  jobs:
- - template: compliance/sbom/job.v1.yml@xamarin-templates
+ - template: compliance/sbom/job.v1.yml@yaml-templates
  parameters:
  artifactNames: [ nuget, vs-msi-nugets, vsdrop-signed ]
  artifactMap: [ nuget/signed ] # Use artifacts that match the filter from the signed directory and not the top-level directory for the nuget artifact

eng/pipelines/common/pack.yml

@@ -5,12 +5,6 @@ parameters:
  artifact: 'nuget'
 
 steps:
- - ${{ if eq(parameters.platform, 'macOS') }}:
- - template: agent-cleanser/v1.yml@xamarin-templates
- parameters:
- UninstallMono: false
- UninstallXamarinMac: false
- CleanseAgentToolsDotNet: true # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
  - template: provision.yml
  parameters:
  platform: ${{ parameters.platform }}

eng/pipelines/common/provision.yml

@@ -5,22 +5,18 @@ parameters:
  provisionatorChannel: 'latest'
 
 steps:
- - task: UseDotNet@2 # https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/tool/dotnet-core-tool-installer?view=azure-devops
- displayName: 'Use .NET SDK 6'
- inputs:
- packageType: sdk
- version: 6.0.x
-
- - pwsh: |
- dotnet --version
- dotnet --list-sdks
- displayName: 'Show .NET SDK info'
-
  # Prepare macOS
  - ${{ if eq(parameters.platform, 'macos') }}:
+ - template: agent-cleanser/v1.yml@yaml-templates
+ parameters:
+ UninstallMono: false
+ UninstallXamarinMac: false
+ CleanseAgentToolsDotNet: true # Cleanse all .NET versions under the agent tools directory and use only those provisioned by the pipeline
+ SelfHealPowerShell: false
+ AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
  # Provision Xcode
  - ${{ if ne(parameters.skipXcode, 'true') }}:
- - task: xamops.azdevex.provisionator-task.provisionator@1
+ - task: xamops.azdevex.provisionator-task.provisionator@2
  displayName: 'Provision Xcode'
  condition: ne(variables['REQUIRED_XCODE'], '')
  inputs:
@@ -30,9 +26,10 @@ steps:
  PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
  AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
  # Provision Additional Software
- - task: xamops.azdevex.provisionator-task.provisionator@1
+ - task: xamops.azdevex.provisionator-task.provisionator@2
  displayName: 'Provision Additional Software'
  condition: eq(variables['provisioning'], 'true')
+ continueOnError: true 
  inputs:
  provisioning_script: $(provisionator.path)
  provisioning_extra_args: $(provisionator.extraArguments)
@@ -81,7 +78,6 @@ steps:
  inputs:
  certSecureFile: 'Components Mac Certificate.p12'
 
-
  # Prepare Windows
  - ${{ if eq(parameters.platform, 'windows') }}:
  - powershell: |
@@ -93,13 +89,14 @@ steps:
  msiexec.exe /package $output /quiet ADD_EXPLORER_CONTEXT_MENU_OPENPOWERSHELL=1 ENABLE_PSREMOTING=1 REGISTER_MANIFEST=1
  }
  displayName: 'Install PowerShell Core'
- - task: xamops.azdevex.provisionator-task.provisionator@1
+ - task: xamops.azdevex.provisionator-task.provisionator@2
  displayName: 'Provision Visual Studio'
  condition: eq(variables['provisioningVS'], 'true')
  inputs:
  provisioning_script: $(provisionator.vs)
  env:
  PROVISIONATOR_CHANNEL: ${{ parameters.provisionatorChannel }}
+ AUTH_TOKEN_GITHUB_COM: $(github--pat--vs-mobiletools-engineering-service2)
 
  - pwsh: |
  $msbuild = "$env:ProgramFiles/Microsoft Visual Studio/2022/Preview/MSBuild/Current/Bin/MSBuild.exe"
@@ -108,6 +105,17 @@ steps:
  condition: eq(variables['provisioningVS'], 'true')
 
  # Prepare Both
+ - task: UseDotNet@2 # https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/tool/dotnet-core-tool-installer?view=azure-devops
+ displayName: 'Use .NET SDK 6'
+ inputs:
+ packageType: sdk
+ version: 6.0.x
+
+ - pwsh: |
+ dotnet --version
+ dotnet --list-sdks
+ displayName: 'Show .NET SDK info'
+
  - pwsh: ./build.ps1 --target provision
  displayName: 'Cake Provision'
  condition: eq(variables['provisioningCake'], 'true')
@@ -125,14 +133,14 @@ steps:
 
 
  # Prepare for Reunion packages
- - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}:
- - task: NuGetAuthenticate@0
- displayName: 'Authenticate Reunion NuGet sources'
- inputs:
- nuGetServiceConnections: Project.Reunion.nuget.internal
- - pwsh: |
- $path = '$(Build.SourcesDirectory)\NuGet.config'
- [xml]$xml = Get-Content $path
- $xml.configuration.RemoveChild($xml.configuration.disabledPackageSources)
- $xml.Save($path)
- displayName: 'Add "wasdk-internal" to NuGet.config'
+ # - ${{ if eq(variables['System.TeamProject'], 'devdiv') }}:
+ #  - task: NuGetAuthenticate@0
+ #  displayName: 'Authenticate Reunion NuGet sources'
+ #  inputs:
+ #  nuGetServiceConnections: Project.Reunion.nuget.internal
+ #  - pwsh: |
+ #  $path = '$(Build.SourcesDirectory)\NuGet.config'
+ #  [xml]$xml = Get-Content $path
+ #  $xml.configuration.RemoveChild($xml.configuration.disabledPackageSources)
+ #  $xml.Save($path)
+ #  displayName: 'Add "wasdk-internal" to NuGet.config'