From 5307a55423394df75a2d8cf28b64201ef4c4e2da Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Mon, 12 May 2025 15:54:35 +1000
Subject: [PATCH 1/7] #848 Tweak dependencies

Signed-off-by: James Thompson <thompson.tomo@outlook.com>
---
 src/NATS.Client.Core/NATS.Client.Core.csproj | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/NATS.Client.Core/NATS.Client.Core.csproj b/src/NATS.Client.Core/NATS.Client.Core.csproj
index 40a77b231..1cf136a73 100644
--- a/src/NATS.Client.Core/NATS.Client.Core.csproj
+++ b/src/NATS.Client.Core/NATS.Client.Core.csproj
@@ -37,7 +37,6 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="System.IO.Pipelines" Version="8.0.0"/>
     </ItemGroup>
 
     <!--  Dependencies for netstandard only  -->
@@ -49,6 +48,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
+        <PackageReference Include="System.IO.Pipelines" Version="8.0.0"/>
     </ItemGroup>
 
     <!--  Dependencies for netstandard2.0 only -->
@@ -61,9 +61,8 @@
         <PackageReference Include="IndexRange" Version="1.0.3"/>
     </ItemGroup>
 
-    <!--  Dependencies for net6.0 and net8.0 only -->
-    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net8.0'">
-        <PackageReference Include="System.Text.Json" Version="8.0.5"/>
+    <ItemGroup Condition="'$(TargetFramework)' == 'net6' OR '$(TargetFramework)' == 'net8'">
+        <PackageReference Include="System.IO.Pipelines" Version="8.0.0"/>
     </ItemGroup>
 
     <ItemGroup>

From 99fb4c8cb71984f088757d00a8d4bfd09398d356 Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Mon, 12 May 2025 15:58:16 +1000
Subject: [PATCH 2/7] Update NATS.Client.Core.csproj

Signed-off-by: James Thompson <thompson.tomo@outlook.com>
---
 src/NATS.Client.Core/NATS.Client.Core.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/NATS.Client.Core/NATS.Client.Core.csproj b/src/NATS.Client.Core/NATS.Client.Core.csproj
index 1cf136a73..49e1e18d3 100644
--- a/src/NATS.Client.Core/NATS.Client.Core.csproj
+++ b/src/NATS.Client.Core/NATS.Client.Core.csproj
@@ -61,7 +61,7 @@
         <PackageReference Include="IndexRange" Version="1.0.3"/>
     </ItemGroup>
 
-    <ItemGroup Condition="'$(TargetFramework)' == 'net6' OR '$(TargetFramework)' == 'net8'">
+    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net8.0'">
         <PackageReference Include="System.IO.Pipelines" Version="8.0.0"/>
     </ItemGroup>
 

From 6ea1eb187d733f2ff9d8511973d38ebaf769c959 Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Mon, 12 May 2025 15:59:24 +1000
Subject: [PATCH 3/7] Update NATS.Client.Core.csproj

Signed-off-by: James Thompson <thompson.tomo@outlook.com>
---
 src/NATS.Client.Core/NATS.Client.Core.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/NATS.Client.Core/NATS.Client.Core.csproj b/src/NATS.Client.Core/NATS.Client.Core.csproj
index 49e1e18d3..1011db242 100644
--- a/src/NATS.Client.Core/NATS.Client.Core.csproj
+++ b/src/NATS.Client.Core/NATS.Client.Core.csproj
@@ -61,6 +61,7 @@
         <PackageReference Include="IndexRange" Version="1.0.3"/>
     </ItemGroup>
 
+    <!--  Dependencies for net6.0 and net8.0 only -->
     <ItemGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net8.0'">
         <PackageReference Include="System.IO.Pipelines" Version="8.0.0"/>
     </ItemGroup>

From 1616a26d6693692c05c7e0b5430ef99ec10132b0 Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Tue, 13 May 2025 19:07:44 +1000
Subject: [PATCH 4/7] Make STJ explicit dependency for JetStream

Signed-off-by: James Thompson <thompson.tomo@outlook.com>
---
 src/NATS.Client.JetStream/NATS.Client.JetStream.csproj | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/NATS.Client.JetStream/NATS.Client.JetStream.csproj b/src/NATS.Client.JetStream/NATS.Client.JetStream.csproj
index cd04a66fa..89813872a 100644
--- a/src/NATS.Client.JetStream/NATS.Client.JetStream.csproj
+++ b/src/NATS.Client.JetStream/NATS.Client.JetStream.csproj
@@ -27,6 +27,13 @@
   <!--  Dependencies for netstandard only  -->
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'">
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5"/>
+  </ItemGroup>
+
+
+  <!--  Dependencies for net6.0 and net8.0 only -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="System.Text.Json" Version="8.0.5"/>
   </ItemGroup>
 
   <ItemGroup>

From b17cefa93ca053a09decde32f5615c7ffa3e7d4d Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Tue, 13 May 2025 19:09:50 +1000
Subject: [PATCH 5/7] Update NATS.Client.JetStream.csproj

Signed-off-by: James Thompson <thompson.tomo@outlook.com>
---
 src/NATS.Client.JetStream/NATS.Client.JetStream.csproj | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/NATS.Client.JetStream/NATS.Client.JetStream.csproj b/src/NATS.Client.JetStream/NATS.Client.JetStream.csproj
index 89813872a..2d301b9c0 100644
--- a/src/NATS.Client.JetStream/NATS.Client.JetStream.csproj
+++ b/src/NATS.Client.JetStream/NATS.Client.JetStream.csproj
@@ -30,8 +30,7 @@
     <PackageReference Include="System.Text.Json" Version="8.0.5"/>
   </ItemGroup>
 
-
-  <!--  Dependencies for net6.0 and net8.0 only -->
+  <!--  Dependencies for net6.0 only -->
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
     <PackageReference Include="System.Text.Json" Version="8.0.5"/>
   </ItemGroup>

From 3eea2f2b0e6e268850df6f51a72fbb7a80b3713e Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Sat, 17 May 2025 11:26:53 +1000
Subject: [PATCH 6/7] Force sdk to 8.0.0

Signed-off-by: James Thompson <thompson.tomo@outlook.com>
---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index 9e5e1fd1d..dad2db5ef 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.0",
+    "version": "8.0.0",
     "rollForward": "latestMajor",
     "allowPrerelease": true
   }

From 2050d60e0bc5cb9658147282793dae2bea16769f Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Sat, 24 May 2025 14:28:40 +1000
Subject: [PATCH 7/7] Add newer stj for net 6

Signed-off-by: James Thompson <thompson.tomo@outlook.com>
---
 src/NATS.Client.Core/NATS.Client.Core.csproj      | 15 +++++++++------
 .../NATS.Client.JetStream.csproj                  |  7 +++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/NATS.Client.Core/NATS.Client.Core.csproj b/src/NATS.Client.Core/NATS.Client.Core.csproj
index 1011db242..fcb8eacc2 100644
--- a/src/NATS.Client.Core/NATS.Client.Core.csproj
+++ b/src/NATS.Client.Core/NATS.Client.Core.csproj
@@ -39,16 +39,14 @@
         </PackageReference>
     </ItemGroup>
 
-    <!--  Dependencies for netstandard only  -->
-    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'">
-        <PackageReference Include="System.Text.Json" Version="8.0.5"/>
+    <!--  Dependencies for prior to net5.0-->
+    <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0'))">
         <PackageReference Include="System.Threading.Channels" Version="8.0.0"/>
         <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1"/>
         <PackageReference Include="Nullable" Version="1.3.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="System.IO.Pipelines" Version="8.0.0"/>
     </ItemGroup>
 
     <!--  Dependencies for netstandard2.0 only -->
@@ -61,8 +59,13 @@
         <PackageReference Include="IndexRange" Version="1.0.3"/>
     </ItemGroup>
 
-    <!--  Dependencies for net6.0 and net8.0 only -->
-    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net8.0'">
+    <!--  Dependencies for prior to net8.0-->
+    <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
+        <PackageReference Include="System.Text.Json" Version="8.0.5"/>
+    </ItemGroup>
+    
+    <!--  Dependencies for prior to net9.0-->
+    <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
         <PackageReference Include="System.IO.Pipelines" Version="8.0.0"/>
     </ItemGroup>
 
diff --git a/src/NATS.Client.JetStream/NATS.Client.JetStream.csproj b/src/NATS.Client.JetStream/NATS.Client.JetStream.csproj
index 2d301b9c0..84a809596 100644
--- a/src/NATS.Client.JetStream/NATS.Client.JetStream.csproj
+++ b/src/NATS.Client.JetStream/NATS.Client.JetStream.csproj
@@ -24,14 +24,13 @@
     <NoWarn>$(NoWarn);CS8774</NoWarn>
   </PropertyGroup>
 
-  <!--  Dependencies for netstandard only  -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'">
+  <!--  Dependencies for prior to net5.0-->
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net5.0'))">
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.5"/>
   </ItemGroup>
 
   <!--  Dependencies for net6.0 only -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
     <PackageReference Include="System.Text.Json" Version="8.0.5"/>
   </ItemGroup>