diff --git a/.circleci/config.yml b/.circleci/config.yml
index a5633cefd..428b17544 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/Client.csproj b/Client/Client.csproj
index c188d9034..d4c8c4cc1 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;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>
@@ -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>
diff --git a/Client/Writes/PointData.Builder.cs b/Client/Writes/PointData.Builder.cs
index 4815c8e04..104842ffe 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));
                 }