diff --git a/KGySoft.ComponentModelDemo/App.config b/KGySoft.ComponentModelDemo/App.config index d6f8e88..c3e8a0b 100644 --- a/KGySoft.ComponentModelDemo/App.config +++ b/KGySoft.ComponentModelDemo/App.config @@ -3,12 +3,4 @@ - - - - - - - - \ No newline at end of file diff --git a/KGySoft.ComponentModelDemo/KGySoft.ComponentModelDemo.csproj b/KGySoft.ComponentModelDemo/KGySoft.ComponentModelDemo.csproj index 50897dd..3da3f3c 100644 --- a/KGySoft.ComponentModelDemo/KGySoft.ComponentModelDemo.csproj +++ b/KGySoft.ComponentModelDemo/KGySoft.ComponentModelDemo.csproj @@ -1,172 +1,23 @@ - - - + - Debug - AnyCPU - {336A85AB-7AD0-4063-9835-24B523D32422} - WinExe + net472 + false KGySoft.ComponentModelDemo - KGySoft.ComponentModelDemo - v4.7.2 - 512 - true - true - bin\$(Configuration) - - - true - TRACE;DEBUG - full - false - - - TRACE - true - pdbonly - - - KGySoft.ComponentModelDemo.Program - - - app.manifest + latest + György Kőszeg + WinExe + true + + + + + - - ..\..\..\packages\KGySoft.CoreLibraries.5.1.0-alpha.2\lib\net472\KGySoft.CoreLibraries.dll - - + - - - - - - - - + - - - - True - True - Resources.resx - - - - Component - - - - - - - - - Component - - - - - - - - - Form - - - MainForm.cs - - - - - Component - - - - App.xaml - Code - - - - - - MainWindow.xaml - - - - - - EditToolBar.xaml - - - - - - - - - - MainForm.cs - - - ResXFileCodeGenerator - Designer - Resources.Designer.cs - - - - - README.md - - - Designer - - - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - Designer - XamlIntelliSenseFileGenerator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + diff --git a/KGySoft.ComponentModelDemo/Properties/AssemblyInfo.cs b/KGySoft.ComponentModelDemo/Properties/AssemblyInfo.cs index 2885e01..c939199 100644 --- a/KGySoft.ComponentModelDemo/Properties/AssemblyInfo.cs +++ b/KGySoft.ComponentModelDemo/Properties/AssemblyInfo.cs @@ -35,5 +35,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("5.1.0.0")] +[assembly: AssemblyFileVersion("5.1.0.0")] diff --git a/KGySoft.ComponentModelDemo/ViewWinForms/Images.cs b/KGySoft.ComponentModelDemo/ViewWinForms/Images.cs index bc42daf..a91fa40 100644 --- a/KGySoft.ComponentModelDemo/ViewWinForms/Images.cs +++ b/KGySoft.ComponentModelDemo/ViewWinForms/Images.cs @@ -14,14 +14,14 @@ internal static class Images private static Icon warning; private static Icon info; - public static Image Undo => undo ?? (undo = Image.FromStream(Properties.Resources.Undo)); - public static Image Redo => redo ?? (redo = Image.FromStream(Properties.Resources.Redo)); - public static Image Edit => edit ?? (edit = Image.FromStream(Properties.Resources.Edit)); - public static Image Accept => accept ?? (accept = Image.FromStream(Properties.Resources.Accept)); - public static Image Cancel => cancel ?? (cancel = Image.FromStream(Properties.Resources.Cancel)); + public static Image Undo => undo ??= Image.FromStream(Properties.Resources.Undo); + public static Image Redo => redo ??= Image.FromStream(Properties.Resources.Redo); + public static Image Edit => edit ??= Image.FromStream(Properties.Resources.Edit); + public static Image Accept => accept ??= Image.FromStream(Properties.Resources.Accept); + public static Image Cancel => cancel ??= Image.FromStream(Properties.Resources.Cancel); - public static Icon Error => error ?? (error = new Icon(Properties.Resources.Error)); - public static Icon Warning => warning ?? (warning = new Icon(Properties.Resources.Warning)); - public static Icon Information => info ?? (info = new Icon(Properties.Resources.Information)); + public static Icon Error => error ??= new Icon(Properties.Resources.Error); + public static Icon Warning => warning ??= new Icon(Properties.Resources.Warning); + public static Icon Information => info ??= new Icon(Properties.Resources.Information); } } diff --git a/KGySoft.ComponentModelDemo/ViewWpf/Commands/EventToKGyCommandExtension.cs b/KGySoft.ComponentModelDemo/ViewWpf/Commands/EventToKGyCommandExtension.cs index d698cd8..2773fa8 100644 --- a/KGySoft.ComponentModelDemo/ViewWpf/Commands/EventToKGyCommandExtension.cs +++ b/KGySoft.ComponentModelDemo/ViewWpf/Commands/EventToKGyCommandExtension.cs @@ -76,7 +76,7 @@ private ICommandState State commandState = (ICommandState)owner.State?.Evaluate(source as DependencyObject); if (commandState != null) InitEnabledSync(); - return commandState ?? (commandState = new CommandState()); + return commandState ??= new CommandState(); } } diff --git a/KGySoft.ComponentModelDemo/ViewWpf/Images.cs b/KGySoft.ComponentModelDemo/ViewWpf/Images.cs index a7ab794..ecc6aee 100644 --- a/KGySoft.ComponentModelDemo/ViewWpf/Images.cs +++ b/KGySoft.ComponentModelDemo/ViewWpf/Images.cs @@ -25,15 +25,15 @@ internal static class Images #region Properties - public static ImageSource Undo => undo ?? (undo = BitmapFrame.Create(Properties.Resources.Undo)); - public static ImageSource Redo => redo ?? (redo = BitmapFrame.Create(Properties.Resources.Redo)); - public static ImageSource Edit => edit ?? (edit = BitmapFrame.Create(Properties.Resources.Edit)); - public static ImageSource Accept => accept ?? (accept = BitmapFrame.Create(Properties.Resources.Accept)); - public static ImageSource Cancel => cancel ?? (cancel = BitmapFrame.Create(Properties.Resources.Cancel)); - - public static ImageSource Error => error ?? (error = BitmapFrame.Create(Properties.Resources.Error)); - public static ImageSource Warning => warning ?? (warning = BitmapFrame.Create(Properties.Resources.Warning)); - public static ImageSource Information => info ?? (info = BitmapFrame.Create(Properties.Resources.Information)); + public static ImageSource Undo => undo ??= BitmapFrame.Create(Properties.Resources.Undo); + public static ImageSource Redo => redo ??= BitmapFrame.Create(Properties.Resources.Redo); + public static ImageSource Edit => edit ??= BitmapFrame.Create(Properties.Resources.Edit); + public static ImageSource Accept => accept ??= BitmapFrame.Create(Properties.Resources.Accept); + public static ImageSource Cancel => cancel ??= BitmapFrame.Create(Properties.Resources.Cancel); + + public static ImageSource Error => error ??= BitmapFrame.Create(Properties.Resources.Error); + public static ImageSource Warning => warning ??= BitmapFrame.Create(Properties.Resources.Warning); + public static ImageSource Information => info ??= BitmapFrame.Create(Properties.Resources.Information); #endregion } diff --git a/KGySoft.ComponentModelDemo/packages.config b/KGySoft.ComponentModelDemo/packages.config deleted file mode 100644 index 78d8203..0000000 --- a/KGySoft.ComponentModelDemo/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/nuget.config b/nuget.config deleted file mode 100644 index 7cd2fee..0000000 --- a/nuget.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - -