From 1165a164067e39967b45eae20190f71542b2f5fd Mon Sep 17 00:00:00 2001 From: Unai Zorrilla Castro Date: Tue, 4 Jul 2023 14:08:00 +0200 Subject: [PATCH 1/2] Upgrade sdk version and remove circuit breaker from client --- .github/workflows/ci.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/nuget-preview.yml | 2 +- .github/workflows/nuget.yml | 2 +- build/dependencies.props | 2 +- global.json | 2 +- .../DependencyInjection/BaleaApiStoreExtensions.cs | 4 +--- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fde4f07..44a2f53 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: - name: Setup .NET Core SDK 5.0.101 uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.200 + dotnet-version: 7.0.304 - name: dotnet build dotNET 3.1 run: dotnet build Balea.sln -c $BUILD_CONFIG --framework netcoreapp3.1 - name: dotnet build dotNET 5.0 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 3add4b4..38a248b 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -22,7 +22,7 @@ jobs: - name: Setup .NET Core SDK 6.0.200 uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.200 + dotnet-version: 7.0.304 - name: Setup .NET Core SDK 5.0.101 uses: actions/setup-dotnet@v1 with: diff --git a/.github/workflows/nuget-preview.yml b/.github/workflows/nuget-preview.yml index de29c71..81ae6b6 100644 --- a/.github/workflows/nuget-preview.yml +++ b/.github/workflows/nuget-preview.yml @@ -24,7 +24,7 @@ jobs: - name: Setup .NET Core SDK 6.0.200 uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.200 + dotnet-version: 7.0.304 - name: Setup .NET Core SDK 5.0.101 uses: actions/setup-dotnet@v1 with: diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml index c7968fd..1e8b3da 100644 --- a/.github/workflows/nuget.yml +++ b/.github/workflows/nuget.yml @@ -24,7 +24,7 @@ jobs: - name: Setup .NET Core SDK 6.0.200 uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.200 + dotnet-version: 7.0.304 - name: Setup .NET Core SDK 5.0.101 uses: actions/setup-dotnet@v1 with: diff --git a/build/dependencies.props b/build/dependencies.props index 524a9f7..8307140 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -7,7 +7,7 @@ - 7.1.0$(VersionSuffix) + 7.2.0$(VersionSuffix) diff --git a/global.json b/global.json index b9b0214..767fe5b 100644 --- a/global.json +++ b/global.json @@ -5,6 +5,6 @@ "samples" ], "sdk": { - "version": "6.0.200" + "version": "7.0.304" } } \ No newline at end of file diff --git a/src/Balea.Api.Store/DependencyInjection/BaleaApiStoreExtensions.cs b/src/Balea.Api.Store/DependencyInjection/BaleaApiStoreExtensions.cs index a27e92c..cff1cc6 100644 --- a/src/Balea.Api.Store/DependencyInjection/BaleaApiStoreExtensions.cs +++ b/src/Balea.Api.Store/DependencyInjection/BaleaApiStoreExtensions.cs @@ -43,9 +43,7 @@ public static IBaleaBuilder AddApiStore(this IBaleaBuilder builder, Action() - .AddTransientHttpErrorPolicy(p => p.RetryAsync(options.RetryCount)) - .AddTransientHttpErrorPolicy(p => - p.CircuitBreakerAsync(options.HandledEventsAllowedBeforeBreaking, TimeSpan.FromSeconds(options.DurationOfBreak))); + .AddTransientHttpErrorPolicy(p => p.RetryAsync(options.RetryCount)); builder.Services.AddScoped(); From 89893800dba6feff56cab4d97c35ec07078320dc Mon Sep 17 00:00:00 2001 From: Unai Zorrilla Castro Date: Tue, 4 Jul 2023 14:12:24 +0200 Subject: [PATCH 2/2] restore 6.0.200 sdk --- .github/workflows/ci.yml | 2 +- .github/workflows/nightly.yml | 2 +- .github/workflows/nuget-preview.yml | 2 +- .github/workflows/nuget.yml | 2 +- global.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 44a2f53..fde4f07 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: - name: Setup .NET Core SDK 5.0.101 uses: actions/setup-dotnet@v1 with: - dotnet-version: 7.0.304 + dotnet-version: 6.0.200 - name: dotnet build dotNET 3.1 run: dotnet build Balea.sln -c $BUILD_CONFIG --framework netcoreapp3.1 - name: dotnet build dotNET 5.0 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 38a248b..3add4b4 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -22,7 +22,7 @@ jobs: - name: Setup .NET Core SDK 6.0.200 uses: actions/setup-dotnet@v1 with: - dotnet-version: 7.0.304 + dotnet-version: 6.0.200 - name: Setup .NET Core SDK 5.0.101 uses: actions/setup-dotnet@v1 with: diff --git a/.github/workflows/nuget-preview.yml b/.github/workflows/nuget-preview.yml index 81ae6b6..de29c71 100644 --- a/.github/workflows/nuget-preview.yml +++ b/.github/workflows/nuget-preview.yml @@ -24,7 +24,7 @@ jobs: - name: Setup .NET Core SDK 6.0.200 uses: actions/setup-dotnet@v1 with: - dotnet-version: 7.0.304 + dotnet-version: 6.0.200 - name: Setup .NET Core SDK 5.0.101 uses: actions/setup-dotnet@v1 with: diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml index 1e8b3da..c7968fd 100644 --- a/.github/workflows/nuget.yml +++ b/.github/workflows/nuget.yml @@ -24,7 +24,7 @@ jobs: - name: Setup .NET Core SDK 6.0.200 uses: actions/setup-dotnet@v1 with: - dotnet-version: 7.0.304 + dotnet-version: 6.0.200 - name: Setup .NET Core SDK 5.0.101 uses: actions/setup-dotnet@v1 with: diff --git a/global.json b/global.json index 767fe5b..b9b0214 100644 --- a/global.json +++ b/global.json @@ -5,6 +5,6 @@ "samples" ], "sdk": { - "version": "7.0.304" + "version": "6.0.200" } } \ No newline at end of file