diff --git a/samples/Wpf/EmbedEtoInWpf/EmbedEtoInWpf.csproj b/samples/Wpf/EmbedEtoInWpf/EmbedEtoInWpf.csproj index 419945d86e..04a059e35e 100644 --- a/samples/Wpf/EmbedEtoInWpf/EmbedEtoInWpf.csproj +++ b/samples/Wpf/EmbedEtoInWpf/EmbedEtoInWpf.csproj @@ -1,14 +1,9 @@ - + - true - net48;net6.0-windows - - - WinExe Properties @@ -30,18 +25,6 @@ - - - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - App.xaml @@ -77,7 +60,4 @@ - - - \ No newline at end of file diff --git a/samples/Wpf/EmbedWpfInEto/EmbedWpfInEto.csproj b/samples/Wpf/EmbedWpfInEto/EmbedWpfInEto.csproj index db52235e51..0237a8c5fe 100644 --- a/samples/Wpf/EmbedWpfInEto/EmbedWpfInEto.csproj +++ b/samples/Wpf/EmbedWpfInEto/EmbedWpfInEto.csproj @@ -1,14 +1,9 @@ - + - true - net48;net6.0-windows - - - WinExe Properties @@ -36,20 +31,9 @@ - - - - Designer - MSBuild:Compile - - - - - - \ No newline at end of file diff --git a/src/Eto.Direct2D/Eto.Direct2D.csproj b/src/Eto.Direct2D/Eto.Direct2D.csproj index ea096c7850..61cd858f45 100755 --- a/src/Eto.Direct2D/Eto.Direct2D.csproj +++ b/src/Eto.Direct2D/Eto.Direct2D.csproj @@ -1,19 +1,14 @@ - + - true - - netcoreapp3.1;net462 + net6.0-windows;net462 - - - Library True $(DefineConstants);WINFORMS - true + true @@ -60,8 +55,5 @@ You do not need to use any of the classes of this assembly (unless customizing t - - - \ No newline at end of file diff --git a/src/Eto.Forms.Templates/content/App-CSharp/.template.config/template.json b/src/Eto.Forms.Templates/content/App-CSharp/.template.config/template.json index 605500c372..abd8e60320 100755 --- a/src/Eto.Forms.Templates/content/App-CSharp/.template.config/template.json +++ b/src/Eto.Forms.Templates/content/App-CSharp/.template.config/template.json @@ -78,20 +78,20 @@ "type": "parameter", "description": "Specify the framework(s) to support", "dataType": "choice", - "defaultValue": "net6.0", + "defaultValue": "net8.0", "replaces": "net6.0", "choices": [ { - "choice": "net6.0", - "description": ".NET 6.0" + "choice": "net8.0", + "description": ".NET 8.0" }, { - "choice": "net5.0", - "description": ".NET 5.0" + "choice": "net7.0", + "description": ".NET 7.0" }, { - "choice": "netcoreapp3.1", - "description": ".NET Core 3.1" + "choice": "net6.0", + "description": ".NET 6.0" }, { "choice": "net48", diff --git a/src/Eto.Forms.Templates/content/App-FSharp/.template.config/template.json b/src/Eto.Forms.Templates/content/App-FSharp/.template.config/template.json index 34f8d489d1..dbcd9a128a 100755 --- a/src/Eto.Forms.Templates/content/App-FSharp/.template.config/template.json +++ b/src/Eto.Forms.Templates/content/App-FSharp/.template.config/template.json @@ -78,20 +78,20 @@ "type": "parameter", "description": "Specify the framework(s) to support", "dataType": "choice", - "defaultValue": "net6.0", + "defaultValue": "net8.0", "replaces": "net6.0", "choices": [ { - "choice": "net6.0", - "description": ".NET 6.0" + "choice": "net8.0", + "description": ".NET 8.0" }, { - "choice": "net5.0", - "description": ".NET 5.0" + "choice": "net7.0", + "description": ".NET 7.0" }, { - "choice": "netcoreapp3.1", - "description": ".NET Core 3.1" + "choice": "net6.0", + "description": ".NET 6.0" }, { "choice": "net48", diff --git a/src/Eto.Forms.Templates/content/App-VisualBasic/.template.config/template.json b/src/Eto.Forms.Templates/content/App-VisualBasic/.template.config/template.json index 4f5731dd21..06940a5b56 100755 --- a/src/Eto.Forms.Templates/content/App-VisualBasic/.template.config/template.json +++ b/src/Eto.Forms.Templates/content/App-VisualBasic/.template.config/template.json @@ -78,20 +78,20 @@ "type": "parameter", "description": "Specify the framework(s) to support", "dataType": "choice", - "defaultValue": "net6.0", + "defaultValue": "net8.0", "replaces": "net6.0", "choices": [ { - "choice": "net6.0", - "description": ".NET 6.0" + "choice": "net8.0", + "description": ".NET 8.0" }, { - "choice": "net5.0", - "description": ".NET 5.0" + "choice": "net7.0", + "description": ".NET 7.0" }, { - "choice": "netcoreapp3.1", - "description": ".NET Core 3.1" + "choice": "net6.0", + "description": ".NET 6.0" }, { "choice": "net48", diff --git a/src/Eto.Gtk/Forms/LinuxTrayIndicatorHandler.cs b/src/Eto.Gtk/Forms/LinuxTrayIndicatorHandler.cs index 329f6ede89..6d74b64a0d 100644 --- a/src/Eto.Gtk/Forms/LinuxTrayIndicatorHandler.cs +++ b/src/Eto.Gtk/Forms/LinuxTrayIndicatorHandler.cs @@ -50,7 +50,7 @@ public bool Visible public LinuxTrayIndicatorHandler() { -#if NETCOREAPP +#if NET NativeLibrary.SetDllImportResolver(typeof(LinuxTrayIndicatorHandler).Assembly, (name, assembly, path) => { // Use custom import resolver for libappindicator diff --git a/src/Eto.Gtk/NativeMethods.tt b/src/Eto.Gtk/NativeMethods.tt index 4f20f063f3..883c7b9ce8 100755 --- a/src/Eto.Gtk/NativeMethods.tt +++ b/src/Eto.Gtk/NativeMethods.tt @@ -152,7 +152,7 @@ namespace Eto.GtkSharp static class <#= pclass[i] #> { -#if NETCOREAPP +#if NET static <#= pclass[i] #>() { diff --git a/src/Eto.WinForms/Eto.WinForms.csproj b/src/Eto.WinForms/Eto.WinForms.csproj index 56a8bff7b6..21a92e2da9 100755 --- a/src/Eto.WinForms/Eto.WinForms.csproj +++ b/src/Eto.WinForms/Eto.WinForms.csproj @@ -1,21 +1,15 @@ - - + - true - - netcoreapp3.1;net461 + net6.0-windows;net461 - - - Library True $(DefineConstants);WINFORMS MSB4011;$(NoWarn) - true + true True @@ -132,8 +126,6 @@ You do not need to use any of the classes of this assembly (unless customizing t - - True diff --git a/src/Eto.WinForms/Forms/Controls/TextStepperHandler.cs b/src/Eto.WinForms/Forms/Controls/TextStepperHandler.cs index aadf674704..a0866a796a 100644 --- a/src/Eto.WinForms/Forms/Controls/TextStepperHandler.cs +++ b/src/Eto.WinForms/Forms/Controls/TextStepperHandler.cs @@ -7,7 +7,7 @@ public class EtoUpDown : swf.UpDownBase public event EventHandler DownButtonClicked; public event EventHandler UpButtonClicked; -#if NETCOREAPP +#if NET static FieldInfo DefaultButtonsWidthField = typeof(swf.UpDownBase).GetField("_defaultButtonsWidth", BindingFlags.Static | BindingFlags.NonPublic); static FieldInfo TextBoxField = typeof(swf.UpDownBase).GetField("_upDownEdit", BindingFlags.Instance | BindingFlags.NonPublic); static FieldInfo UpDownButtonsField = typeof(swf.UpDownBase).GetField("_upDownButtons", BindingFlags.Instance | BindingFlags.NonPublic); diff --git a/src/Eto.WinForms/ScrollMessageFilter.cs b/src/Eto.WinForms/ScrollMessageFilter.cs index 675dd8acf1..091185f188 100755 --- a/src/Eto.WinForms/ScrollMessageFilter.cs +++ b/src/Eto.WinForms/ScrollMessageFilter.cs @@ -8,7 +8,7 @@ public static bool IsScrollable(swf.Control control) if (p != null) return p.AutoScroll; return control is swf.DataGridView -#if !NETCOREAPP3_1 +#if NETFRAMEWORK || control is swf.DataGrid #endif || control is swf.TreeView diff --git a/src/Eto.Wpf/Eto.Wpf.csproj b/src/Eto.Wpf/Eto.Wpf.csproj index c74d028b9f..d8ae7d774e 100755 --- a/src/Eto.Wpf/Eto.Wpf.csproj +++ b/src/Eto.Wpf/Eto.Wpf.csproj @@ -1,14 +1,9 @@ - + - true - - netcoreapp3.1;net462 + net6.0-windows;net462 - - - Library Eto.Wpf @@ -16,8 +11,8 @@ true true $(DefineConstants);WPF - true - true + true + true NU1701;MSB4011;$(NoWarn) @@ -151,17 +146,6 @@ You do not need to use any of the classes of this assembly (unless customizing t - - - - MSBuild:Compile - Designer - - - $([System.String]::Copy('%(Filename)').Replace('.xaml', ''))%(Extension) - - - @@ -172,7 +156,4 @@ You do not need to use any of the classes of this assembly (unless customizing t - - - diff --git a/src/Eto/Forms/Binding/ICommand.cs b/src/Eto/Forms/Binding/ICommand.cs deleted file mode 100644 index f739cdbb29..0000000000 --- a/src/Eto/Forms/Binding/ICommand.cs +++ /dev/null @@ -1,36 +0,0 @@ -#if !NETSTANDARD && !NETCOREAPP -namespace System.Windows.Input -{ -} - -namespace Eto.Forms -{ - /// - /// Interface to define a command to execute. - /// - /// - /// This interface is provided only for .NET 4.0 to mimic the System.Windows.Input.ICommand provided in .NET 4.5 and PCL. - /// It is useful for MVVM scenarios to bind object events to a command in the model. - /// - public interface ICommand - { - /// - /// Determines whether this command can be executed. - /// - /// true if the command can be executed; otherwise, false. - /// Optional data to pass to the command, or null if not required by the command. - bool CanExecute(object parameter); - - /// - /// Executes the command - /// - /// Optional data to pass to the command, or null if not required by the command. - void Execute(object parameter); - - /// - /// Event to handle when the state of the method changes. - /// - event EventHandler CanExecuteChanged; - } -} -#endif \ No newline at end of file diff --git a/src/Eto/Forms/Controls/Control.cs b/src/Eto/Forms/Controls/Control.cs index b519141dd2..5f6debd042 100755 --- a/src/Eto/Forms/Controls/Control.cs +++ b/src/Eto/Forms/Controls/Control.cs @@ -7,11 +7,6 @@ namespace Eto.Forms; /// All visual user interface elements should inherit from this class to provide common functionality like binding, /// load/unload, and common events. /// -#if !NETSTANDARD && !NETCOREAPP - [ToolboxItem(true)] - [DesignTimeVisible(true)] - [DesignerCategory("Eto.Forms")] -#endif [sc.TypeConverter(typeof(ControlConverter))] public partial class Control : BindableWidget, IMouseInputSource, IKeyboardInputSource, ICallbackSource { diff --git a/src/Eto/PclTypes.cs b/src/Eto/PclTypes.cs index d37dff4473..34b533990d 100644 --- a/src/Eto/PclTypes.cs +++ b/src/Eto/PclTypes.cs @@ -1,4 +1,4 @@ -#if NETSTANDARD || NETCOREAPP +#if NETSTANDARD || NET // This file contains type definitions currently needed to compile Eto // as a Portable Class Library, in the project Eto.Pcl.csproj. namespace Eto