From 7226be807526dc6a18992826e4c9301c33cc8f2e Mon Sep 17 00:00:00 2001 From: Cristi Pufu Date: Sat, 3 Dec 2022 19:34:56 +0200 Subject: [PATCH] Fix build, remove end-of-support target frameworks --- .../AspNetCoreRateLimit.Redis.csproj | 77 ++++++------- .../RedisProcessingStrategy.cs | 3 +- .../AspNetCoreRateLimit.csproj | 107 +++++++----------- .../AspNetCoreRateLimit.Demo.csproj | 31 ++--- test/AspNetCoreRateLimit.Demo/Startup.cs | 3 +- .../AspNetCoreRateLimit.Tests.csproj | 4 +- 6 files changed, 95 insertions(+), 130 deletions(-) diff --git a/src/AspNetCoreRateLimit.Redis/AspNetCoreRateLimit.Redis.csproj b/src/AspNetCoreRateLimit.Redis/AspNetCoreRateLimit.Redis.csproj index f6af3c2b..63f1f449 100644 --- a/src/AspNetCoreRateLimit.Redis/AspNetCoreRateLimit.Redis.csproj +++ b/src/AspNetCoreRateLimit.Redis/AspNetCoreRateLimit.Redis.csproj @@ -1,44 +1,41 @@  - - - netcoreapp3.1;netstandard2.0;net5.0;net6.0; - StackExchange Redis support for ASP.NET Core rate limiting middleware - Nick Cromwell, Cristi Pufu - AspNetCoreRateLimit.Redis - AspNetCoreRateLimit.Redis - aspnetcore;rate-limit;throttle;redis - https://github.com/stefanprodan/AspNetCoreRateLimit - http://opensource.org/licenses/MIT - git - https://github.com/stefanprodan/AspNetCoreRateLimit - 9 - 1.0.1 - true - ../../sgKey.snk - false - true - true - embedded - - - - - - - - - - - - - - - - + + net6.0 + StackExchange Redis support for ASP.NET Core rate limiting middleware + Nick Cromwell, Cristi Pufu + AspNetCoreRateLimit.Redis + AspNetCoreRateLimit.Redis + aspnetcore;rate-limit;throttle;redis + https://github.com/stefanprodan/AspNetCoreRateLimit + http://opensource.org/licenses/MIT + git + https://github.com/stefanprodan/AspNetCoreRateLimit + 2.0.0 + true + ../../sgKey.snk + false + true + true + embedded + + + + + + + + + + + + + + + + + + true + - - true - - \ No newline at end of file diff --git a/src/AspNetCoreRateLimit.Redis/RedisProcessingStrategy.cs b/src/AspNetCoreRateLimit.Redis/RedisProcessingStrategy.cs index ff97be59..8481be42 100644 --- a/src/AspNetCoreRateLimit.Redis/RedisProcessingStrategy.cs +++ b/src/AspNetCoreRateLimit.Redis/RedisProcessingStrategy.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.Logging; +using AspNetCoreRateLimit; +using Microsoft.Extensions.Logging; using StackExchange.Redis; using System; using System.Threading; diff --git a/src/AspNetCoreRateLimit/AspNetCoreRateLimit.csproj b/src/AspNetCoreRateLimit/AspNetCoreRateLimit.csproj index 7fc138ca..1e4b7cda 100644 --- a/src/AspNetCoreRateLimit/AspNetCoreRateLimit.csproj +++ b/src/AspNetCoreRateLimit/AspNetCoreRateLimit.csproj @@ -1,73 +1,42 @@  - - netcoreapp3.1;netstandard2.0;net5.0;net6.0 - ASP.NET Core rate limiting middleware - Stefan Prodan, Cristi Pufu - AspNetCoreRateLimit - AspNetCoreRateLimit - aspnetcore;rate-limit;throttle - https://github.com/stefanprodan/AspNetCoreRateLimit - http://opensource.org/licenses/MIT - git - https://github.com/stefanprodan/AspNetCoreRateLimit - 9 - 4.0.2 - true - ../../sgKey.snk - false - true - true - embedded - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - + + net6.0 + ASP.NET Core rate limiting middleware + Stefan Prodan, Cristi Pufu + AspNetCoreRateLimit + AspNetCoreRateLimit + aspnetcore;rate-limit;throttle + https://github.com/stefanprodan/AspNetCoreRateLimit + http://opensource.org/licenses/MIT + git + https://github.com/stefanprodan/AspNetCoreRateLimit + 5.0.0 + true + ../../sgKey.snk + false + true + true + embedded + + + + + + + + + + + + + + + + + + + true + diff --git a/test/AspNetCoreRateLimit.Demo/AspNetCoreRateLimit.Demo.csproj b/test/AspNetCoreRateLimit.Demo/AspNetCoreRateLimit.Demo.csproj index bad77ba5..c848be96 100644 --- a/test/AspNetCoreRateLimit.Demo/AspNetCoreRateLimit.Demo.csproj +++ b/test/AspNetCoreRateLimit.Demo/AspNetCoreRateLimit.Demo.csproj @@ -1,20 +1,21 @@ - + - - net6.0 - true - true - 9 - + + net6.0 + - - - - + + + - - - - + + + + + + + + + diff --git a/test/AspNetCoreRateLimit.Demo/Startup.cs b/test/AspNetCoreRateLimit.Demo/Startup.cs index d91376a2..8a47735e 100644 --- a/test/AspNetCoreRateLimit.Demo/Startup.cs +++ b/test/AspNetCoreRateLimit.Demo/Startup.cs @@ -1,4 +1,3 @@ -using AspNetCoreRateLimit.Redis; using Ben.Diagnostics; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; @@ -39,7 +38,7 @@ public void ConfigureServices(IServiceCollection services) { options.EnableEndpointRouting = false; - }).AddNewtonsoftJson(); + }); // configure the resolvers diff --git a/test/AspNetCoreRateLimit.Tests/AspNetCoreRateLimit.Tests.csproj b/test/AspNetCoreRateLimit.Tests/AspNetCoreRateLimit.Tests.csproj index 6ea4a6b6..5ff52d8c 100644 --- a/test/AspNetCoreRateLimit.Tests/AspNetCoreRateLimit.Tests.csproj +++ b/test/AspNetCoreRateLimit.Tests/AspNetCoreRateLimit.Tests.csproj @@ -5,7 +5,6 @@ net6.0 true true - 9.0 @@ -14,8 +13,7 @@ - - +