Repository navigation
[net11.0] Fix Skia dependencies and Android CI blockers - #38538
Merged
Merged
Conversation
Restore the dependency versions and SVG packaging/signing entries omitted when the SkiaSharp 4 source changes were merged from main. This fixes the missing SKPathBuilder and DrawBitmap overload build errors. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Contributor
|
🚀 Dogfood this PR with:
curl -fsSL https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.sh | bash -s -- 38538Or
iex "& { $(irm https://raw.githubusercontent.com/dotnet/maui/main/eng/scripts/get-maui-pr.ps1) } 38538" |
Contributor
Author
|
/azp run maui-pr |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
Contributor
Skill Validation Results
✅ Skill Validation Results —
|
Contributor
Author
|
/azp run maui-pr |
|
Azure Pipelines: Successfully started running 1 pipeline(s). |
Contributor
There was a problem hiding this comment.
🔵 Needs a closer look
Coordinated dependency, packaging, and signing changes require final human review.
Pull request overview
Restores coordinated SkiaSharp 4 dependencies and packaging definitions for net11.0.
Changes:
- Updates graphics, SVG, memory, buffer, and ExCSS dependency versions.
- Adds SVG assemblies to packaging, version mappings, and signing.
File summaries
| File | Description |
|---|---|
src/SingleProject/Resizetizer/src/ResizetizerPackages.projitems |
Adds required SVG assemblies to the package. |
eng/Versions.props |
Updates coordinated dependency versions. |
eng/Signing.props |
Adds signing entries for new assemblies. |
eng/NuGetVersions.targets |
Maps SVG dependencies to restored versions. |
Review details
- Files reviewed: 4/4 changed files
- Comments generated: 0
- Review effort level: Lite
Contributor
Author
|
@dalexsoto stamp |
Disambiguate Android intent flags from AndroidX.Activity.ActivityFlags. Share an API-aware task ID lookup between activity-result monitoring and its recreation test: use TaskId on Android 29+ and PersistentId on older supported versions. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Contributor
Author
|
/azp run maui-pr |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
kubaflo
changed the title
Comment on lines
+29
to
+32
| internal static int GetTaskId(ActivityManager.RecentTaskInfo taskInfo) => | ||
| OperatingSystem.IsAndroidVersionAtLeast(29) | ||
| ? taskInfo.TaskId | ||
| : taskInfo.PersistentId; |
Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Contributor
Author
|
/azp run maui-pr |
|
Azure Pipelines will not run the associated pipelines, because the pull request was updated after the run command was issued. Review the pull request again and issue a new run command. |
kubaflo
changed the title
Contributor
There was a problem hiding this comment.
🔵 Needs a closer look
The Android API 24–28 task-ID fallback still needs runtime or equivalent deterministic test coverage.
Review details
Suppressed comments (2)
src/Essentials/src/Platform/PlatformUtils.android.cs:32
- This introduces the supported Android 24–28 fallback, but the recreation tests exercise the API 30
TaskIdbranch only. A mismatch betweenActivity.TaskIdandRecentTaskInfo.PersistentIdon an older device would therefore go undetected while this helper controls whether pending requests are canceled or kept alive. Add an API 24–28 device test/leg, or a deterministic seam that exercises the fallback, before relying on this path.
internal static int GetTaskId(ActivityManager.RecentTaskInfo taskInfo) =>
OperatingSystem.IsAndroidVersionAtLeast(29)
? taskInfo.TaskId
: taskInfo.PersistentId;
src/Essentials/test/DeviceTests/Tests/ActivityStateManagerRecreation_Tests.Android.cs:200
- The recreation tests exercise
GetTaskIdonly on the API 30 emulator, so the newly introducedPersistentIdbranch for Android 24–28 is not validated. Because this branch is the compatibility path that avoids theTaskIdAPI warning, please add a runtime test on a pre-29 emulator (or an equivalent test seam) before relying on it for older supported Android versions.
if (appTask.TaskInfo is { } taskInfo && PlatformUtils.GetTaskId(taskInfo) == taskId)
- Files reviewed: 9/9 changed files
- Comments generated: 0 new
- Review effort level: Lite
This was referenced Sep 15, 2026
Contributor
Author
|
@dalexsoto stamp |
dalexsoto
approved these changes
Sep 15, 2026
simonrozsival
added a commit
to dotnet/android
that referenced
this pull request
Sep 16, 2026
R8 9.4.17 inlines and removes companion methods; disabling optimization alone still allows their names to be obfuscated. Disable optimization and obfuscation only in the interface parity fixture, keeping shrinking and the existing DEX/JNI assertions enabled. Replayed the CoreCLR and NativeAOT CI Java inputs and keep rules locally at API 21 and 24, and compared all existing DEX-shape assertions against these outputs and D8. The MAUI Skia dependency mismatch was fixed independently by dotnet/maui#38538. Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
kubaflo
added a commit
that referenced
this pull request
Sep 23, 2026
<!-- 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! ## Description Repair `maui-pr` on `release/11.0.1xx-rc2` without downgrading its Apple 27.0 or Android 37.0 platform SDKs. | Failure | Fix | |---|---| | Apple manifests reference unavailable .NET 10 compatibility packs `26.5.10322` | Add the verified public feed from BAR build 332005 outside dependency-flow-managed sources. | | SVG restore downgrades and Skia 4 compilation errors | Restore coordinated SkiaSharp/HarfBuzz/SVG/ExCSS/System.Memory/System.Buffers pins used by net11.0 and #38538. | | Aces agents lack Xcode 27 | Select MAUI agents advertising Xcode 27 RC for public macOS jobs; fail explicitly if the required Xcode is absent. | | Universal iOS 27 simulator download is unavailable | Select native ARM64 on Apple Silicon; retain universal on Intel. Keep downloads version-pinned and fail unavailable downloads before destructive simulator recovery. | | Apple library TFMs still target 26.5 | Align current Apple TFMs and SDK defaults to 27.0; preserve previous-.NET TFMs. | | Xcode 27 rejects native iOS 12.x / mapped macOS 10.15 minimums | Set native and managed iOS minimums to 15.0, matching app templates. Native iOS 15.0 maps to macOS 12.0 for Catalyst. | | Apple binding generator needs a newer .NET host runtime | Align bootstrap, workload-provisioning, and SDK provenance pins at `11.0.100-rc.2.26470.103`, from green net11 build 1607497. Its runtime satisfies Apple's `26465.108` minimum; other product/Arcade pins stay unchanged. | | Helix monitor selects unauthorized `NetCore-Svc-Public` | Reuse the submission pool and preserve public/internal Linux image demands. | | Raster image assertions pass, but Windows test cleanup encounters a sharing violation | Reuse `BaseTest`'s existing RC1-era bounded, logged cleanup retries from #38124. Put raster outputs in its isolated directory and dispose raster tools deterministically. | Compared RC1 at `484132f9e5`: retain its native-runtime download capability and established test-cleanup handling, without copying unpinned fallback behavior or downgrading RC2 platform inputs. Its latest 15 branch builds were not green, so its entire dependency set is not treated as a known-good replacement. Add focused regression checks and CI troubleshooting guidance. No test skips, assertion weakening, warning suppressions, or pool-permission changes. Cleanup still fails after retry exhaustion. Rebased onto RC2 `2fe346448b`. **Compatibility:** The declared iOS minimum increases from 13.0 to 15.0 to match the native framework required by Xcode 27. Previous-.NET TFM identifiers remain unchanged. ## Validation - **Full latest-head `maui-pr` succeeded:** [build 1608203](https://dev.azure.com/dnceng-public/public/_build/results?buildId=1608203), completed 2026-09-23 at 08:17 UTC for source head `7c8e9a5d710c2552ed3901caed84bfd87cfcb47f`. All 31 jobs and all four stages succeeded; the complete 1,233-record timeline contains no failed, canceled, or abandoned records. - All 48 Helix work items passed. Actual failed-result queries across all 26 published test runs returned no failures. The previously failing raster test is explicitly `Pass` in both Windows Debug and Release uploaded XML. - Android integration: all 11 tests passed, with zero failures or skips, including NativeAOT, net10/net11, MAUI/Blazor, Debug/Release, and full-trimming scenarios. The long overall build duration was dominated by waiting for capacity in `MAUI-DNCENG`; the Android job itself took 25m35s. No pool or coverage bypass was used. - Reproduced Resizetizer restore downgrades and seven Graphics.Skia compilation errors before fixing dependencies; Graphics.Skia builds afterward. - Graphics.Tests: 375 passed. Full Resizetizer suite after the cleanup change on the selected RC2 SDK: 782 passed, 2 existing platform skips. All 23 raster tests pass. Resizetizer packaging contains the required SVG/Skia/HarfBuzz assemblies. - Pipeline/Review-PR Pester checks: 103 passed, covering executed Bash download scenarios, Apple SDK/TFM consistency, deployment minimums, and SDK pin alignment. - Native Release archives pass locally for iOS device, simulator, and Catalyst. Effective Catalyst settings confirm the macOS 12.0 mapping. CI subsequently built these using Xcode 27. - Confirmed the exact Apple binding-generator runtime requirement from its package and successfully launched that actual tool with the newly selected SDK runtime. - MSBuild evaluation confirms net11 Apple 27.0 and Android 37.0 TFMs, with unchanged net10 compatibility TFMs. - Original pipeline regressions fail against the release baseline and pass with the fixes. Compatibility packages, XML/YAML parsing, Xcode project lint, Bash syntax, scoped formatting, and whitespace checks were verified. ## CI progression Original failures: [1607595](https://dev.azure.com/dnceng-public/public/_build/results?buildId=1607595), [1607490](https://dev.azure.com/dnceng-public/public/_build/results?buildId=1607490). - [1607851](https://dev.azure.com/dnceng-public/public/_build/results?buildId=1607851): removed attempted legacy Provisionator enablement; that task is unavailable publicly. - [1607874](https://dev.azure.com/dnceng-public/public/_build/results?buildId=1607874): Xcode selected; exposed universal-runtime download issue. - [1607921](https://dev.azure.com/dnceng-public/public/_build/results?buildId=1607921): runtime/workloads installed; exposed TFM mismatch. - [1608019](https://dev.azure.com/dnceng-public/public/_build/results?buildId=1608019): exposed native deployment minimums. - [1608031](https://dev.azure.com/dnceng-public/public/_build/results?buildId=1608031): native compilation passed; exposed binding-generator host runtime. - [1608055](https://dev.azure.com/dnceng-public/public/_build/results?buildId=1608055): all four framework build jobs, both pack jobs, and completed integration jobs passed. One Windows Debug Resizetizer cleanup failed; fixed in `7c8e9a5d71`. Android had not started before the next push superseded this run. - [1608203](https://dev.azure.com/dnceng-public/public/_build/results?buildId=1608203): **succeeded on the final head**. All build, packaging, unit-test, and integration-test jobs passed, including Android. Build Analysis and Build Insights also passed. --------- Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
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 join this conversation on GitHub.
Already have an account?
Sign in to comment
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 of Change
Targets net11.0.
The automated main-to-net11.0 merge #38455 brought in the SkiaSharp 4 source changes from #37731 while retaining the older dependency and packaging definitions. Graphics.Skia therefore uses
SKPathBuilderand the newerDrawBitmapoverload but restores SkiaSharp 3.116.1. This breaks Windows/macOS solution builds, unit-test builds, and macOS packing; Helix monitoring and native-artifact publishing fail downstream.Restore the coordinated upgrade from #37731:
With Graphics compiling, PR build 1596609 exposed two further Android recreation-test compilation problems. This PR also:
Android.Content.ActivityFlagsso the newAndroidX.Activity.ActivityFlagstype does not make intent flags ambiguous.TaskInfo.TaskIdon Android 29+,RecentTaskInfo.PersistentIdon Android 24–28. This preserves support for older Android versions instead of suppressing the platform warning or raising the minimum OS version.PR build 1596661 then reached integration testing and exposed JDK-discovery failures in macOS NativeAOT and Windows/macOS MultiProject tests. Although provisioning selected a valid JDK, Android SDK discovery still inspected broken system registrations (
java_home -Xreturning empty XML) or the parent of a nested Windows JDK installation (missingjar).ProvisionJdknow publishes the validated home asJavaSdkDirectoryin addition toJAVA_HOME, so downstream MSBuild processes use that JDK directly. The existing JDK validation and strict integration-test warning checks remain intact.No Graphics implementation changes, public API additions, or warning suppressions are needed.
Issues Fixed
Fixes the persistent
maui-prcompilation failure on net11.0, observed in build 1593297 and build 1594662, plus the Android compilation and JDK-discovery blockers subsequently exposed in PR builds 1596609 and 1596661.Validation
Full CI: maui-pr build 1596781 completed successfully for head
7cbfdec35ece2ad29e072bae352fd29d3f417abbon September 15, 2026. All 31 jobs succeeded, including Windows/macOS Debug/Release solution builds, both packaging jobs, and all integration jobs. All 48 Helix unit-test work items passed.The previously failing JDK-sensitive integration jobs now pass: macOS AOT (18 passed), MultiProject macOS and Windows (19 passed and four existing skips each). The final Windows Build integration suite passed 84 tests with two existing skips. No tests were skipped or warning checks relaxed by this PR.
Local and earlier CI evidence:
CS0246/CS1501errors with a targeted Graphics.Skia netstandard2.0 build before the change; the identical build passes afterward with zero warnings/errors.CS0104intent-flag errors and theCA1416task-ID error locally in Essentials.DeviceTests for net11.0-android; the same Debug build succeeds after the Android repair, with only existing MAUI1001 warnings.ProvisionJdklocally and verified that both Azure variables contain the validated JDK home. Passed its emitted value to a fresh Android_ResolveSdksinvocation using Azure's uppercase environment-variable convention; it selected the expected JDK even with an intentionally invalidJAVA_HOME. The CI agent-specific broken registrations were not reproduced locally.Local validation used the installed .NET 11 Preview 6 SDK; the successful full
maui-prbuild used the branch's RC.2 SDK.