From e285448097447c568669a7274c36108526a8da22 Mon Sep 17 00:00:00 2001 From: Curtis Wensley Date: Thu, 24 Nov 2022 21:04:17 -0800 Subject: [PATCH] Remove Gtk2 and Gtk3 platforms - now only one Gtk platform for linux support Fixes #2109 --- .github/ISSUE_TEMPLATE.md | 2 +- .github/workflows/build.yml | 1 - .vscode/launch.json | 12 +++---- README.md | 6 +--- src/Eto.Mac/build/BundleMono.targets | 2 -- src/Eto.sln | 54 ---------------------------- src/Eto/Eto.csproj | 2 -- src/Eto/Platform.cs | 6 ---- src/Eto/Platforms.cs | 10 ------ 9 files changed, 6 insertions(+), 89 deletions(-) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index b7fdbc468c..cedb8217e2 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -29,6 +29,6 @@ ## Specifications - Version: - - Platform(s): + - Platform(s): - Operating System(s): diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 47164c33ec..59cf7bd05c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -112,7 +112,6 @@ jobs: path: | artifacts/nuget/${{ env.BuildConfiguration }}/Eto.Platform.XamMac2*.nupkg artifacts/nuget/${{ env.BuildConfiguration }}/Eto.Platform.macOS*.nupkg - artifacts/nuget/${{ env.BuildConfiguration }}/Eto.Platform.Gtk2*.nupkg - name: Upload test artifacts uses: actions/upload-artifact@v2 diff --git a/.vscode/launch.json b/.vscode/launch.json index 67f59d709a..f42ca2b8a5 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -23,8 +23,7 @@ "passDebugOptionsViaEnvironmentVariable": true, "args": [], "console": "internalConsole", - "internalConsoleOptions": "openOnSessionStart", - "justMyCode": false + "internalConsoleOptions": "openOnSessionStart" }, { "name": "Eto.Test.macOS", @@ -47,8 +46,7 @@ "passDebugOptionsViaEnvironmentVariable": true, "args": [], "console": "internalConsole", - "internalConsoleOptions": "openOnSessionStart", - "justMyCode": false + "internalConsoleOptions": "openOnSessionStart" }, { "name": "Eto.Test.Gtk", @@ -81,8 +79,7 @@ } }, "console": "internalConsole", - "internalConsoleOptions": "openOnSessionStart", - "justMyCode": false + "internalConsoleOptions": "openOnSessionStart" }, { "name": "Eto.Test.Gtk2", @@ -93,8 +90,7 @@ "passDebugOptionsViaEnvironmentVariable": true, "args": [], "console": "internalConsole", - "internalConsoleOptions": "openOnSessionStart", - "justMyCode": false + "internalConsoleOptions": "openOnSessionStart" }, { "name": "Eto.Test.Wpf", diff --git a/README.md b/README.md index 1f6842dc56..c70e29c753 100644 --- a/README.md +++ b/README.md @@ -123,17 +123,13 @@ Assemblies Your project only needs to reference Eto.dll, and include the corresponding platform assembly that you wish to target. To run on a Mac platform, you need to [bundle your app](https://github.com/picoe/Eto/wiki/Running-your-application). * Eto.dll - Eto.Forms (UI), Eto.Drawing (Graphics), and platform loading -* Eto.Mac.dll - MonoMac platform for OS X using 32-bit mono * Eto.Mac64.dll - MonoMac platform for OS X using 64-bit mono -* Eto.XamMac.dll - Xamarin.Mac Classic platform for OS X to embed mono * Eto.XamMac2.dll - Xamarin.Mac Unified platform for OS X to embed mono * Eto.macOS.dll - .NET 6 platform for OS X (for use with the net6.0-macos target) * Eto.WinForms.dll - Windows Forms platform using GDI+ for graphics * Eto.Direct2D.dll - Windows Forms platform using Direct2D for graphics * Eto.Wpf.dll - Windows Presentation Foundation platform * Eto.Gtk.dll - Gtk+3 platform for Mac, Windows, and Linux. -* Eto.Gtk2.dll - Gtk2 platform using gtk-sharp2 on Mac, Windows, and Linux. -* Eto.Gtk3.dll - [deprecated] Gtk3 platform for running on Linux with gtk-sharp3 package * Eto.iOS.dll - Xamarin.iOS platform * Eto.Android.dll - Xamarin.Android platform @@ -141,7 +137,7 @@ Currently supported targets --------------------------- * OS X: MonoMac, Xamarin.Mac, or net6.0-macos -* Linux: GTK# 2 or 3 +* Linux: GTK+ 3 * Windows: Windows Forms (using GDI or Direct2D) or WPF Under development diff --git a/src/Eto.Mac/build/BundleMono.targets b/src/Eto.Mac/build/BundleMono.targets index 2c293f8924..44018561f1 100644 --- a/src/Eto.Mac/build/BundleMono.targets +++ b/src/Eto.Mac/build/BundleMono.targets @@ -147,8 +147,6 @@ public static readonly string Gtk = "Eto.GtkSharp.Platform, Eto.Gtk"; /// - /// Type of the GTK 2 platform - /// - [Obsolete("Gtk2 platform is obsolete, please use Platforms.Gtk instead.")] - public static readonly string Gtk2 = "Eto.GtkSharp.Platform, Eto.Gtk2"; - /// - /// Type of the GTK 3 platform - /// - [Obsolete("Gtk3 platform is obsolete, please use Platforms.Gtk instead.")] - public static readonly string Gtk3 = "Eto.GtkSharp.Platform, Eto.Gtk3"; - /// /// Type of the macOS platform on .NET 6+ or mono /// public static readonly string Mac64 = "Eto.Mac.Platform, Eto.Mac64";