Skip to content

[xcode26.4] Merge remote-tracking branch 'origin/main' into xcode26.4#24847

Merged
dalexsoto merged 11 commits intoxcode26.4from
dev/alex/main2xcode26.4
Mar 9, 2026
Merged

[xcode26.4] Merge remote-tracking branch 'origin/main' into xcode26.4#24847
dalexsoto merged 11 commits intoxcode26.4from
dev/alex/main2xcode26.4

Conversation

@dalexsoto
Copy link
Copy Markdown
Member

@dalexsoto dalexsoto commented Mar 6, 2026

No description provided.

dotnet-maestro bot and others added 10 commits March 4, 2026 10:07
@dotnet-maestro
[main] Update dependencies from dotnet/macios (#24821)
0a86cf7 
This pull request updates the following dependencies

[marker]: <> (Begin:c0371266-dd6f-4959-822b-decc72d2d668)
## From https://github.com/dotnet/macios
- **Subscription**:
[c0371266-dd6f-4959-822b-decc72d2d668](https://maestro.dot.net/subscriptions?search=c0371266-dd6f-4959-822b-decc72d2d668)
- **Build**:
[20260302.8](https://dev.azure.com/devdiv/DevDiv/_build/results?buildId=13440985)
([304125](https://maestro.dot.net/channel/3884/github:dotnet:macios/build/304125))
- **Date Produced**: March 3, 2026 2:21:46 AM UTC
- **Commit**:
[42038e1](42038e1)
- **Branch**:
[release/9.0.1xx](https://github.com/dotnet/macios/tree/release/9.0.1xx)

[DependencyUpdate]: <> (Begin)

- **Dependency Updates**:
  - From [26.2.9000 to 26.2.9001][1]
     - Microsoft.iOS.Sdk.net9.0_26.2
     - Microsoft.MacCatalyst.Sdk.net9.0_26.2
     - Microsoft.macOS.Sdk.net9.0_26.2
     - Microsoft.tvOS.Sdk.net9.0_26.2

[1]: 2634d0a...42038e1

[DependencyUpdate]: <> (End)


[marker]: <> (End:c0371266-dd6f-4959-822b-decc72d2d668)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@dotnet-maestro
[main] Update dependencies from dotnet/dotnet (#24807)
8c6b601 
This pull request updates the following dependencies

## From https://github.com/dotnet/dotnet

- **Subscription**: [30303172-6f12-44a9-887a-ea8520fce068](https://maestro.dot.net/subscriptions?search=30303172-6f12-44a9-887a-ea8520fce068)
- **Build**: [20260302.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2916063) ([304003](https://maestro.dot.net/channel/9626/github:dotnet:dotnet/build/304003))
- **Date Produced**: March 2, 2026 3:25:47 PM UTC
- **Commit**: [938faf92928867a829fc5678ff93daf37821a3c5](dotnet/dotnet@938faf9)
- **Branch**: [release/10.0.3xx](https://github.com/dotnet/dotnet/tree/release/10.0.3xx)

- **Dependency Updates**:
  - From [10.0.0-beta.26126.103 to 10.0.0-beta.26152.104][1]
     - Microsoft.DotNet.Arcade.Sdk
     - Microsoft.DotNet.Build.Tasks.Feed
     - Microsoft.DotNet.SharedFramework.Sdk
  - From [10.0.300-preview.26126.103 to 10.0.300-preview.26152.104][1]
     - Microsoft.NET.Sdk
     - Microsoft.TemplateEngine.Authoring.Tasks

[1]: dotnet/dotnet@c9c7256...938faf9
@rolfbjarne
[devops] Treat 'merge/' branches as pull request branches. (#24823)
3ab08da 
These branches come from the inter-branch-merge workflow
(.github/workflows/inter-branch-merge-flow.yml).

Example: #24809.
@rolfbjarne
[sharpie] Add the sharpie nupkg version to 'make show-versions'. (#24827
9cf7f59 
)

This required a few simplifications to the 'create-makefile-fragment.sh'
script to avoid trying to create a makefile fragment if we don't have .NET
downloaded yet, because 'make show-versions' should succeed without a
downloaded .NET.
@rolfbjarne
[ObjCRuntime] Fix GC race in RetainAndAutoreleaseHandle causing inter…
13312b6 
…mittent SIGSEGV (#24814)

After obj.GetHandle() extracts the native handle, the GC can finalize obj (a NativeObject, not protected by ObjC runtime reference tracking) before DangerousRetain executes. This causes a use-after-free when the finalizer calls CFRelease on the handle before it's been retained.

Add GC.KeepAlive(obj) to ensure the managed wrapper survives until after the retain+autorelease has completed.

This fixes intermittent SIGSEGV crashes in CGBitmapContext.CreateAdaptive tests (and potentially any other caller of RetainAndAutoreleaseHandle with NativeObject-derived types).

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@rolfbjarne
[sharpie] Add support for visionos_app_extension availability platform.
bf5cb5d 
Fixes #18098. (#24828)

Sharpie's clang reports visionOS app extension availability as 'xros_app_extension', which was not handled in the GetPlatform() switch statement, causing an 'Unsupported clang availability platform' exception. This is the same class of bug as #18098.

Add:
- VisionOSAppExtension to the PlatformName enum
- Handle 'xros_app_extension' and 'visionos_app_extension' strings in GetPlatform()
- Test with all app extension availability platforms

Fixes #18098.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@rolfbjarne
[msbuild] Fix race condition when generating MSBStrings.Designer.cs (#…
8468832 
…24826)

When the Xamarin.Localization.MSBuild project was changed to multi-target (netstandard2.0 + net10.0), both inner builds run in parallel and both try to generate MSBStrings.Designer.cs to the same path. One build may write the file while the other is compiling it, causing:

    CSC : error CS1504: Source file 'MSBStrings.Designer.cs' could not be opened -- Attempted to read past the end of the stream.

Fix by directing StronglyTypedFileName to $(IntermediateOutputPath), which is per-TFM (obj/Debug/netstandard2.0/ vs obj/Debug/net10.0/), so each inner build generates its own copy without interfering with the other.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@rolfbjarne
[ci] Fix publish GitHub comment for sharpie-only builds and partial f…
dbdc42f 
…ailures (#24825)

Fix two issues in the Prepare .NET Release GitHub comment:

1. Treat 'Skipped' as an acceptable result for the nuget_convert job. This
   job is skipped by design when DOTNET_PLATFORMS is empty (e.g. sharpie-only
   builds), so a skipped result should not cause the comment to report failure.

2. Always list signed/published NuGet packages in the comment, even when the
   overall result is a failure. Previously the package list was only shown on
   success, hiding useful information when some packages were published but a
   later step failed. The summary says 'Published' on success and 'Signed' on
   failure to reflect that publishing may not have completed.

---------

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
@dalexsoto
[skills] Add a "macios-xcode-beta-update" skill (#24818)
0b48048
@dalexsoto
Merge remote-tracking branch 'origin/main' into xcode26.4
76523b8
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

vs-mobiletools-engineering-service2 commented Mar 6, 2026

✅ [CI Build #8ef7b9e] Build passed (Build packages) ✅

Pipeline on Agent
Hash: 8ef7b9e1f3677886874e77f75fcacf1d3bcb69f3 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

vs-mobiletools-engineering-service2 commented Mar 6, 2026

✅ [PR Build #8ef7b9e] Build passed (Detect API changes) ✅

Pipeline on Agent
Hash: 8ef7b9e1f3677886874e77f75fcacf1d3bcb69f3 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

vs-mobiletools-engineering-service2 commented Mar 6, 2026

✅ API diff for current PR / commit

NET (empty diffs)

✅ API diff vs stable

NET (empty diffs)

ℹ️ Generator diff

Generator Diff: vsdrops (html) vsdrops (raw diff) gist (raw diff) - Please review changes)

Pipeline on Agent
Hash: 8ef7b9e1f3677886874e77f75fcacf1d3bcb69f3 [PR build]

@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

vs-mobiletools-engineering-service2 commented Mar 6, 2026

✅ [CI Build #8ef7b9e] Build passed (Build macOS tests) ✅

Pipeline on Agent
Hash: 8ef7b9e1f3677886874e77f75fcacf1d3bcb69f3 [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@vs-mobiletools-engineering-service2
Copy link
Copy Markdown
Collaborator

vs-mobiletools-engineering-service2 commented Mar 7, 2026

🔥 [CI Build #8ef7b9e] Test results 🔥

Test results

❌ Tests failed on VSTS: test results

1 tests crashed, 0 tests failed, 155 tests passed.

Failures

❌ windows tests [attempt 3]

🔥 Failed catastrophically on VSTS: test results - windows (no summary found).

Html Report (VSDrops) Download

Successes

✅ cecil: All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (iOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (MacCatalyst): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (macOS): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (Multiple platforms): All 1 tests passed. Html Report (VSDrops) Download
✅ dotnettests (tvOS): All 1 tests passed. Html Report (VSDrops) Download
✅ framework: All 2 tests passed. Html Report (VSDrops) Download
✅ fsharp: All 4 tests passed. Html Report (VSDrops) Download
✅ generator: All 5 tests passed. Html Report (VSDrops) Download
✅ interdependent-binding-projects: All 4 tests passed. Html Report (VSDrops) Download
✅ introspection: All 8 tests passed. Html Report (VSDrops) Download
✅ linker: All 44 tests passed. Html Report (VSDrops) Download
✅ monotouch (iOS): All 11 tests passed. Html Report (VSDrops) Download
✅ monotouch (MacCatalyst): All 15 tests passed. Html Report (VSDrops) Download
✅ monotouch (macOS): All 12 tests passed. [attempt 2] Html Report (VSDrops) Download
✅ monotouch (tvOS): All 11 tests passed. [attempt 3] Html Report (VSDrops) Download
✅ msbuild: All 2 tests passed. Html Report (VSDrops) Download
✅ sharpie: All 1 tests passed. Html Report (VSDrops) Download
✅ xcframework: All 4 tests passed. Html Report (VSDrops) Download
✅ xtro: All 1 tests passed. Html Report (VSDrops) Download

macOS tests

✅ Tests on macOS Monterey (12): All 5 tests passed. Html Report (VSDrops) Download
✅ Tests on macOS Ventura (13): All 5 tests passed. Html Report (VSDrops) Download
✅ Tests on macOS Sonoma (14): All 5 tests passed. Html Report (VSDrops) Download
✅ Tests on macOS Sequoia (15): All 5 tests passed. Html Report (VSDrops) Download
✅ Tests on macOS Tahoe (26): All 5 tests passed. Html Report (VSDrops) Download

Pipeline on Agent
Hash: 8ef7b9e1f3677886874e77f75fcacf1d3bcb69f3 [PR build]

@vs-mobiletools-engineering-service2

This comment has been minimized.

Sign in to view
@dalexsoto dalexsoto merged commit 9942936 into xcode26.4 Mar 9, 2026
45 of 48 checks passed
@dalexsoto dalexsoto added this to the xcode26.4 milestone Mar 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rolfbjarne rolfbjarne rolfbjarne approved these changes

@emaf emaf Awaiting requested review from emaf emaf is a code owner

@mauroa mauroa Awaiting requested review from mauroa mauroa is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

xcode26.4

Development

Successfully merging this pull request may close these issues.

3 participants

@dalexsoto @vs-mobiletools-engineering-service2 @rolfbjarne