Skip to content

Remove Mac Catalyst version detection workaround#29112

Merged
PureWeen merged 1 commit intoinflight/currentfrom
remove-maccat-workaround
Apr 22, 2025
Merged

Remove Mac Catalyst version detection workaround#29112
PureWeen merged 1 commit intoinflight/currentfrom
remove-maccat-workaround

Conversation

@jfversluis
Copy link
Copy Markdown
Member

Description of Change

Removes a workaround that was needed earlier to detect the proper Mac Catalyst version number. A fix has been merged into .NET Runtime so we should be good to remove the workaround on our end.

@jfversluis jfversluis added t/housekeeping ♻︎ area-architecture Issues with code structure, SDK structure, implementation details labels Apr 22, 2025
@jfversluis jfversluis added this to the .NET 9 SR7 milestone Apr 22, 2025
Copilot AI review requested due to automatic review settings April 22, 2025 06:47
@jfversluis jfversluis requested a review from a team as a code owner April 22, 2025 06:47
@jfversluis jfversluis moved this from Todo to Ready To Review in MAUI SDK Ongoing Apr 22, 2025
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR removes a legacy workaround used for detecting Mac Catalyst version 18 now that a fix has been merged into .NET Runtime. Key changes include:

  • Updating version checks in TabbedViewExtensions.cs to use OperatingSystem.IsMacCatalystVersionAtLeast().
  • Removing the obsolete OperatingSystemMacCatalyst18Workaround.cs file.
  • Updating conditional logic in ShellPageRendererTracker.cs and ShellItemRenderer.cs to reference the updated OS detection methods.

Reviewed Changes

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

File Description
src/Core/src/Platform/iOS/TabbedViewExtensions.cs Updated version check for Mac Catalyst detection.
src/Core/src/OperatingSystemMacCatalyst18Workaround.cs Removed outdated workaround file.
src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs Updated combined OS version check for tab bar visibility.
src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs Updated conditional version check for managing tab bar.
Comments suppressed due to low confidence (2)

src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellPageRendererTracker.cs:144

  • Ensure that there are corresponding test cases in TestCases.HostApp and TestCases.Shared.Tests covering scenarios both when the OS version is below and above 18 to validate the updated conditional behavior.
if (!(OperatingSystem.IsMacCatalystVersionAtLeast(18) || OperatingSystem.IsIOSVersionAtLeast(18)))

src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs:441

  • Verify that automated tests in both TestCases.HostApp and TestCases.Shared.Tests adequately cover the tab bar state when running on systems with OS versions both under and over 18.
if (OperatingSystem.IsMacCatalystVersionAtLeast(18) || OperatingSystem.IsIOSVersionAtLeast(18))

@github-project-automation github-project-automation bot moved this from Ready To Review to Approved in MAUI SDK Ongoing Apr 22, 2025
@PureWeen PureWeen changed the base branch from main to inflight/current April 22, 2025 20:28
@PureWeen PureWeen merged commit 828f600 into inflight/current Apr 22, 2025
124 of 128 checks passed
@PureWeen PureWeen deleted the remove-maccat-workaround branch April 22, 2025 20:29
@github-project-automation github-project-automation bot moved this from Approved to Done in MAUI SDK Ongoing Apr 22, 2025
SuthiYuvaraj pushed a commit to SuthiYuvaraj/maui that referenced this pull request May 9, 2025
@github-actions github-actions bot locked and limited conversation to collaborators May 23, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-architecture Issues with code structure, SDK structure, implementation details t/housekeeping ♻︎

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants