chore: Upgrade to .NET 10.0, Uno.Sdk 6.4.42, remove MacCatalyst as deprecated and migrate macOS to Desktop (Skia) #1228

agneszitte · 2025-12-12T21:14:37Z

GitHub Issue: closes https://github.com/unoplatform/uno-private/issues/1413

PR Type:

💬 Other: Adjustments based on the latest Uno.Sdk versions

Description

This PR contains two major updates:

.NET 10.0 and Uno.Sdk Upgrade

Update target framework from net9.0 to net10.0 across all platforms
Upgrade Uno.Sdk from 6.2.36 to 6.4.42
Update .NET SDK version from 9.0.300 to 10.0.100
Update uno-check from 1.31.13 to 1.33.1
Update build scripts and CI/CD pipelines for net10.0
Add missing VS Code and Rider configuration files

macOS Desktop Migration

MacCatalyst support has been deprecated in favor of macOS Desktop support. All MacCatalyst references have been removed and replaced with macOS Desktop builds using the Skia renderer.

Technical Notes:

Builds thin x86_64 bundle only, relies on Rosetta for arm64 execution
When the Uno.Sdk version includes fat bundle support (UnoMergeBundles task), this can be updated to build universal binaries
TestFlight submission configured for both master and canary tracks

References:

unoplatform/uno.sdk.extras#84
https://github.com/unoplatform/uno.sdk.extras/issues/35#issuecomment-3071601482
docs(macos): how to publish fat app bundles uno#21744

PR Checklist ✅

Please check if your PR fulfills the following requirements:

📝 Commits must be following the Conventional Commits specification.
🧪 Added Runtime tests, UI tests, or a manual test sample for the changes have been added (for bug fixes / features) (if applicable)
📚 Docs have been added/updated which fit documentation template (for bug fixes / features)
🖼️ Validated PR Screenshots Compare Test Run results.
❗ Contains NO breaking changes

Copilot

Pull request overview

This PR upgrades the Uno Gallery project from .NET 9.0 to .NET 10.0 and from Uno.Sdk 6.2.36 to 6.4.42. Additionally, it removes deprecated MacCatalyst support and migrates macOS builds to use the native Desktop target with Skia renderer. The changes include comprehensive updates to build pipelines, configuration files, and IDE support files.

Upgrades all target frameworks from net9.0 to net10.0 across all platforms
Updates .NET SDK from 9.0.300 to 10.0.100 and uno-check from 1.31.13 to 1.33.1
Removes all MacCatalyst references and replaces with macOS Desktop (Skia) builds

Reviewed changes

Copilot reviewed 45 out of 45 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
global.json	Updates Uno.Sdk from 6.2.36 to 6.4.42
build/templates/master-publish/stage-publish-macos-desktop.yml	New publish pipeline for macOS Desktop to App Store TestFlight
build/templates/master-publish/stage-publish-ios.yml	Updates iOS artifact paths from net9.0 to net10.0
build/templates/master-publish/stage-publish-catalyst.yml	Completely removed as Catalyst is deprecated
build/templates/dotnet-install-*.yml	Updates .NET SDK to 10.0.100 and uno-check to 1.33.1 across all platforms
build/templates/canary-updater.yml	Updates display names for ApplicationId adjustments to reflect platform changes
build/templates/canary-publish/stage-publish-macos-desktop-canary.yml	New canary publish pipeline for macOS Desktop
build/templates/canary-publish/stage-publish-ios-canary.yml	Updates canary iOS artifact paths to net10.0
build/templates/canary-publish/stage-publish-catalyst-canary.yml	Removed as Catalyst is deprecated
build/stage-uitests-*.yml	Updates all UI test paths and parameters to net10.0
build/stage-build-*.yml	Updates all build commands and output paths to net10.0
build/stage-build-macos-desktop.yml	New build template for macOS Desktop with x64-only builds (Rosetta for arm64)
build/scripts/*.sh	Updates all build and test script paths to net10.0
build/build.csproj	Removes Catalyst-specific version update logic
azure-pipelines.yml	Replaces Catalyst build matrix with macOS Desktop, updates provisioning profiles
Uno.Gallery/Uno.Gallery.csproj	Updates all target frameworks to net10.0, removes MacCatalyst references
Uno.Gallery/Properties/launchSettings.json	Updates WSL2 debug path to net10.0
Uno.Gallery/Platforms/MacCatalyst/*	All MacCatalyst platform files removed
Uno.Gallery/Platforms/Desktop/Info.plist	Removes iOS-specific keys, adds macOS minimum system version
Uno.Gallery/Platforms/Desktop/Entitlements.plist	Adds comments explaining entitlements for macOS Desktop
Uno.Gallery/App.xaml.cs	Removes MacCatalyst exclusion from Calabash initialization
Uno.Gallery.UITests/Uno.Gallery.UITests.csproj	Updates target framework to net10.0
.vscode/*.json	Adds comprehensive VS Code configuration for debugging and tasks
.run/*.xml	Adds Rider IDE configuration for Desktop debugging
.github/workflows/azure-static-webapp.yml	Updates WebAssembly build to net10.0 and .NET SDK to 10.0.100

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

build/templates/canary-updater.yml

.vscode/settings.json

.github/workflows/azure-static-webapp.yml

Uno.Gallery/Uno.Gallery.csproj

Copilot

Pull request overview

Copilot reviewed 45 out of 45 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

build/templates/canary-publish/stage-publish-macos-desktop-canary.yml

.vscode/settings.json

Copilot

Pull request overview

Copilot reviewed 45 out of 45 changed files in this pull request and generated 6 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

build/templates/canary-publish/stage-publish-macos-desktop-canary.yml

azure-pipelines.yml

build/scripts/wasm-uitest-build.sh

.vscode/settings.json

build/templates/master-publish/stage-publish-macos-desktop.yml

kazo0 · 2025-12-15T14:55:21Z

build/templates/canary-updater.yml

          foreach-object { $_ -replace "com.nventive.uno.ui.demo","com.nventive.uno.ui.demo.canary" } |
          set-content $a }
-    displayName: 'Adjust info.plist bundle name (Android)'
+    displayName: 'Adjust ApplicationId (Android Skia)'


This job is specifically for the native Android build. If we aren't including that anymore then we can remove those script here

agneszitte · 2025-12-15T20:42:47Z

/azp run

azure-pipelines · 2025-12-15T20:43:01Z

Azure Pipelines successfully started running 1 pipeline(s).

spouliot · 2025-12-15T20:54:51Z

@agneszitte fwiw I had a (draft) PR, before net10 release, to publish desktop (skia/macOS). It might be useful since publishing differs from catalyst #1225

build/stage-build-macos-desktop.yml

Uno.Gallery/Platforms/Desktop/Info.plist

unodevops · 2025-12-15T21:35:19Z

⚠️⚠️ The build 188216 has failed on Uno.Gallery - CI.

unodevops · 2025-12-15T23:30:19Z

⚠️⚠️ The build 188234 has failed on Uno.Gallery - CI.

unodevops · 2025-12-15T23:45:24Z

⚠️⚠️ The build 188239 has failed on Uno.Gallery - CI.

Copilot

Pull request overview

Copilot reviewed 47 out of 47 changed files in this pull request and generated 3 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

build/scripts/wasm-uitest-build.sh

build/build.csproj

.vscode/settings.json

…precated and migrate macOS to Desktop (Skia)

agneszitte · 2025-12-16T02:17:31Z

/azp run

azure-pipelines · 2025-12-16T02:17:40Z

Azure Pipelines successfully started running 1 pipeline(s).

unodevops · 2025-12-16T03:59:24Z

⚠️⚠️ The build 188283 has failed on Uno.Gallery - CI.

unodevops · 2025-12-16T22:25:19Z

⚠️⚠️ The build 188561 has failed on Uno.Gallery - CI.

unodevops · 2025-12-16T22:30:15Z

⚠️⚠️ The build 188559 has failed on Uno.Gallery - CI.

unodevops · 2025-12-17T00:55:14Z

⚠️⚠️ The build 188578 has failed on Uno.Gallery - CI.

unodevops · 2025-12-17T02:50:18Z

⚠️⚠️ The build 188611 has failed on Uno.Gallery - CI.

unodevops · 2025-12-17T03:50:20Z

⚠️⚠️ The build 188631 has failed on Uno.Gallery - CI.

unodevops · 2025-12-17T15:25:20Z

⚠️⚠️ The build 188760 has failed on Uno.Gallery - CI.

unodevops · 2025-12-17T15:50:31Z

⚠️⚠️ The build 188767 has failed on Uno.Gallery - CI.

unodevops · 2025-12-18T02:15:18Z

⚠️⚠️ The build 188931 has failed on Uno.Gallery - CI.

agneszitte requested a review from Copilot December 12, 2025 21:14

Copilot started reviewing on behalf of agneszitte December 12, 2025 21:15 View session

Copilot AI reviewed Dec 12, 2025

View reviewed changes

build/templates/canary-updater.yml Outdated Show resolved Hide resolved

.vscode/settings.json Show resolved Hide resolved

.github/workflows/azure-static-webapp.yml Show resolved Hide resolved

Uno.Gallery/Uno.Gallery.csproj Show resolved Hide resolved

agneszitte force-pushed the dev/agzi/UpdateGallery branch from 271f3cf to 7e5d64e Compare December 12, 2025 21:46

agneszitte requested a review from Copilot December 12, 2025 21:46

Copilot started reviewing on behalf of agneszitte December 12, 2025 21:47 View session

Copilot AI reviewed Dec 12, 2025

View reviewed changes

build/templates/canary-publish/stage-publish-macos-desktop-canary.yml Outdated Show resolved Hide resolved

.vscode/settings.json Show resolved Hide resolved

agneszitte force-pushed the dev/agzi/UpdateGallery branch from 7e5d64e to e00148c Compare December 12, 2025 21:57

agneszitte requested a review from Copilot December 12, 2025 21:57

Copilot started reviewing on behalf of agneszitte December 12, 2025 21:58 View session

Copilot AI reviewed Dec 12, 2025

View reviewed changes

agneszitte force-pushed the dev/agzi/UpdateGallery branch from e00148c to 9b8e78d Compare December 12, 2025 22:18

agneszitte requested review from MartinZikmund, jeromelaban, kazo0 and spouliot December 12, 2025 22:30

kazo0 approved these changes Dec 15, 2025

View reviewed changes

agneszitte force-pushed the dev/agzi/UpdateGallery branch 2 times, most recently from 04eb859 to a6ac259 Compare December 15, 2025 20:51

spouliot reviewed Dec 15, 2025

View reviewed changes

build/stage-build-macos-desktop.yml Outdated Show resolved Hide resolved

build/stage-build-macos-desktop.yml Outdated Show resolved Hide resolved

Uno.Gallery/Platforms/Desktop/Info.plist Outdated Show resolved Hide resolved

agneszitte marked this pull request as draft December 15, 2025 21:26

agneszitte force-pushed the dev/agzi/UpdateGallery branch from b9994b9 to b50ae55 Compare December 15, 2025 23:30

agneszitte marked this pull request as ready for review December 15, 2025 23:33

agneszitte force-pushed the dev/agzi/UpdateGallery branch from ede6d0c to a5e18ec Compare December 16, 2025 00:04

Copilot AI reviewed Dec 16, 2025

View reviewed changes

build/scripts/wasm-uitest-build.sh Show resolved Hide resolved

build/build.csproj Show resolved Hide resolved

.vscode/settings.json Show resolved Hide resolved

agneszitte force-pushed the dev/agzi/UpdateGallery branch 2 times, most recently from 11cf9d0 to c767588 Compare December 16, 2025 01:27

chore: Upgrade to .NET 10.0, Uno.Sdk 6.4.42, remove MacCatalyst as de…

207a648

…precated and migrate macOS to Desktop (Skia)

agneszitte force-pushed the dev/agzi/UpdateGallery branch 2 times, most recently from ac436c2 to eb25a63 Compare December 16, 2025 01:59

agneszitte force-pushed the dev/agzi/UpdateGallery branch from 1020cec to 32ea414 Compare December 16, 2025 02:47

jeromelaban approved these changes Dec 16, 2025

View reviewed changes

agneszitte marked this pull request as draft December 16, 2025 04:24

agneszitte force-pushed the dev/agzi/UpdateGallery branch 4 times, most recently from e048cf1 to 732c7f0 Compare December 16, 2025 05:20

agneszitte force-pushed the dev/agzi/UpdateGallery branch from 93f202e to 7b2c287 Compare December 17, 2025 03:20

chore: More tests and adjustments

dda8f15

agneszitte force-pushed the dev/agzi/UpdateGallery branch from 18efcbf to dda8f15 Compare December 17, 2025 14:46

agneszitte added 2 commits December 17, 2025 09:57

chore: More tests

719baba

chore: more tests

87b0a2b

chore: More tests without feed

76a8e06

chore: Upgrade to .NET 10.0, Uno.Sdk 6.4.42, remove MacCatalyst as deprecated and migrate macOS to Desktop (Skia) #1228

Are you sure you want to change the base?

chore: Upgrade to .NET 10.0, Uno.Sdk 6.4.42, remove MacCatalyst as deprecated and migrate macOS to Desktop (Skia) #1228

Uh oh!

Conversation

agneszitte commented Dec 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Type:

Description

.NET 10.0 and Uno.Sdk Upgrade

macOS Desktop Migration

PR Checklist ✅

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kazo0 Dec 15, 2025

Choose a reason for hiding this comment

Uh oh!

agneszitte commented Dec 15, 2025

Uh oh!

azure-pipelines bot commented Dec 15, 2025

Uh oh!

spouliot commented Dec 15, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

unodevops commented Dec 15, 2025

Uh oh!

unodevops commented Dec 15, 2025

Uh oh!

unodevops commented Dec 15, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

agneszitte commented Dec 16, 2025

Uh oh!

azure-pipelines bot commented Dec 16, 2025

Uh oh!

unodevops commented Dec 16, 2025

Uh oh!

unodevops commented Dec 16, 2025

Uh oh!

unodevops commented Dec 16, 2025

Uh oh!

unodevops commented Dec 17, 2025

Uh oh!

unodevops commented Dec 17, 2025

Uh oh!

unodevops commented Dec 17, 2025

Uh oh!

unodevops commented Dec 17, 2025

agneszitte commented Dec 12, 2025 •

edited

Loading