Skip to content

#630 add tfm and tweak dependencies #766

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

Draft
thompson-tomo wants to merge 13 commits into
base: master
Choose a base branch
from
Draft

#630 add tfm and tweak dependencies #766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 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
d5a0e49
Merge branch 'master' into chore/#630_AddTFMAndTweakDependencies
thompson-tomo May 10, 2025
a371fa5
Build tweak
thompson-tomo Jul 24, 2025
21984cc
Merge branch 'master' into chore/#630_AddTFMAndTweakDependencies
thompson-tomo Mar 10, 2026
6ae6f38
Merge branch 'master' into chore/#630_AddTFMAndTweakDependencies
thompson-tomo Jun 22, 2026
8fe766f
Revert CircleCI config change
thompson-tomo Jun 22, 2026
512c33f
More revert
thompson-tomo Jun 22, 2026
bef4230
ci optimisation
thompson-tomo Jun 22, 2026
39c0db9
ci: explicit build
thompson-tomo Jun 22, 2026
11c5dac
more changes
thompson-tomo Jun 22, 2026
7971ab1
more descope
thompson-tomo Jun 22, 2026
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
29 changes: 12 additions & 17 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,34 +131,22 @@ jobs:
name: "Start InfluxDB"
command: /c/influxdata/influxdb-1.8.0-1/influxd.exe -config "Scripts/influxdb.conf"
background: true
- run: |
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\<TargetFramework>'net5.0'<\/TargetFramework>' Client.Core.Test/Client.Core.Test.csproj
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\<TargetFramework>'net5.0'<\/TargetFramework>' Client.Test/Client.Test.csproj
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\<TargetFramework>'net5.0'<\/TargetFramework>' Client.Legacy.Test/Client.Legacy.Test.csproj
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\<TargetFramework>'net5.0'<\/TargetFramework>' Client.Linq.Test/Client.Linq.Test.csproj
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\<TargetFramework>'net5.0'<\/TargetFramework>' Examples/Examples.csproj
- run: dotnet sln remove Examples/ExampleBlazor/ExampleBlazor.csproj
- run: dotnet nuget locals --clear all
- run: dotnet restore --no-cache --force -s https://api.nuget.org/v3/index.json
- run: dotnet build
- run: dotnet test Client.Legacy.Test/Client.Legacy.Test.csproj --no-build
- run: dotnet restore --no-cache --framework="net5.0" --force -s https://api.nuget.org/v3/index.json
- run: dotnet build Client.Legacy.Test/Client.Legacy.Test.csproj --no-restore --framework="net5.0"
- run: dotnet test Client.Legacy.Test/Client.Legacy.Test.csproj --no-build --framework="net5.0"

check-compilation-warnings:
docker:
- image: *default-dotnet-image
steps:
- checkout
- run: |
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\<TargetFramework>'net8.0'<\/TargetFramework>' Client.Core.Test/Client.Core.Test.csproj
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\<TargetFramework>'net8.0'<\/TargetFramework>' Client.Test/Client.Test.csproj
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\<TargetFramework>'net8.0'<\/TargetFramework>' Client.Legacy.Test/Client.Legacy.Test.csproj
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\<TargetFramework>'net8.0'<\/TargetFramework>' Client.Linq.Test/Client.Linq.Test.csproj
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\<TargetFramework>'net8.0'<\/TargetFramework>' Examples/Examples.csproj
- run:
name: Check compilation warnings
command: |
dotnet clean --configuration Release
dotnet build --configuration Release -warnAsError -warnAsMessage:CS0419,CS0618,CS1591,CS1573,CS1574,NETSDK1138
dotnet build --framework="net8.0" --configuration Release -warnAsError -warnAsMessage:CS0419,CS0618,CS1591,CS1573,CS1574,NETSDK1138

check-code-formatting:
docker:
Expand Down Expand Up @@ -213,21 +201,28 @@ workflows:
name: dotnet-3.1-nightly
influxdb-image: "quay.io/influxdb/influxdb:nightly"
dotnet-image: "mcr.microsoft.com/dotnet/core/sdk:3.1"
dotnet-target-version: netcoreapp3.1
- tests-dotnet:
name: dotnet-3.1
dotnet-image: "mcr.microsoft.com/dotnet/core/sdk:3.1"
dotnet-target-version: netcoreapp3.1
- tests-dotnet:
name: dotnet-5.0
code-coverage-report: true
dotnet-image: "mcr.microsoft.com/dotnet/sdk:5.0-bullseye-slim"
dotnet-image: "mcr.microsoft.com/dotnet/sdk:5.0"
dotnet-target-version: net5.0
- tests-dotnet:
name: dotnet-6.0
dotnet-image: "mcr.microsoft.com/dotnet/sdk:6.0"
dotnet-target-version: net6.0
- tests-dotnet:
name: dotnet-7.0
dotnet-image: "mcr.microsoft.com/dotnet/sdk:7.0"
dotnet-target-version: net7.0
- tests-dotnet:
name: dotnet-8.0
dotnet-image: "mcr.microsoft.com/dotnet/sdk:8.0"
dotnet-target-version: net8.0
- tests-windows:
name: dotnet-windows
- deploy-preview:
Expand Down
2 changes: 1 addition & 1 deletion Client.Core/Client.Core.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>InfluxDB Client Core - exceptions, validations, REST client.</Description>
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="10.0.8" />
<PackageReference Include="Microsoft.Net.Http.Headers" Version="2.3.10" />
<PackageReference Include="System.Collections.Immutable" Version="10.0.8" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="10.0.8" />
<PackageReference Include="System.Reactive" Version="6.0.1" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
<PackageReference Include="System.Collections.Immutable" Version="10.0.8" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Client/Writes/PointData.Builder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,4 +275,4 @@ private Builder PutField(string name, object value)
}
}
}
}
}
28 changes: 9 additions & 19 deletions Scripts/ci-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,25 +19,13 @@ echo "$NET_TEST_VERSION"

DEFAULT_NET_TARGET_VERSION="netstandard2.1"
NET_TARGET_VERSION="${NET_TARGET_VERSION:-$DEFAULT_NET_TARGET_VERSION}"

sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TEST_VERSION}"'<\/TargetFramework>' Client.Core.Test/Client.Core.Test.csproj
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TEST_VERSION}"'<\/TargetFramework>' Client.Test/Client.Test.csproj
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TEST_VERSION}"'<\/TargetFramework>' Client.Legacy.Test/Client.Legacy.Test.csproj
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TEST_VERSION}"'<\/TargetFramework>' Client.Linq.Test/Client.Linq.Test.csproj
sed -i '/<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TEST_VERSION}"'<\/TargetFramework>' Examples/Examples.csproj

sed -i '/<TargetFrameworks>netstandard2.0;netstandard2.1<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TARGET_VERSION}"'<\/TargetFramework>' Client.Core/Client.Core.csproj
sed -i '/<TargetFrameworks>netstandard2.0;netstandard2.1<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TARGET_VERSION}"'<\/TargetFramework>' Client/Client.csproj
sed -i '/<TargetFrameworks>netstandard2.0;netstandard2.1<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TARGET_VERSION}"'<\/TargetFramework>' Client.Legacy/Client.Legacy.csproj
sed -i '/<TargetFrameworks>netstandard2.0;netstandard2.1<\/TargetFrameworks>/c\<TargetFramework>'"${NET_TARGET_VERSION}"'<\/TargetFramework>' Client.Linq/Client.Linq.csproj

TRX2JUNIT_VERSION=""
TEST_PARAMS=()

if [[ "$CODE_COVERAGE_REPORT" = true ]]
then
TRX2JUNIT_VERSION="1.6.0"
TEST_PARAMS=(--collect:"XPlat Code Coverage")
TRX2JUNIT_VERSION="1.6.0"
else
TRX2JUNIT_VERSION="1.3.2"
fi
Expand Down Expand Up @@ -65,16 +53,18 @@ dotnet tool install --tool-path="./trx2junit/" trx2junit --version ${TRX2JUNIT_V
#
# Build
#
dotnet restore
dotnet build --no-restore
dotnet build Client.Core.Test/Client.Core.Test.csproj --framework="${NET_TARGET_VERSION}"
dotnet build Client.Test/Client.Test.csproj --framework="${NET_TARGET_VERSION}"
dotnet build Client.Legacy.Test/Client.Legacy.Test.csproj --framework="${NET_TARGET_VERSION}"
dotnet build Client.Linq.Test/Client.Linq.Test.csproj --framework="${NET_TARGET_VERSION}"

#
# Test
#
dotnet test Client.Core.Test/Client.Core.Test.csproj --no-build --verbosity normal --logger trx "${TEST_PARAMS[@]}"
dotnet test Client.Test/Client.Test.csproj --no-build --verbosity normal --logger trx "${TEST_PARAMS[@]}"
dotnet test Client.Legacy.Test/Client.Legacy.Test.csproj --no-build --verbosity normal --logger trx "${TEST_PARAMS[@]}"
dotnet test Client.Linq.Test/Client.Linq.Test.csproj --no-build --verbosity normal --logger trx "${TEST_PARAMS[@]}"
dotnet test Client.Core.Test/Client.Core.Test.csproj --no-build --verbosity normal --framework="${NET_TARGET_VERSION}" --logger trx "${TEST_PARAMS[@]}"
dotnet test Client.Test/Client.Test.csproj --no-build --verbosity normal --framework="${NET_TARGET_VERSION}" --logger trx "${TEST_PARAMS[@]}"
dotnet test Client.Legacy.Test/Client.Legacy.Test.csproj --no-build --verbosity normal --framework="${NET_TARGET_VERSION}" --logger trx "${TEST_PARAMS[@]}"
dotnet test Client.Linq.Test/Client.Linq.Test.csproj --no-build --verbosity normal --framework="${NET_TARGET_VERSION}" --logger trx "${TEST_PARAMS[@]}"

#
# Convert test results to Junit format
Expand Down