Skip to content

[cherry-pick][main_0.34] Fix Mac Catalyst build (#2184)#2185

Merged
mischreiber merged 1 commit intomicrosoft:main_0.34from
mischreiber:cherry-pick-61269898101f21cdf992f67bd0cad9adb06a851c
Jun 18, 2025
Merged

[cherry-pick][main_0.34] Fix Mac Catalyst build (#2184)#2185
mischreiber merged 1 commit intomicrosoft:main_0.34from
mischreiber:cherry-pick-61269898101f21cdf992f67bd0cad9adb06a851c

Conversation

@mischreiber
Copy link
Copy Markdown
Collaborator

@mischreiber mischreiber commented Jun 18, 2025

Cherry-pick of 6126989 into main_0.34

Original notes follow:

Platforms Impacted

  • iOS
  • visionOS
  • macOS

Description of changes

After some of the changes in the 0.34.0 release to move FluentTheme into the common layer, it's no longer possible to build FluentUI for Mac Catalyst. The changes are relatively simple to get things building again.

Add a target environment check to NSColor+Extensions

  • Simply checking if we can import AppKit is not sufficient since the framework can be imported, but NSColor is unavailable on Catalyst.

Use FluentFontInfo type alias

  • Since Catalyst has access to ApplicationServices.FontInfo, the reference to FontInfo in the iOS target is ambiguous. Using the type alias resolves this ambiguity.

Binary change

N/A, should have no impact on iOS binary size.

Verification

Swift package for FluentUI was built for iOS, visionOS, macOS, and macOS (Catalyst). I confirmed that the package builds properly for all supported platforms listed in the package definition.

Pull request checklist

This PR has considered:

  • Light and Dark appearances
  • iOS supported versions (all major versions greater than or equal current target deployment version)
  • VoiceOver and Keyboard Accessibility
  • Internationalization and Right to Left layouts
  • Different resolutions (1x, 2x, 3x)
  • Size classes and window sizes (iPhone vs iPad, notched devices, multitasking, different window sizes, etc)
  • iPad Pointer interaction
  • SwiftUI consumption (validation or new demo scenarios needed)
  • Objective-C exposure (provide it only if needed)
Microsoft Reviewers: Open in CodeFlow
Microsoft Reviewers: Open in CodeFlow

@mischreiber mischreiber requested a review from a team as a code owner June 18, 2025 22:55
@mischreiber mischreiber enabled auto-merge (squash) June 18, 2025 22:58
@mischreiber mischreiber merged commit 4ab89fa into microsoft:main_0.34 Jun 18, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants