Migrate Linux GTK4 packages from Maui.Gtk to dotnet/maui-labs

.gitignore

@@ -420,3 +420,4 @@ FodyWeavers.xsd
 *.msix
 *.msm
 *.msp
+nohup.out

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

nuget.config

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <clear />
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
+  </packageSources>
+</configuration>

src/MauiSherpa.LinuxGtk/MauiSherpa.LinuxGtk.csproj

@@ -20,9 +20,6 @@
     <DebSection>devel</DebSection>
     <DebMaintainer>Jon Dick &lt;redth@users.noreply.github.com&gt;</DebMaintainer>
     <FlatpakFinishArgs>--socket=wayland --socket=fallback-x11 --share=ipc --device=dri --share=network --filesystem=home</FlatpakFinishArgs>
-    <LocalGtkNugetSource>$(MSBuildThisFileDirectory)..\..\.nuget\local-packages</LocalGtkNugetSource>
-    <RestoreSources>$(RestoreSources);https://api.nuget.org/v3/index.json</RestoreSources>
-    <RestoreSources Condition="Exists('$(LocalGtkNugetSource)')">$(RestoreSources);$(LocalGtkNugetSource)</RestoreSources>
   </PropertyGroup>
 
   <ItemGroup>
@@ -31,15 +28,14 @@
     <PackageReference Include="Markdig" Version="0.44.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
-    <!-- Use local ProjectReference when Maui.Gtk repo is cloned, otherwise NuGet -->
-    <ProjectReference Condition="Exists('$(HOME)/code/Maui.Gtk/src/Platform.Maui.Linux.Gtk4/Platform.Maui.Linux.Gtk4.csproj')" Include="$(HOME)/code/Maui.Gtk/src/Platform.Maui.Linux.Gtk4/Platform.Maui.Linux.Gtk4.csproj" />
-    <ProjectReference Condition="Exists('$(HOME)/code/Maui.Gtk/src/Platform.Maui.Linux.Gtk4.BlazorWebView/Platform.Maui.Linux.Gtk4.BlazorWebView.csproj')" Include="$(HOME)/code/Maui.Gtk/src/Platform.Maui.Linux.Gtk4.BlazorWebView/Platform.Maui.Linux.Gtk4.BlazorWebView.csproj" />
-    <ProjectReference Condition="Exists('$(HOME)/code/Maui.Gtk/src/Platform.Maui.Linux.Gtk4.Essentials/Platform.Maui.Linux.Gtk4.Essentials.csproj')" Include="$(HOME)/code/Maui.Gtk/src/Platform.Maui.Linux.Gtk4.Essentials/Platform.Maui.Linux.Gtk4.Essentials.csproj" />
-    <PackageReference Condition="!Exists('$(HOME)/code/Maui.Gtk/src/Platform.Maui.Linux.Gtk4/Platform.Maui.Linux.Gtk4.csproj')" Include="Platform.Maui.Linux.Gtk4" Version="0.6.0" />
-    <PackageReference Condition="!Exists('$(HOME)/code/Maui.Gtk/src/Platform.Maui.Linux.Gtk4.BlazorWebView/Platform.Maui.Linux.Gtk4.BlazorWebView.csproj')" Include="Platform.Maui.Linux.Gtk4.BlazorWebView" Version="0.6.0" />
-    <PackageReference Condition="!Exists('$(HOME)/code/Maui.Gtk/src/Platform.Maui.Linux.Gtk4.Essentials/Platform.Maui.Linux.Gtk4.Essentials.csproj')" Include="Platform.Maui.Linux.Gtk4.Essentials" Version="0.6.0" />
-    <PackageReference Include="Redth.MauiDevFlow.Agent.Gtk" Version="0.23.0" Condition="'$(Configuration)' == 'Debug'" />
-    <PackageReference Include="Redth.MauiDevFlow.Blazor.Gtk" Version="0.23.0" Condition="'$(Configuration)' == 'Debug'" />
+    <PackageReference Include="Microsoft.Maui.Platforms.Linux.Gtk4" Version="0.1.0-preview.5.26222.2" />
+    <PackageReference Include="Microsoft.Maui.Platforms.Linux.Gtk4.BlazorWebView" Version="0.1.0-preview.5.26222.2" />
+    <PackageReference Include="Microsoft.Maui.Platforms.Linux.Gtk4.Essentials" Version="0.1.0-preview.5.26222.2" />
+    <!-- DevFlow GTK packages temporarily removed — they depend on old Platform.Maui.Linux.Gtk4
+         and conflict with the new Microsoft.Maui.Platforms.Linux.Gtk4 packages.
+         Restore once DevFlow is updated to reference the new package names. -->
+    <!-- <PackageReference Include="Redth.MauiDevFlow.Agent.Gtk" Version="0.23.0" Condition="'$(Configuration)' == 'Debug'" /> -->
+    <!-- <PackageReference Include="Redth.MauiDevFlow.Blazor.Gtk" Version="0.23.0" Condition="'$(Configuration)' == 'Debug'" /> -->
     <PackageReference Include="Sentry.Maui" Version="6.4.0" />
     <PackageReference Include="Shiny.Mediator.Caching.MicrosoftMemoryCache" Version="6.1.1" />
     <PackageReference Include="Shiny.Mediator.Maui" Version="6.1.1" />

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<ICopilotModalService>();
 
-#if DEBUG
-        Microsoft.Maui.Controls.Application.Current?.StartDevFlowAgent();
-#endif
+// DevFlow GTK agent removed temporarily (package conflict with new Microsoft.Maui.Platforms.Linux.Gtk4)
     }
 
     /// <summary>

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;

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
 

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;