diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Directory.Build.props b/Hardcodet.NotifyIcon.Wpf/Source/Directory.Build.props new file mode 100644 index 0000000..c73f9ce --- /dev/null +++ b/Hardcodet.NotifyIcon.Wpf/Source/Directory.Build.props @@ -0,0 +1,43 @@ + + + + net40;net45;net452;net46;net462;net47;net472 + 7.3 + true + true + full + true + + $(MSBuildProjectName.Contains('Sample')) + + + + + + true + + + + + + + + + + true + + true + + true + + $(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb + + + + + + + + + + \ No newline at end of file diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf.sln b/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf.sln index acefad4..c28970d 100644 --- a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf.sln +++ b/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf.sln @@ -1,20 +1,22 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28711.60 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{C37AE34D-A8C4-4AEC-995C-3C763300934E}" ProjectSection(SolutionItems) = preProject Changelog.txt = Changelog.txt + Directory.Build.props = Directory.Build.props + global.json = global.json EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NotifyIconWpf", "NotifyIconWpf\NotifyIconWpf.csproj", "{7AC63864-7638-41C4-969C-D3197EF2BED9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotifyIconWpf", "NotifyIconWpf\NotifyIconWpf.csproj", "{7AC63864-7638-41C4-969C-D3197EF2BED9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample Project", "Sample Project\Sample Project.csproj", "{71C74F29-F1C2-49C5-969F-C25AC4CDFCCC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample Project", "Sample Project\Sample Project.csproj", "{71C74F29-F1C2-49C5-969F-C25AC4CDFCCC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsFormsSample", "WindowsFormsSample\WindowsFormsSample.csproj", "{F6DC0A6D-D1CE-4AD2-92ED-08FFF0AD4FA8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowsFormsSample", "WindowsFormsSample\WindowsFormsSample.csproj", "{F6DC0A6D-D1CE-4AD2-92ED-08FFF0AD4FA8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Windowless Sample", "Windowless Sample\Windowless Sample.csproj", "{964EBFBE-A600-49B2-BDD8-422B46F1D544}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Windowless Sample", "Windowless Sample\Windowless Sample.csproj", "{964EBFBE-A600-49B2-BDD8-422B46F1D544}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -42,4 +44,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C139BD97-A4F7-411B-99B1-824CE1ABA403} + EndGlobalSection EndGlobal diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/NotifyIconWpf.csproj b/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/NotifyIconWpf.csproj index 4e7a2af..e4c620c 100644 --- a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/NotifyIconWpf.csproj +++ b/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/NotifyIconWpf.csproj @@ -1,84 +1,27 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {7AC63864-7638-41C4-969C-D3197EF2BED9} - library - Properties Hardcodet.Wpf.TaskbarNotification Hardcodet.Wpf.TaskbarNotification - v4.0 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - Client - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AnyCPU - AllRules.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Hardcodet.Wpf.TaskbarNotification.xml - AllRules.ruleset + NotifyIcon for WPF + hardcodet.net + NotifyIcon WPF + NotifyIcon implementation for the WPF platform. + Copyright © Philipp Sumi 2013 + 1.0.8.0 + 1.0.8.0 + true - - - - - - Code - - - - - - - - - - - - - - - - Code - - - - - - - + + + + \ No newline at end of file diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Properties/AssemblyInfo.cs b/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Properties/AssemblyInfo.cs index 49d0d2e..5788b36 100644 --- a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Properties/AssemblyInfo.cs +++ b/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Properties/AssemblyInfo.cs @@ -4,23 +4,6 @@ using System.Runtime.InteropServices; using System.Windows; using System.Windows.Markup; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly: AssemblyTitle("NotifyIcon for WPF")] -[assembly: AssemblyDescription("NotifyIcon implementation for the WPF platform.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("hardcodet.net")] -[assembly: AssemblyProduct("NotifyIcon WPF")] -[assembly: AssemblyCopyright("Copyright © Philipp Sumi 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - - -[assembly: AssemblyVersion("1.0.5.0")] -[assembly: AssemblyFileVersion("1.0.5.0")] - //provides simplified declaration in XAML [assembly: XmlnsPrefix("http://www.hardcodet.net/taskbar", "tb")] diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Properties/AssemblyInfo.cs b/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Properties/AssemblyInfo.cs index 061b7a4..7390bf8 100644 --- a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Properties/AssemblyInfo.cs +++ b/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Properties/AssemblyInfo.cs @@ -4,19 +4,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Windows; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly: AssemblyTitle("Sample Project")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("Sample Project")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2009")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -41,18 +28,3 @@ using System.Windows; //(used if a resource is not found in the page, // app, or any theme specific resource dictionaries) )] - - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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")] \ No newline at end of file diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Sample Project.csproj b/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Sample Project.csproj index 3f003ff..e2b107b 100644 --- a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Sample Project.csproj +++ b/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Sample Project.csproj @@ -1,355 +1,25 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {71C74F29-F1C2-49C5-969F-C25AC4CDFCCC} WinExe - Properties Samples - Sample Project - v4.0 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - - - 3.5 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - Client - 12.0.41002.1 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - AnyCPU - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - AllRules.ruleset + Sample Project + Sample Project + true - - ClockPopup.xaml - - - - MvvmSampleWindow.xaml - - - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - + + + - - - 3.5 - - - - 3.5 - - - 3.5 - - - - - 3.0 - - - 3.0 - - - 3.0 - - - 3.0 - - - - - - - MSBuild:Compile - Designer - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - MSBuild:Compile - Designer - - - - FancyToolTip.xaml - - - + + + + + - - MSBuild:Compile - Designer - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - MSBuild:Compile - Designer - - - Designer - MSBuild:Compile - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - MSBuild:Compile - Designer - - - Code - App.xaml - - - Code - ShowcaseWindow.xaml - + + - - - - - - FancyBalloon.xaml - - - FancyPopup.xaml - - - Main.xaml - - - Code - - - True - True - Resources.resx - - - True - True - Settings.settings - - - SimpleWindowWithNotifyIcon.xaml - - - SimpleUserControl.xaml - - - InlineToolTipWindow.xaml - - - UserControlToolTipWindow.xaml - - - InlinePopupWindow.xaml - - - InlineContextMenuWindow.xaml - - - CommandWindow.xaml - - - - EventVisualizerWindow.xaml - - - BalloonSampleWindow.xaml - - - DataBoundToolTipWindow.xaml - - - WelcomeBalloon.xaml - - - ResXFileCodeGenerator - Resources.Designer.cs - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - - - - - - - - - - - - - - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - - {7AC63864-7638-41C4-969C-D3197EF2BED9} - NotifyIconWpf - - - - - \ No newline at end of file diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/Properties/AssemblyInfo.cs b/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/Properties/AssemblyInfo.cs index fcf6826..c509387 100644 --- a/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/Properties/AssemblyInfo.cs +++ b/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/Properties/AssemblyInfo.cs @@ -4,18 +4,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; using System.Windows; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Windowless Sample")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Windowless Sample")] -[assembly: AssemblyCopyright("Copyright © 2013")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -39,17 +27,3 @@ using System.Windows; //(used if a resource is not found in the page, // app, or any theme specific resource dictionaries) )] - - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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")] diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/Windowless Sample.csproj b/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/Windowless Sample.csproj index 06b72ef..31a18f4 100644 --- a/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/Windowless Sample.csproj +++ b/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/Windowless Sample.csproj @@ -1,98 +1,24 @@ - - - + - Debug - AnyCPU - {964EBFBE-A600-49B2-BDD8-422B46F1D544} WinExe - Properties Windowless_Sample - Windowless Sample - v4.0 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + Windowless Sample + Windowless Sample + true - - - + + + - - - - 4.0 - + - - MSBuild:Compile - Designer - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - MainWindow.xaml - Code - - - Designer - MSBuild:Compile - + + - - - - Code - - - - - - {7AC63864-7638-41C4-969C-D3197EF2BED9} - NotifyIconWpf - - - - - - - \ No newline at end of file diff --git a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Properties/AssemblyInfo.cs b/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Properties/AssemblyInfo.cs index b6341d8..1b323e9 100644 --- a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Properties/AssemblyInfo.cs +++ b/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Properties/AssemblyInfo.cs @@ -2,19 +2,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly: AssemblyTitle("WindowsFormsSample")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] -[assembly: AssemblyProduct("WindowsFormsSample")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2009")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -24,17 +11,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("072bbfa0-9b8b-48df-bf88-3e4806b3e3e8")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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")] \ No newline at end of file diff --git a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Properties/Settings.Designer.cs b/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Properties/Settings.Designer.cs index b781a34..d12cf18 100644 --- a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Properties/Settings.Designer.cs +++ b/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Properties/Settings.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18408 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace WindowsFormsSample.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + [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()))); diff --git a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/WindowsFormsSample.csproj b/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/WindowsFormsSample.csproj index d7823aa..d06f196 100644 --- a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/WindowsFormsSample.csproj +++ b/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/WindowsFormsSample.csproj @@ -1,162 +1,61 @@ - - + - Debug - AnyCPU - 9.0.30729 - 2.0 - {F6DC0A6D-D1CE-4AD2-92ED-08FFF0AD4FA8} WinExe - Properties - WindowsFormsSample - WindowsFormsSample - 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 - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - AllRules.ruleset + WindowsFormsSample + WindowsFormsSample + + + - - - 3.5 - - - - 3.5 - - - 3.5 - - + - + - - - 3.0 - - - 3.0 - + + - - FancyPopup.xaml - - + Form - + Form1.cs - - - + Form1.cs - + ResXFileCodeGenerator Resources.Designer.cs Designer - + True Resources.resx True - - SettingsSingleFileGenerator - Settings.Designer.cs - - + True Settings.settings True - - MSBuild:Compile - Designer - MSBuild:Compile - Designer - + + - + + - - {7AC63864-7638-41C4-969C-D3197EF2BED9} - NotifyIconWpf - + + SettingsSingleFileGenerator + Settings.Designer.cs + - - - - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - - \ No newline at end of file diff --git a/Hardcodet.NotifyIcon.Wpf/Source/global.json b/Hardcodet.NotifyIcon.Wpf/Source/global.json new file mode 100644 index 0000000..d767fa2 --- /dev/null +++ b/Hardcodet.NotifyIcon.Wpf/Source/global.json @@ -0,0 +1,5 @@ +{ + "msbuild-sdks": { + "MSBuild.Sdk.Extras": "1.6.65" + } +} \ No newline at end of file