From 336e3e5ceb7891010b9f75322937d160a64b1ab8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Apr 2022 08:27:19 +0200 Subject: [PATCH 01/17] chore: Bump trakx/bump-version-action from 8 to 9.0.0 (#22) Bumps [trakx/bump-version-action](https://github.com/trakx/bump-version-action) from 8 to 9.0.0. - [Release notes](https://github.com/trakx/bump-version-action/releases) - [Commits](https://github.com/trakx/bump-version-action/compare/v8...v9.0.0) --- updated-dependencies: - dependency-name: trakx/bump-version-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/publish.nuget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.nuget.yml b/.github/workflows/publish.nuget.yml index 9b9f418..31df87d 100644 --- a/.github/workflows/publish.nuget.yml +++ b/.github/workflows/publish.nuget.yml @@ -43,7 +43,7 @@ jobs: - name: Bump version id: bumpVersion - uses: trakx/bump-version-action@v8 + uses: trakx/bump-version-action@v9.0.0 with: semverIncrementLevel: ${{github.event.inputs.semverIncrementLevel}} releaseBranches: master From 84f82337478f88eff85babcbc61173e2fc8ff5e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Apr 2022 09:07:47 +0100 Subject: [PATCH 02/17] chore: Bump anothrNick/github-tag-action from 1.38.0 to 1.39.0 (#23) Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.38.0 to 1.39.0. - [Release notes](https://github.com/anothrNick/github-tag-action/releases) - [Commits](https://github.com/anothrNick/github-tag-action/compare/1.38.0...1.39.0) --- updated-dependencies: - dependency-name: anothrNick/github-tag-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/publish.nuget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.nuget.yml b/.github/workflows/publish.nuget.yml index 31df87d..119506f 100644 --- a/.github/workflows/publish.nuget.yml +++ b/.github/workflows/publish.nuget.yml @@ -89,7 +89,7 @@ jobs: --source "https://nuget.pkg.github.com/trakx/index.json"; done - name: push version tag - uses: anothrNick/github-tag-action@1.38.0 + uses: anothrNick/github-tag-action@1.39.0 env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} CUSTOM_TAG: v${{steps.bumpVersion.outputs.fullVersion}} From 7b6b97be39cc755fc19daeb4c16a5c8e6cac7246 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Apr 2022 09:08:05 +0100 Subject: [PATCH 03/17] chore: Bump Trakx.Utils.Testing from 0.3.1 to 0.3.11 (#25) Bumps Trakx.Utils.Testing from 0.3.1 to 0.3.11. --- updated-dependencies: - dependency-name: Trakx.Utils.Testing dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: monsieurleberre --- .../Trakx.CryptoCompare.ApiClient.Tests.csproj | 2 +- .../Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj b/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj index 562606c..88328ab 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj @@ -28,7 +28,7 @@ - + all diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj index ebf1016..ebb74bd 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj @@ -17,7 +17,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive From f35efe8074920acaa7f3568504bd64fc02da321e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Apr 2022 09:08:19 +0100 Subject: [PATCH 04/17] chore: Bump Trakx.Utils from 0.3.1 to 0.3.11 (#26) Bumps Trakx.Utils from 0.3.1 to 0.3.11. --- updated-dependencies: - dependency-name: Trakx.Utils dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: monsieurleberre --- .../Trakx.CryptoCompare.ApiClient.Websocket.csproj | 2 +- .../Trakx.CryptoCompare.ApiClient.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj b/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj index cb536fd..70cbfe2 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj b/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj index 7f7776c..5646c41 100644 --- a/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj +++ b/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj @@ -13,7 +13,7 @@ - + From bedf939c3a2c2bf72f30e57b654eaf724ee5c6b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Apr 2022 09:08:46 +0100 Subject: [PATCH 05/17] chore: Bump FluentAssertions from 6.5.1 to 6.6.0 (#24) Bumps [FluentAssertions](https://github.com/fluentassertions/fluentassertions) from 6.5.1 to 6.6.0. - [Release notes](https://github.com/fluentassertions/fluentassertions/releases) - [Changelog](https://github.com/fluentassertions/fluentassertions/blob/develop/AcceptApiChanges.ps1) - [Commits](https://github.com/fluentassertions/fluentassertions/compare/6.5.1...6.6.0) --- updated-dependencies: - dependency-name: FluentAssertions dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: monsieurleberre --- .../Trakx.CryptoCompare.ApiClient.Tests.csproj | 2 +- .../Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj b/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj index 88328ab..b51db20 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj @@ -18,7 +18,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj index ebb74bd..ed159db 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj @@ -9,7 +9,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 07224136ea2a83c3501b844a339f4b3f3c0d06d1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Apr 2022 09:37:13 +0200 Subject: [PATCH 06/17] chore: Bump trakx/bump-version-action from 9.0.0 to 9.0.1 (#27) Bumps [trakx/bump-version-action](https://github.com/trakx/bump-version-action) from 9.0.0 to 9.0.1. - [Release notes](https://github.com/trakx/bump-version-action/releases) - [Commits](https://github.com/trakx/bump-version-action/compare/v9.0.0...v9.0.1) --- updated-dependencies: - dependency-name: trakx/bump-version-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/publish.nuget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.nuget.yml b/.github/workflows/publish.nuget.yml index 119506f..f3c210c 100644 --- a/.github/workflows/publish.nuget.yml +++ b/.github/workflows/publish.nuget.yml @@ -43,7 +43,7 @@ jobs: - name: Bump version id: bumpVersion - uses: trakx/bump-version-action@v9.0.0 + uses: trakx/bump-version-action@v9.0.1 with: semverIncrementLevel: ${{github.event.inputs.semverIncrementLevel}} releaseBranches: master From ececddb5f266a405cc34af7ec878ae1858d68156 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 19 Apr 2022 09:41:06 +0200 Subject: [PATCH 07/17] chore: Bump GitHubActionsTestLogger from 1.3.0 to 1.4.1 (#29) Bumps [GitHubActionsTestLogger](https://github.com/Tyrrrz/GitHubActionsTestLogger) from 1.3.0 to 1.4.1. - [Release notes](https://github.com/Tyrrrz/GitHubActionsTestLogger/releases) - [Changelog](https://github.com/Tyrrrz/GitHubActionsTestLogger/blob/master/Changelog.md) - [Commits](https://github.com/Tyrrrz/GitHubActionsTestLogger/compare/1.3...1.4.1) --- updated-dependencies: - dependency-name: GitHubActionsTestLogger dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../Trakx.CryptoCompare.ApiClient.Tests.csproj | 2 +- .../Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj b/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj index b51db20..e2182dc 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj @@ -19,7 +19,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj index ed159db..18f9ed7 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj @@ -10,7 +10,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive From 3d252d0f22be8a4d61d5d3d10d55e9f9e2676dda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 May 2022 09:42:13 +0100 Subject: [PATCH 08/17] chore: Bump Trakx.Utils from 0.3.11 to 0.3.13 (#36) Bumps Trakx.Utils from 0.3.11 to 0.3.13. --- updated-dependencies: - dependency-name: Trakx.Utils dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .../Trakx.CryptoCompare.ApiClient.Websocket.csproj | 2 +- .../Trakx.CryptoCompare.ApiClient.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj b/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj index 70cbfe2..5920fdb 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj b/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj index 5646c41..6826414 100644 --- a/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj +++ b/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj @@ -13,7 +13,7 @@ - + From 12cac6f4b899bb17aff4985b530d33c50dd0221e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 May 2022 09:42:30 +0100 Subject: [PATCH 09/17] chore: Bump Serilog from 2.10.0 to 2.11.0 (#32) Bumps [Serilog](https://github.com/serilog/serilog) from 2.10.0 to 2.11.0. - [Release notes](https://github.com/serilog/serilog/releases) - [Changelog](https://github.com/serilog/serilog/blob/dev/CHANGES.md) - [Commits](https://github.com/serilog/serilog/compare/v2.10.0...v2.11.0) --- updated-dependencies: - dependency-name: Serilog dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: monsieurleberre --- .../Trakx.CryptoCompare.ApiClient.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj b/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj index 6826414..80a7f10 100644 --- a/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj +++ b/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj @@ -11,7 +11,7 @@ - + From 2d9a062c2334b23c7bed17b7f152104fb1311e5b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 May 2022 09:42:44 +0100 Subject: [PATCH 10/17] chore: Bump Trakx.Utils.Testing from 0.3.11 to 0.3.13 (#35) Bumps Trakx.Utils.Testing from 0.3.11 to 0.3.13. --- updated-dependencies: - dependency-name: Trakx.Utils.Testing dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: monsieurleberre --- .../Trakx.CryptoCompare.ApiClient.Tests.csproj | 2 +- .../Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj b/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj index e2182dc..4cc07a4 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj @@ -28,7 +28,7 @@ - + all diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj index 18f9ed7..e98eeda 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj @@ -17,7 +17,7 @@ - + runtime; build; native; contentfiles; analyzers; buildtransitive From 5ffa517e3e8e0b91d0f1d45bc8671a8d0fe5cfde Mon Sep 17 00:00:00 2001 From: monsieurleberre Date: Sun, 1 May 2022 09:44:24 +0100 Subject: [PATCH 11/17] update bump-version --- .github/workflows/publish.nuget.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/publish.nuget.yml b/.github/workflows/publish.nuget.yml index 9b9f418..7b104ad 100644 --- a/.github/workflows/publish.nuget.yml +++ b/.github/workflows/publish.nuget.yml @@ -43,11 +43,9 @@ jobs: - name: Bump version id: bumpVersion - uses: trakx/bump-version-action@v8 + uses: trakx/bump-version-action/get-tag@v9.1.1 with: semverIncrementLevel: ${{github.event.inputs.semverIncrementLevel}} - releaseBranches: master - githubToken: ${{secrets.GITHUB_TOKEN}} - name: Setup .NET Core uses: actions/setup-dotnet@v2 @@ -88,8 +86,9 @@ jobs: for f in ./nuget/*.symbols.nupkg; do echo "pushing $f file.." && dotnet nuget push $f --api-key ${{secrets.GITHUB_TOKEN}} \ --source "https://nuget.pkg.github.com/trakx/index.json"; done - - name: push version tag - uses: anothrNick/github-tag-action@1.38.0 - env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - CUSTOM_TAG: v${{steps.bumpVersion.outputs.fullVersion}} + - name: Push version tag + id: pushTag + uses: trakx/bump-version-action/push-tag@v9.1.1 + with: + tag: v${{steps.bumpVersion.outputs.fullVersion}} + githubToken: ${{secrets.GITHUB_TOKEN}} From ffd55d442bb56f9b3e5aa24086e90e89635c16ad Mon Sep 17 00:00:00 2001 From: monsieurleberre Date: Tue, 24 May 2022 09:56:14 +0200 Subject: [PATCH 12/17] update packages --- .../Trakx.CryptoCompare.ApiClient.Tests.csproj | 10 +++++----- ...rakx.CryptoCompare.ApiClient.Websocket.Tests.csproj | 10 +++++----- .../Trakx.CryptoCompare.ApiClient.Websocket.csproj | 4 ++-- .../Trakx.CryptoCompare.ApiClient.csproj | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj b/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj index 4cc07a4..db03534 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj @@ -18,19 +18,19 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - + - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj index e98eeda..c72188a 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj @@ -9,17 +9,17 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + - - + + - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj b/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj index 5920fdb..02e1770 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj @@ -8,8 +8,8 @@ - - + + diff --git a/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj b/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj index 80a7f10..648545b 100644 --- a/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj +++ b/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj @@ -13,7 +13,7 @@ - + From 4dc22e8e22a61eb109dfb4cf901d4c73f52a0613 Mon Sep 17 00:00:00 2001 From: Emanuel Gaspar Date: Tue, 28 Mar 2023 17:40:22 +0100 Subject: [PATCH 13/17] refactor: rename from/to symbol to base/quote --- .../Model/Ohlc.cs | 4 ++-- .../Model/Ticker.cs | 4 ++-- .../Model/Trade.cs | 4 ++-- .../Rest/Models/Responses/AggregatedData.cs | 4 ++-- .../CoinFullAggregatedDataDisplay.cs | 4 ++-- .../Rest/Models/Responses/Sub.cs | 22 +++++++++---------- .../Rest/Models/Responses/TopInfo.cs | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ohlc.cs b/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ohlc.cs index 1745c57..0318222 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ohlc.cs +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ohlc.cs @@ -7,8 +7,8 @@ public class Ohlc : InboundMessageBase { #nullable disable [JsonPropertyName("MARKET")] public string Market { get; set; } - [JsonPropertyName("FROMSYMBOL")] public string FromSymbol { get; set; } - [JsonPropertyName("TOSYMBOL")] public string ToSymbol { get; set; } + [JsonPropertyName("FROMSYMBOL")] public string BaseSymbol { get; set; } + [JsonPropertyName("TOSYMBOL")] public string QuoteSymbol { get; set; } [JsonPropertyName("TS"), JsonConverter(typeof(ULongOrStringConverter))] public ulong TimeStamp { get; set; } [JsonPropertyName("UNIT")] public string Unit { get; set; } [JsonPropertyName("ACTION")] public string Action { get; set; } diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ticker.cs b/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ticker.cs index d6d43c8..c0dd0b1 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ticker.cs +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ticker.cs @@ -7,8 +7,8 @@ public class Ticker : InboundMessageBase { #nullable disable [JsonPropertyName("MARKET")] public string Market { get; set; } - [JsonPropertyName("FROMSYMBOL")] public string FromSymbol { get; set; } - [JsonPropertyName("TOSYMBOL")] public string ToSymbol { get; set; } + [JsonPropertyName("FROMSYMBOL")] public string BaseSymbol { get; set; } + [JsonPropertyName("TOSYMBOL")] public string QuoteSymbol { get; set; } [JsonPropertyName("FLAGS"), JsonConverter(typeof(ULongOrStringConverter))] public ulong Flags { get; set; } diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Trade.cs b/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Trade.cs index 111483d..5ba3736 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Trade.cs +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Trade.cs @@ -7,8 +7,8 @@ public class Trade : InboundMessageBase { #nullable disable [JsonPropertyName("M")] public string Market { get; set; } - [JsonPropertyName("FSYM")] public string FromSymbol { get; set; } - [JsonPropertyName("TSYM")] public string ToSymbol { get; set; } + [JsonPropertyName("FSYM")] public string BaseSymbol { get; set; } + [JsonPropertyName("TSYM")] public string QuoteSymbol { get; set; } [JsonPropertyName("F"), JsonConverter(typeof(ULongOrStringConverter))] public ulong Flags { get; set; } [JsonPropertyName("ID")] public string Id { get; set; } [JsonPropertyName("TS"), JsonConverter(typeof(ULongOrStringConverter))] public ulong TimeStamp { get; set; } diff --git a/src/Trakx.CryptoCompare.ApiClient/Rest/Models/Responses/AggregatedData.cs b/src/Trakx.CryptoCompare.ApiClient/Rest/Models/Responses/AggregatedData.cs index 58fbde7..8f30f6e 100644 --- a/src/Trakx.CryptoCompare.ApiClient/Rest/Models/Responses/AggregatedData.cs +++ b/src/Trakx.CryptoCompare.ApiClient/Rest/Models/Responses/AggregatedData.cs @@ -10,7 +10,7 @@ public class AggregatedData public string Flags { get; set; } [JsonProperty("FROMSYMBOL")] - public string FromSymbol { get; set; } + public string BaseSymbol { get; set; } [JsonProperty("HIGH24HOUR")] public double? High24Hour { get; set; } @@ -41,7 +41,7 @@ public class AggregatedData public double? Price { get; set; } [JsonProperty("TOSYMBOL")] - public string ToSymbol { get; set; } + public string QuoteSymbol { get; set; } [JsonProperty("TYPE")] public string Type { get; set; } diff --git a/src/Trakx.CryptoCompare.ApiClient/Rest/Models/Responses/CoinFullAggregatedDataDisplay.cs b/src/Trakx.CryptoCompare.ApiClient/Rest/Models/Responses/CoinFullAggregatedDataDisplay.cs index 96a6deb..cd046e4 100644 --- a/src/Trakx.CryptoCompare.ApiClient/Rest/Models/Responses/CoinFullAggregatedDataDisplay.cs +++ b/src/Trakx.CryptoCompare.ApiClient/Rest/Models/Responses/CoinFullAggregatedDataDisplay.cs @@ -18,7 +18,7 @@ public class CoinFullAggregatedDataDisplay public string ChangePCTDay { get; set; } [JsonProperty("FROMSYMBOL")] - public string FromSymbol { get; set; } + public string BaseSymbol { get; set; } [JsonProperty("HIGH24HOUR")] public string High24Hour { get; set; } @@ -66,7 +66,7 @@ public class CoinFullAggregatedDataDisplay public string Supply { get; set; } [JsonProperty("TOSYMBOL")] - public string ToSymbol { get; set; } + public string QuoteSymbol { get; set; } [JsonProperty("TOTALVOLUME24H")] public string TotalVolume24H { get; set; } diff --git a/src/Trakx.CryptoCompare.ApiClient/Rest/Models/Responses/Sub.cs b/src/Trakx.CryptoCompare.ApiClient/Rest/Models/Responses/Sub.cs index b5957c1..88c95de 100644 --- a/src/Trakx.CryptoCompare.ApiClient/Rest/Models/Responses/Sub.cs +++ b/src/Trakx.CryptoCompare.ApiClient/Rest/Models/Responses/Sub.cs @@ -4,12 +4,12 @@ namespace Trakx.CryptoCompare.ApiClient.Rest.Models.Responses { - public struct Sub : IEquatable + public readonly struct Sub : IEquatable { public bool Equals(Sub other) => string.Equals(this.Exchange, other.Exchange) - && string.Equals(this.FromSymbol, other.FromSymbol) - && this.SubId == other.SubId - && string.Equals(this.ToSymbol, other.ToSymbol); + && string.Equals(this.BaseSymbol, other.BaseSymbol) + && this.SubId == other.SubId + && string.Equals(this.QuoteSymbol, other.QuoteSymbol); public override bool Equals(object obj) { @@ -25,9 +25,9 @@ public override int GetHashCode() unchecked { var hashCode = this.Exchange.GetHashCode(); - hashCode = (hashCode * 397) ^ this.FromSymbol.GetHashCode(); + hashCode = (hashCode * 397) ^ this.BaseSymbol.GetHashCode(); hashCode = (hashCode * 397) ^ (int)this.SubId; - hashCode = (hashCode * 397) ^ this.ToSymbol.GetHashCode(); + hashCode = (hashCode * 397) ^ this.QuoteSymbol.GetHashCode(); return hashCode; } } @@ -38,22 +38,22 @@ public Sub([NotNull] string exchange, [NotNull] string fromSymbol, SubId subId, Check.NotNullOrWhiteSpace(fromSymbol, nameof(fromSymbol)); Check.NotNullOrWhiteSpace(toSymbol, nameof(toSymbol)); this.Exchange = exchange; - this.FromSymbol = fromSymbol; + this.BaseSymbol = fromSymbol; this.SubId = subId; - this.ToSymbol = toSymbol; + this.QuoteSymbol = toSymbol; } public string Exchange { get; } - public string FromSymbol { get; } + public string BaseSymbol { get; } public SubId SubId { get; } - public string ToSymbol { get; } + public string QuoteSymbol { get; } public override string ToString() { - return $"{this.SubId:D}~{this.Exchange}~{this.FromSymbol}~{this.ToSymbol}"; + return $"{this.SubId:D}~{this.Exchange}~{this.BaseSymbol}~{this.QuoteSymbol}"; } } } diff --git a/src/Trakx.CryptoCompare.ApiClient/Rest/Models/Responses/TopInfo.cs b/src/Trakx.CryptoCompare.ApiClient/Rest/Models/Responses/TopInfo.cs index 9927332..a8034cd 100644 --- a/src/Trakx.CryptoCompare.ApiClient/Rest/Models/Responses/TopInfo.cs +++ b/src/Trakx.CryptoCompare.ApiClient/Rest/Models/Responses/TopInfo.cs @@ -5,9 +5,9 @@ public class TopInfo #nullable disable public string Exchange { get; set; } - public string FromSymbol { get; set; } + public string BaseSymbol { get; set; } - public string ToSymbol { get; set; } + public string QuoteSymbol { get; set; } public decimal Volume24H { get; set; } From 5c41e79e55d511674de00e0f18edcff619a6340a Mon Sep 17 00:00:00 2001 From: TiagoFroisPereira Date: Thu, 20 Apr 2023 11:06:29 +0100 Subject: [PATCH 14/17] Update to .Net 7 Update pipeline to support .net7 --- .github/workflows/dotnet-core.yml | 2 +- .github/workflows/publish.nuget.yml | 2 +- .../Integration/ReadmeDocumentationUpdater.cs | 2 +- .../Clients/CryptoCompareClientTestsBase.cs | 4 +- .../Core/ThrottledHttpClientHandlerTests.cs | 5 +- ...Trakx.CryptoCompare.ApiClient.Tests.csproj | 70 +++++++++---------- .../CryptoCompareWebsocketHandlerTests.cs | 6 +- ...toCompare.ApiClient.Websocket.Tests.csproj | 39 ++++++----- .../Model/Ohlc.cs | 2 +- .../Model/Ticker.cs | 2 +- .../Model/Trade.cs | 2 +- ...x.CryptoCompare.ApiClient.Websocket.csproj | 4 +- .../CryptoCompareApiConfiguration.cs | 2 +- .../Trakx.CryptoCompare.ApiClient.csproj | 6 +- 14 files changed, 73 insertions(+), 75 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 5847918..bc2f09c 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -21,7 +21,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v2 with: - dotnet-version: 6.0.x + dotnet-version: 7.0.x - name: Add github nuget source run: dotnet nuget add source "https://nuget.pkg.github.com/trakx/index.json" --name "github" --username "trakx-bot" --password ${{secrets.TRAKX_BOT_READONLY_PAT}} --store-password-in-clear-text diff --git a/.github/workflows/publish.nuget.yml b/.github/workflows/publish.nuget.yml index 7b104ad..e2e9c51 100644 --- a/.github/workflows/publish.nuget.yml +++ b/.github/workflows/publish.nuget.yml @@ -50,7 +50,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v2 with: - dotnet-version: 6.0.x + dotnet-version: 7.0.x - name: Add github nuget source run: dotnet nuget add source "https://nuget.pkg.github.com/trakx/index.json" --name "github" --username "trakx-bot" --password ${{secrets.TRAKX_BOT_READONLY_PAT}} --store-password-in-clear-text diff --git a/src/Trakx.CryptoCompare.ApiClient.Tests/Integration/ReadmeDocumentationUpdater.cs b/src/Trakx.CryptoCompare.ApiClient.Tests/Integration/ReadmeDocumentationUpdater.cs index fc726e8..1af7e10 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Tests/Integration/ReadmeDocumentationUpdater.cs +++ b/src/Trakx.CryptoCompare.ApiClient.Tests/Integration/ReadmeDocumentationUpdater.cs @@ -1,4 +1,4 @@ -using Trakx.Utils.Testing.ReadmeUpdater; +using Trakx.Common.Testing.Documentation.ReadmeUpdater; using Xunit.Abstractions; namespace Trakx.CryptoCompare.ApiClient.Tests.Integration diff --git a/src/Trakx.CryptoCompare.ApiClient.Tests/Integration/Rest/Clients/CryptoCompareClientTestsBase.cs b/src/Trakx.CryptoCompare.ApiClient.Tests/Integration/Rest/Clients/CryptoCompareClientTestsBase.cs index 098efad..e7f5593 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Tests/Integration/Rest/Clients/CryptoCompareClientTestsBase.cs +++ b/src/Trakx.CryptoCompare.ApiClient.Tests/Integration/Rest/Clients/CryptoCompareClientTestsBase.cs @@ -1,7 +1,7 @@ using System; using Microsoft.Extensions.DependencyInjection; +using Trakx.Common.Testing.Configuration; using Trakx.CryptoCompare.ApiClient.Rest; -using Trakx.Utils.Testing; using Xunit; namespace Trakx.CryptoCompare.ApiClient.Tests.Integration.Rest.Clients @@ -29,7 +29,7 @@ public class CryptoCompareApiFixture : IDisposable public ICryptoCompareClient CryptoCompareClient { get; } public CryptoCompareApiFixture() { - var configuration = ConfigurationHelper.GetConfigurationFromEnv(); + var configuration = AwsConfigurationHelper.GetConfigurationFromAws(); var services = new ServiceCollection(); services.AddCryptoCompareClient(configuration); var provider = services.BuildServiceProvider(); diff --git a/src/Trakx.CryptoCompare.ApiClient.Tests/Integration/Rest/Core/ThrottledHttpClientHandlerTests.cs b/src/Trakx.CryptoCompare.ApiClient.Tests/Integration/Rest/Core/ThrottledHttpClientHandlerTests.cs index 2ae2bea..17336aa 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Tests/Integration/Rest/Core/ThrottledHttpClientHandlerTests.cs +++ b/src/Trakx.CryptoCompare.ApiClient.Tests/Integration/Rest/Core/ThrottledHttpClientHandlerTests.cs @@ -1,9 +1,8 @@ using System.Diagnostics; using System.Linq; using System.Threading.Tasks; -using Microsoft.Extensions.Options; +using Trakx.Common.Testing.Configuration; using Trakx.CryptoCompare.ApiClient.Rest; -using Trakx.Utils.Testing; using Xunit; namespace Trakx.CryptoCompare.ApiClient.Tests.Integration.Rest.Core @@ -16,7 +15,7 @@ public async Task WaitsBetweenQueries() var throttleDelayMs = 200; var queriesCount = 5; - var configuration = ConfigurationHelper.GetConfigurationFromEnv() + var configuration = EnvConfigurationHelper.GetConfigurationFromEnv() with { ThrottleDelayMs = throttleDelayMs }; diff --git a/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj b/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj index db03534..6b2aa56 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj @@ -1,43 +1,41 @@  - - net6.0 + + net7.0 - false - + false + - + - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + - - - + + + - + \ No newline at end of file diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Integration/CryptoCompareWebsocketHandlerTests.cs b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Integration/CryptoCompareWebsocketHandlerTests.cs index d7e98c9..41e5a4a 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Integration/CryptoCompareWebsocketHandlerTests.cs +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Integration/CryptoCompareWebsocketHandlerTests.cs @@ -5,11 +5,9 @@ using System.Reactive.Linq; using System.Reactive.Threading.Tasks; using System.Threading.Tasks; +using Trakx.Common.Testing.Configuration; using Trakx.CryptoCompare.ApiClient.Websocket.Extensions; using Trakx.CryptoCompare.ApiClient.Websocket.Model; -using Trakx.Utils.Testing; -using Trakx.Websocket; -using Trakx.Websocket.Interfaces; using Trakx.Websocket.Model; using Xunit; @@ -34,7 +32,7 @@ public IServiceProvider CreateServiceProvider() BufferSize = 4096, MaxSubscriptionsPerScope = 100 }; - var configuration = ConfigurationHelper.GetConfigurationFromEnv() + var configuration = EnvConfigurationHelper.GetConfigurationFromEnv() with { WebSocketBaseUrl = "wss://streamer.cryptocompare.com/v2?api_key=", }; serviceCollection.AddCryptoCompareWebsockets(configuration, websocketConfiguration); diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj index c72188a..f9fec8e 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj @@ -1,7 +1,7 @@ - net6.0 + net7.0 false @@ -9,24 +9,27 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ohlc.cs b/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ohlc.cs index 0318222..8d94a17 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ohlc.cs +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ohlc.cs @@ -1,5 +1,5 @@ using System.Text.Json.Serialization; -using Trakx.Utils.Serialization.Converters; +using Trakx.Common.Serialization.Converters; namespace Trakx.CryptoCompare.ApiClient.Websocket.Model; diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ticker.cs b/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ticker.cs index c0dd0b1..dec6b3f 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ticker.cs +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Ticker.cs @@ -1,5 +1,5 @@ using System.Text.Json.Serialization; -using Trakx.Utils.Serialization.Converters; +using Trakx.Common.Serialization.Converters; namespace Trakx.CryptoCompare.ApiClient.Websocket.Model; diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Trade.cs b/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Trade.cs index 5ba3736..28963a2 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Trade.cs +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket/Model/Trade.cs @@ -1,5 +1,5 @@ using System.Text.Json.Serialization; -using Trakx.Utils.Serialization.Converters; +using Trakx.Common.Serialization.Converters; namespace Trakx.CryptoCompare.ApiClient.Websocket.Model; diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj b/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj index 02e1770..560d321 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj @@ -1,14 +1,14 @@  - net6.0 + net7.0 - + diff --git a/src/Trakx.CryptoCompare.ApiClient/CryptoCompareApiConfiguration.cs b/src/Trakx.CryptoCompare.ApiClient/CryptoCompareApiConfiguration.cs index 0bb23eb..daf9ce4 100644 --- a/src/Trakx.CryptoCompare.ApiClient/CryptoCompareApiConfiguration.cs +++ b/src/Trakx.CryptoCompare.ApiClient/CryptoCompareApiConfiguration.cs @@ -1,6 +1,6 @@ using System; using System.Text.Json.Serialization; -using Trakx.Utils.Attributes; +using Trakx.Common.Attributes; namespace Trakx.CryptoCompare.ApiClient { diff --git a/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj b/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj index 648545b..23f2ebf 100644 --- a/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj +++ b/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj @@ -1,19 +1,19 @@  - net6.0 + net7.0 - + - + From 0c8044b1aedf7b3595cc19785ebfc11eb038d412 Mon Sep 17 00:00:00 2001 From: TiagoFroisPereira Date: Thu, 20 Apr 2023 11:35:53 +0100 Subject: [PATCH 15/17] PUMP Trakx.WebSocket to latest version --- .../Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj | 2 +- .../Trakx.CryptoCompare.ApiClient.Websocket.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj index f9fec8e..affbc88 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Trakx.CryptoCompare.ApiClient.Websocket.Tests.csproj @@ -9,7 +9,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj b/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj index 560d321..181f1ba 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket/Trakx.CryptoCompare.ApiClient.Websocket.csproj @@ -9,7 +9,7 @@ - + From dae6f8fed9d6c96f39ab08976a8b41f4543666a9 Mon Sep 17 00:00:00 2001 From: TiagoFroisPereira Date: Thu, 20 Apr 2023 12:16:49 +0100 Subject: [PATCH 16/17] Fix unit test --- README.md | 11 ++++++----- .../Rest/Clients/CryptoCompareClientTestsBase.cs | 2 +- .../Trakx.CryptoCompare.ApiClient.Tests.csproj | 3 +-- .../Integration/CryptoCompareWebsocketHandlerTests.cs | 3 ++- .../ServiceConfiguration.cs | 1 - .../Trakx.CryptoCompare.ApiClient.csproj | 2 -- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 1f1f28a..c06e58e 100644 --- a/README.md +++ b/README.md @@ -47,11 +47,6 @@ In order to be able to run some integration tests, you should create a `.env` fi CryptoCompareApiConfiguration__ApiKey=******** ``` -## AWS Parameters -In order to be able to run some integration tests you should ensure that you have access to the following AWS parameters : -```awsParams -/Trakx/CryptoCompare/ApiClient/CryptoCompareApiConfiguration/ApiKey -``` ## Basic usage ````csharp @@ -80,3 +75,9 @@ Console.WriteLine(eth.Data.General.Name); [![FOSSA Status](https://app.fossa.io/api/projects/git%2Bgithub.com%2Fjoancaron%2Fcryptocompare-api.svg?type=large)](https://app.fossa.io/projects/git%2Bgithub.com%2Fjoancaron%2Fcryptocompare-api?ref=badge_large) + +## AWS Parameters +In order to be able to run some integration tests, you should ensure that you have access to the AWS parameters starting in `/CiCd`. In order for the applications in this solution to run correctly on AWS, please ensure that variables starting in `/[environment]` are defined for all 3 environments \( _Production_, _Staging_, _Development_ \) : +```awsParams +/[environment]/Trakx/CryptoCompare/ApiClient/CryptoCompareApiConfiguration/ApiKey +``` \ No newline at end of file diff --git a/src/Trakx.CryptoCompare.ApiClient.Tests/Integration/Rest/Clients/CryptoCompareClientTestsBase.cs b/src/Trakx.CryptoCompare.ApiClient.Tests/Integration/Rest/Clients/CryptoCompareClientTestsBase.cs index e7f5593..a4cd66f 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Tests/Integration/Rest/Clients/CryptoCompareClientTestsBase.cs +++ b/src/Trakx.CryptoCompare.ApiClient.Tests/Integration/Rest/Clients/CryptoCompareClientTestsBase.cs @@ -29,7 +29,7 @@ public class CryptoCompareApiFixture : IDisposable public ICryptoCompareClient CryptoCompareClient { get; } public CryptoCompareApiFixture() { - var configuration = AwsConfigurationHelper.GetConfigurationFromAws(); + var configuration = EnvConfigurationHelper.GetConfigurationFromEnv(); var services = new ServiceCollection(); services.AddCryptoCompareClient(configuration); var provider = services.BuildServiceProvider(); diff --git a/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj b/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj index 6b2aa56..df69253 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj +++ b/src/Trakx.CryptoCompare.ApiClient.Tests/Trakx.CryptoCompare.ApiClient.Tests.csproj @@ -1,8 +1,7 @@  - net7.0 - + net7.0 false diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Integration/CryptoCompareWebsocketHandlerTests.cs b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Integration/CryptoCompareWebsocketHandlerTests.cs index 41e5a4a..40ab0ee 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Integration/CryptoCompareWebsocketHandlerTests.cs +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Integration/CryptoCompareWebsocketHandlerTests.cs @@ -1,6 +1,7 @@ using FluentAssertions; using Microsoft.Extensions.DependencyInjection; using System; +using System.Globalization; using System.Linq; using System.Reactive.Linq; using System.Reactive.Threading.Tasks; @@ -66,7 +67,7 @@ public async Task Should_be_able_to_get_full_top_tier_volume_subscriptions() var result = await GetResult(CryptoCompareSubscriptionFactory.GetFullTopTierVolumeSubscriptionStr("btc")) .ConfigureAwait(false); result!.Symbol.Should().Be("BTC"); - decimal.Parse(result.Volume).Should().BeGreaterThan(0); + decimal.Parse(result.Volume,CultureInfo.InvariantCulture).Should().BeGreaterThan(0); } [Fact] diff --git a/src/Trakx.CryptoCompare.ApiClient/ServiceConfiguration.cs b/src/Trakx.CryptoCompare.ApiClient/ServiceConfiguration.cs index faf90a7..c08033e 100644 --- a/src/Trakx.CryptoCompare.ApiClient/ServiceConfiguration.cs +++ b/src/Trakx.CryptoCompare.ApiClient/ServiceConfiguration.cs @@ -1,6 +1,5 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Options; using Trakx.CryptoCompare.ApiClient.Rest; namespace Trakx.CryptoCompare.ApiClient diff --git a/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj b/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj index 23f2ebf..867983d 100644 --- a/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj +++ b/src/Trakx.CryptoCompare.ApiClient/Trakx.CryptoCompare.ApiClient.csproj @@ -11,8 +11,6 @@ - - From 5d48f8b8297a88a624618b320a8c9254bd9b27c9 Mon Sep 17 00:00:00 2001 From: Tiago Pereira Date: Thu, 20 Apr 2023 12:32:24 +0100 Subject: [PATCH 17/17] Update src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Integration/CryptoCompareWebsocketHandlerTests.cs Co-authored-by: Emanuel Gaspar --- .../Integration/CryptoCompareWebsocketHandlerTests.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Integration/CryptoCompareWebsocketHandlerTests.cs b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Integration/CryptoCompareWebsocketHandlerTests.cs index 40ab0ee..b08a544 100644 --- a/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Integration/CryptoCompareWebsocketHandlerTests.cs +++ b/src/Trakx.CryptoCompare.ApiClient.Websocket.Tests/Integration/CryptoCompareWebsocketHandlerTests.cs @@ -67,7 +67,8 @@ public async Task Should_be_able_to_get_full_top_tier_volume_subscriptions() var result = await GetResult(CryptoCompareSubscriptionFactory.GetFullTopTierVolumeSubscriptionStr("btc")) .ConfigureAwait(false); result!.Symbol.Should().Be("BTC"); - decimal.Parse(result.Volume,CultureInfo.InvariantCulture).Should().BeGreaterThan(0); + decimal.TryParse(result.Volume, CultureInfo.InvariantCulture, out decimal volume); + volume.Should().BeGreaterThan(0); } [Fact]