From 7f44040b9154a8a67984ce2b719260aeba6375e1 Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Sat, 6 Apr 2024 10:02:09 +1100
Subject: [PATCH 1/4] #630 Add in net 5 and make dependency conditional

---
 Client/Client.csproj | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Client/Client.csproj b/Client/Client.csproj
index c188d903..54b31981 100644
--- a/Client/Client.csproj
+++ b/Client/Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-      <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+      <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
       <LangVersion>8</LangVersion>
 
       <Description>The reference client that allows query, write and management (bucket, organization, users) for the InfluxDB 2.x.</Description>
@@ -42,9 +42,11 @@
         <PackageReference Include="JsonSubTypes" Version="2.0.1" />
         <PackageReference Include="Microsoft.Extensions.ObjectPool" Version="8.0.8" />
         <PackageReference Include="Microsoft.Net.Http.Headers" Version="2.2.8" />
-        <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
         <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
         <PackageReference Include="System.Reactive" Version="6.0.1" />
     </ItemGroup>
 
+    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
+        <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
+    </ItemGroup>
 </Project>

From 539c1338d96ffa0ba94a0219fb5a86cff4fcfa6a Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Tue, 9 Apr 2024 21:14:32 +1000
Subject: [PATCH 2/4] chore: switch to net 6 to suppress  build error

---
 Client/Client.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Client/Client.csproj b/Client/Client.csproj
index 54b31981..d4c8c4cc 100644
--- a/Client/Client.csproj
+++ b/Client/Client.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-      <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
+      <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
       <LangVersion>8</LangVersion>
 
       <Description>The reference client that allows query, write and management (bucket, organization, users) for the InfluxDB 2.x.</Description>

From 07818cfef388b13642d7798f6ebced5536c29ce6 Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Sun, 27 Oct 2024 18:05:02 +1100
Subject: [PATCH 3/4] chore: fix pipeline

---
 .circleci/config.yml               | 13 ++++---------
 Client/Writes/PointData.Builder.cs |  6 +++++-
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a5633cef..428b1754 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -210,18 +210,15 @@ workflows:
       - check-compilation-warnings
       - check-code-formatting
       - tests-dotnet:
-          name: dotnet-3.1-nightly
+          name: dotnet-6.0-nightly
           influxdb-image: "quay.io/influxdb/influxdb:nightly"
-          dotnet-image: "mcr.microsoft.com/dotnet/core/sdk:3.1"
-      - tests-dotnet:
-          name: dotnet-3.1
-          dotnet-image: "mcr.microsoft.com/dotnet/core/sdk:3.1"
+          dotnet-image: "mcr.microsoft.com/dotnet/sdk:6.0"
       - tests-dotnet:
           name: dotnet-5.0
-          code-coverage-report: true
           dotnet-image: "mcr.microsoft.com/dotnet/sdk:5.0"
       - tests-dotnet:
           name: dotnet-6.0
+          code-coverage-report: true
           dotnet-image: "mcr.microsoft.com/dotnet/sdk:6.0"
       - tests-dotnet:
           name: dotnet-7.0
@@ -231,10 +228,8 @@ workflows:
           requires:
             - check-compilation-warnings
             - check-code-formatting
-            - dotnet-3.1-nightly
-            - dotnet-3.1
             - dotnet-5.0
-            - dotnet-6.0
+            - dotnet-6.0-nightly
             - dotnet-7.0
             - dotnet-windows
           filters:
diff --git a/Client/Writes/PointData.Builder.cs b/Client/Writes/PointData.Builder.cs
index 4815c8e0..104842ff 100644
--- a/Client/Writes/PointData.Builder.cs
+++ b/Client/Writes/PointData.Builder.cs
@@ -212,7 +212,11 @@ public Builder Timestamp(TimeSpan timestamp, WritePrecision timeUnit)
             /// <returns></returns>
             public Builder Timestamp(DateTime timestamp, WritePrecision timeUnit)
             {
-                if (timestamp != null && timestamp.Kind != DateTimeKind.Utc)
+ if (
+#if !NETSTANDARD
+                    timestamp != null &&
+#endif
+                    timestamp.Kind != DateTimeKind.Utc)
                 {
                     throw new ArgumentException("Timestamps must be specified as UTC", nameof(timestamp));
                 }

From a371fa585ca320f12b6cb7a2a382edec1c8d1a22 Mon Sep 17 00:00:00 2001
From: James Thompson <thompson.tomo@outlook.com>
Date: Thu, 24 Jul 2025 19:42:31 +1000
Subject: [PATCH 4/4] Build tweak

---
 .circleci/config.yml               | 5 +----
 Client.Core/Client.Core.csproj     | 2 +-
 Client/Writes/PointData.Builder.cs | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 12b9c4e4..aa93f7ec 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -213,9 +213,6 @@ workflows:
           name: dotnet-6.0-nightly
           influxdb-image: "quay.io/influxdb/influxdb:nightly"
           dotnet-image: "mcr.microsoft.com/dotnet/sdk:6.0"
-      - tests-dotnet:
-          name: dotnet-5.0
-          dotnet-image: "mcr.microsoft.com/dotnet/sdk:5.0"
       - tests-dotnet:
           name: dotnet-6.0
           code-coverage-report: true
@@ -231,7 +228,7 @@ workflows:
           requires:
             - check-compilation-warnings
             - check-code-formatting
-            - dotnet-5.0
+            - dotnet-6.0
             - dotnet-6.0-nightly
             - dotnet-7.0
             - dotnet-8.0
diff --git a/Client.Core/Client.Core.csproj b/Client.Core/Client.Core.csproj
index 69b59f49..f5541dd4 100644
--- a/Client.Core/Client.Core.csproj
+++ b/Client.Core/Client.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
         <LangVersion>8</LangVersion>
 
         <Description>InfluxDB Client Core - exceptions, validations, REST client.</Description>
diff --git a/Client/Writes/PointData.Builder.cs b/Client/Writes/PointData.Builder.cs
index 104842ff..c8e45386 100644
--- a/Client/Writes/PointData.Builder.cs
+++ b/Client/Writes/PointData.Builder.cs
@@ -212,7 +212,7 @@ public Builder Timestamp(TimeSpan timestamp, WritePrecision timeUnit)
             /// <returns></returns>
             public Builder Timestamp(DateTime timestamp, WritePrecision timeUnit)
             {
- if (
+                if (
 #if !NETSTANDARD
                     timestamp != null &&
 #endif