From 51ba0d8a0f2d9b1edff98c8abfe6e4abfd9f93b4 Mon Sep 17 00:00:00 2001
From: Andrea Cuneo <andrea.cuneo@ark-energy.eu>
Date: Tue, 19 Nov 2024 19:27:57 +0100
Subject: [PATCH] fix(deps): remove NetAnalyzer from nuget dependencies and
 remove net6.0 from Frameworks

* remove .net6.0 (EOL)
* remove NetAnalyzers from package dependencies (move to private assets)
---
 Directory.Build.props                         | 20 +++++++++++++++----
 .../MessagePack.NodaTime.Tests.csproj         | 10 ++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index ae9a4b8..79df18a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
-		<LangVersion>10.0</LangVersion>
+		<TargetFrameworks>net8.0;netstandard2.0;netstandard2.1;</TargetFrameworks>
+		<LangVersion>12</LangVersion>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<NoWarn>1591</NoWarn>
 		<Nullable>enable</Nullable>
@@ -45,10 +45,22 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" />
+		<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" >
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
+
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
 
 		<None Include="..\ark-dark.png" Pack="true" PackagePath="\"/>
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
+
+		
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'netstandard2.0'">
 
 		<PackageReference Include="Nullable" Version="1.3.1">
 			<PrivateAssets>all</PrivateAssets>
diff --git a/MessagePack.NodaTime.Tests/MessagePack.NodaTime.Tests.csproj b/MessagePack.NodaTime.Tests/MessagePack.NodaTime.Tests.csproj
index 658c0d8..1350a7d 100644
--- a/MessagePack.NodaTime.Tests/MessagePack.NodaTime.Tests.csproj
+++ b/MessagePack.NodaTime.Tests/MessagePack.NodaTime.Tests.csproj
@@ -1,7 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
   </PropertyGroup>
+  <ItemGroup>
+    <Compile Remove="Properties\**" />
+    <EmbeddedResource Remove="Properties\**" />
+    <None Remove="Properties\**" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MessagePack.NodaTime\MessagePack.NodaTime.csproj">
     </ProjectReference>
@@ -23,7 +28,4 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Properties\" />
-  </ItemGroup>
 </Project>
\ No newline at end of file