Merge release/11.0.1xx-preview4 into net11.0 - #35330
Merged
Merged
Conversation
…an network isolation compliance (#35170) <!-- 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! Cherry-pick of #35089 from `release/10.0.1xx-sr6` to `release/11.0.1xx-preview4`. See #35089 for full details — routes Gradle/Maven dependency resolution through Azure Artifacts feed for CFSClean compliance. --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Matt Mitchell (.NET) <mmitche@microsoft.com>
…dotnet/dotnet (#35171) This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Sdk.Android.Manifest-10.0.100**: from 36.1.53 to 36.1.53 (parent: Microsoft.Android.Sdk.Windows) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:74f9a062-0c3c-4244-97f5-1bdef5ec5486) ## From https://github.com/dotnet/dotnet - **Subscription**: [74f9a062-0c3c-4244-97f5-1bdef5ec5486](https://maestro.dot.net/subscriptions?search=74f9a062-0c3c-4244-97f5-1bdef5ec5486) - **Build**: [20260424.22](https://dev.azure.com/dnceng/internal/_build/results?buildId=2959731) ([311857](https://maestro.dot.net/channel/9588/github:dotnet:dotnet/build/311857)) - **Date Produced**: April 25, 2026 6:28:19 AM UTC - **Commit**: [48bd87d899e187fe0e4e2b81a7b4a65a37845213](dotnet/dotnet@48bd87d) - **Branch**: [release/11.0.1xx-preview4](https://github.com/dotnet/dotnet/tree/release/11.0.1xx-preview4) [DependencyUpdate]: <> (Begin) - **Dependency Updates**: - From [11.0.0-preview.3.26203.107 to 11.0.0-preview.4.26224.122][1] - Microsoft.AspNetCore.Authentication.Facebook - Microsoft.AspNetCore.Authentication.Google - Microsoft.AspNetCore.Authentication.MicrosoftAccount - Microsoft.AspNetCore.Authorization - Microsoft.AspNetCore.Components - Microsoft.AspNetCore.Components.Analyzers - Microsoft.AspNetCore.Components.Forms - Microsoft.AspNetCore.Components.Web - Microsoft.AspNetCore.Components.WebAssembly - Microsoft.AspNetCore.Components.WebAssembly.Server - Microsoft.AspNetCore.Components.WebView - Microsoft.AspNetCore.Metadata - Microsoft.Extensions.Configuration - Microsoft.Extensions.Configuration.Abstractions - Microsoft.Extensions.Configuration.Json - Microsoft.Extensions.DependencyInjection - Microsoft.Extensions.DependencyInjection.Abstractions - Microsoft.Extensions.FileProviders.Abstractions - Microsoft.Extensions.Hosting.Abstractions - Microsoft.Extensions.Logging - Microsoft.Extensions.Logging.Abstractions - Microsoft.Extensions.Logging.Console - Microsoft.Extensions.Logging.Debug - Microsoft.Extensions.Primitives - Microsoft.JSInterop - Microsoft.NETCore.App.Ref - From [11.0.0-beta.26203.107 to 11.0.0-beta.26224.122][1] - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.Build.Tasks.Feed - Microsoft.DotNet.Build.Tasks.Installers - Microsoft.DotNet.Build.Tasks.Workloads - Microsoft.DotNet.Helix.Sdk - Microsoft.DotNet.RemoteExecutor - Microsoft.DotNet.SharedFramework.Sdk - Microsoft.DotNet.XUnitExtensions - From [11.0.100-preview.3.26203.107 to 11.0.100-preview.4.26224.122][1] - Microsoft.NET.Sdk [1]: dotnet/dotnet@ca90a9c...48bd87d [DependencyUpdate]: <> (End) [marker]: <> (End:74f9a062-0c3c-4244-97f5-1bdef5ec5486) [marker]: <> (Begin:902715f9-ebb0-449f-aca4-494dbb50849c) ## From https://github.com/dotnet/android - **Subscription**: [902715f9-ebb0-449f-aca4-494dbb50849c](https://maestro.dot.net/subscriptions?search=902715f9-ebb0-449f-aca4-494dbb50849c) - **Build**: [11.0.0-preview.4.26229.1+azdo.13969894](https://dev.azure.com/devdiv/DevDiv/_build/results?buildId=13969894) ([312445](https://maestro.dot.net/channel/9588/github:dotnet:android/build/312445)) - **Date Produced**: April 29, 2026 5:35:21 PM UTC - **Commit**: [e8fb4bc8f779fd0d27c5c0ed04637a5dd25c083b](dotnet/android@e8fb4bc) - **Branch**: [release/11.0.1xx-preview4](https://github.com/dotnet/android/tree/release/11.0.1xx-preview4) [DependencyUpdate]: <> (Begin) - **Dependency Updates**: - From [36.99.0-preview.3.10 to 36.99.0-preview.4.137][4] - Microsoft.Android.Sdk.Windows [4]: dotnet/android@0048908...e8fb4bc [DependencyUpdate]: <> (End) [marker]: <> (End:902715f9-ebb0-449f-aca4-494dbb50849c) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions <github-actions@xamarin.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Co-authored-by: Rolf Bjarne Kvinge <rolf@xamarin.com>
…merge/preview4-to-net11.0
Contributor
|
🚀 Dogfood this PR with:
curl -fsSL https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.sh | bash -s -- 35330Or
iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 35330" |
Contributor
🔍 Skill Validation Results✅ Static Checks PassedSkills checked: 15 | Agents checked: 3 Full validator output⏭️ LLM Evaluation: SkippedNo changed skills with eval tests found. |
Contributor
There was a problem hiding this comment.
Pull request overview
This PR merges release/11.0.1xx-preview4 into net11.0, bringing preview4 build infrastructure, dependency, and SDK updates forward (notably .NET 11 preview4, Apple SDK 26.4, and CI provisioning/publishing adjustments).
Changes:
- Bumps .NET/Arcade/Helix toolset versions to preview4 and updates Apple SDK/TFM defaults to 26.4.
- Updates CI to provision via
dotnet cakeand introducesSkipInitInternalToolingto avoid redundant workload install steps. - Moves AndroidNative Gradle/Maven resolution to Azure Artifacts feeds for CFSClean compliance, adding an ingestion helper script and Gradle init script.
Show a summary per file
| File | Description |
|---|---|
| src/DotNet/DotNet.csproj | Adds target to remove stale workload manifest bands during dotnet provisioning. |
| src/Core/AndroidNative/settings.gradle | Redirects plugin/dependency repos to Azure Artifacts + adds credprovider plugin. |
| src/Core/AndroidNative/gradle/wrapper/gradle-wrapper.properties | Documents Gradle 8.x pin constraint vs Android SDK/Gradle 9.x. |
| src/Core/AndroidNative/build.gradle | Routes buildscript deps through Azure Artifacts Maven feed. |
| NuGet.config | Updates Darc-managed AzDO feeds (removes old Android/macOS entries, adds new macios feed). |
| global.json | Updates repo toolset SDK and MSBuild SDK versions to preview4-aligned builds. |
| eng/Versions.props | Updates central dependency versions (SDK/runtime/extensions/android/macios) to preview4/26.4. |
| eng/Version.Details.xml | Updates dependency flow versions/shas for SDK/runtime/android/macios/extensions. |
| eng/Tools.props | Adds SkipInitInternalTooling gate to avoid redundant workload install in CI. |
| eng/pipelines/common/variables.yml | Bumps required Xcode version to 26.4. |
| eng/pipelines/common/cache-gradle.yml | Ensures eng/init.gradle is installed after cache restore (cross-OS). |
| eng/pipelines/arcade/stage-unit-tests.yml | Switches BuildTasks provisioning/build to dotnet cake target. |
| eng/pipelines/arcade/stage-pack.yml | Provisions SDK/workloads via Cake and skips InitInternalTooling during pack. |
| eng/pipelines/arcade/stage-helix-tests.yml | Provisions via Cake and skips InitInternalTooling when running Helix tests. |
| eng/pipelines/arcade/stage-device-tests.yml | Uses Cake to provision/build BuildTasks (incl. Windows device tests path). |
| eng/pipelines/arcade/stage-build.yml | Uses Cake for BuildTasks, skips InitInternalTooling for main solution build. |
| eng/init.gradle | Adds Gradle init script to replace public repos with Azure Artifacts feed. |
| eng/ingest-maven-deps.sh | Adds helper to pre-ingest Gradle/Maven deps into Azure Artifacts feed. |
| eng/common/tools.sh | Adds DOTNET_GLOBAL_INSTALL_DIR support; reworks Arcade toolset init via dotnet package download; adds DotNet helper; refines warn-not-as-error behavior. |
| eng/common/tools.ps1 | Mirrors tools.sh changes for PowerShell; removes xcopy-msbuild fallback; adds DotNet helper; updates toolset init logic. |
| eng/common/templates/variables/pool-providers.yml | Updates example Windows image override to windows.vs2026.amd64. |
| eng/common/templates/steps/component-governance.yml | Removes shim template (component governance no longer invoked here). |
| eng/common/templates/job/job.yml | Updates artifact publishing approach and removes component governance wiring (public skip variable). |
| eng/common/templates-official/variables/pool-providers.yml | Updates example official Windows image to windows.vs2026.amd64. |
| eng/common/templates-official/steps/publish-pipeline-artifacts.yml | Adjusts optional inputs emission (sbomEnabled/isProduction). |
| eng/common/templates-official/steps/component-governance.yml | Removes shim template (component governance no longer invoked here). |
| eng/common/templates-official/job/job.yml | Updates official artifact publishing outputs (pipeline artifacts + retry naming + V4 publishing output). |
| eng/common/template-guidance.md | Removes SBOM shim references in guidance. |
| eng/common/sdk-task.sh | Updates help text to reflect new Arcade toolset layout. |
| eng/common/sdk-task.ps1 | Updates help text and removes xcopy-msbuild setup; uses VS MSBuild directly. |
| eng/common/post-build/sourcelink-validation.ps1 | Removes non-functional SourceLink validation script. |
| eng/common/post-build/redact-logs.ps1 | Switches dotnet tool install from --add-source to --source. |
| eng/common/generate-sbom-prep.sh | Removes SBOM prep script (deprecated path). |
| eng/common/generate-sbom-prep.ps1 | Removes SBOM prep script (deprecated path). |
| eng/common/darc-init.sh | Switches darc tool install from --add-source to --source. |
| eng/common/darc-init.ps1 | Switches darc tool install from --add-source to --source. |
| eng/common/core-templates/steps/source-build.yml | Marks published logs as non-production artifacts. |
| eng/common/core-templates/steps/publish-logs.yml | Switches to pipeline artifacts publishing; adds non-production metadata. |
| eng/common/core-templates/steps/generate-sbom.yml | Deprecates SBOM generation template, emitting a warning instead. |
| eng/common/core-templates/steps/component-governance.yml | Removes core component governance step template. |
| eng/common/core-templates/stages/renovate.yml | Updates renovate pool image to windows.vs2026.amd64. |
| eng/common/core-templates/post-build/setup-maestro-vars.yml | Switches ReleaseConfigs download to DownloadPipelineArtifact. |
| eng/common/core-templates/post-build/post-build.yml | Adds publishing infra v4 option + artifact download adjustments; removes SourceLink validation job; updates pool images. |
| eng/common/core-templates/post-build/common-variables.yml | Removes SourceLink CLI version variable. |
| eng/common/core-templates/jobs/jobs.yml | Adds publishingVersion parameter and forwards it to job templates. |
| eng/common/core-templates/job/renovate.yml | Marks renovate logs artifacts as non-production. |
| eng/common/core-templates/job/publish-build-assets.yml | Updates pool images and publish steps to pipeline artifacts + non-production metadata. |
| eng/common/core-templates/job/onelocbuild.yml | Updates pool images to newer Windows images. |
| eng/common/core-templates/job/job.yml | Removes componentGovernanceSteps parameter and adds enablePublishing flag. |
| eng/build.sh | Minor whitespace/format adjustment. |
| Directory.Build.props | Updates Apple TFM default/current versions to 26.4. |
| .github/skills/azdo-build-investigator/SKILL.md | Adds guidance for Gradle/Maven feed 401 (XAGRDL0000) failures and ingestion fix. |
| .github/instructions/android.instructions.md | Extends Android instructions scope and documents Gradle/Maven ingestion workflow. |
| .github/copilot-instructions.md | Documents CFSClean Gradle/Maven feed behavior and ingestion fix; warns against Gradle 9.x upgrade. |
Copilot's findings
- Files reviewed: 54/54 changed files
- Comments generated: 3
| arguments: > | ||
| -BuildId $(BARBuildId) | ||
| -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} | ||
| -PublishingInfraVersion 3 |
Comment on lines
+4
to
+9
| # CG related params, unused now and can eventually be removed | ||
| disableComponentGovernance: unused | ||
| # Sbom related params, unused now and can eventually be removed | ||
| enableSbom: unused | ||
| PackageVersion: unused | ||
| BuildDropPath: unused |
Comment on lines
+3
to
+6
| # Sbom related params, unused now and can eventually be removed | ||
| enableSbom: unused | ||
| PackageVersion: unused | ||
| BuildDropPath: unused |
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Member
Author
|
/azp run maui-pr-uitests |
Member
Author
|
/azp run maui-pr-devicetests |
|
Azure Pipelines successfully started running 1 pipeline(s). |
1 similar comment
|
Azure Pipelines successfully started running 1 pipeline(s). |
This was referenced May 7, 2026
Open
Includes Rolf's fix for mlaunch failing to launch apps on simulator with Xcode 26.4 (dotnet/xharness#1591). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Member
Author
|
/azp run maui-pr-uitests |
Member
Author
|
/azp run maui-pr-devicetests |
|
Azure Pipelines successfully started running 1 pipeline(s). |
1 similar comment
|
Azure Pipelines successfully started running 1 pipeline(s). |
…otnet/macios (#35271) This pull request updates the following dependencies [marker]: <> (Begin:5ff6fff7-e896-44f6-b87f-673c4569f4a5) ## From https://github.com/dotnet/macios - **Subscription**: [5ff6fff7-e896-44f6-b87f-673c4569f4a5](https://maestro.dot.net/subscriptions?search=5ff6fff7-e896-44f6-b87f-673c4569f4a5) - **Build**: [20260501.3](https://dev.azure.com/devdiv/DevDiv/_build/results?buildId=13990367) ([312733](https://maestro.dot.net/channel/9588/github:dotnet:macios/build/312733)) - **Date Produced**: May 1, 2026 8:08:10 AM UTC - **Commit**: [cbe42632ab063a8b23df492692f92beeeda68a16](dotnet/macios@cbe4263) - **Branch**: [release/11.0.1xx-preview4](https://github.com/dotnet/macios/tree/release/11.0.1xx-preview4) [DependencyUpdate]: <> (Begin) - **Dependency Updates**: - From [26.4.11511-net11-p4 to 26.4.11514-net11-p4][3] - Microsoft.iOS.Sdk.net11.0_26.4 - Microsoft.MacCatalyst.Sdk.net11.0_26.4 - Microsoft.macOS.Sdk.net11.0_26.4 - Microsoft.tvOS.Sdk.net11.0_26.4 [3]: dotnet/macios@16dad20...cbe4263 [DependencyUpdate]: <> (End) [marker]: <> (End:5ff6fff7-e896-44f6-b87f-673c4569f4a5) [marker]: <> (Begin:74f9a062-0c3c-4244-97f5-1bdef5ec5486) ## From https://github.com/dotnet/dotnet - **Subscription**: [74f9a062-0c3c-4244-97f5-1bdef5ec5486](https://maestro.dot.net/subscriptions?search=74f9a062-0c3c-4244-97f5-1bdef5ec5486) - **Build**: [20260430.15](https://dev.azure.com/dnceng/internal/_build/results?buildId=2964538) ([312694](https://maestro.dot.net/channel/9588/github:dotnet:dotnet/build/312694)) - **Date Produced**: May 1, 2026 3:25:05 AM UTC - **Commit**: [4370ea16341331f045fa9b89cc46e03aed27195c](dotnet/dotnet@4370ea1) - **Branch**: [release/11.0.1xx-preview4](https://github.com/dotnet/dotnet/tree/release/11.0.1xx-preview4) [DependencyUpdate]: <> (Begin) - **Dependency Updates**: - From [11.0.0-preview.4.26224.122 to 11.0.0-preview.4.26230.115][2] - Microsoft.AspNetCore.Authentication.Facebook - Microsoft.AspNetCore.Authentication.Google - Microsoft.AspNetCore.Authentication.MicrosoftAccount - Microsoft.AspNetCore.Authorization - Microsoft.AspNetCore.Components - Microsoft.AspNetCore.Components.Analyzers - Microsoft.AspNetCore.Components.Forms - Microsoft.AspNetCore.Components.Web - Microsoft.AspNetCore.Components.WebAssembly - Microsoft.AspNetCore.Components.WebAssembly.Server - Microsoft.AspNetCore.Components.WebView - Microsoft.AspNetCore.Metadata - Microsoft.Extensions.Configuration - Microsoft.Extensions.Configuration.Abstractions - Microsoft.Extensions.Configuration.Json - Microsoft.Extensions.DependencyInjection - Microsoft.Extensions.DependencyInjection.Abstractions - Microsoft.Extensions.FileProviders.Abstractions - Microsoft.Extensions.Hosting.Abstractions - Microsoft.Extensions.Logging - Microsoft.Extensions.Logging.Abstractions - Microsoft.Extensions.Logging.Console - Microsoft.Extensions.Logging.Debug - Microsoft.Extensions.Primitives - Microsoft.JSInterop - Microsoft.NETCore.App.Ref - From [11.0.0-beta.26224.122 to 11.0.0-beta.26230.115][2] - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.Build.Tasks.Feed - Microsoft.DotNet.Build.Tasks.Installers - Microsoft.DotNet.Build.Tasks.Workloads - Microsoft.DotNet.Helix.Sdk - Microsoft.DotNet.RemoteExecutor - Microsoft.DotNet.SharedFramework.Sdk - Microsoft.DotNet.XUnitExtensions - From [11.0.100-preview.4.26224.122 to 11.0.100-preview.4.26230.115][2] - Microsoft.NET.Sdk [2]: dotnet/dotnet@48bd87d...4370ea1 [DependencyUpdate]: <> (End) [marker]: <> (End:74f9a062-0c3c-4244-97f5-1bdef5ec5486) [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.MacCatalyst.Sdk.net10.0_26.4**: from 26.4.10255 to 26.4.10259 (parent: Microsoft.MacCatalyst.Sdk.net11.0_26.4) - **Microsoft.macOS.Sdk.net10.0_26.4**: from 26.4.10255 to 26.4.10259 (parent: Microsoft.macOS.Sdk.net11.0_26.4) - **Microsoft.iOS.Sdk.net10.0_26.4**: from 26.4.10255 to 26.4.10259 (parent: Microsoft.iOS.Sdk.net11.0_26.4) - **Microsoft.tvOS.Sdk.net10.0_26.4**: from 26.4.10255 to 26.4.10259 (parent: Microsoft.tvOS.Sdk.net11.0_26.4) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: GitHub Actions <github-actions@xamarin.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
…merge/preview4-to-net11.0
Member
Author
|
/azp run maui-pr-uitests, maui-pr-devicetests |
|
Azure Pipelines successfully started running 2 pipeline(s). |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 from this PR and let us know in a comment if this change resolves your issue. Thank you!
Description
Merges
release/11.0.1xx-preview4intonet11.0to bring preview4 changes upstream. Clean merge — no conflicts.Key changes flowing from preview4:
Workload provisioning fix — Switch CI from
build.shtodotnet cakefor SDK provisioning, fixing MSBuild workload resolver caching issues ([release/8.0.4xx] Update branding to 8.0.420 sdk#53233). AddsSkipInitInternalToolingto prevent redundant DotNet.csproj re-runs.iOS/macOS SDK bump from 26.2 → 26.4 — Updates macios packs to preview4 versions. This should resolve CA1416/CA1422 deprecated API errors currently failing on net11.0.
Xcode 26.2 → 26.4 — Bumps CI Xcode version to match the 26.4 SDK packs.
DotNet.csproj stale manifest cleanup —
_CleanStaleWorkloadManifestBandstarget removes stale preview bands.Dependency updates — Android, macios, and dotnet/dotnet packages updated to preview4 versions via Maestro.