From 8e738fc03db43afcec92b4b8099f07b2d6732e79 Mon Sep 17 00:00:00 2001
From: Thomas Levesque <thomaslevesque@users.noreply.github.com>
Date: Thu, 25 Jan 2024 22:38:35 -0500
Subject: [PATCH] Centralize target frameworks

---
 NHotkey.sln                                                  | 3 +++
 samples/Directory.Build.props                                | 5 +++++
 .../NHotkey.WindowsForms.Demo.csproj                         | 2 +-
 samples/NHotkey.Wpf.Demo/NHotkey.Wpf.Demo.csproj             | 4 ++--
 src/Directory.Build.props                                    | 1 +
 src/NHotkey.WindowsForms/NHotkey.WindowsForms.csproj         | 4 ++--
 src/NHotkey.Wpf/NHotkey.Wpf.csproj                           | 4 ++--
 src/NHotkey/NHotkey.csproj                                   | 4 ++--
 8 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 samples/Directory.Build.props

diff --git a/NHotkey.sln b/NHotkey.sln
index d293aee..b9d7dba 100644
--- a/NHotkey.sln
+++ b/NHotkey.sln
@@ -14,6 +14,9 @@ EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHotkey.Wpf.Demo", "samples\NHotkey.Wpf.Demo\NHotkey.Wpf.Demo.csproj", "{338F60F0-F9FE-42AB-9EAE-31E9C3E3CEC3}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{CEE3E414-E343-43C9-8CB9-72CA02FD0299}"
+	ProjectSection(SolutionItems) = preProject
+		samples\Directory.Build.props = samples\Directory.Build.props
+	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{FBA6085F-DD7E-4E18-9BC8-8F709157EC33}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
new file mode 100644
index 0000000..0b3c588
--- /dev/null
+++ b/samples/Directory.Build.props
@@ -0,0 +1,5 @@
+<Project>
+    <PropertyGroup>
+        <DemoTargetFrameworks>net481;net8.0-windows</DemoTargetFrameworks>
+    </PropertyGroup>
+</Project>
diff --git a/samples/NHotkey.WindowsForms.Demo/NHotkey.WindowsForms.Demo.csproj b/samples/NHotkey.WindowsForms.Demo/NHotkey.WindowsForms.Demo.csproj
index 892cefc..c0129ec 100644
--- a/samples/NHotkey.WindowsForms.Demo/NHotkey.WindowsForms.Demo.csproj
+++ b/samples/NHotkey.WindowsForms.Demo/NHotkey.WindowsForms.Demo.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net481;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>$(DemoTargetFrameworks)</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <OutputType>WinExe</OutputType>
     <IsPackable>false</IsPackable>
diff --git a/samples/NHotkey.Wpf.Demo/NHotkey.Wpf.Demo.csproj b/samples/NHotkey.Wpf.Demo/NHotkey.Wpf.Demo.csproj
index cdeff52..8a0509a 100644
--- a/samples/NHotkey.Wpf.Demo/NHotkey.Wpf.Demo.csproj
+++ b/samples/NHotkey.Wpf.Demo/NHotkey.Wpf.Demo.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net481;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>$(DemoTargetFrameworks)</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <OutputType>WinExe</OutputType>
     <IsPackable>false</IsPackable>
@@ -9,4 +9,4 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\NHotkey.Wpf\NHotkey.Wpf.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 093c6af..cc2f779 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,6 +1,7 @@
 <Project>
 
   <PropertyGroup>
+    <LibraryTargetFrameworks>net462;net6.0-windows</LibraryTargetFrameworks>
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)NHotkey.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
diff --git a/src/NHotkey.WindowsForms/NHotkey.WindowsForms.csproj b/src/NHotkey.WindowsForms/NHotkey.WindowsForms.csproj
index d22ecae..157451a 100644
--- a/src/NHotkey.WindowsForms/NHotkey.WindowsForms.csproj
+++ b/src/NHotkey.WindowsForms/NHotkey.WindowsForms.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>$(LibraryTargetFrameworks)</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <PropertyGroup Label="Package properties">
@@ -9,4 +9,4 @@
   <ItemGroup>
     <ProjectReference Include="..\NHotkey\NHotkey.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/NHotkey.Wpf/NHotkey.Wpf.csproj b/src/NHotkey.Wpf/NHotkey.Wpf.csproj
index 823ccf2..5bfdb5b 100644
--- a/src/NHotkey.Wpf/NHotkey.Wpf.csproj
+++ b/src/NHotkey.Wpf/NHotkey.Wpf.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>$(LibraryTargetFrameworks)</TargetFrameworks>
     <UseWPF>true</UseWPF>
   </PropertyGroup>
   <PropertyGroup Label="Package properties">
@@ -9,4 +9,4 @@
   <ItemGroup>
     <ProjectReference Include="..\NHotkey\NHotkey.csproj" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/NHotkey/NHotkey.csproj b/src/NHotkey/NHotkey.csproj
index 1f935b5..23f3e7e 100644
--- a/src/NHotkey/NHotkey.csproj
+++ b/src/NHotkey/NHotkey.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net462;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>$(LibraryTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Label="Package properties">
     <Description>A managed library to handle global hotkeys in Windows Forms and WPF applications. NOTE: this package doesn't contain a concrete HotkeyManager implementation; you should add either the NHotkey.Wpf or NHotkey.WindowsForms package to get one.</Description>
   </PropertyGroup>
 
-</Project>
\ No newline at end of file
+</Project>