diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 1b33b4c..cb75183 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,13 +1,17 @@ + net45;net462;net472;netcoreapp3.1;net5.0-windows latest true true true $(MSBuildProjectName.Contains('Sample')) + True + embedded + Copyright (c) 2009-2020 Philipp Sumi hardcodet.net - Philipp Sumi + Philipp Sumi, Robin Krom, Jan Karger icon.png https://github.com/hardcodet/wpf-notifyicon git @@ -18,7 +22,6 @@ Source code and extensive sample application available at http://www.hardcodet.net/projects/wpf-notifyicon NotifyIcon (aka system tray icon or taskbar icon) for the WPF platform. - NotifyIcon WPF Tray Notify ToolTip Popup Balloon Toast @@ -27,17 +30,7 @@ Source code and extensive sample application available at http://www.hardcodet.n - DEBUG;TRACE - True true - embedded - false - - - - true - embedded - True @@ -55,10 +48,11 @@ Source code and extensive sample application available at http://www.hardcodet.n true - + true ..\NotifyIconWpf.snk false + true diff --git a/src/NotifyIconWpf.Sample.ShowCases/NotifyIconWpf.Sample.ShowCases.csproj b/src/NotifyIconWpf.Sample.ShowCases/NotifyIconWpf.Sample.ShowCases.csproj index 080a032..77aa039 100644 --- a/src/NotifyIconWpf.Sample.ShowCases/NotifyIconWpf.Sample.ShowCases.csproj +++ b/src/NotifyIconWpf.Sample.ShowCases/NotifyIconWpf.Sample.ShowCases.csproj @@ -1,26 +1,18 @@  WinExe - net472;netcoreapp3.1;net5.0-windows - true - app.manifest + app.manifest + true + - - - - - - - - - - - + + + diff --git a/src/NotifyIconWpf.Sample.ShowCases/Properties/Resources.Designer.cs b/src/NotifyIconWpf.Sample.ShowCases/Properties/Resources.Designer.cs deleted file mode 100644 index a678323..0000000 --- a/src/NotifyIconWpf.Sample.ShowCases/Properties/Resources.Designer.cs +++ /dev/null @@ -1,93 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.18408 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Samples.Properties { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Samples.Properties.Resources", typeof(Resources).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Bulb { - get { - object obj = ResourceManager.GetObject("Bulb", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon Computers { - get { - object obj = ResourceManager.GetObject("Computers", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - - /// - /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). - /// - internal static System.Drawing.Icon NetDrives { - get { - object obj = ResourceManager.GetObject("NetDrives", resourceCulture); - return ((System.Drawing.Icon)(obj)); - } - } - } -} diff --git a/src/NotifyIconWpf.Sample.ShowCases/Properties/Resources.resx b/src/NotifyIconWpf.Sample.ShowCases/Properties/Resources.resx deleted file mode 100644 index 614a82e..0000000 --- a/src/NotifyIconWpf.Sample.ShowCases/Properties/Resources.resx +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - ..\icons\bulb.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\icons\computers.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\icons\netdrives.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - \ No newline at end of file diff --git a/src/NotifyIconWpf.Sample.ShowCases/Properties/Settings.Designer.cs b/src/NotifyIconWpf.Sample.ShowCases/Properties/Settings.Designer.cs deleted file mode 100644 index 5df9eba..0000000 --- a/src/NotifyIconWpf.Sample.ShowCases/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.18408 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Samples.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/src/NotifyIconWpf.Sample.ShowCases/Properties/Settings.settings b/src/NotifyIconWpf.Sample.ShowCases/Properties/Settings.settings deleted file mode 100644 index c14891b..0000000 --- a/src/NotifyIconWpf.Sample.ShowCases/Properties/Settings.settings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/NotifyIconWpf.Sample.Windowless/NotifyIconWpf.Sample.Windowless.csproj b/src/NotifyIconWpf.Sample.Windowless/NotifyIconWpf.Sample.Windowless.csproj index b69fab4..5abdd99 100644 --- a/src/NotifyIconWpf.Sample.Windowless/NotifyIconWpf.Sample.Windowless.csproj +++ b/src/NotifyIconWpf.Sample.Windowless/NotifyIconWpf.Sample.Windowless.csproj @@ -1,25 +1,13 @@  WinExe - net45;net472;netcoreapp3.1;net5.0-windows - true - app.manifest + app.manifest + - - - - - - - - - - - diff --git a/src/NotifyIconWpf.Sample.WindowsForms/NotifyIconWpf.Sample.WindowsForms.csproj b/src/NotifyIconWpf.Sample.WindowsForms/NotifyIconWpf.Sample.WindowsForms.csproj index 5d3c24e..5e5b7e5 100644 --- a/src/NotifyIconWpf.Sample.WindowsForms/NotifyIconWpf.Sample.WindowsForms.csproj +++ b/src/NotifyIconWpf.Sample.WindowsForms/NotifyIconWpf.Sample.WindowsForms.csproj @@ -1,26 +1,18 @@  WinExe - net472;netcoreapp3.1;net5.0-windows - true - app.manifest + app.manifest + true + + - - - - - - - - - - - + + Form @@ -31,33 +23,24 @@ Form1.cs + + + True + True + Resources.resx + ResXFileCodeGenerator Resources.Designer.cs - Designer - - True - Resources.resx - True - - - True - Settings.settings - True - + + - - - SettingsSingleFileGenerator - Settings.Designer.cs - - \ No newline at end of file diff --git a/src/NotifyIconWpf.Sample.WindowsForms/Properties/Settings.Designer.cs b/src/NotifyIconWpf.Sample.WindowsForms/Properties/Settings.Designer.cs deleted file mode 100644 index d12cf18..0000000 --- a/src/NotifyIconWpf.Sample.WindowsForms/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace WindowsFormsSample.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.1.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/src/NotifyIconWpf.Sample.WindowsForms/Properties/Settings.settings b/src/NotifyIconWpf.Sample.WindowsForms/Properties/Settings.settings deleted file mode 100644 index e04fc63..0000000 --- a/src/NotifyIconWpf.Sample.WindowsForms/Properties/Settings.settings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/NotifyIconWpf/NotifyIconWpf.csproj b/src/NotifyIconWpf/NotifyIconWpf.csproj index ff566da..13b74bd 100644 --- a/src/NotifyIconWpf/NotifyIconWpf.csproj +++ b/src/NotifyIconWpf/NotifyIconWpf.csproj @@ -4,18 +4,12 @@ Hardcodet.NotifyIcon.Wpf NotifyIcon for WPF NotifyIcon WPF - net45;net472;netcoreapp3.1;net5.0-windows - - - - - - +