diff --git a/.gitignore b/.gitignore
index 6b22eb1..ae89e90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -420,3 +420,4 @@ FodyWeavers.xsd
*.msix
*.msm
*.msp
+nohup.out
diff --git a/README.md b/README.md
index 0e70377..dcc09ee 100644
--- a/README.md
+++ b/README.md
@@ -342,7 +342,7 @@ This project is licensed under the MIT License - see the [LICENSE](LICENSE) file
- [.NET MAUI](https://github.com/dotnet/maui) - Cross-platform UI framework
- [Platform.Maui.MacOS](https://github.com/nicoleeldridge/mauiplatforms) - macOS AppKit backend for .NET MAUI
-- [Platform.Maui.Linux.Gtk4](https://github.com/nicoleeldridge/Maui.Gtk) - Linux GTK4 backend for .NET MAUI
+- [Microsoft.Maui.Platforms.Linux.Gtk4](https://github.com/dotnet/maui-labs) - Linux GTK4 backend for .NET MAUI
- [Shiny.Mediator](https://github.com/shinyorg/mediator) - Mediator pattern with caching
- [AndroidSdk](https://github.com/redth/androidsdk.tool) - Android SDK management APIs
- [AppleDev.Tools](https://github.com/redth/appledev.tools) - Apple Developer Tools APIs and AppStoreConnect API client
diff --git a/nuget.config b/nuget.config
new file mode 100644
index 0000000..6251cde
--- /dev/null
+++ b/nuget.config
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/src/MauiSherpa.LinuxGtk/MauiSherpa.LinuxGtk.csproj b/src/MauiSherpa.LinuxGtk/MauiSherpa.LinuxGtk.csproj
index e2366b1..07b550f 100644
--- a/src/MauiSherpa.LinuxGtk/MauiSherpa.LinuxGtk.csproj
+++ b/src/MauiSherpa.LinuxGtk/MauiSherpa.LinuxGtk.csproj
@@ -20,9 +20,6 @@
devel
Jon Dick <redth@users.noreply.github.com>
--socket=wayland --socket=fallback-x11 --share=ipc --device=dri --share=network --filesystem=home
- $(MSBuildThisFileDirectory)..\..\.nuget\local-packages
- $(RestoreSources);https://api.nuget.org/v3/index.json
- $(RestoreSources);$(LocalGtkNugetSource)
@@ -31,15 +28,14 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/src/MauiSherpa.LinuxGtk/Program.cs b/src/MauiSherpa.LinuxGtk/Program.cs
index 9bf2e1b..b55d273 100644
--- a/src/MauiSherpa.LinuxGtk/Program.cs
+++ b/src/MauiSherpa.LinuxGtk/Program.cs
@@ -1,11 +1,8 @@
using Microsoft.Maui.Controls;
using Microsoft.Maui.Hosting;
-#if DEBUG
-using MauiDevFlow.Agent.Gtk;
-#endif
using MauiSherpa.Core.Interfaces;
using MauiSherpa.Services;
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
namespace MauiSherpa;
@@ -56,9 +53,7 @@ protected override void OnStarted()
// to context events before the Blazor app loads or user clicks Copilot button.
Services.GetService();
-#if DEBUG
- Microsoft.Maui.Controls.Application.Current?.StartDevFlowAgent();
-#endif
+// DevFlow GTK agent removed temporarily (package conflict with new Microsoft.Maui.Platforms.Linux.Gtk4)
}
///
diff --git a/src/MauiSherpa/CopilotPage.cs b/src/MauiSherpa/CopilotPage.cs
index 5ee9f51..2708b8d 100644
--- a/src/MauiSherpa/CopilotPage.cs
+++ b/src/MauiSherpa/CopilotPage.cs
@@ -4,7 +4,7 @@
using Microsoft.Maui.Platform.MacOS;
using Microsoft.Maui.Platform.MacOS.Controls;
#elif LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
using Microsoft.AspNetCore.Components.WebView.Maui;
#else
using Microsoft.AspNetCore.Components.WebView.Maui;
diff --git a/src/MauiSherpa/MauiProgram.cs b/src/MauiSherpa/MauiProgram.cs
index e6bb9f7..ac01df7 100644
--- a/src/MauiSherpa/MauiProgram.cs
+++ b/src/MauiSherpa/MauiProgram.cs
@@ -5,13 +5,10 @@
using MauiSherpa.Core.Interfaces;
using MauiSherpa.Core.Services;
#if LINUXGTK
-#if DEBUG
-using MauiDevFlow.Agent.Gtk;
-using MauiDevFlow.Blazor.Gtk;
-#endif
-using Platform.Maui.Linux.Gtk4.BlazorWebView;
-using Platform.Maui.Linux.Gtk4.Essentials.Hosting;
-using Platform.Maui.Linux.Gtk4.Hosting;
+// DevFlow GTK usings removed temporarily (package conflict with new Microsoft.Maui.Platforms.Linux.Gtk4)
+using Microsoft.Maui.Platforms.Linux.Gtk4.BlazorWebView;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Essentials.Hosting;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Hosting;
#else
#if DEBUG
using MauiDevFlow.Agent;
@@ -288,9 +285,9 @@ public static MauiApp CreateMauiApp()
#if DEBUG
#if !LINUXGTK
builder.Services.AddBlazorWebViewDeveloperTools();
-#endif
builder.AddMauiDevFlowAgent();
builder.AddMauiBlazorDevFlowTools();
+#endif
builder.Logging.AddDebug();
#endif
diff --git a/src/MauiSherpa/Pages/Forms/FormPage.cs b/src/MauiSherpa/Pages/Forms/FormPage.cs
index e3543ec..7981404 100644
--- a/src/MauiSherpa/Pages/Forms/FormPage.cs
+++ b/src/MauiSherpa/Pages/Forms/FormPage.cs
@@ -1,7 +1,7 @@
using Microsoft.Maui.Controls;
using MauiSherpa.Core.Interfaces;
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Forms;
diff --git a/src/MauiSherpa/Pages/Forms/HybridFormPage.cs b/src/MauiSherpa/Pages/Forms/HybridFormPage.cs
index 7839a75..6fd26d5 100644
--- a/src/MauiSherpa/Pages/Forms/HybridFormPage.cs
+++ b/src/MauiSherpa/Pages/Forms/HybridFormPage.cs
@@ -7,7 +7,7 @@
using Microsoft.AspNetCore.Components.WebView.Maui;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Forms;
diff --git a/src/MauiSherpa/Pages/Forms/HybridProgressPage.cs b/src/MauiSherpa/Pages/Forms/HybridProgressPage.cs
index 749fe35..47fee17 100644
--- a/src/MauiSherpa/Pages/Forms/HybridProgressPage.cs
+++ b/src/MauiSherpa/Pages/Forms/HybridProgressPage.cs
@@ -6,7 +6,7 @@
using Microsoft.AspNetCore.Components.WebView.Maui;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Forms;
diff --git a/src/MauiSherpa/Pages/Forms/HybridViewPage.cs b/src/MauiSherpa/Pages/Forms/HybridViewPage.cs
index ed374db..fb21cab 100644
--- a/src/MauiSherpa/Pages/Forms/HybridViewPage.cs
+++ b/src/MauiSherpa/Pages/Forms/HybridViewPage.cs
@@ -6,7 +6,7 @@
using Microsoft.AspNetCore.Components.WebView.Maui;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Forms;
diff --git a/src/MauiSherpa/Pages/Forms/ProgressModalPage.cs b/src/MauiSherpa/Pages/Forms/ProgressModalPage.cs
index 1db0b0c..7cc53fd 100644
--- a/src/MauiSherpa/Pages/Forms/ProgressModalPage.cs
+++ b/src/MauiSherpa/Pages/Forms/ProgressModalPage.cs
@@ -6,7 +6,7 @@
using Microsoft.AspNetCore.Components.WebView.Maui;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Forms;
diff --git a/src/MauiSherpa/Pages/Forms/SettingsPage.cs b/src/MauiSherpa/Pages/Forms/SettingsPage.cs
index a64bd48..036a467 100644
--- a/src/MauiSherpa/Pages/Forms/SettingsPage.cs
+++ b/src/MauiSherpa/Pages/Forms/SettingsPage.cs
@@ -7,7 +7,7 @@
using Microsoft.AspNetCore.Components.WebView.Maui;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Forms;
diff --git a/src/MauiSherpa/Pages/Forms/WizardFormPage.cs b/src/MauiSherpa/Pages/Forms/WizardFormPage.cs
index 051a2f3..f964eb7 100644
--- a/src/MauiSherpa/Pages/Forms/WizardFormPage.cs
+++ b/src/MauiSherpa/Pages/Forms/WizardFormPage.cs
@@ -7,7 +7,7 @@
using Microsoft.AspNetCore.Components.WebView.Maui;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Forms;
diff --git a/src/MauiSherpa/Pages/Modals/AddPublisherPage.cs b/src/MauiSherpa/Pages/Modals/AddPublisherPage.cs
index 3a94f82..34338ac 100644
--- a/src/MauiSherpa/Pages/Modals/AddPublisherPage.cs
+++ b/src/MauiSherpa/Pages/Modals/AddPublisherPage.cs
@@ -4,7 +4,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/AppleConfigWizardPage.cs b/src/MauiSherpa/Pages/Modals/AppleConfigWizardPage.cs
index 476938b..a7c4cfb 100644
--- a/src/MauiSherpa/Pages/Modals/AppleConfigWizardPage.cs
+++ b/src/MauiSherpa/Pages/Modals/AppleConfigWizardPage.cs
@@ -4,7 +4,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/AppleIdentityPage.cs b/src/MauiSherpa/Pages/Modals/AppleIdentityPage.cs
index f44decd..ca5ca96 100644
--- a/src/MauiSherpa/Pages/Modals/AppleIdentityPage.cs
+++ b/src/MauiSherpa/Pages/Modals/AppleIdentityPage.cs
@@ -4,7 +4,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/CISecretsWizardPage.cs b/src/MauiSherpa/Pages/Modals/CISecretsWizardPage.cs
index 232ed0b..d57707e 100644
--- a/src/MauiSherpa/Pages/Modals/CISecretsWizardPage.cs
+++ b/src/MauiSherpa/Pages/Modals/CISecretsWizardPage.cs
@@ -3,7 +3,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/CloudProviderPage.cs b/src/MauiSherpa/Pages/Modals/CloudProviderPage.cs
index f0228e7..c121466 100644
--- a/src/MauiSherpa/Pages/Modals/CloudProviderPage.cs
+++ b/src/MauiSherpa/Pages/Modals/CloudProviderPage.cs
@@ -4,7 +4,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/CreateProfilePage.cs b/src/MauiSherpa/Pages/Modals/CreateProfilePage.cs
index 7764182..1cbf9ba 100644
--- a/src/MauiSherpa/Pages/Modals/CreateProfilePage.cs
+++ b/src/MauiSherpa/Pages/Modals/CreateProfilePage.cs
@@ -4,7 +4,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/EditProfilePage.cs b/src/MauiSherpa/Pages/Modals/EditProfilePage.cs
index b38c901..bd49c7b 100644
--- a/src/MauiSherpa/Pages/Modals/EditProfilePage.cs
+++ b/src/MauiSherpa/Pages/Modals/EditProfilePage.cs
@@ -4,7 +4,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/ExportCertificatePage.cs b/src/MauiSherpa/Pages/Modals/ExportCertificatePage.cs
index 166f646..28d89f1 100644
--- a/src/MauiSherpa/Pages/Modals/ExportCertificatePage.cs
+++ b/src/MauiSherpa/Pages/Modals/ExportCertificatePage.cs
@@ -4,7 +4,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/ExportSettingsPage.cs b/src/MauiSherpa/Pages/Modals/ExportSettingsPage.cs
index 18233db..d45c787 100644
--- a/src/MauiSherpa/Pages/Modals/ExportSettingsPage.cs
+++ b/src/MauiSherpa/Pages/Modals/ExportSettingsPage.cs
@@ -3,7 +3,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/GoogleIdentityPage.cs b/src/MauiSherpa/Pages/Modals/GoogleIdentityPage.cs
index a2e8059..1f27cb6 100644
--- a/src/MauiSherpa/Pages/Modals/GoogleIdentityPage.cs
+++ b/src/MauiSherpa/Pages/Modals/GoogleIdentityPage.cs
@@ -4,7 +4,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/ImportSettingsPage.cs b/src/MauiSherpa/Pages/Modals/ImportSettingsPage.cs
index 2353e8f..0e67166 100644
--- a/src/MauiSherpa/Pages/Modals/ImportSettingsPage.cs
+++ b/src/MauiSherpa/Pages/Modals/ImportSettingsPage.cs
@@ -4,7 +4,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/KeystoreSignaturesPage.cs b/src/MauiSherpa/Pages/Modals/KeystoreSignaturesPage.cs
index a1ec9b9..cda6656 100644
--- a/src/MauiSherpa/Pages/Modals/KeystoreSignaturesPage.cs
+++ b/src/MauiSherpa/Pages/Modals/KeystoreSignaturesPage.cs
@@ -4,7 +4,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/ManageCapabilitiesPage.cs b/src/MauiSherpa/Pages/Modals/ManageCapabilitiesPage.cs
index 34b9e33..544088b 100644
--- a/src/MauiSherpa/Pages/Modals/ManageCapabilitiesPage.cs
+++ b/src/MauiSherpa/Pages/Modals/ManageCapabilitiesPage.cs
@@ -4,7 +4,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/PepkExportPage.cs b/src/MauiSherpa/Pages/Modals/PepkExportPage.cs
index 6089a0b..a6cc4e2 100644
--- a/src/MauiSherpa/Pages/Modals/PepkExportPage.cs
+++ b/src/MauiSherpa/Pages/Modals/PepkExportPage.cs
@@ -3,7 +3,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/ProfilingCaptureWizardPage.cs b/src/MauiSherpa/Pages/Modals/ProfilingCaptureWizardPage.cs
index 4749322..1783aff 100644
--- a/src/MauiSherpa/Pages/Modals/ProfilingCaptureWizardPage.cs
+++ b/src/MauiSherpa/Pages/Modals/ProfilingCaptureWizardPage.cs
@@ -4,7 +4,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/PublishProfileEditorPage.cs b/src/MauiSherpa/Pages/Modals/PublishProfileEditorPage.cs
index e550cbd..7e3f91f 100644
--- a/src/MauiSherpa/Pages/Modals/PublishProfileEditorPage.cs
+++ b/src/MauiSherpa/Pages/Modals/PublishProfileEditorPage.cs
@@ -4,7 +4,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/PublishReviewPage.cs b/src/MauiSherpa/Pages/Modals/PublishReviewPage.cs
index 17ff7b2..0df8f40 100644
--- a/src/MauiSherpa/Pages/Modals/PublishReviewPage.cs
+++ b/src/MauiSherpa/Pages/Modals/PublishReviewPage.cs
@@ -4,7 +4,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/PublishSecretsPage.cs b/src/MauiSherpa/Pages/Modals/PublishSecretsPage.cs
index 0c04096..9a5924d 100644
--- a/src/MauiSherpa/Pages/Modals/PublishSecretsPage.cs
+++ b/src/MauiSherpa/Pages/Modals/PublishSecretsPage.cs
@@ -3,7 +3,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/PublisherPage.cs b/src/MauiSherpa/Pages/Modals/PublisherPage.cs
index e137cb8..fe3c151 100644
--- a/src/MauiSherpa/Pages/Modals/PublisherPage.cs
+++ b/src/MauiSherpa/Pages/Modals/PublisherPage.cs
@@ -4,7 +4,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/RuntimePickerPage.cs b/src/MauiSherpa/Pages/Modals/RuntimePickerPage.cs
index bce88dd..abe5701 100644
--- a/src/MauiSherpa/Pages/Modals/RuntimePickerPage.cs
+++ b/src/MauiSherpa/Pages/Modals/RuntimePickerPage.cs
@@ -4,7 +4,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/SecretPickerPage.cs b/src/MauiSherpa/Pages/Modals/SecretPickerPage.cs
index dcfbb90..43ed3f5 100644
--- a/src/MauiSherpa/Pages/Modals/SecretPickerPage.cs
+++ b/src/MauiSherpa/Pages/Modals/SecretPickerPage.cs
@@ -4,7 +4,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;
diff --git a/src/MauiSherpa/Pages/Modals/XcodeDownloadAuthPage.cs b/src/MauiSherpa/Pages/Modals/XcodeDownloadAuthPage.cs
index 2521fda..6b106cb 100644
--- a/src/MauiSherpa/Pages/Modals/XcodeDownloadAuthPage.cs
+++ b/src/MauiSherpa/Pages/Modals/XcodeDownloadAuthPage.cs
@@ -3,7 +3,7 @@
using Microsoft.Maui.Platform.MacOS;
#endif
#if LINUXGTK
-using Platform.Maui.Linux.Gtk4.Platform;
+using Microsoft.Maui.Platforms.Linux.Gtk4.Platform;
#endif
namespace MauiSherpa.Pages.Modals;