From 3e9fb0627bf468ad81eb57675f5c159455a16b2f Mon Sep 17 00:00:00 2001
From: punker76 <punkerat76@gmail.com>
Date: Fri, 4 Oct 2024 14:21:14 +0200
Subject: [PATCH] Remove netcoreapp3.1 and add net8.0 target framework

---
 azure-pipelines.yml                                        | 7 +++----
 src/Directory.Build.props                                  | 2 +-
 .../NotifyIconWpf.Sample.ShowCases.csproj                  | 6 +++---
 .../NotifyIconWpf.Sample.WindowsForms.csproj               | 7 +++----
 src/global.json                                            | 6 +++---
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 45ef42e..ed74052 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -29,13 +29,12 @@ stages:
 
     - task: NuGetToolInstaller@1
       inputs:
-        versionSpec: '6.3.0'
+        versionSpec: '6.11.1'
 
     - task: UseDotNet@2
-      displayName: 'Install .NET Core SDK 6.0'
+      displayName: 'Install .NET Core SDK by GlobalJson'
       inputs:
-        packageType: sdk
-        version: 6.0.400
+        useGlobalJson: true
 
     - task: DotNetCoreCLI@2
       displayName: Build
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index bdfdff8..033d9bf 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFrameworks>net462;net472;netcoreapp3.1;net6.0-windows</TargetFrameworks>
+    <TargetFrameworks>net8.0-windows;net6.0-windows;net472;net462</TargetFrameworks>
     <LangVersion>latest</LangVersion>
     <UseWindowsForms>true</UseWindowsForms>
 	  <UseWPF>true</UseWPF>
diff --git a/src/NotifyIconWpf.Sample.ShowCases/NotifyIconWpf.Sample.ShowCases.csproj b/src/NotifyIconWpf.Sample.ShowCases/NotifyIconWpf.Sample.ShowCases.csproj
index 7c7243e..27b11b0 100644
--- a/src/NotifyIconWpf.Sample.ShowCases/NotifyIconWpf.Sample.ShowCases.csproj
+++ b/src/NotifyIconWpf.Sample.ShowCases/NotifyIconWpf.Sample.ShowCases.csproj
@@ -2,15 +2,15 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <GenerateResourceUsePreserializedResources Condition="'$(TargetFramework)' != 'net45'">true</GenerateResourceUsePreserializedResources>
+    <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\NotifyIconWpf\NotifyIconWpf.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'net45'">
-    <PackageReference Include="System.Resources.Extensions" Version="6.0.0" PrivateAssets="All" />
+  <ItemGroup>
+    <PackageReference Include="System.Resources.Extensions" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
   
   <ItemGroup>
diff --git a/src/NotifyIconWpf.Sample.WindowsForms/NotifyIconWpf.Sample.WindowsForms.csproj b/src/NotifyIconWpf.Sample.WindowsForms/NotifyIconWpf.Sample.WindowsForms.csproj
index 46de5f8..113f461 100644
--- a/src/NotifyIconWpf.Sample.WindowsForms/NotifyIconWpf.Sample.WindowsForms.csproj
+++ b/src/NotifyIconWpf.Sample.WindowsForms/NotifyIconWpf.Sample.WindowsForms.csproj
@@ -1,17 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net462;net472;netcoreapp3.1;net5.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <GenerateResourceUsePreserializedResources Condition="'$(TargetFramework)' != 'net45'">true</GenerateResourceUsePreserializedResources>
+    <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
   </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\NotifyIconWpf\NotifyIconWpf.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' != 'net45'">
-    <PackageReference Include="System.Resources.Extensions" Version="6.0.0" PrivateAssets="All" />
+  <ItemGroup>
+    <PackageReference Include="System.Resources.Extensions" Version="8.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/global.json b/src/global.json
index 9e5e1fd..81e632a 100644
--- a/src/global.json
+++ b/src/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "6.0.0",
-    "rollForward": "latestMajor",
-    "allowPrerelease": true
+    "version": "8.0.100",
+    "rollForward": "feature",
+    "allowPrerelease": false
   }
 }
\ No newline at end of file