From 43ab2a8debbcbeebb833a3f0398c8296d90329b8 Mon Sep 17 00:00:00 2001 From: redth Date: Wed, 22 Apr 2026 11:27:55 -0400 Subject: [PATCH 1/2] Migrate Linux GTK4 packages from Maui.Gtk to dotnet/maui-labs Switch from community packages (Platform.Maui.Linux.Gtk4 from nicoleeldridge/Maui.Gtk) to official packages (Microsoft.Maui.Platforms.Linux.Gtk4 from dotnet/maui-labs), published to the dotnet10 Azure DevOps NuGet feed. Changes: - Add dotnet10 NuGet feed to nuget.config - Update 3 package references in MauiSherpa.LinuxGtk.csproj - Update namespaces across ~34 files - Remove local ProjectReference fallback from csproj - Comment out DevFlow GTK packages (need update for new package names) - Update README acknowledgment link to dotnet/maui-labs Note: The current preview packages have a heap corruption bug triggered by BlazorWebView + ZIndex combinations. Fix submitted as dotnet/maui-labs#132 (Graphene.Point.Free() use-after-free). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .gitignore | 1 + README.md | 2 +- nuget.config | 8 ++++++++ .../MauiSherpa.LinuxGtk.csproj | 20 ++++++++----------- src/MauiSherpa.LinuxGtk/Program.cs | 9 ++------- src/MauiSherpa/CopilotPage.cs | 2 +- src/MauiSherpa/MauiProgram.cs | 13 +++++------- src/MauiSherpa/Pages/Forms/FormPage.cs | 2 +- src/MauiSherpa/Pages/Forms/HybridFormPage.cs | 2 +- .../Pages/Forms/HybridProgressPage.cs | 2 +- src/MauiSherpa/Pages/Forms/HybridViewPage.cs | 2 +- .../Pages/Forms/ProgressModalPage.cs | 2 +- src/MauiSherpa/Pages/Forms/SettingsPage.cs | 2 +- src/MauiSherpa/Pages/Forms/WizardFormPage.cs | 2 +- .../Pages/Modals/AddPublisherPage.cs | 2 +- .../Pages/Modals/AppleConfigWizardPage.cs | 2 +- .../Pages/Modals/AppleIdentityPage.cs | 2 +- .../Pages/Modals/CISecretsWizardPage.cs | 2 +- .../Pages/Modals/CloudProviderPage.cs | 2 +- .../Pages/Modals/CreateProfilePage.cs | 2 +- .../Pages/Modals/EditProfilePage.cs | 2 +- .../Pages/Modals/ExportCertificatePage.cs | 2 +- .../Pages/Modals/ExportSettingsPage.cs | 2 +- .../Pages/Modals/GoogleIdentityPage.cs | 2 +- .../Pages/Modals/ImportSettingsPage.cs | 2 +- .../Pages/Modals/KeystoreSignaturesPage.cs | 2 +- .../Pages/Modals/ManageCapabilitiesPage.cs | 2 +- src/MauiSherpa/Pages/Modals/PepkExportPage.cs | 2 +- .../Modals/ProfilingCaptureWizardPage.cs | 2 +- .../Pages/Modals/PublishProfileEditorPage.cs | 2 +- .../Pages/Modals/PublishReviewPage.cs | 2 +- .../Pages/Modals/PublishSecretsPage.cs | 2 +- src/MauiSherpa/Pages/Modals/PublisherPage.cs | 2 +- .../Pages/Modals/RuntimePickerPage.cs | 2 +- .../Pages/Modals/SecretPickerPage.cs | 2 +- .../Pages/Modals/XcodeDownloadAuthPage.cs | 2 +- 36 files changed, 55 insertions(+), 58 deletions(-) create mode 100644 nuget.config diff --git a/.gitignore b/.gitignore index 6b22eb15..ae89e908 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 0e703770..dcc09ee0 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 00000000..6251cdee --- /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 e2366b19..098ad7bc 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 9bf2e1b5..b55d2737 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 5ee9f512..2708b8d6 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 e6bb9f7a..ac01df7d 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 e3543ec5..79814049 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 7839a756..6fd26d58 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 749fe35e..47fee170 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 ed374db7..fb21cab8 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 1db0b0c3..7cc53fda 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 a64bd48b..036a4676 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 051a2f38..f964eb7d 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 3a94f825..34338acf 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 476938b5..a7c4cfbd 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 f44decd3..ca5ca961 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 232ed0b0..d57707e7 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 f0228e7e..c121466f 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 77641823..1cbf9ba8 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 b38c9013..bd49c7be 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 166f646a..28d89f10 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 18233dbd..d45c787c 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 a2e80590..1f27cb6b 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 2353e8fc..0e67166f 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 a1ec9b9d..cda66560 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 34b9e339..544088bc 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 6089a0ba..a6cc4e2e 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 47493222..1783affe 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 e550cbd6..7e3f91f6 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 17ff7b25..0df8f405 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 0c04096b..9a5924d5 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 e137cb86..fe3c1516 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 bce88dd0..abe5701e 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 dcfbb903..43ed3f5f 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 2521fda0..6b106cb3 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; From ee131c7cdb3bcd31533b19ef7bc283ff2c45ab42 Mon Sep 17 00:00:00 2001 From: redth Date: Wed, 22 Apr 2026 15:11:58 -0400 Subject: [PATCH 2/2] Pin Linux.Gtk4 packages to 0.1.0-preview.5.26222.2 (includes heap corruption fix) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- src/MauiSherpa.LinuxGtk/MauiSherpa.LinuxGtk.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/MauiSherpa.LinuxGtk/MauiSherpa.LinuxGtk.csproj b/src/MauiSherpa.LinuxGtk/MauiSherpa.LinuxGtk.csproj index 098ad7bc..07b550f2 100644 --- a/src/MauiSherpa.LinuxGtk/MauiSherpa.LinuxGtk.csproj +++ b/src/MauiSherpa.LinuxGtk/MauiSherpa.LinuxGtk.csproj @@ -28,9 +28,9 @@ - - - + + +