Skip to content

Migrate macOS project to official Microsoft.Maui.Platforms.MacOS packages #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jfversluis wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Migrate macOS project to official Microsoft.Maui.Platforms.MacOS packages #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/MauiSherpa.MacOS/BlazorContentPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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;
Expand Down
8 changes: 8 additions & 0 deletions src/MauiSherpa.MacOS/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSBluetoothAlwaysUsageDescription</key>
<string>MAUI Sherpa uses Bluetooth to detect device connectivity status.</string>
</dict>
</plist>
4 changes: 2 additions & 2 deletions src/MauiSherpa.MacOS/InspectorPage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
6 changes: 3 additions & 3 deletions src/MauiSherpa.MacOS/MacOSApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -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)
Expand All @@ -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;
}

Expand Down
6 changes: 3 additions & 3 deletions src/MauiSherpa.MacOS/MacOSMauiProgram.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/MauiSherpa.MacOS/MauiMacOSApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
12 changes: 6 additions & 6 deletions src/MauiSherpa.MacOS/MauiSherpa.MacOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Platform.Maui.MacOS" Version="0.3.0" />
<PackageReference Include="Platform.Maui.MacOS.BlazorWebView" Version="0.3.0" />
<PackageReference Include="Platform.Maui.MacOS.Essentials" Version="0.3.0" />
<PackageReference Include="Microsoft.Maui.Platforms.MacOS" Version="0.1.0-preview.8.26256.5" />
<PackageReference Include="Microsoft.Maui.Platforms.MacOS.BlazorWebView" Version="0.1.0-preview.8.26256.5" />
<PackageReference Include="Microsoft.Maui.Platforms.MacOS.Essentials" Version="0.1.0-preview.8.26256.5" />
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.7.2" />
<!-- Reference the SDK directly so its build targets run with the AppKit publish RID
instead of inheriting the build-host architecture from MauiSherpa.Core. -->
Expand All @@ -37,7 +37,7 @@
<PackageReference Include="Markdig" Version="0.44.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.31" />
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.41" />
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
<PackageReference Include="Sentry.Maui" Version="6.4.0" />
<PackageReference Include="Shiny.Mediator.Caching.MicrosoftMemoryCache" Version="6.1.1" />
Expand Down Expand Up @@ -93,7 +93,7 @@
<Exec Command="chmod +x &quot;$(_CopilotAppBundle)/copilot&quot;" Condition="Exists('$(_CopilotSourceBinary)')" />
</Target>

<!-- Platform.Maui.MacOS leaves GitHub.Copilot.SDK.dll beside the app in Debug,
<!-- Microsoft.Maui.Platforms.MacOS leaves GitHub.Copilot.SDK.dll beside the app in Debug,
but CopilotService loads it from the app bundle at runtime. Copy it into
Contents/MonoBundle so the dedicated Copilot window can render. -->
<Target Name="_BundleCopilotSdkAssemblyForMacOS" AfterTargets="Build">
Expand All @@ -109,7 +109,7 @@
</Target>

<!-- Bundle Copilot Skills into the macOS app.
MauiAsset items are not processed by Platform.Maui.MacOS, so we
MauiAsset items are not processed by Microsoft.Maui.Platforms.MacOS, so we
copy Skills into Contents/Resources/Skills manually. -->
<Target Name="_BundleSkillsForMacOS" AfterTargets="Build">
<PropertyGroup>
Expand Down
Loading