diff --git a/src/MauiSherpa.MacOS/BlazorContentPage.cs b/src/MauiSherpa.MacOS/BlazorContentPage.cs index 090653b..08a728e 100644 --- a/src/MauiSherpa.MacOS/BlazorContentPage.cs +++ b/src/MauiSherpa.MacOS/BlazorContentPage.cs @@ -1,6 +1,6 @@ using Microsoft.Maui.Controls; -using Microsoft.Maui.Platform.MacOS; -using Microsoft.Maui.Platform.MacOS.Controls; +using Microsoft.Maui.Platforms.MacOS.Platform; +using Microsoft.Maui.Platforms.MacOS.Controls; using MauiSherpa.Core.Interfaces; using AppKit; using CoreGraphics; @@ -278,7 +278,7 @@ private void SetupSidebarWidthPersistence() // BlazorContentPage -> NavigationPage (Detail) -> FlyoutPage var navPage = this.Parent as NavigationPage; var flyoutPage = navPage?.Parent as FlyoutPage; - var handler = flyoutPage?.Handler as Microsoft.Maui.Platform.MacOS.Handlers.NativeSidebarFlyoutPageHandler; + var handler = flyoutPage?.Handler as Microsoft.Maui.Platforms.MacOS.Handlers.NativeSidebarFlyoutPageHandler; var splitVC = handler?.SplitViewController; var splitView = splitVC?.SplitView; if (splitView == null) return; diff --git a/src/MauiSherpa.MacOS/Info.plist b/src/MauiSherpa.MacOS/Info.plist new file mode 100644 index 0000000..360bb5c --- /dev/null +++ b/src/MauiSherpa.MacOS/Info.plist @@ -0,0 +1,8 @@ + + + + + NSBluetoothAlwaysUsageDescription + MAUI Sherpa uses Bluetooth to detect device connectivity status. + + diff --git a/src/MauiSherpa.MacOS/InspectorPage.cs b/src/MauiSherpa.MacOS/InspectorPage.cs index 45d5046..db952d8 100644 --- a/src/MauiSherpa.MacOS/InspectorPage.cs +++ b/src/MauiSherpa.MacOS/InspectorPage.cs @@ -1,6 +1,6 @@ using Microsoft.Maui.Controls; -using Microsoft.Maui.Platform.MacOS; -using Microsoft.Maui.Platform.MacOS.Controls; +using Microsoft.Maui.Platforms.MacOS.Platform; +using Microsoft.Maui.Platforms.MacOS.Controls; namespace MauiSherpa; diff --git a/src/MauiSherpa.MacOS/MacOSApp.cs b/src/MauiSherpa.MacOS/MacOSApp.cs index 9fb8d0d..26691b9 100644 --- a/src/MauiSherpa.MacOS/MacOSApp.cs +++ b/src/MauiSherpa.MacOS/MacOSApp.cs @@ -1,5 +1,5 @@ using Microsoft.Maui.Controls; -using Microsoft.Maui.Platform.MacOS; +using Microsoft.Maui.Platforms.MacOS.Platform; using MauiSherpa.Core.Interfaces; using AppKit; using Foundation; @@ -91,7 +91,7 @@ private void SaveState() var splitView = _cachedSplitView; if (splitView == null) { - var handler = _flyoutPage?.Handler as Microsoft.Maui.Platform.MacOS.Handlers.NativeSidebarFlyoutPageHandler; + var handler = _flyoutPage?.Handler as Microsoft.Maui.Platforms.MacOS.Handlers.NativeSidebarFlyoutPageHandler; splitView = handler?.SplitViewController?.SplitView; } if (splitView != null) @@ -116,7 +116,7 @@ private void SaveState() internal void CacheSplitView() { if (_cachedSplitView != null) return; - var handler = _flyoutPage?.Handler as Microsoft.Maui.Platform.MacOS.Handlers.NativeSidebarFlyoutPageHandler; + var handler = _flyoutPage?.Handler as Microsoft.Maui.Platforms.MacOS.Handlers.NativeSidebarFlyoutPageHandler; _cachedSplitView = handler?.SplitViewController?.SplitView; } diff --git a/src/MauiSherpa.MacOS/MacOSMauiProgram.cs b/src/MauiSherpa.MacOS/MacOSMauiProgram.cs index e759f49..f3ad89d 100644 --- a/src/MauiSherpa.MacOS/MacOSMauiProgram.cs +++ b/src/MauiSherpa.MacOS/MacOSMauiProgram.cs @@ -4,9 +4,9 @@ using MauiSherpa.Core.ViewModels; using MauiSherpa.Core.Interfaces; using MauiSherpa.Core.Services; -using Microsoft.Maui.Platform.MacOS.Hosting; -using Microsoft.Maui.Platform.MacOS.Handlers; -using Microsoft.Maui.Essentials.MacOS; +using Microsoft.Maui.Platforms.MacOS.Hosting; +using Microsoft.Maui.Platforms.MacOS.Handlers; +using Microsoft.Maui.Platforms.MacOS.Essentials; using Shiny.Mediator; using Sentry.Maui; #if DEBUG diff --git a/src/MauiSherpa.MacOS/MauiMacOSApp.cs b/src/MauiSherpa.MacOS/MauiMacOSApp.cs index 9fbd979..44f2654 100644 --- a/src/MauiSherpa.MacOS/MauiMacOSApp.cs +++ b/src/MauiSherpa.MacOS/MauiMacOSApp.cs @@ -1,7 +1,8 @@ using AppKit; using Foundation; using Microsoft.Maui.Hosting; -using Microsoft.Maui.Platform.MacOS.Hosting; +using Microsoft.Maui.Platforms.MacOS.Hosting; +using Microsoft.Maui.Platforms.MacOS.Platform; namespace MauiSherpa; diff --git a/src/MauiSherpa.MacOS/MauiSherpa.MacOS.csproj b/src/MauiSherpa.MacOS/MauiSherpa.MacOS.csproj index e42f96d..9221a23 100644 --- a/src/MauiSherpa.MacOS/MauiSherpa.MacOS.csproj +++ b/src/MauiSherpa.MacOS/MauiSherpa.MacOS.csproj @@ -26,9 +26,9 @@ - - - + + + @@ -37,7 +37,7 @@ - + @@ -93,7 +93,7 @@ - @@ -109,7 +109,7 @@