Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: add tfm and tweak dependencies #671

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

chore: add tfm and tweak dependencies #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f44040
#630 Add in net 5 and make dependency conditional
thompson-tomo Apr 5, 2024
539c133
chore: switch to net 6 to suppress build error
thompson-tomo Apr 9, 2024
07818cf
chore: fix pipeline
thompson-tomo Oct 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
6 changes: 4 additions & 2 deletions Client/Client.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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>
6 changes: 5 additions & 1 deletion Client/Writes/PointData.Builder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
Expand Down