From 99adb87826a2e2d4457d6056f5b8105b85b927d9 Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Mon, 22 Apr 2024 21:05:21 +1000
Subject: [PATCH] #556 Leverage framework to provide dependencies

---
 src/KafkaFlow.Abstractions/KafkaFlow.Abstractions.csproj | 4 ++--
 .../KafkaFlow.LogHandler.Console.csproj                  | 4 ++--
 .../KafkaFlow.LogHandler.Microsoft.csproj                | 9 ++++++---
 .../KafkaFlow.Serializer.JsonCore.csproj                 | 4 ++--
 src/KafkaFlow/KafkaFlow.csproj                           | 6 ++++--
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/KafkaFlow.Abstractions/KafkaFlow.Abstractions.csproj b/src/KafkaFlow.Abstractions/KafkaFlow.Abstractions.csproj
index 283ef9c6b..9252642f1 100644
--- a/src/KafkaFlow.Abstractions/KafkaFlow.Abstractions.csproj
+++ b/src/KafkaFlow.Abstractions/KafkaFlow.Abstractions.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
         <RootNamespace>KafkaFlow</RootNamespace>
         <PackageId>KafkaFlow.Abstractions</PackageId>
         <Description>Contains all KafkaFlow extendable interfaces</Description>
     </PropertyGroup>
 
-    <ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)'== 'netStandard2.0'">
       <PackageReference Include="System.Memory" Version="4.5.5" />
       <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
     </ItemGroup>
diff --git a/src/KafkaFlow.LogHandler.Console/KafkaFlow.LogHandler.Console.csproj b/src/KafkaFlow.LogHandler.Console/KafkaFlow.LogHandler.Console.csproj
index 44287854f..0e422745f 100644
--- a/src/KafkaFlow.LogHandler.Console/KafkaFlow.LogHandler.Console.csproj
+++ b/src/KafkaFlow.LogHandler.Console/KafkaFlow.LogHandler.Console.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
         <RootNamespace>KafkaFlow</RootNamespace>
     </PropertyGroup>
 
@@ -9,7 +9,7 @@
         <ProjectReference Include="..\KafkaFlow.Abstractions\KafkaFlow.Abstractions.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)'== 'netStandard2.0'">
         <PackageReference Include="System.Text.Json" Version="6.0.8" />
     </ItemGroup>
 
diff --git a/src/KafkaFlow.LogHandler.Microsoft/KafkaFlow.LogHandler.Microsoft.csproj b/src/KafkaFlow.LogHandler.Microsoft/KafkaFlow.LogHandler.Microsoft.csproj
index a2ef2b168..e96a11987 100644
--- a/src/KafkaFlow.LogHandler.Microsoft/KafkaFlow.LogHandler.Microsoft.csproj
+++ b/src/KafkaFlow.LogHandler.Microsoft/KafkaFlow.LogHandler.Microsoft.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
         <RootNamespace>KafkaFlow</RootNamespace>
         <PackageId>KafkaFlow.LogHandler.Microsoft</PackageId>
         <Description>LogHandler implementation leveraging Microsoft Logging framework.</Description>
@@ -11,9 +11,12 @@
         <ProjectReference Include="..\KafkaFlow.Abstractions\KafkaFlow.Abstractions.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)'== 'netStandard2.0'">
         <PackageReference Include="System.Text.Json" Version="6.0.8" />
+    </ItemGroup>
+
+    <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     </ItemGroup>
-    
+
 </Project>
diff --git a/src/KafkaFlow.Serializer.JsonCore/KafkaFlow.Serializer.JsonCore.csproj b/src/KafkaFlow.Serializer.JsonCore/KafkaFlow.Serializer.JsonCore.csproj
index 252b999e7..e93a74f47 100644
--- a/src/KafkaFlow.Serializer.JsonCore/KafkaFlow.Serializer.JsonCore.csproj
+++ b/src/KafkaFlow.Serializer.JsonCore/KafkaFlow.Serializer.JsonCore.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
         <PackageId>KafkaFlow.Serializer.JsonCore</PackageId>
         <Description>JSON implementation for KafkaFlow serializer middleware using System.Text.Json</Description>
         <RootNamespace>KafkaFlow.Serializer</RootNamespace>
     </PropertyGroup>
 
-    <ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)'== 'netStandard2.0'">
         <PackageReference Include="System.Text.Json" Version="6.0.8" />
     </ItemGroup>
 
diff --git a/src/KafkaFlow/KafkaFlow.csproj b/src/KafkaFlow/KafkaFlow.csproj
index bebc9488a..f720b8cf0 100644
--- a/src/KafkaFlow/KafkaFlow.csproj
+++ b/src/KafkaFlow/KafkaFlow.csproj
@@ -1,15 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
         <PackageId>KafkaFlow</PackageId>
         <Description>KafkaFlow main package</Description>
     </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="Confluent.Kafka" Version="2.1.1" />
-        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
         <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.0" />
+    </ItemGroup>
+    <ItemGroup Condition="'$(TargetFramework)'== 'netStandard2.0'">
+        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
         <PackageReference Include="System.Threading.Channels" Version="6.0.0" />
     </ItemGroup>