Removed some warnings, and added dotnet core 3.1 support

azure-pipelines.yml

@@ -4,71 +4,88 @@
 # https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net
 
 trigger:
-- master
+  batch: true
-- feature/*
+  branches:
+    include:
+    - master
+    - feature/*
+    exclude:
+    - gh-pages
 
-pr:
+stages:
-- master
+- stage: Build
+  jobs:
+  - job: Build
+    pool:
+      vmImage: 'Windows-latest'
 
-pool:
+    variables:
-  vmImage: 'windows-latest'
+      solution: '**/src/*.sln'
+      buildPlatform: 'Any CPU'
+      buildConfiguration: 'Release'
 
-variables:
+    steps:
-  solution: '**/src/*.sln'
-  buildPlatform: 'Any CPU'
-  buildConfiguration: 'Release'
 
-steps:
+    - task: NuGetToolInstaller@1
-- task: DotNetCoreInstaller@2
-  displayName: 'Use .NET Core sdk 3.0'
-  inputs:
-    version: '3.0.100'
 
-- task: NuGetToolInstaller@0
+    - task: UseDotNet@2
-  displayName: 'Use NuGet 5.2.0'
+      displayName: 'Use .NET Core sdk 3.1'
-  inputs:
+      inputs:
-    versionSpec: 5.2.0
+        packageType: sdk
-    checkLatest: true
+        version: 3.1.101
 
-- task: NuGetCommand@2
+    - task: DotNetCoreCLI@2
-  displayName: NuGet restore
+      displayName: Test
-  inputs:
+      inputs:
-    restoreSolution: '$(solution)'
+        command: test
-    feedsToUse: config
+        projects: '$(solution)'
+        arguments: '--configuration Debug /p:Platform="$(buildPlatform)" /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura'
 
-- task: VSBuild@1
+    - task: DotNetCoreCLI@2
-  displayName: 'Build solution **\src\*.sln'
+      displayName: Build
-  inputs:
+      inputs:
-    vsVersion: 'latest'
+        command: build
-    solution: '$(solution)'
+        projects: '$(solution)'
-    platform: '$(buildPlatform)'
+        arguments: '--configuration $(buildConfiguration) /p:Platform="$(buildPlatform)"'
-    configuration: '$(buildConfiguration)'
 
-- task: replacetokens@3
+    - task: CopyFiles@2
-  inputs:
+      displayName: 'Copy Files to: $(Build.ArtifactStagingDirectory)'
-    rootDirectory: 'templates\Dapplo.Microsoft.Extensions.Hosting.CaliburnMicro.Template\content'
+      inputs:
-    targetFiles: '*.csproj'
+        SourceFolder: '$(System.DefaultWorkingDirectory)'
-    encoding: 'auto'
+        Contents: |
-    writeBOM: true
+          **\bin\$(buildConfiguration)\*.nupkg
-    actionOnMissing: 'fail'
+        TargetFolder: '$(Build.ArtifactStagingDirectory)'
-    keepToken: false
+        flattenFolders: true
-    tokenPrefix: '#{'
-    tokenSuffix: '}#'
 
-- script: nuget pack templates\Dapplo.Microsoft.Extensions.Hosting.CaliburnMicro.Template\Dapplo.Microsoft.Extensions.Hosting.CaliburnMicro.Template.nuspec -Version $(Build.BuildNumber)
+    - publish: $(Build.ArtifactStagingDirectory)
+      artifact: drop
 
-- task: CopyFiles@2
+- stage: Deploy
-  displayName: 'Copy Files to: $(build.artifactstagingdirectory)'
+  jobs:
-  inputs:
+  - deployment: DeployNuGet
-    SourceFolder: '$(system.defaultworkingdirectory)'
+    pool:
-    Contents: |
+      vmImage: 'Windows-2019'
-     **\bin\$(BuildConfiguration)\*.nupkg
-     *Template*.nupkg
-     **\TestResults\**\*.coverage
-    TargetFolder: '$(build.artifactstagingdirectory)'
-    flattenFolders: true
 
-- task: PublishBuildArtifacts@1
+    environment: 'NuGet'
-  displayName: 'Publish Artifact: drop'
+    strategy:
-  inputs:
+      # default deployment strategy
-    PathtoPublish: '$(build.artifactstagingdirectory)'
+      runOnce:
+        deploy:
+          steps:
+          - task: DownloadPipelineArtifact@2
+            inputs:
+              artifact: 'drop'
+
+          - task: NuGetToolInstaller@0
+            displayName: 'Use NuGet 5.4.0'
+            inputs:
+              versionSpec: 5.4.0
+              checkLatest: true
+
+          - task: NuGetCommand@2
+            displayName: 'NuGet push'
+            inputs:
+              command: push
+              packagesToPush: '$(Pipeline.Workspace)/drop/*.nupkg;!$(Pipeline.Workspace)/drop/*.symbols.nupkg'
+              nuGetFeedType: external
+              publishFeedCredentials: 'NotifyIcon nuget push'

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)
 *****
 

src/Directory.Build.props

@@ -1,12 +1,11 @@
 <Project>
   <PropertyGroup>
-    <LangVersion>7.3</LangVersion>
+    <LangVersion>latest</LangVersion>
     <UseWindowsForms>true</UseWindowsForms>
 	  <UseWPF>true</UseWPF>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <IsSampleProject>$(MSBuildProjectName.Contains('Sample'))</IsSampleProject>
-    <Copyright>Copyright (c) 2016 Philipp Sumi</Copyright>
+    <Copyright>Copyright (c) 2009-2020 Philipp Sumi</Copyright>
     <Company>hardcodet.net</Company>
     <Authors>Philipp Sumi</Authors>
     <PackageIconUrl>http://www.hardcodet.net/wp-content/themes/inove/favicon.ico</PackageIconUrl>
@@ -23,6 +22,10 @@ Source code and extensive sample application available at http://www.hardcodet.n
     <tags>NotifyIcon WPF Tray Notify ToolTip Popup Balloon Toast</tags>
   </PropertyGroup>
 
+  <PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugSymbols>True</DebugSymbols>
@@ -46,11 +49,11 @@ Source code and extensive sample application available at http://www.hardcodet.n
       </PropertyGroup>
 
       <ItemGroup>
-        <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.25">
+        <PackageReference Include="Nerdbank.GitVersioning" Version="3.0.50">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01" PrivateAssets="All"/>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
       </ItemGroup>
 
       <!-- SourceLink -->

src/NotifyIconWpf.sln

@@ -5,6 +5,7 @@ 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

src/NotifyIconWpf/Interop/AppBarInfo.cs

@@ -6,9 +6,12 @@ using System.Runtime.InteropServices;
 
 namespace Hardcodet.Wpf.TaskbarNotification.Interop
 {
+    /// <summary>
+    /// This contains the logic to access the location of the app bar and communicate with it.
+    /// </summary>
     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;
 
+        /// <summary>
+        /// Get on which edge the app bar is located
+        /// </summary>
         public ScreenEdge Edge
         {
             get { return (ScreenEdge) m_data.uEdge; }
         }
 
+        /// <summary>
+        /// Get the working area
+        /// </summary>
         public Rectangle WorkArea
         {
             get { return GetRectangle(m_data.rc); }
@@ -46,7 +47,12 @@ namespace Hardcodet.Wpf.TaskbarNotification.Interop
             return new Rectangle(rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top);
         }
 
-        public void GetPosition(string strClassName, string strWindowName)
+        /// <summary>
+        /// Update the location of the appbar with the specified classname and window name.
+        /// </summary>
+        /// <param name="strClassName">string</param>
+        /// <param name="strWindowName">string</param>
+        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
             }
         }
 
-
+        /// <summary>
+        /// Updates the system taskbar position
+        /// </summary>
         public void GetSystemTaskBarPosition()
         {
             GetPosition("Shell_TrayWnd", null);
         }
 
-
+        /// <summary>
+        /// A value that specifies an edge of the screen.
+        /// </summary>
         public enum ScreenEdge
         {
+            /// <summary>
+            /// Undefined
+            /// </summary>
             Undefined = -1,
-            Left = ABE_LEFT,
+            /// <summary>
-            Top = ABE_TOP,
+            /// Left edge.
-            Right = ABE_RIGHT,
+            /// </summary>
-            Bottom = ABE_BOTTOM
+            Left = 0,
+            /// <summary>
+            /// Top edge.
+            /// </summary>
+            Top = 1,
+            /// <summary>
+            /// Right edge.
+            /// </summary>
+            Right = 2,
+            /// <summary>
+            /// Bottom edge.
+            /// </summary>
+            Bottom = 3
         }
 
-
         [StructLayout(LayoutKind.Sequential)]
         private struct APPBARDATA
         {

src/NotifyIconWpf/NotifyIconWpf.csproj

@@ -4,14 +4,14 @@
     <AssemblyName>Hardcodet.Wpf.TaskbarNotification</AssemblyName>
     <AssemblyTitle>NotifyIcon for WPF</AssemblyTitle>
     <Product>NotifyIcon WPF</Product>
-    <TargetFrameworks>net45;net472;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net45;net472;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
-    
   </PropertyGroup>
+
   <ItemGroup Condition="'$(TargetFramework)' != 'net45'">
-    <PackageReference Include="System.Resources.Extensions" Version="4.6.0" PrivateAssets="All"/>
+    <PackageReference Include="System.Resources.Extensions" Version="4.7.0" PrivateAssets="All" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <Reference Include="System.Xaml" />
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />

src/Sample Project/Sample Project.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net472</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
     <RootNamespace>Samples</RootNamespace>
     <AssemblyTitle>Sample Project</AssemblyTitle>
     <Product>Sample Project</Product>
@@ -11,10 +11,10 @@
     <ProjectReference Include="..\NotifyIconWpf\NotifyIconWpf.csproj" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' != 'net45'">
-    <PackageReference Include="System.Resources.Extensions" Version="4.6.0" PrivateAssets="All"/>
+    <PackageReference Include="System.Resources.Extensions" Version="4.7.0" PrivateAssets="All"/>
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <Reference Include="PresentationFramework.Aero" />
     <Reference Include="System.Xaml" />
     <Reference Include="System.Data.DataSetExtensions" />

src/Sample Project/Sample Project_fpsqmi4v_wpftmp.csproj

@@ -1,65 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>Samples</RootNamespace>
-    <AssemblyTitle>Sample Project</AssemblyTitle>
-    <Product>Sample Project</Product>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NotifyIconWpf\NotifyIconWpf.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile DependentUpon="%(Filename)" SubType="Code" Update="**\obj\**\*.g$(DefaultLanguageSourceExtension)" />
-    <Compile DependentUpon="%(Filename)" SubType="Designer" Update="**\*.xaml$(DefaultLanguageSourceExtension)" />
-  </ItemGroup>
-  <ItemGroup>
-    <ReferencePath Include="C:\Projects\wpf-notifyicon\src\NotifyIconWpf\bin\Debug\net472\Hardcodet.Wpf.TaskbarNotification.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\mscorlib.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\PresentationCore.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\PresentationFramework.Aero.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\PresentationFramework.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Core.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Data.DataSetExtensions.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Data.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Drawing.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.IO.Compression.FileSystem.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Numerics.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Runtime.Serialization.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Windows.Controls.Ribbon.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Windows.Forms.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Xaml.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Xml.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Xml.Linq.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\UIAutomationClient.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\UIAutomationClientsideProviders.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\UIAutomationProvider.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\UIAutomationTypes.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\WindowsBase.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\WindowsFormsIntegration.dll" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\Main.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\Showcase\FancyBalloon.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\Showcase\FancyPopup.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\Showcase\FancyToolTip.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\Showcase\ShowcaseWindow.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\Showcase\WelcomeBalloon.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\Tutorials\01 - Declaration\SimpleWindowWithNotifyIcon.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\Tutorials\02 - ToolTips\InlineToolTipWindow.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\Tutorials\02 - ToolTips\SimpleUserControl.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\Tutorials\02 - ToolTips\UserControlToolTipWindow.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\Tutorials\03 - Popups\InlinePopupWindow.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\Tutorials\04 - ContextMenus\InlineContextMenuWindow.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\Tutorials\05 - Balloons\BalloonSampleWindow.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\Tutorials\06 - Commands\CommandWindow.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\Tutorials\07 - Events\EventVisualizerWindow.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\Tutorials\08 - DataBinding\DataBoundToolTipWindow.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\Tutorials\09 - MVVM\ClockPopup.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\Tutorials\09 - MVVM\MvvmSampleWindow.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\App.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Sample Project\obj\Debug\net472\GeneratedInternalTypeHelper.g.cs" />
-  </ItemGroup>
-</Project>

src/Windowless Sample/Windowless Sample.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net45;net472;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net45;net472;netcoreapp3.0;netcoreapp3.1</TargetFrameworks>
     <RootNamespace>Windowless_Sample</RootNamespace>
     <AssemblyTitle>Windowless Sample</AssemblyTitle>
     <Product>Windowless Sample</Product>
@@ -11,10 +11,10 @@
     <ProjectReference Include="..\NotifyIconWpf\NotifyIconWpf.csproj" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' != 'net45'">
-    <PackageReference Include="System.Resources.Extensions" Version="4.6.0" PrivateAssets="All"/>
+    <PackageReference Include="System.Resources.Extensions" Version="4.7.0" PrivateAssets="All"/>
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Xaml" />

src/Windowless Sample/Windowless Sample_2p2cnbpd_wpftmp.csproj

@@ -1,48 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>Windowless_Sample</RootNamespace>
-    <AssemblyTitle>Windowless Sample</AssemblyTitle>
-    <Product>Windowless Sample</Product>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\NotifyIconWpf\NotifyIconWpf.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile DependentUpon="%(Filename)" SubType="Code" Update="**\obj\**\*.g$(DefaultLanguageSourceExtension)" />
-    <Compile DependentUpon="%(Filename)" SubType="Designer" Update="**\*.xaml$(DefaultLanguageSourceExtension)" />
-  </ItemGroup>
-  <ItemGroup>
-    <ReferencePath Include="C:\Projects\wpf-notifyicon\src\NotifyIconWpf\bin\Debug\net472\Hardcodet.Wpf.TaskbarNotification.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\Microsoft.CSharp.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\mscorlib.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\PresentationCore.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\PresentationFramework.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Core.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Data.DataSetExtensions.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Data.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Drawing.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.IO.Compression.FileSystem.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Numerics.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Runtime.Serialization.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Windows.Controls.Ribbon.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Windows.Forms.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Xaml.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Xml.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\System.Xml.Linq.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\UIAutomationClient.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\UIAutomationClientsideProviders.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\UIAutomationProvider.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\UIAutomationTypes.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\WindowsBase.dll" />
-    <ReferencePath Include="C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.2\WindowsFormsIntegration.dll" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Windowless Sample\obj\Debug\net472\MainWindow.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Windowless Sample\obj\Debug\net472\App.g.cs" />
-    <Compile Include="C:\Projects\wpf-notifyicon\src\Windowless Sample\obj\Debug\net472\GeneratedInternalTypeHelper.g.cs" />
-  </ItemGroup>
-</Project>

src/WindowsFormsSample/WindowsFormsSample.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net472</TargetFrameworks>
+    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
     <StartupObject>WindowsFormsSample.Program</StartupObject>
     <AssemblyTitle>WindowsFormsSample</AssemblyTitle>
     <Product>WindowsFormsSample</Product>
@@ -11,9 +11,9 @@
     <ProjectReference Include="..\NotifyIconWpf\NotifyIconWpf.csproj" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' != 'net45'">
-    <PackageReference Include="System.Resources.Extensions" Version="4.6.0" PrivateAssets="All"/>
+    <PackageReference Include="System.Resources.Extensions" Version="4.7.0" PrivateAssets="All"/>
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System.Data.DataSetExtensions" />