From 7f44040b9154a8a67984ce2b719260aeba6375e1 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Sat, 6 Apr 2024 10:02:09 +1100 Subject: [PATCH 01/10] #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 @@ - netstandard2.0;netstandard2.1 + netstandard2.0;netstandard2.1;net5.0 8 The reference client that allows query, write and management (bucket, organization, users) for the InfluxDB 2.x. @@ -42,9 +42,11 @@ - + + + From 539c1338d96ffa0ba94a0219fb5a86cff4fcfa6a Mon Sep 17 00:00:00 2001 From: James Thompson Date: Tue, 9 Apr 2024 21:14:32 +1000 Subject: [PATCH 02/10] 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 @@ - netstandard2.0;netstandard2.1;net5.0 + netstandard2.0;netstandard2.1;net6.0 8 The reference client that allows query, write and management (bucket, organization, users) for the InfluxDB 2.x. From 07818cfef388b13642d7798f6ebced5536c29ce6 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Sun, 27 Oct 2024 18:05:02 +1100 Subject: [PATCH 03/10] 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) /// 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 Date: Thu, 24 Jul 2025 19:42:31 +1000 Subject: [PATCH 04/10] 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 @@ - netstandard2.0;netstandard2.1 + netstandard2.0;netstandard2.1;net6.0 8 InfluxDB Client Core - exceptions, validations, REST client. 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) /// public Builder Timestamp(DateTime timestamp, WritePrecision timeUnit) { - if ( + if ( #if !NETSTANDARD timestamp != null && #endif From 8fe766f71a10f7d0570e8df8ffe61527066e2176 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Mon, 22 Jun 2026 16:53:41 +1000 Subject: [PATCH 05/10] Revert CircleCI config change --- .circleci/config.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a80da32e..11973a61 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -210,12 +210,18 @@ workflows: - check-compilation-warnings - check-code-formatting - tests-dotnet: - name: dotnet-6.0-nightly + name: dotnet-3.1-nightly influxdb-image: "quay.io/influxdb/influxdb:nightly" - dotnet-image: "mcr.microsoft.com/dotnet/sdk:6.0" + dotnet-image: "mcr.microsoft.com/dotnet/core/sdk:3.1" - tests-dotnet: - name: dotnet-6.0 + name: dotnet-3.1 + dotnet-image: "mcr.microsoft.com/dotnet/core/sdk:3.1" + - tests-dotnet: + name: dotnet-5.0 code-coverage-report: true + dotnet-image: "mcr.microsoft.com/dotnet/sdk:5.0-bullseye-slim" + - tests-dotnet: + name: dotnet-6.0 dotnet-image: "mcr.microsoft.com/dotnet/sdk:6.0" - tests-dotnet: name: dotnet-7.0 @@ -228,8 +234,10 @@ 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-8.0 - dotnet-windows From 512c33fc9449e026397e373f5b60193b4cbc8a68 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Mon, 22 Jun 2026 16:56:59 +1000 Subject: [PATCH 06/10] More revert --- Client/Writes/PointData.Builder.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Client/Writes/PointData.Builder.cs b/Client/Writes/PointData.Builder.cs index c8e45386..cf22b276 100644 --- a/Client/Writes/PointData.Builder.cs +++ b/Client/Writes/PointData.Builder.cs @@ -212,11 +212,7 @@ public Builder Timestamp(TimeSpan timestamp, WritePrecision timeUnit) /// public Builder Timestamp(DateTime timestamp, WritePrecision timeUnit) { - if ( -#if !NETSTANDARD - timestamp != null && -#endif - timestamp.Kind != DateTimeKind.Utc) + if (timestamp != null && timestamp.Kind != DateTimeKind.Utc) { throw new ArgumentException("Timestamps must be specified as UTC", nameof(timestamp)); } @@ -279,4 +275,4 @@ private Builder PutField(string name, object value) } } } -} \ No newline at end of file +} From bef423047845b92e2fb3eedab49cad473df0bd26 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Mon, 22 Jun 2026 18:35:46 +1000 Subject: [PATCH 07/10] ci optimisation --- .circleci/config.yml | 26 +++++--------------------- Scripts/ci-test.sh | 35 +++++------------------------------ 2 files changed, 10 insertions(+), 51 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 11973a61..8f6f9bfa 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -131,12 +131,6 @@ jobs: name: "Start InfluxDB" command: /c/influxdata/influxdb-1.8.0-1/influxd.exe -config "Scripts/influxdb.conf" background: true - - run: | - sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\'net5.0'<\/TargetFramework>' Client.Core.Test/Client.Core.Test.csproj - sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\'net5.0'<\/TargetFramework>' Client.Test/Client.Test.csproj - sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\'net5.0'<\/TargetFramework>' Client.Legacy.Test/Client.Legacy.Test.csproj - sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\'net5.0'<\/TargetFramework>' Client.Linq.Test/Client.Linq.Test.csproj - sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\'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 @@ -148,12 +142,6 @@ jobs: - image: *default-dotnet-image steps: - checkout - - run: | - sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\'net8.0'<\/TargetFramework>' Client.Core.Test/Client.Core.Test.csproj - sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\'net8.0'<\/TargetFramework>' Client.Test/Client.Test.csproj - sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\'net8.0'<\/TargetFramework>' Client.Legacy.Test/Client.Legacy.Test.csproj - sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\'net8.0'<\/TargetFramework>' Client.Linq.Test/Client.Linq.Test.csproj - sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\'net8.0'<\/TargetFramework>' Examples/Examples.csproj - run: name: Check compilation warnings command: | @@ -209,32 +197,28 @@ workflows: jobs: - check-compilation-warnings - check-code-formatting - - tests-dotnet: - name: dotnet-3.1-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-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-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-target-version: net8.0 - tests-windows: name: dotnet-windows - deploy-preview: requires: - check-compilation-warnings - check-code-formatting - - dotnet-3.1-nightly - dotnet-3.1 - dotnet-5.0 - dotnet-6.0 diff --git a/Scripts/ci-test.sh b/Scripts/ci-test.sh index b6d25841..1b26657a 100755 --- a/Scripts/ci-test.sh +++ b/Scripts/ci-test.sh @@ -19,37 +19,12 @@ echo "$NET_TEST_VERSION" DEFAULT_NET_TARGET_VERSION="netstandard2.1" NET_TARGET_VERSION="${NET_TARGET_VERSION:-$DEFAULT_NET_TARGET_VERSION}" - -sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\'"${NET_TEST_VERSION}"'<\/TargetFramework>' Client.Core.Test/Client.Core.Test.csproj -sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\'"${NET_TEST_VERSION}"'<\/TargetFramework>' Client.Test/Client.Test.csproj -sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\'"${NET_TEST_VERSION}"'<\/TargetFramework>' Client.Legacy.Test/Client.Legacy.Test.csproj -sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\'"${NET_TEST_VERSION}"'<\/TargetFramework>' Client.Linq.Test/Client.Linq.Test.csproj -sed -i '/netcoreapp3.1;net5.0;net6.0;net7.0;net8.0<\/TargetFrameworks>/c\'"${NET_TEST_VERSION}"'<\/TargetFramework>' Examples/Examples.csproj - -sed -i '/netstandard2.0;netstandard2.1<\/TargetFrameworks>/c\'"${NET_TARGET_VERSION}"'<\/TargetFramework>' Client.Core/Client.Core.csproj -sed -i '/netstandard2.0;netstandard2.1<\/TargetFrameworks>/c\'"${NET_TARGET_VERSION}"'<\/TargetFramework>' Client/Client.csproj -sed -i '/netstandard2.0;netstandard2.1<\/TargetFrameworks>/c\'"${NET_TARGET_VERSION}"'<\/TargetFramework>' Client.Legacy/Client.Legacy.csproj -sed -i '/netstandard2.0;netstandard2.1<\/TargetFrameworks>/c\'"${NET_TARGET_VERSION}"'<\/TargetFramework>' Client.Linq/Client.Linq.csproj - -TRX2JUNIT_VERSION="" +TRX2JUNIT_VERSION="2.1.0" TEST_PARAMS=() if [[ "$CODE_COVERAGE_REPORT" = true ]] then - TRX2JUNIT_VERSION="1.6.0" TEST_PARAMS=(--collect:"XPlat Code Coverage") -else - TRX2JUNIT_VERSION="1.3.2" -fi - -if [[ "$NET_TEST_VERSION" = "netcoreapp6.0" || "$NET_TEST_VERSION" = "netcoreapp7.0" || "$NET_TEST_VERSION" = "netcoreapp8.0" ]] -then - TRX2JUNIT_VERSION="2.1.0" -fi - -if [[ "$NET_TEST_VERSION" != "netcoreapp8.0" ]] -then - dotnet sln remove Examples/ExampleBlazor/ExampleBlazor.csproj fi # @@ -71,10 +46,10 @@ dotnet build --no-restore # # 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 From 39c0db9b8f659bf93205828c9bd50eb3fb0defcf Mon Sep 17 00:00:00 2001 From: James Thompson Date: Mon, 22 Jun 2026 19:47:26 +1000 Subject: [PATCH 08/10] ci: explicit build --- .circleci/config.yml | 5 +++++ Scripts/ci-test.sh | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8f6f9bfa..f3670f74 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -199,19 +199,24 @@ workflows: - check-code-formatting - 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" 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 diff --git a/Scripts/ci-test.sh b/Scripts/ci-test.sh index 1b26657a..9849f447 100755 --- a/Scripts/ci-test.sh +++ b/Scripts/ci-test.sh @@ -41,7 +41,10 @@ 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 --no-restore --framework="${NET_TARGET_VERSION}" +dotnet build Client.Test/Client.Test.csproj --no-restore --framework="${NET_TARGET_VERSION}" +dotnet build Client.Legacy.Test/Client.Legacy.Test.csproj --no-restore --framework="${NET_TARGET_VERSION}" +dotnet biild Client.Linq.Test/Client.Linq.Test.csproj --no-restore --framework="${NET_TARGET_VERSION}" # # Test From 11c5dac022eef507d17a92d45faf77001fdd0ceb Mon Sep 17 00:00:00 2001 From: James Thompson Date: Mon, 22 Jun 2026 20:11:23 +1000 Subject: [PATCH 09/10] more changes --- .circleci/config.yml | 6 +++--- Scripts/ci-test.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f3670f74..fb94bd02 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -134,8 +134,8 @@ jobs: - 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 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: @@ -146,7 +146,7 @@ jobs: 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: diff --git a/Scripts/ci-test.sh b/Scripts/ci-test.sh index 9849f447..85f0a4e4 100755 --- a/Scripts/ci-test.sh +++ b/Scripts/ci-test.sh @@ -44,7 +44,7 @@ dotnet restore dotnet build Client.Core.Test/Client.Core.Test.csproj --no-restore --framework="${NET_TARGET_VERSION}" dotnet build Client.Test/Client.Test.csproj --no-restore --framework="${NET_TARGET_VERSION}" dotnet build Client.Legacy.Test/Client.Legacy.Test.csproj --no-restore --framework="${NET_TARGET_VERSION}" -dotnet biild Client.Linq.Test/Client.Linq.Test.csproj --no-restore --framework="${NET_TARGET_VERSION}" +dotnet build Client.Linq.Test/Client.Linq.Test.csproj --no-restore --framework="${NET_TARGET_VERSION}" # # Test From 7971ab120676bfd6ab786aea5abd02b54300a8a8 Mon Sep 17 00:00:00 2001 From: James Thompson Date: Mon, 22 Jun 2026 20:31:11 +1000 Subject: [PATCH 10/10] more descope --- .circleci/config.yml | 8 +++++++- Scripts/ci-test.sh | 24 ++++++++++++++++++------ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fb94bd02..416980e7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -133,7 +133,7 @@ jobs: background: true - 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 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" @@ -197,6 +197,11 @@ workflows: jobs: - check-compilation-warnings - check-code-formatting + - tests-dotnet: + 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" @@ -224,6 +229,7 @@ workflows: requires: - check-compilation-warnings - check-code-formatting + - dotnet-3.1-nightly - dotnet-3.1 - dotnet-5.0 - dotnet-6.0 diff --git a/Scripts/ci-test.sh b/Scripts/ci-test.sh index 85f0a4e4..17cdfd8a 100755 --- a/Scripts/ci-test.sh +++ b/Scripts/ci-test.sh @@ -19,12 +19,25 @@ echo "$NET_TEST_VERSION" DEFAULT_NET_TARGET_VERSION="netstandard2.1" NET_TARGET_VERSION="${NET_TARGET_VERSION:-$DEFAULT_NET_TARGET_VERSION}" -TRX2JUNIT_VERSION="2.1.0" +TRX2JUNIT_VERSION="" TEST_PARAMS=() if [[ "$CODE_COVERAGE_REPORT" = true ]] then TEST_PARAMS=(--collect:"XPlat Code Coverage") + TRX2JUNIT_VERSION="1.6.0" +else + TRX2JUNIT_VERSION="1.3.2" +fi + +if [[ "$NET_TEST_VERSION" = "netcoreapp6.0" || "$NET_TEST_VERSION" = "netcoreapp7.0" || "$NET_TEST_VERSION" = "netcoreapp8.0" ]] +then + TRX2JUNIT_VERSION="2.1.0" +fi + +if [[ "$NET_TEST_VERSION" != "netcoreapp8.0" ]] +then + dotnet sln remove Examples/ExampleBlazor/ExampleBlazor.csproj fi # @@ -40,11 +53,10 @@ dotnet tool install --tool-path="./trx2junit/" trx2junit --version ${TRX2JUNIT_V # # Build # -dotnet restore -dotnet build Client.Core.Test/Client.Core.Test.csproj --no-restore --framework="${NET_TARGET_VERSION}" -dotnet build Client.Test/Client.Test.csproj --no-restore --framework="${NET_TARGET_VERSION}" -dotnet build Client.Legacy.Test/Client.Legacy.Test.csproj --no-restore --framework="${NET_TARGET_VERSION}" -dotnet build Client.Linq.Test/Client.Linq.Test.csproj --no-restore --framework="${NET_TARGET_VERSION}" +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