Remove Mac Catalyst version detection workaround#29112
Merged
PureWeen merged 1 commit intoinflight/currentfrom Apr 22, 2025
Merged
Remove Mac Catalyst version detection workaround#29112PureWeen merged 1 commit intoinflight/currentfrom
PureWeen merged 1 commit intoinflight/currentfrom
Conversation
Contributor
There was a problem hiding this comment.
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))
rmarinho
approved these changes
Apr 22, 2025
PureWeen
pushed a commit
that referenced
this pull request
Apr 23, 2025
PureWeen
pushed a commit
that referenced
this pull request
May 2, 2025
SuthiYuvaraj
pushed a commit
to SuthiYuvaraj/maui
that referenced
this pull request
May 9, 2025
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
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.