Merge pull request #2357 from cwensley/curtis/remove-gtk2-and-gtk3

Remove Gtk2 and Gtk3 platforms

.github/ISSUE_TEMPLATE.md

@@ -29,6 +29,6 @@
 ## Specifications
 
   - Version:
-  - Platform(s): <!-- WPF, WinForms, Gtk2, Gtk3, Mac, XamMac, etc -->
+  - Platform(s): <!-- WPF, WinForms, Gtk, Mac64, XamMac2, etc -->
   - Operating System(s): <!-- E.g. Windows 10, macOS 10.13, Ubuntu 18.04, etc -->
 

.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

.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",

README.md

@@ -123,25 +123,21 @@ 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
 
 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

src/Eto.Mac/build/BundleMono.targets

@@ -147,8 +147,6 @@
       <MacExecutableFiles Remove="@(MacExecutableFiles)" Condition="
         (%(Filename) == 'Eto' and %(Extension) == '.xml')
         or %(Filename) == 'Eto.Direct2D'
-        or %(Filename) == 'Eto.Gtk2'
-        or %(Filename) == 'Eto.Gtk3'
         or %(Filename) == 'Eto.Gtk'
         or %(Filename) == 'GLibSharp'
         or %(Filename) == 'GtkSharp'

src/Eto.sln

@@ -15,12 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eto.Serialization.Json", "E
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eto.WinForms", "Eto.WinForms\Eto.WinForms.csproj", "{9F51798A-354C-47A1-9207-4BB7D7FC7FC4}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eto.Gtk2", "Eto.Gtk\Eto.Gtk2.csproj", "{80915A80-CA54-11E3-9C1A-0800200C9A66}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eto.Wpf", "Eto.Wpf\Eto.Wpf.csproj", "{63137FA0-CA55-11E3-9C1A-0800200C9A66}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eto.Gtk3", "Eto.Gtk\Eto.Gtk3.csproj", "{543B2F90-CA56-11E3-9C1A-0800200C9A66}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{E121B009-AB4B-4585-B3FB-D70E3DF8D3CC}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eto.Test", "..\test\Eto.Test\Eto.Test.csproj", "{EB9C0A22-6644-46E4-948C-F7C95E1F8CE1}"
@@ -46,10 +42,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eto.Gtk", "Eto.Gtk\Eto.Gtk.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eto.Direct2D", "Eto.Direct2D\Eto.Direct2D.csproj", "{3511ADDE-7CA8-4F7F-9721-AB48D3913760}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eto.Test.Gtk2", "..\test\Eto.Test.Gtk\Eto.Test.Gtk2.csproj", "{E3832AF1-FCBA-4575-8FB1-7168949150D8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Eto.Test.Gtk3", "..\test\Eto.Test.Gtk\Eto.Test.Gtk3.csproj", "{B45F3211-6C33-43B9-A492-1495FB149636}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.Test.XamMac2", "..\test\Eto.Test.Mac\Eto.Test.XamMac2.csproj", "{96C9D209-238D-4EBF-8391-F632A14921AD}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Eto.XamMac2", "Eto.Mac\Eto.XamMac2.csproj", "{6A38350E-51D6-4C13-ADD8-B9C6DC8A4358}"
@@ -146,16 +138,6 @@ Global
 		{9F51798A-354C-47A1-9207-4BB7D7FC7FC4}.Release|Mac.ActiveCfg = Release|Any CPU
 		{9F51798A-354C-47A1-9207-4BB7D7FC7FC4}.Release|Windows.ActiveCfg = Release|Any CPU
 		{9F51798A-354C-47A1-9207-4BB7D7FC7FC4}.Release|Windows.Build.0 = Release|Any CPU
-		{80915A80-CA54-11E3-9C1A-0800200C9A66}.Debug|Linux.ActiveCfg = Debug|Any CPU
-		{80915A80-CA54-11E3-9C1A-0800200C9A66}.Debug|Linux.Build.0 = Debug|Any CPU
-		{80915A80-CA54-11E3-9C1A-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU
-		{80915A80-CA54-11E3-9C1A-0800200C9A66}.Debug|Mac.Build.0 = Debug|Any CPU
-		{80915A80-CA54-11E3-9C1A-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU
-		{80915A80-CA54-11E3-9C1A-0800200C9A66}.Release|Linux.ActiveCfg = Release|Any CPU
-		{80915A80-CA54-11E3-9C1A-0800200C9A66}.Release|Linux.Build.0 = Release|Any CPU
-		{80915A80-CA54-11E3-9C1A-0800200C9A66}.Release|Mac.ActiveCfg = Release|Any CPU
-		{80915A80-CA54-11E3-9C1A-0800200C9A66}.Release|Mac.Build.0 = Release|Any CPU
-		{80915A80-CA54-11E3-9C1A-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU
 		{63137FA0-CA55-11E3-9C1A-0800200C9A66}.Debug|Linux.ActiveCfg = Debug|Any CPU
 		{63137FA0-CA55-11E3-9C1A-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU
 		{63137FA0-CA55-11E3-9C1A-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU
@@ -164,18 +146,6 @@ Global
 		{63137FA0-CA55-11E3-9C1A-0800200C9A66}.Release|Mac.ActiveCfg = Release|Any CPU
 		{63137FA0-CA55-11E3-9C1A-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU
 		{63137FA0-CA55-11E3-9C1A-0800200C9A66}.Release|Windows.Build.0 = Release|Any CPU
-		{543B2F90-CA56-11E3-9C1A-0800200C9A66}.Debug|Linux.ActiveCfg = Debug|Any CPU
-		{543B2F90-CA56-11E3-9C1A-0800200C9A66}.Debug|Linux.Build.0 = Debug|Any CPU
-		{543B2F90-CA56-11E3-9C1A-0800200C9A66}.Debug|Mac.ActiveCfg = Debug|Any CPU
-		{543B2F90-CA56-11E3-9C1A-0800200C9A66}.Debug|Mac.Build.0 = Debug|Any CPU
-		{543B2F90-CA56-11E3-9C1A-0800200C9A66}.Debug|Windows.ActiveCfg = Debug|Any CPU
-		{543B2F90-CA56-11E3-9C1A-0800200C9A66}.Debug|Windows.Build.0 = Debug|Any CPU
-		{543B2F90-CA56-11E3-9C1A-0800200C9A66}.Release|Linux.ActiveCfg = Release|Any CPU
-		{543B2F90-CA56-11E3-9C1A-0800200C9A66}.Release|Linux.Build.0 = Release|Any CPU
-		{543B2F90-CA56-11E3-9C1A-0800200C9A66}.Release|Mac.ActiveCfg = Release|Any CPU
-		{543B2F90-CA56-11E3-9C1A-0800200C9A66}.Release|Mac.Build.0 = Release|Any CPU
-		{543B2F90-CA56-11E3-9C1A-0800200C9A66}.Release|Windows.ActiveCfg = Release|Any CPU
-		{543B2F90-CA56-11E3-9C1A-0800200C9A66}.Release|Windows.Build.0 = Release|Any CPU
 		{EB9C0A22-6644-46E4-948C-F7C95E1F8CE1}.Debug|Linux.ActiveCfg = Debug|Any CPU
 		{EB9C0A22-6644-46E4-948C-F7C95E1F8CE1}.Debug|Linux.Build.0 = Debug|Any CPU
 		{EB9C0A22-6644-46E4-948C-F7C95E1F8CE1}.Debug|Mac.ActiveCfg = Debug|Any CPU
@@ -232,28 +202,6 @@ Global
 		{3511ADDE-7CA8-4F7F-9721-AB48D3913760}.Release|Mac.ActiveCfg = Release|Any CPU
 		{3511ADDE-7CA8-4F7F-9721-AB48D3913760}.Release|Windows.ActiveCfg = Release|Any CPU
 		{3511ADDE-7CA8-4F7F-9721-AB48D3913760}.Release|Windows.Build.0 = Release|Any CPU
-		{E3832AF1-FCBA-4575-8FB1-7168949150D8}.Debug|Linux.ActiveCfg = Debug|Any CPU
-		{E3832AF1-FCBA-4575-8FB1-7168949150D8}.Debug|Linux.Build.0 = Debug|Any CPU
-		{E3832AF1-FCBA-4575-8FB1-7168949150D8}.Debug|Mac.ActiveCfg = Debug|Any CPU
-		{E3832AF1-FCBA-4575-8FB1-7168949150D8}.Debug|Mac.Build.0 = Debug|Any CPU
-		{E3832AF1-FCBA-4575-8FB1-7168949150D8}.Debug|Windows.ActiveCfg = Debug|Any CPU
-		{E3832AF1-FCBA-4575-8FB1-7168949150D8}.Release|Linux.ActiveCfg = Release|Any CPU
-		{E3832AF1-FCBA-4575-8FB1-7168949150D8}.Release|Linux.Build.0 = Release|Any CPU
-		{E3832AF1-FCBA-4575-8FB1-7168949150D8}.Release|Mac.ActiveCfg = Release|Any CPU
-		{E3832AF1-FCBA-4575-8FB1-7168949150D8}.Release|Mac.Build.0 = Release|Any CPU
-		{E3832AF1-FCBA-4575-8FB1-7168949150D8}.Release|Windows.ActiveCfg = Release|Any CPU
-		{B45F3211-6C33-43B9-A492-1495FB149636}.Debug|Linux.ActiveCfg = Debug|Any CPU
-		{B45F3211-6C33-43B9-A492-1495FB149636}.Debug|Linux.Build.0 = Debug|Any CPU
-		{B45F3211-6C33-43B9-A492-1495FB149636}.Debug|Mac.ActiveCfg = Debug|Any CPU
-		{B45F3211-6C33-43B9-A492-1495FB149636}.Debug|Mac.Build.0 = Debug|Any CPU
-		{B45F3211-6C33-43B9-A492-1495FB149636}.Debug|Windows.ActiveCfg = Debug|Any CPU
-		{B45F3211-6C33-43B9-A492-1495FB149636}.Debug|Windows.Build.0 = Debug|Any CPU
-		{B45F3211-6C33-43B9-A492-1495FB149636}.Release|Linux.ActiveCfg = Release|Any CPU
-		{B45F3211-6C33-43B9-A492-1495FB149636}.Release|Linux.Build.0 = Release|Any CPU
-		{B45F3211-6C33-43B9-A492-1495FB149636}.Release|Mac.ActiveCfg = Release|Any CPU
-		{B45F3211-6C33-43B9-A492-1495FB149636}.Release|Mac.Build.0 = Release|Any CPU
-		{B45F3211-6C33-43B9-A492-1495FB149636}.Release|Windows.ActiveCfg = Release|Any CPU
-		{B45F3211-6C33-43B9-A492-1495FB149636}.Release|Windows.Build.0 = Release|Any CPU
 		{96C9D209-238D-4EBF-8391-F632A14921AD}.Debug|Linux.ActiveCfg = Debug|Any CPU
 		{96C9D209-238D-4EBF-8391-F632A14921AD}.Debug|Mac.ActiveCfg = Debug|Any CPU
 		{96C9D209-238D-4EBF-8391-F632A14921AD}.Debug|Mac.Build.0 = Debug|Any CPU
@@ -360,8 +308,6 @@ Global
 		{B5BC1D10-24ED-441C-A4D6-1F3AB9FF3689} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC}
 		{063AF7E7-18BD-488F-85BF-53B6E3D75685} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC}
 		{EB9C0A22-6644-46E4-948C-F7C95E1F8CE1} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC}
-		{E3832AF1-FCBA-4575-8FB1-7168949150D8} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC}
-		{B45F3211-6C33-43B9-A492-1495FB149636} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC}
 		{96C9D209-238D-4EBF-8391-F632A14921AD} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC}
 		{7EBEA53F-6CDC-4DB8-8042-1B048C3502CF} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC}
 		{CF18B0BB-2C60-437F-8AA3-711ABAE11A91} = {E121B009-AB4B-4585-B3FB-D70E3DF8D3CC}

src/Eto/Eto.csproj

@@ -26,8 +26,6 @@ In order to run your Eto.Forms based application, you must also install one (or
 - Eto.Platform.Windows
 - Eto.Platform.Direct2D
 - Eto.Platform.Gtk
-- Eto.Platform.Gtk2
-- Eto.Platform.Gtk3
 - Eto.Platform.Mac64
 - Eto.Platform.XamMac2
 

src/Eto/Platform.cs

@@ -409,12 +409,6 @@ public static Platform Detect
 				if (detected == null && EtoEnvironment.Platform.IsUnix)
 				{
 					detected = Get(Platforms.Gtk, true, errors);
-#pragma warning disable CS0618
-					if (detected == null)
-						detected = Get(Platforms.Gtk3, true, errors);
-					if (detected == null)
-						detected = Get(Platforms.Gtk2, true, errors);
-#pragma warning restore CS0618
 				}
 
 				if (detected == null)

src/Eto/Platforms.cs

@@ -20,16 +20,6 @@ public static class Platforms
 		/// </summary>
 		public static readonly string Gtk = "Eto.GtkSharp.Platform, Eto.Gtk";
 		/// <summary>
-		/// Type of the GTK 2 platform
-		/// </summary>
-		[Obsolete("Gtk2 platform is obsolete, please use Platforms.Gtk instead.")]
-		public static readonly string Gtk2 = "Eto.GtkSharp.Platform, Eto.Gtk2";
-		/// <summary>
-		/// Type of the GTK 3 platform
-		/// </summary>
-		[Obsolete("Gtk3 platform is obsolete, please use Platforms.Gtk instead.")]
-		public static readonly string Gtk3 = "Eto.GtkSharp.Platform, Eto.Gtk3";
-		/// <summary>
 		/// Type of the macOS platform on .NET 6+ or mono
 		/// </summary>
 		public static readonly string Mac64 = "Eto.Mac.Platform, Eto.Mac64";