diff --git a/Source/WindowsFormsSample/FancyPopup.xaml b/Source/WindowsFormsSample/FancyPopup.xaml index efba38f..b021f27 100644 --- a/Source/WindowsFormsSample/FancyPopup.xaml +++ b/Source/WindowsFormsSample/FancyPopup.xaml @@ -110,6 +110,5 @@ - - + diff --git a/Source/WindowsFormsSample/FancyPopup.xaml.cs b/Source/WindowsFormsSample/FancyPopup.xaml.cs index c50f34f..9b940d1 100644 --- a/Source/WindowsFormsSample/FancyPopup.xaml.cs +++ b/Source/WindowsFormsSample/FancyPopup.xaml.cs @@ -1,12 +1,11 @@ using System.Windows; -using System.Windows.Controls; namespace Samples { /// /// Interaction logic for FancyPopup.xaml /// - public partial class FancyPopup : UserControl + public partial class FancyPopup { #region ClickCount dependency property diff --git a/Source/WindowsFormsSample/Form1.cs b/Source/WindowsFormsSample/Form1.cs index 93a7e2d..9cf870a 100644 --- a/Source/WindowsFormsSample/Form1.cs +++ b/Source/WindowsFormsSample/Form1.cs @@ -1,10 +1,4 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; using System.Windows; using System.Windows.Forms; using Hardcodet.Wpf.TaskbarNotification; @@ -37,7 +31,8 @@ namespace WindowsFormsSample { base.OnClosed(e); - //close the notify icon + //the notify icon only closes automatically on WPF applications + //-> dispose the notify icon manually notifyIcon.Dispose(); } } diff --git a/Source/WindowsFormsSample/Program.cs b/Source/WindowsFormsSample/Program.cs index cefff3c..921a50d 100644 --- a/Source/WindowsFormsSample/Program.cs +++ b/Source/WindowsFormsSample/Program.cs @@ -1,7 +1,6 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Windows.Forms; +using Samples; namespace WindowsFormsSample { diff --git a/Source/WindowsFormsSample/Properties/Resources.Designer.cs b/Source/WindowsFormsSample/Properties/Resources.Designer.cs index 47cb61f..4dc5ac7 100644 --- a/Source/WindowsFormsSample/Properties/Resources.Designer.cs +++ b/Source/WindowsFormsSample/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3074 +// Runtime Version:4.0.30319.18408 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace WindowsFormsSample.Properties { // 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", "2.0.0.0")] + [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 { @@ -60,6 +60,9 @@ namespace WindowsFormsSample.Properties { } } + /// + /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). + /// internal static System.Drawing.Icon Led { get { object obj = ResourceManager.GetObject("Led", resourceCulture); diff --git a/Source/WindowsFormsSample/Properties/Settings.Designer.cs b/Source/WindowsFormsSample/Properties/Settings.Designer.cs index 12508d3..2a00ed0 100644 --- a/Source/WindowsFormsSample/Properties/Settings.Designer.cs +++ b/Source/WindowsFormsSample/Properties/Settings.Designer.cs @@ -1,30 +1,26 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.3074 +// Runtime Version:4.0.30319.18408 // // 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", "9.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; - } +namespace WindowsFormsSample.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/Source/WindowsFormsSample/WindowsFormsSample.csproj b/Source/WindowsFormsSample/WindowsFormsSample.csproj index 6e5677f..6ee8d4e 100644 --- a/Source/WindowsFormsSample/WindowsFormsSample.csproj +++ b/Source/WindowsFormsSample/WindowsFormsSample.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,9 +10,29 @@ Properties WindowsFormsSample WindowsFormsSample - v3.5 + v4.0 512 WindowsFormsSample.Program + + + 3.5 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + Client true @@ -22,6 +42,7 @@ DEBUG;TRACE prompt 4 + AllRules.ruleset pdbonly @@ -30,18 +51,16 @@ TRACE prompt 4 + AllRules.ruleset - - 3.0 - - - 3.0 - + + 3.5 + 3.5 @@ -99,6 +118,8 @@ MSBuild:Compile Designer + MSBuild:Compile + Designer @@ -113,6 +134,23 @@ + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + +