diff --git a/Hardcodet.NotifyIcon.Wpf/NuGet/Hardcodet.NotifyIcon.Wpf.nuspec b/Hardcodet.NotifyIcon.Wpf/NuGet/Hardcodet.NotifyIcon.Wpf.nuspec deleted file mode 100644 index a2bf8ba..0000000 --- a/Hardcodet.NotifyIcon.Wpf/NuGet/Hardcodet.NotifyIcon.Wpf.nuspec +++ /dev/null @@ -1,42 +0,0 @@ - - - - Hardcodet.NotifyIcon.Wpf - 1.0.7 - Hardcodet WPF NotifyIcon - Philipp Sumi - Philipp Sumi - http://www.codeproject.com/info/cpol10.aspx - http://www.hardcodet.net/projects/wpf-notifyicon - false - This is an implementation of a NotifyIcon (aka system tray icon or taskbar icon) for the WPF platform. It does not just rely on the Windows Forms NotifyIcon component, but is a purely independent control which leverages several features of the WPF framework in order to display rich tooltips, popups, context menus, and balloon messages. It can be used directly in code or embedded in any XAML file. - -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. - Bugfixes. Contains source and binaries for .NET 3.5 - 4.51. - Copyright (c) 2016 Philipp Sumi - - NotifyIcon WPF Tray Notify ToolTip Popup Balloon Toast - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Hardcodet.NotifyIcon.Wpf/NuGet/Legacy Switch/Hardcodet.Wpf.TaskbarNotification.1.0.5.nuspec b/Hardcodet.NotifyIcon.Wpf/NuGet/Legacy Switch/Hardcodet.Wpf.TaskbarNotification.1.0.5.nuspec deleted file mode 100644 index 046317c..0000000 --- a/Hardcodet.NotifyIcon.Wpf/NuGet/Legacy Switch/Hardcodet.Wpf.TaskbarNotification.1.0.5.nuspec +++ /dev/null @@ -1,31 +0,0 @@ - - - - Hardcodet.Wpf.TaskbarNotification - 1.0.5 - Hardcodet.Wpf.TaskbarNotification - Philipp Sumi - Philipp Sumi - http://www.codeproject.com/info/cpol10.aspx - http://www.hardcodet.net/projects/wpf-notifyicon - false - THIS PACKAGE IS OBSOLETE. - -Please switch to the officially maintained NuGet package: Hardcodet.NotifyIcon.WPF - -This is an implementation of a NotifyIcon (aka system tray icon or taskbar icon) for the WPF platform. It does not just rely on the Windows Forms NotifyIcon component, but is a purely independent control which leverages several features of the WPF framework in order to display rich tooltips, popups, context menus, and balloon messages. It can be used directly in code or embedded in any XAML file. - -Source code and extensive sample application available at http://www.hardcodet.net/projects/wpf-notifyicon - This package is obsolete. Please switch to the maintained NuGet package: Hardcodet.NotifyIcon.WPF - Mostly bug fixes and full x64 / Win 8 support. Contains source and binaries for .NET 3.5 - 4.51. - Copyright (c) 2013 Philipp Sumi - - NotifyIcon WPF Tray Notify ToolTip Popup Balloon Toast - - - - - - - - \ No newline at end of file diff --git a/Hardcodet.NotifyIcon.Wpf/NuGet/Legacy Switch/readme.from.legacy.package.txt b/Hardcodet.NotifyIcon.Wpf/NuGet/Legacy Switch/readme.from.legacy.package.txt deleted file mode 100644 index ac394ba..0000000 --- a/Hardcodet.NotifyIcon.Wpf/NuGet/Legacy Switch/readme.from.legacy.package.txt +++ /dev/null @@ -1,9 +0,0 @@ -Hardcodet NotifyIcon for WPF -**************************** - -THIS PACKAGE IS OBSOLETE. - -This package has a dependency to the official package in order to keep things working for you, but consider switching to the official NuGet package: Hardcodet.NotifyIcon.Wpf - -For direct NuGet links, source code or samples, please visit the project page: -http://www.hardcodet.net/projects/wpf-notifyicon \ No newline at end of file diff --git a/Hardcodet.NotifyIcon.Wpf/NuGet/readme.txt b/Hardcodet.NotifyIcon.Wpf/NuGet/readme.txt deleted file mode 100644 index eb3628f..0000000 --- a/Hardcodet.NotifyIcon.Wpf/NuGet/readme.txt +++ /dev/null @@ -1,7 +0,0 @@ -Hardcodet NotifyIcon for WPF -**************************** - -This is an implementation of a NotifyIcon (aka system tray icon or taskbar icon) for the WPF platform. It does not just rely on the Windows Forms NotifyIcon component, but is a purely independent control which leverages several features of the WPF framework in order to display rich tooltips, popups, context menus, and balloon messages. It can be used directly in code or embedded in any XAML file. - -This package contains only binaries. For source code and samples, please visit the project page: -http://www.hardcodet.net/projects/wpf-notifyicon \ No newline at end of file diff --git a/Hardcodet.NotifyIcon.Wpf/Source/BuildTargets.cmd b/Hardcodet.NotifyIcon.Wpf/Source/BuildTargets.cmd deleted file mode 100644 index 5640701..0000000 --- a/Hardcodet.NotifyIcon.Wpf/Source/BuildTargets.cmd +++ /dev/null @@ -1,9 +0,0 @@ -"C:\Program Files (x86)\MSBuild\12.0\Bin\msbuild.exe" NotifyIconWpf\NotifyIconWpf.csproj /p:Configuration=Release;TargetFrameworkVersion=v3.5;TargetFrameworkProfile="";OutputPath=..\..\Binaries\net35 /t:Rebuild -"C:\Program Files (x86)\MSBuild\12.0\Bin\msbuild.exe" NotifyIconWpf\NotifyIconWpf.csproj /p:Configuration=Release;TargetFrameworkVersion=v3.5;TargetFrameworkProfile="Client";OutputPath=..\..\Binaries\net35-client /t:Rebuild - -"C:\Program Files (x86)\MSBuild\12.0\Bin\msbuild.exe" NotifyIconWpf\NotifyIconWpf.csproj /p:Configuration=Release;TargetFrameworkVersion=v4.0;TargetFrameworkProfile="";OutputPath=..\..\Binaries\net40 /t:Rebuild -"C:\Program Files (x86)\MSBuild\12.0\Bin\msbuild.exe" NotifyIconWpf\NotifyIconWpf.csproj /p:Configuration=Release;TargetFrameworkVersion=v4.0;TargetFrameworkProfile="Client";OutputPath=..\..\Binaries\net40-client /t:Rebuild - -"C:\Program Files (x86)\MSBuild\12.0\Bin\msbuild.exe" NotifyIconWpf\NotifyIconWpf.csproj /p:Configuration=Release;TargetFrameworkVersion=v4.5;TargetFrameworkProfile="";OutputPath=..\..\Binaries\net45 /t:Rebuild - -"C:\Program Files (x86)\MSBuild\12.0\Bin\msbuild.exe" NotifyIconWpf\NotifyIconWpf.csproj /p:Configuration=Release;TargetFrameworkVersion=v4.5.1;TargetFrameworkProfile="";OutputPath=..\..\Binaries\net451 /t:Rebuild diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Cleanup_Solution_For_Deployment.bat b/Hardcodet.NotifyIcon.Wpf/Source/Cleanup_Solution_For_Deployment.bat deleted file mode 100644 index 01581a4..0000000 --- a/Hardcodet.NotifyIcon.Wpf/Source/Cleanup_Solution_For_Deployment.bat +++ /dev/null @@ -1,20 +0,0 @@ -del /s /ah /f *.suo -del /s /f *.user -del /s /f *.cache -del /s /f *.scc -del /s /f *.vssscc -del /s /f *.vspscc -del /s /f *.keep -del /s /ah /f vssver2.scc - -rd /s /q bin obj ClientBin _Resharper.* _Upgrade* - -del dirs.txt -dir /s /b /ad bin > dirs.txt -dir /s /b /ad obj >> dirs.txt -dir /s /b /ad ClientBin >> dirs.txt -dir /s /b /ad _Resharper.* >> dirs.txt -dir /s /b /ad _Upgrade* >> dirs.txt - -for /f "delims=;" %%i in (dirs.txt) DO rd /s /q "%%i" -del dirs.txt diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Directory.Build.props b/Hardcodet.NotifyIcon.Wpf/Source/Directory.Build.props deleted file mode 100644 index c73f9ce..0000000 --- a/Hardcodet.NotifyIcon.Wpf/Source/Directory.Build.props +++ /dev/null @@ -1,43 +0,0 @@ - - - - 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/global.json b/Hardcodet.NotifyIcon.Wpf/Source/global.json deleted file mode 100644 index d767fa2..0000000 --- a/Hardcodet.NotifyIcon.Wpf/Source/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "msbuild-sdks": { - "MSBuild.Sdk.Extras": "1.6.65" - } -} \ No newline at end of file diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000..a47b6c1 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,56 @@ +# .NET Desktop +# Build and run tests for .NET Desktop or Windows classic desktop solutions. +# Add steps that publish symbols, save build artifacts, and more: +# https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net + +trigger: + batch: true + branches: + include: + - master + - feature/* + exclude: + - gh-pages + +stages: +- stage: Build + jobs: + - job: Build + pool: + vmImage: 'Windows-latest' + + variables: + solution: '**/src/*.sln' + buildPlatform: 'Any CPU' + buildConfiguration: 'Release' + + steps: + + - task: NuGetToolInstaller@1 + inputs: + versionSpec: '5.5.1' + + - task: UseDotNet@2 + displayName: 'Use .NET Core sdk 3.1.2' + inputs: + packageType: sdk + version: 3.1.201 + + - task: DotNetCoreCLI@2 + displayName: Build + inputs: + command: build + projects: '$(solution)' + arguments: '--configuration $(buildConfiguration) /p:Platform="$(buildPlatform)"' + + - task: CopyFiles@2 + displayName: 'Copy Files to: $(Build.ArtifactStagingDirectory)' + inputs: + SourceFolder: '$(System.DefaultWorkingDirectory)' + Contents: | + **\bin\$(buildConfiguration)\*.nupkg + TargetFolder: '$(Build.ArtifactStagingDirectory)' + flattenFolders: true + + - publish: $(Build.ArtifactStagingDirectory) + artifact: drop diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Changelog.txt b/src/Changelog.txt similarity index 94% rename from Hardcodet.NotifyIcon.Wpf/Source/Changelog.txt rename to src/Changelog.txt index b56facf..cda6bed 100644 --- a/Hardcodet.NotifyIcon.Wpf/Source/Changelog.txt +++ b/src/Changelog.txt @@ -1,7 +1,19 @@ hardcodet.net NotifyIcon for WPF - Changelog -Copyright (c) 2009-2016 Philipp Sumi +Copyright (c) 2009-2020 Philipp Sumi Contact and Information: http://www.hardcodet.net +1.0.9 (2020.xx.xx) +***** + +ADD Added dotnet core 3.0 and 3.1 support + + +1.0.8 (2016.04.02) +***** + +FIX Delayed message sink listener causing interop issues. + + 1.0.7 (2016.04.01) ***** diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 0000000..cc136e1 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,77 @@ + + + latest + true + true + true + $(MSBuildProjectName.Contains('Sample')) + Copyright (c) 2009-2020 Philipp Sumi + hardcodet.net + Philipp Sumi + icon.png + https://github.com/hardcodet/wpf-notifyicon + git + hhttp://www.hardcodet.net/projects/wpf-notifyicon + CPOL-1.02 + false + This is an implementation of a NotifyIcon (aka system tray icon or taskbar icon) for the WPF platform. It does not just rely on the Windows Forms NotifyIcon component, but is a purely independent control which leverages several features of the WPF framework in order to display rich tooltips, popups, context menus, and balloon messages. It can be used directly in code or embedded in any XAML file. + +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 + + + + true + + + + DEBUG;TRACE + True + true + embedded + false + + + + true + embedded + True + + + + + + true + true + true + + + + + all + runtime; build; native; contentfiles; analyzers + + + + + + + + + true + + true + + true + + + + + + + + + + \ No newline at end of file diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf.sln b/src/NotifyIconWpf.sln similarity index 97% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf.sln rename to src/NotifyIconWpf.sln index c28970d..e7ea44b 100644 --- a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf.sln +++ b/src/NotifyIconWpf.sln @@ -5,9 +5,11 @@ 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 + ..\azure-pipelines.yml = ..\azure-pipelines.yml Changelog.txt = Changelog.txt Directory.Build.props = Directory.Build.props global.json = global.json + version.json = version.json EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NotifyIconWpf", "NotifyIconWpf\NotifyIconWpf.csproj", "{7AC63864-7638-41C4-969C-D3197EF2BED9}" diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/BalloonIcon.cs b/src/NotifyIconWpf/BalloonIcon.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/BalloonIcon.cs rename to src/NotifyIconWpf/BalloonIcon.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Diagrams/TaskbarIcon Overview.cd b/src/NotifyIconWpf/Diagrams/TaskbarIcon Overview.cd similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Diagrams/TaskbarIcon Overview.cd rename to src/NotifyIconWpf/Diagrams/TaskbarIcon Overview.cd diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/AppBarInfo.cs b/src/NotifyIconWpf/Interop/AppBarInfo.cs similarity index 63% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/AppBarInfo.cs rename to src/NotifyIconWpf/Interop/AppBarInfo.cs index a5d2ee1..c6b94e8 100644 --- a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/AppBarInfo.cs +++ b/src/NotifyIconWpf/Interop/AppBarInfo.cs @@ -6,9 +6,12 @@ using System.Runtime.InteropServices; namespace Hardcodet.Wpf.TaskbarNotification.Interop { + /// + /// This contains the logic to access the location of the app bar and communicate with it. + /// public class AppBarInfo { - [DllImport("user32.dll")] + [DllImport("user32.dll", CharSet = CharSet.Unicode)] private static extern IntPtr FindWindow(string lpClassName, string lpWindowName); [DllImport("shell32.dll")] @@ -18,24 +21,22 @@ namespace Hardcodet.Wpf.TaskbarNotification.Interop private static extern int SystemParametersInfo(uint uiAction, uint uiParam, IntPtr pvParam, uint fWinIni); - - private const int ABE_BOTTOM = 3; - private const int ABE_LEFT = 0; - private const int ABE_RIGHT = 2; - private const int ABE_TOP = 1; - private const int ABM_GETTASKBARPOS = 0x00000005; - // SystemParametersInfo constants - private const uint SPI_GETWORKAREA = 0x0030; private APPBARDATA m_data; + /// + /// Get on which edge the app bar is located + /// public ScreenEdge Edge { get { return (ScreenEdge) m_data.uEdge; } } + /// + /// Get the working area + /// public Rectangle WorkArea { get { return GetRectangle(m_data.rc); } @@ -44,9 +45,14 @@ namespace Hardcodet.Wpf.TaskbarNotification.Interop private Rectangle GetRectangle(RECT rc) { return new Rectangle(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top); - } + } - public void GetPosition(string strClassName, string strWindowName) + /// + /// Update the location of the appbar with the specified classname and window name. + /// + /// string + /// string + private void GetPosition(string strClassName, string strWindowName) { m_data = new APPBARDATA(); m_data.cbSize = (uint) Marshal.SizeOf(m_data.GetType()); @@ -68,23 +74,41 @@ namespace Hardcodet.Wpf.TaskbarNotification.Interop } } - + /// + /// Updates the system taskbar position + /// public void GetSystemTaskBarPosition() { GetPosition("Shell_TrayWnd", null); } - + /// + /// A value that specifies an edge of the screen. + /// public enum ScreenEdge { + /// + /// Undefined + /// Undefined = -1, - Left = ABE_LEFT, - Top = ABE_TOP, - Right = ABE_RIGHT, - Bottom = ABE_BOTTOM + /// + /// Left edge. + /// + Left = 0, + /// + /// Top edge. + /// + Top = 1, + /// + /// Right edge. + /// + Right = 2, + /// + /// Bottom edge. + /// + Bottom = 3 } - [StructLayout(LayoutKind.Sequential)] private struct APPBARDATA { diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/BalloonFlags.cs b/src/NotifyIconWpf/Interop/BalloonFlags.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/BalloonFlags.cs rename to src/NotifyIconWpf/Interop/BalloonFlags.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/IconDataMembers.cs b/src/NotifyIconWpf/Interop/IconDataMembers.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/IconDataMembers.cs rename to src/NotifyIconWpf/Interop/IconDataMembers.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/IconState.cs b/src/NotifyIconWpf/Interop/IconState.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/IconState.cs rename to src/NotifyIconWpf/Interop/IconState.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/MouseEvent.cs b/src/NotifyIconWpf/Interop/MouseEvent.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/MouseEvent.cs rename to src/NotifyIconWpf/Interop/MouseEvent.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/NotifyCommand.cs b/src/NotifyIconWpf/Interop/NotifyCommand.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/NotifyCommand.cs rename to src/NotifyIconWpf/Interop/NotifyCommand.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/NotifyIconData.cs b/src/NotifyIconWpf/Interop/NotifyIconData.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/NotifyIconData.cs rename to src/NotifyIconWpf/Interop/NotifyIconData.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/NotifyIconVersion.cs b/src/NotifyIconWpf/Interop/NotifyIconVersion.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/NotifyIconVersion.cs rename to src/NotifyIconWpf/Interop/NotifyIconVersion.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/Point.cs b/src/NotifyIconWpf/Interop/Point.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/Point.cs rename to src/NotifyIconWpf/Interop/Point.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/SystemInfo.cs b/src/NotifyIconWpf/Interop/SystemInfo.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/SystemInfo.cs rename to src/NotifyIconWpf/Interop/SystemInfo.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/TrayInfo.cs b/src/NotifyIconWpf/Interop/TrayInfo.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/TrayInfo.cs rename to src/NotifyIconWpf/Interop/TrayInfo.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/WinApi.cs b/src/NotifyIconWpf/Interop/WinApi.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/WinApi.cs rename to src/NotifyIconWpf/Interop/WinApi.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/WindowClass.cs b/src/NotifyIconWpf/Interop/WindowClass.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/WindowClass.cs rename to src/NotifyIconWpf/Interop/WindowClass.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/WindowMessageSink.cs b/src/NotifyIconWpf/Interop/WindowMessageSink.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/WindowMessageSink.cs rename to src/NotifyIconWpf/Interop/WindowMessageSink.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/WindowsMessages.cs b/src/NotifyIconWpf/Interop/WindowsMessages.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Interop/WindowsMessages.cs rename to src/NotifyIconWpf/Interop/WindowsMessages.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/NotifyIconWpf.csproj b/src/NotifyIconWpf/NotifyIconWpf.csproj similarity index 67% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/NotifyIconWpf.csproj rename to src/NotifyIconWpf/NotifyIconWpf.csproj index e4c620c..f0f9cd9 100644 --- a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/NotifyIconWpf.csproj +++ b/src/NotifyIconWpf/NotifyIconWpf.csproj @@ -1,17 +1,17 @@ - + Hardcodet.Wpf.TaskbarNotification Hardcodet.Wpf.TaskbarNotification 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 + net45;net472;netcoreapp3.0;netcoreapp3.1 - + + + + + + diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/PopupActivationMode.cs b/src/NotifyIconWpf/PopupActivationMode.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/PopupActivationMode.cs rename to src/NotifyIconWpf/PopupActivationMode.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Properties/AssemblyInfo.cs b/src/NotifyIconWpf/Properties/AssemblyInfo.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Properties/AssemblyInfo.cs rename to src/NotifyIconWpf/Properties/AssemblyInfo.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/RoutedEventHelper.cs b/src/NotifyIconWpf/RoutedEventHelper.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/RoutedEventHelper.cs rename to src/NotifyIconWpf/RoutedEventHelper.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/TaskbarIcon.Declarations.cs b/src/NotifyIconWpf/TaskbarIcon.Declarations.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/TaskbarIcon.Declarations.cs rename to src/NotifyIconWpf/TaskbarIcon.Declarations.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/TaskbarIcon.cs b/src/NotifyIconWpf/TaskbarIcon.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/TaskbarIcon.cs rename to src/NotifyIconWpf/TaskbarIcon.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Util.cs b/src/NotifyIconWpf/Util.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/NotifyIconWpf/Util.cs rename to src/NotifyIconWpf/Util.cs diff --git a/src/NuGet.Config b/src/NuGet.Config new file mode 100644 index 0000000..8d2b705 --- /dev/null +++ b/src/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/App.xaml b/src/Sample Project/App.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/App.xaml rename to src/Sample Project/App.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/App.xaml.cs b/src/Sample Project/App.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/App.xaml.cs rename to src/Sample Project/App.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Commands/CloseWindowCommand.cs b/src/Sample Project/Commands/CloseWindowCommand.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Commands/CloseWindowCommand.cs rename to src/Sample Project/Commands/CloseWindowCommand.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Commands/CommandBase.cs b/src/Sample Project/Commands/CommandBase.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Commands/CommandBase.cs rename to src/Sample Project/Commands/CommandBase.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Commands/HideSampleWindowCommand.cs b/src/Sample Project/Commands/HideSampleWindowCommand.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Commands/HideSampleWindowCommand.cs rename to src/Sample Project/Commands/HideSampleWindowCommand.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Commands/ShowSampleWindowCommand.cs b/src/Sample Project/Commands/ShowSampleWindowCommand.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Commands/ShowSampleWindowCommand.cs rename to src/Sample Project/Commands/ShowSampleWindowCommand.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Icons/Bulb.ico b/src/Sample Project/Icons/Bulb.ico similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Icons/Bulb.ico rename to src/Sample Project/Icons/Bulb.ico diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Icons/Computers.ico b/src/Sample Project/Icons/Computers.ico similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Icons/Computers.ico rename to src/Sample Project/Icons/Computers.ico diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Icons/Error.ico b/src/Sample Project/Icons/Error.ico similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Icons/Error.ico rename to src/Sample Project/Icons/Error.ico diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Icons/Inactive.ico b/src/Sample Project/Icons/Inactive.ico similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Icons/Inactive.ico rename to src/Sample Project/Icons/Inactive.ico diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Icons/NetDrives.ico b/src/Sample Project/Icons/NetDrives.ico similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Icons/NetDrives.ico rename to src/Sample Project/Icons/NetDrives.ico diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Images/Add.png b/src/Sample Project/Images/Add.png similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Images/Add.png rename to src/Sample Project/Images/Add.png diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Images/Close.png b/src/Sample Project/Images/Close.png similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Images/Close.png rename to src/Sample Project/Images/Close.png diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Images/Info.png b/src/Sample Project/Images/Info.png similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Images/Info.png rename to src/Sample Project/Images/Info.png diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Images/Logo.png b/src/Sample Project/Images/Logo.png similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Images/Logo.png rename to src/Sample Project/Images/Logo.png diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Images/Preferences.png b/src/Sample Project/Images/Preferences.png similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Images/Preferences.png rename to src/Sample Project/Images/Preferences.png diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Images/Remove.png b/src/Sample Project/Images/Remove.png similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Images/Remove.png rename to src/Sample Project/Images/Remove.png diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Main.xaml b/src/Sample Project/Main.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Main.xaml rename to src/Sample Project/Main.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Main.xaml.cs b/src/Sample Project/Main.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Main.xaml.cs rename to src/Sample Project/Main.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Properties/AssemblyInfo.cs b/src/Sample Project/Properties/AssemblyInfo.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Properties/AssemblyInfo.cs rename to src/Sample Project/Properties/AssemblyInfo.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Properties/Resources.Designer.cs b/src/Sample Project/Properties/Resources.Designer.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Properties/Resources.Designer.cs rename to src/Sample Project/Properties/Resources.Designer.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Properties/Resources.resx b/src/Sample Project/Properties/Resources.resx similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Properties/Resources.resx rename to src/Sample Project/Properties/Resources.resx diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Properties/Settings.Designer.cs b/src/Sample Project/Properties/Settings.Designer.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Properties/Settings.Designer.cs rename to src/Sample Project/Properties/Settings.Designer.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Properties/Settings.settings b/src/Sample Project/Properties/Settings.settings similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Properties/Settings.settings rename to src/Sample Project/Properties/Settings.settings diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Sample Project.csproj b/src/Sample Project/Sample Project.csproj similarity index 66% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Sample Project.csproj rename to src/Sample Project/Sample Project.csproj index e2b107b..cf29fcd 100644 --- a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Sample Project.csproj +++ b/src/Sample Project/Sample Project.csproj @@ -1,15 +1,20 @@ - + WinExe + net472;netcoreapp3.1 Samples Sample Project Sample Project - true + true - + + + + + diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/FancyBalloon.xaml b/src/Sample Project/Showcase/FancyBalloon.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/FancyBalloon.xaml rename to src/Sample Project/Showcase/FancyBalloon.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/FancyBalloon.xaml.cs b/src/Sample Project/Showcase/FancyBalloon.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/FancyBalloon.xaml.cs rename to src/Sample Project/Showcase/FancyBalloon.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/FancyPopup.xaml b/src/Sample Project/Showcase/FancyPopup.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/FancyPopup.xaml rename to src/Sample Project/Showcase/FancyPopup.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/FancyPopup.xaml.cs b/src/Sample Project/Showcase/FancyPopup.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/FancyPopup.xaml.cs rename to src/Sample Project/Showcase/FancyPopup.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/FancyToolTip.xaml b/src/Sample Project/Showcase/FancyToolTip.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/FancyToolTip.xaml rename to src/Sample Project/Showcase/FancyToolTip.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/FancyToolTip.xaml.cs b/src/Sample Project/Showcase/FancyToolTip.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/FancyToolTip.xaml.cs rename to src/Sample Project/Showcase/FancyToolTip.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/NotifyIconResources.xaml b/src/Sample Project/Showcase/NotifyIconResources.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/NotifyIconResources.xaml rename to src/Sample Project/Showcase/NotifyIconResources.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/ShowcaseWindow.xaml b/src/Sample Project/Showcase/ShowcaseWindow.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/ShowcaseWindow.xaml rename to src/Sample Project/Showcase/ShowcaseWindow.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/ShowcaseWindow.xaml.cs b/src/Sample Project/Showcase/ShowcaseWindow.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/ShowcaseWindow.xaml.cs rename to src/Sample Project/Showcase/ShowcaseWindow.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/WelcomeBalloon.xaml b/src/Sample Project/Showcase/WelcomeBalloon.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/WelcomeBalloon.xaml rename to src/Sample Project/Showcase/WelcomeBalloon.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/WelcomeBalloon.xaml.cs b/src/Sample Project/Showcase/WelcomeBalloon.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Showcase/WelcomeBalloon.xaml.cs rename to src/Sample Project/Showcase/WelcomeBalloon.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/01 - Declaration/NotifyIconResourceDictionary.xaml b/src/Sample Project/Tutorials/01 - Declaration/NotifyIconResourceDictionary.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/01 - Declaration/NotifyIconResourceDictionary.xaml rename to src/Sample Project/Tutorials/01 - Declaration/NotifyIconResourceDictionary.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml b/src/Sample Project/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml rename to src/Sample Project/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml.cs b/src/Sample Project/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml.cs rename to src/Sample Project/Tutorials/01 - Declaration/SimpleWindowWithNotifyIcon.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml b/src/Sample Project/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml rename to src/Sample Project/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml.cs b/src/Sample Project/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml.cs rename to src/Sample Project/Tutorials/02 - ToolTips/InlineToolTipWindow.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/02 - ToolTips/SimpleUserControl.xaml b/src/Sample Project/Tutorials/02 - ToolTips/SimpleUserControl.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/02 - ToolTips/SimpleUserControl.xaml rename to src/Sample Project/Tutorials/02 - ToolTips/SimpleUserControl.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/02 - ToolTips/SimpleUserControl.xaml.cs b/src/Sample Project/Tutorials/02 - ToolTips/SimpleUserControl.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/02 - ToolTips/SimpleUserControl.xaml.cs rename to src/Sample Project/Tutorials/02 - ToolTips/SimpleUserControl.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml b/src/Sample Project/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml rename to src/Sample Project/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml.cs b/src/Sample Project/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml.cs rename to src/Sample Project/Tutorials/02 - ToolTips/UserControlToolTipWindow.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/03 - Popups/InlinePopupWindow.xaml b/src/Sample Project/Tutorials/03 - Popups/InlinePopupWindow.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/03 - Popups/InlinePopupWindow.xaml rename to src/Sample Project/Tutorials/03 - Popups/InlinePopupWindow.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/03 - Popups/InlinePopupWindow.xaml.cs b/src/Sample Project/Tutorials/03 - Popups/InlinePopupWindow.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/03 - Popups/InlinePopupWindow.xaml.cs rename to src/Sample Project/Tutorials/03 - Popups/InlinePopupWindow.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml b/src/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml rename to src/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml.cs b/src/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml.cs rename to src/Sample Project/Tutorials/04 - ContextMenus/InlineContextMenuWindow.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/05 - Balloons/BalloonSampleWindow.xaml b/src/Sample Project/Tutorials/05 - Balloons/BalloonSampleWindow.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/05 - Balloons/BalloonSampleWindow.xaml rename to src/Sample Project/Tutorials/05 - Balloons/BalloonSampleWindow.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/05 - Balloons/BalloonSampleWindow.xaml.cs b/src/Sample Project/Tutorials/05 - Balloons/BalloonSampleWindow.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/05 - Balloons/BalloonSampleWindow.xaml.cs rename to src/Sample Project/Tutorials/05 - Balloons/BalloonSampleWindow.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/06 - Commands/CommandWindow.xaml b/src/Sample Project/Tutorials/06 - Commands/CommandWindow.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/06 - Commands/CommandWindow.xaml rename to src/Sample Project/Tutorials/06 - Commands/CommandWindow.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/06 - Commands/CommandWindow.xaml.cs b/src/Sample Project/Tutorials/06 - Commands/CommandWindow.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/06 - Commands/CommandWindow.xaml.cs rename to src/Sample Project/Tutorials/06 - Commands/CommandWindow.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/06 - Commands/ShowMessageCommand.cs b/src/Sample Project/Tutorials/06 - Commands/ShowMessageCommand.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/06 - Commands/ShowMessageCommand.cs rename to src/Sample Project/Tutorials/06 - Commands/ShowMessageCommand.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/07 - Events/EventVisualizerWindow.xaml b/src/Sample Project/Tutorials/07 - Events/EventVisualizerWindow.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/07 - Events/EventVisualizerWindow.xaml rename to src/Sample Project/Tutorials/07 - Events/EventVisualizerWindow.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/07 - Events/EventVisualizerWindow.xaml.cs b/src/Sample Project/Tutorials/07 - Events/EventVisualizerWindow.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/07 - Events/EventVisualizerWindow.xaml.cs rename to src/Sample Project/Tutorials/07 - Events/EventVisualizerWindow.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml b/src/Sample Project/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml rename to src/Sample Project/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml.cs b/src/Sample Project/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml.cs rename to src/Sample Project/Tutorials/08 - DataBinding/DataBoundToolTipWindow.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/09 - MVVM/Clock.png b/src/Sample Project/Tutorials/09 - MVVM/Clock.png similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/09 - MVVM/Clock.png rename to src/Sample Project/Tutorials/09 - MVVM/Clock.png diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/09 - MVVM/ClockPopup.xaml b/src/Sample Project/Tutorials/09 - MVVM/ClockPopup.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/09 - MVVM/ClockPopup.xaml rename to src/Sample Project/Tutorials/09 - MVVM/ClockPopup.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/09 - MVVM/ClockPopup.xaml.cs b/src/Sample Project/Tutorials/09 - MVVM/ClockPopup.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/09 - MVVM/ClockPopup.xaml.cs rename to src/Sample Project/Tutorials/09 - MVVM/ClockPopup.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/09 - MVVM/MvvmSampleViewModel.cs b/src/Sample Project/Tutorials/09 - MVVM/MvvmSampleViewModel.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/09 - MVVM/MvvmSampleViewModel.cs rename to src/Sample Project/Tutorials/09 - MVVM/MvvmSampleViewModel.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/09 - MVVM/MvvmSampleWindow.xaml b/src/Sample Project/Tutorials/09 - MVVM/MvvmSampleWindow.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/09 - MVVM/MvvmSampleWindow.xaml rename to src/Sample Project/Tutorials/09 - MVVM/MvvmSampleWindow.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/09 - MVVM/MvvmSampleWindow.xaml.cs b/src/Sample Project/Tutorials/09 - MVVM/MvvmSampleWindow.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Sample Project/Tutorials/09 - MVVM/MvvmSampleWindow.xaml.cs rename to src/Sample Project/Tutorials/09 - MVVM/MvvmSampleWindow.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/App.xaml b/src/Windowless Sample/App.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/App.xaml rename to src/Windowless Sample/App.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/App.xaml.cs b/src/Windowless Sample/App.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/App.xaml.cs rename to src/Windowless Sample/App.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/DelegateCommand.cs b/src/Windowless Sample/DelegateCommand.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/DelegateCommand.cs rename to src/Windowless Sample/DelegateCommand.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/MainWindow.xaml b/src/Windowless Sample/MainWindow.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/MainWindow.xaml rename to src/Windowless Sample/MainWindow.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/MainWindow.xaml.cs b/src/Windowless Sample/MainWindow.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/MainWindow.xaml.cs rename to src/Windowless Sample/MainWindow.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/NotifyIconResources.xaml b/src/Windowless Sample/NotifyIconResources.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/NotifyIconResources.xaml rename to src/Windowless Sample/NotifyIconResources.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/NotifyIconViewModel.cs b/src/Windowless Sample/NotifyIconViewModel.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/NotifyIconViewModel.cs rename to src/Windowless Sample/NotifyIconViewModel.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/Properties/AssemblyInfo.cs b/src/Windowless Sample/Properties/AssemblyInfo.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/Properties/AssemblyInfo.cs rename to src/Windowless Sample/Properties/AssemblyInfo.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/Red.ico b/src/Windowless Sample/Red.ico similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/Red.ico rename to src/Windowless Sample/Red.ico diff --git a/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/Windowless Sample.csproj b/src/Windowless Sample/Windowless Sample.csproj similarity index 64% rename from Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/Windowless Sample.csproj rename to src/Windowless Sample/Windowless Sample.csproj index 31a18f4..928655b 100644 --- a/Hardcodet.NotifyIcon.Wpf/Source/Windowless Sample/Windowless Sample.csproj +++ b/src/Windowless Sample/Windowless Sample.csproj @@ -1,15 +1,20 @@ - + WinExe + net45;net472;netcoreapp3.0;netcoreapp3.1 Windowless_Sample Windowless Sample Windowless Sample - true + true - + + + + + diff --git a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/FancyPopup.xaml b/src/WindowsFormsSample/FancyPopup.xaml similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/FancyPopup.xaml rename to src/WindowsFormsSample/FancyPopup.xaml diff --git a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/FancyPopup.xaml.cs b/src/WindowsFormsSample/FancyPopup.xaml.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/FancyPopup.xaml.cs rename to src/WindowsFormsSample/FancyPopup.xaml.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Form1.Designer.cs b/src/WindowsFormsSample/Form1.Designer.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Form1.Designer.cs rename to src/WindowsFormsSample/Form1.Designer.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Form1.cs b/src/WindowsFormsSample/Form1.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Form1.cs rename to src/WindowsFormsSample/Form1.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Form1.resx b/src/WindowsFormsSample/Form1.resx similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Form1.resx rename to src/WindowsFormsSample/Form1.resx diff --git a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Icon/Led.ico b/src/WindowsFormsSample/Icon/Led.ico similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Icon/Led.ico rename to src/WindowsFormsSample/Icon/Led.ico diff --git a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Images/Preferences.png b/src/WindowsFormsSample/Images/Preferences.png similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Images/Preferences.png rename to src/WindowsFormsSample/Images/Preferences.png diff --git a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Program.cs b/src/WindowsFormsSample/Program.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Program.cs rename to src/WindowsFormsSample/Program.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Properties/AssemblyInfo.cs b/src/WindowsFormsSample/Properties/AssemblyInfo.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Properties/AssemblyInfo.cs rename to src/WindowsFormsSample/Properties/AssemblyInfo.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Properties/Resources.Designer.cs b/src/WindowsFormsSample/Properties/Resources.Designer.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Properties/Resources.Designer.cs rename to src/WindowsFormsSample/Properties/Resources.Designer.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Properties/Resources.resx b/src/WindowsFormsSample/Properties/Resources.resx similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Properties/Resources.resx rename to src/WindowsFormsSample/Properties/Resources.resx diff --git a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Properties/Settings.Designer.cs b/src/WindowsFormsSample/Properties/Settings.Designer.cs similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Properties/Settings.Designer.cs rename to src/WindowsFormsSample/Properties/Settings.Designer.cs diff --git a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Properties/Settings.settings b/src/WindowsFormsSample/Properties/Settings.settings similarity index 100% rename from Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/Properties/Settings.settings rename to src/WindowsFormsSample/Properties/Settings.settings diff --git a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/WindowsFormsSample.csproj b/src/WindowsFormsSample/WindowsFormsSample.csproj similarity index 83% rename from Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/WindowsFormsSample.csproj rename to src/WindowsFormsSample/WindowsFormsSample.csproj index d06f196..3cfb103 100644 --- a/Hardcodet.NotifyIcon.Wpf/Source/WindowsFormsSample/WindowsFormsSample.csproj +++ b/src/WindowsFormsSample/WindowsFormsSample.csproj @@ -1,14 +1,19 @@ - + WinExe + net472;netcoreapp3.1 WindowsFormsSample.Program WindowsFormsSample WindowsFormsSample + true - + + + + @@ -45,7 +50,6 @@ - diff --git a/src/global.json b/src/global.json new file mode 100644 index 0000000..7bf4830 --- /dev/null +++ b/src/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "3.1.200", + "rollForward": "latestPatch" + } +} \ No newline at end of file diff --git a/src/icon.png b/src/icon.png new file mode 100644 index 0000000..3850494 Binary files /dev/null and b/src/icon.png differ diff --git a/src/version.json b/src/version.json new file mode 100644 index 0000000..ff6323e --- /dev/null +++ b/src/version.json @@ -0,0 +1,21 @@ +{ + "$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", + "version": "1.0.9", + "publicReleaseRefSpec": [ + ".*/master$" // we release out of master + ], + "nugetPackageVersion": { + "semVer": 2 // optional. Set to either 1 or 2 to control how the NuGet package version string is generated. Default is 1. + }, + "cloudBuild": { + "setVersionVariables": true, + "buildNumber": { + "enabled": true, + "includeCommitId": { + "when": "nonPublicReleaseOnly", + "where": "buildMetadata" + } + } + }, + "inherit": false +} \ No newline at end of file