From a6a7c4f7c359f5de371fb3c7dfe1187becb6dfef Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Mon, 12 May 2025 16:08:21 +1000
Subject: [PATCH 1/4] #125 Update Couchbase.csproj

---
 src/Couchbase/Couchbase.csproj | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Couchbase/Couchbase.csproj b/src/Couchbase/Couchbase.csproj
index 9b1148bc6..5ba556405 100644
--- a/src/Couchbase/Couchbase.csproj
+++ b/src/Couchbase/Couchbase.csproj
@@ -57,9 +57,7 @@
     <PackageReference Include="Microsoft.Extensions.ObjectPool" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="Snappier" />
-    <PackageReference Include="System.IO.Pipelines" />
     <PackageReference Include="System.Linq.Async" />
-    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
   <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
@@ -67,12 +65,17 @@
     <PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
     <PackageReference Include="System.Threading.Channels" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
   <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
     <PackageReference Include="Microsoft.Bcl.TimeProvider" />
   </ItemGroup>
 
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
+    <PackageReference Include="System.IO.Pipelines" />
+  </ItemGroup>
+
   <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
     <PackageReference Include="System.IO.Hashing" />
   </ItemGroup>

From ae0eb83d6d39788a63ee08b5b982c10851d2701a Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Thu, 18 Dec 2025 10:20:07 +1100
Subject: [PATCH 2/4] Fix ordering

Removed duplicate PackageReference for System.Text.Json.
---
 src/Couchbase/Couchbase.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Couchbase/Couchbase.csproj b/src/Couchbase/Couchbase.csproj
index dff5be414..37d68c02f 100644
--- a/src/Couchbase/Couchbase.csproj
+++ b/src/Couchbase/Couchbase.csproj
@@ -61,9 +61,9 @@
   </ItemGroup>
 
   <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
+    <PackageReference Include="System.Text.Json" />
     <PackageReference Include="System.Threading.Channels" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" />
-    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
   <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">

From f2a8c82f37a3d2524c4e39a68424c9fc0d7fed3b Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Thu, 18 Dec 2025 10:28:08 +1100
Subject: [PATCH 3/4] Update Couchbase.Extensions.OpenTelemetry.csproj

---
 .../Couchbase.Extensions.OpenTelemetry.csproj              | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/Couchbase.Extensions.OpenTelemetry/Couchbase.Extensions.OpenTelemetry.csproj b/src/Couchbase.Extensions.OpenTelemetry/Couchbase.Extensions.OpenTelemetry.csproj
index 85eb9ade9..3df4b4165 100644
--- a/src/Couchbase.Extensions.OpenTelemetry/Couchbase.Extensions.OpenTelemetry.csproj
+++ b/src/Couchbase.Extensions.OpenTelemetry/Couchbase.Extensions.OpenTelemetry.csproj
@@ -12,12 +12,7 @@
   <ItemGroup>
     <PackageReference Include="OpenTelemetry" />
     <PackageReference Include="OpenTelemetry.Api" />
-    <PackageReference Include="System.Threading.Tasks.Dataflow" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="System.Linq.AsyncEnumerable" Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net10.0'"/>
-    <PackageReference Include="System.Linq.Async" Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1' "/>
+    <PackageReference Include="System.Linq.AsyncEnumerable"/>
   </ItemGroup>
 
   <ItemGroup>

From e705502f0075f91c6a782f106f5afa95a33a8253 Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Thu, 18 Dec 2025 10:31:52 +1100
Subject: [PATCH 4/4] Add condition for System.Threading.Tasks.Dataflow package

---
 .../Couchbase.Extensions.DependencyInjection.csproj            | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Couchbase.Extensions.DependencyInjection/Couchbase.Extensions.DependencyInjection.csproj b/src/Couchbase.Extensions.DependencyInjection/Couchbase.Extensions.DependencyInjection.csproj
index b838f16e6..f6f1f7f8a 100644
--- a/src/Couchbase.Extensions.DependencyInjection/Couchbase.Extensions.DependencyInjection.csproj
+++ b/src/Couchbase.Extensions.DependencyInjection/Couchbase.Extensions.DependencyInjection.csproj
@@ -25,6 +25,9 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
     <PackageReference Include="Microsoft.Extensions.Options" />
+  </ItemGroup>
+
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">
     <PackageReference Include="System.Threading.Tasks.Dataflow" />
   </ItemGroup>