Merge branch 'dotnet:main' into enable-navigationtests-from-xamarinui…

…tests
dotnet · Nov 7, 2024 · b7aa55a · b7aa55a
2 parents 841d199 + bd61427
commit b7aa55a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/eng/pipelines/common/provision.yml b/eng/pipelines/common/provision.yml
@@ -58,8 +58,9 @@ steps:
         sudo xcode-select -s /Applications/Xcode_$(REQUIRED_XCODE).app
         xcrun xcode-select --print-path
         xcodebuild -version
-        xcodebuild -downloadAllPlatforms
-        xcodebuild -runFirstLaunch
+        sudo xcodebuild -license accept
+        sudo xcodebuild -downloadAllPlatforms
+        sudo xcodebuild -runFirstLaunch
       displayName: Select Xcode Version
       condition: and(succeeded(), eq(variables['Agent.OS'], 'Darwin'))
       timeoutInMinutes: 30

diff --git a/eng/scripts/appium-install.ps1 b/eng/scripts/appium-install.ps1
@@ -198,8 +198,8 @@ if ($IsWindows) {
     appium driver doctor windows || & { "ignore failure"; $global:LASTEXITCODE = 0 }
 }
 if ($IsMacOS) {
-    appium driver doctor xcuitest || & { "ignore failure"; $global:LASTEXITCODE = 0 }
-    appium driver doctor mac2 || & { "ignore failure"; $global:LASTEXITCODE = 0 }
+    # appium driver doctor xcuitest || & { "ignore failure"; $global:LASTEXITCODE = 0 }
+    # appium driver doctor mac2 || & { "ignore failure"; $global:LASTEXITCODE = 0 }
 }
 appium driver doctor uiautomator2 || & { "ignore failure"; $global:LASTEXITCODE = 0 }
 

diff --git a/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs b/src/Controls/src/Core/Compatibility/Handlers/Shell/iOS/ShellItemRenderer.cs
@@ -439,7 +439,14 @@ void UpdateTabBarHidden()
 			if (ShellItemController == null)
 				return;
 
-			TabBar.Hidden = !ShellItemController.ShowTabs;
+			if (OperatingSystemMacCatalyst18Workaround.IsMacCatalystVersionAtLeast18() || OperatingSystem.IsIOSVersionAtLeast(18))
+			{
+				TabBarHidden = !ShellItemController.ShowTabs;
+			}
+			else
+			{
+				TabBar.Hidden = !ShellItemController.ShowTabs;
+			}
 		}
 	}
 }
diff --git a/src/Core/src/Platform/iOS/TabbedViewExtensions.cs b/src/Core/src/Platform/iOS/TabbedViewExtensions.cs
@@ -17,8 +17,6 @@ internal static void DisableiOS18ToolbarTabs(this UITabBarController tabBarContr
 			{
 				tabBarController.TraitOverrides.HorizontalSizeClass = UIUserInterfaceSizeClass.Compact;
 				tabBarController.Mode = UITabBarControllerMode.TabSidebar;
-				tabBarController.Sidebar.Hidden = true;
-				tabBarController.TabBarHidden = true;
 			}
 			else if (OperatingSystem.IsIOSVersionAtLeast(18, 0) && UIDevice.CurrentDevice.UserInterfaceIdiom == UIUserInterfaceIdiom.Pad)
 			{