From 0e5879297e4d6c908e3efc3a4e0443f80dbaef78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Jul 2022 12:09:50 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/runtime build 20220726.8 Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.DirectoryServices.Protocols , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Reflection.Metadata , System.Resources.Extensions , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting From Version 7.0.0-rc.1.22375.7 -> To Version 7.0.0-rc.1.22376.8 --- eng/Version.Details.xml | 244 ++++++++++++++++++++-------------------- eng/Versions.props | 122 ++++++++++---------- 2 files changed, 183 insertions(+), 183 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8d6e2c8b1a5..4a1aa81f5698 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,261 +41,261 @@ https://github.com/dotnet/efcore 129baccb9e136831b8a79be916460ca5fef9dcba - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab https://github.com/dotnet/source-build-externals 3a88d1dbd4557702aa2cb89d5f8bf927bb263a3b - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab - + https://github.com/dotnet/runtime - a660c0f7fb011225f84496d3c4b9d12f15c101e1 + 2c31641b96d880dfb74d46fe63a91c8b35737cab https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index fdb5b8d0550f..4dc0e706d3fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,68 +65,68 @@ --> - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 - 7.0.0-rc.1.22375.7 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 + 7.0.0-rc.1.22376.8 - 7.0.0-rc.1.22375.7 + 7.0.0-rc.1.22376.8 7.0.0-rc.1.22376.4 7.0.0-rc.1.22376.4 From 5e6b3b9786a58701c2f27ac0c1b1f075e7eed507 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 27 Jul 2022 13:49:12 -0700 Subject: [PATCH 2/6] Update BasePolicy.cs --- .../ConcurrencyLimiter/src/QueuePolicies/BasePolicy.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Middleware/ConcurrencyLimiter/src/QueuePolicies/BasePolicy.cs b/src/Middleware/ConcurrencyLimiter/src/QueuePolicies/BasePolicy.cs index 6ef1f4390795..6f0fb50d0f6a 100644 --- a/src/Middleware/ConcurrencyLimiter/src/QueuePolicies/BasePolicy.cs +++ b/src/Middleware/ConcurrencyLimiter/src/QueuePolicies/BasePolicy.cs @@ -32,7 +32,12 @@ public BasePolicy(IOptions options, QueueProcessingOrder ord throw new ArgumentException("The RequestQueueLimit cannot be a negative number.", nameof(options)); } - _limiter = new Limiter(new LimiterOptions(permitLimit: maxConcurrentRequests, order, queueLimit: requestQueueLimit)); + _limiter = new Limiter(new LimiterOptions + { + PermitLimit = maxConcurrentRequests, + QueueProcessingOrder = order, + QueueLimit = requestQueueLimit + }); } public ValueTask TryEnterAsync() From 207bd1fe5d468759659dcd6343cd1b599a3ae95e Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 27 Jul 2022 14:28:51 -0700 Subject: [PATCH 3/6] Fixup --- .../RateLimiting/test/RateLimitingMiddlewareTests.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/Middleware/RateLimiting/test/RateLimitingMiddlewareTests.cs b/src/Middleware/RateLimiting/test/RateLimitingMiddlewareTests.cs index ff090f2f57d1..be45b5190bd4 100644 --- a/src/Middleware/RateLimiting/test/RateLimitingMiddlewareTests.cs +++ b/src/Middleware/RateLimiting/test/RateLimitingMiddlewareTests.cs @@ -193,7 +193,14 @@ public async Task EndpointLimiterConvenienceMethod_Rejects() var onRejectedInvoked = false; var options = CreateOptionsAccessor(); var name = "myEndpoint"; - options.Value.AddFixedWindowLimiter(name, new FixedWindowRateLimiterOptions(1, QueueProcessingOrder.OldestFirst, 0, TimeSpan.Zero, autoReplenishment: false)); + options.Value.AddFixedWindowLimiter(name, new FixedWindowRateLimiterOptions + { + PermitLimit = -1, + QueueProcessingOrder = QueueProcessingOrder.OldestFirst, + QueueLimit = 0, + Window = TimeSpan.Zero, + AutoReplenishment = false + }); options.Value.OnRejected = (context, token) => { onRejectedInvoked = true; From 86a0ebf1ef3d7720c21ddd90cb3ec9e20105131e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Jul 2022 21:58:24 +0000 Subject: [PATCH 4/6] Update dependencies from https://github.com/dotnet/efcore build 20220727.1 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 7.0.0-rc.1.22376.4 -> To Version 7.0.0-rc.1.22377.1 --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a1aa81f5698..6ecd7334e2e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://github.com/dotnet/efcore - 129baccb9e136831b8a79be916460ca5fef9dcba + 25f650095916b0863027444a7409cf1ed9e03664 - + https://github.com/dotnet/efcore - 129baccb9e136831b8a79be916460ca5fef9dcba + 25f650095916b0863027444a7409cf1ed9e03664 - + https://github.com/dotnet/efcore - 129baccb9e136831b8a79be916460ca5fef9dcba + 25f650095916b0863027444a7409cf1ed9e03664 - + https://github.com/dotnet/efcore - 129baccb9e136831b8a79be916460ca5fef9dcba + 25f650095916b0863027444a7409cf1ed9e03664 - + https://github.com/dotnet/efcore - 129baccb9e136831b8a79be916460ca5fef9dcba + 25f650095916b0863027444a7409cf1ed9e03664 - + https://github.com/dotnet/efcore - 129baccb9e136831b8a79be916460ca5fef9dcba + 25f650095916b0863027444a7409cf1ed9e03664 - + https://github.com/dotnet/efcore - 129baccb9e136831b8a79be916460ca5fef9dcba + 25f650095916b0863027444a7409cf1ed9e03664 - + https://github.com/dotnet/efcore - 129baccb9e136831b8a79be916460ca5fef9dcba + 25f650095916b0863027444a7409cf1ed9e03664 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4dc0e706d3fc..2737e9d5e416 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -128,14 +128,14 @@ 7.0.0-rc.1.22376.8 - 7.0.0-rc.1.22376.4 - 7.0.0-rc.1.22376.4 - 7.0.0-rc.1.22376.4 - 7.0.0-rc.1.22376.4 - 7.0.0-rc.1.22376.4 - 7.0.0-rc.1.22376.4 - 7.0.0-rc.1.22376.4 - 7.0.0-rc.1.22376.4 + 7.0.0-rc.1.22377.1 + 7.0.0-rc.1.22377.1 + 7.0.0-rc.1.22377.1 + 7.0.0-rc.1.22377.1 + 7.0.0-rc.1.22377.1 + 7.0.0-rc.1.22377.1 + 7.0.0-rc.1.22377.1 + 7.0.0-rc.1.22377.1 7.0.0-beta.22372.1 7.0.0-beta.22372.1 From 7b08b641b2db44bde7584d688e399544df7bd863 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 27 Jul 2022 15:43:29 -0700 Subject: [PATCH 5/6] Fix sample --- .../samples/RateLimitingSample/Program.cs | 16 ++++++++++++++-- .../SampleRateLimiterPolicy.cs | 9 ++++++++- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/Middleware/RateLimiting/samples/RateLimitingSample/Program.cs b/src/Middleware/RateLimiting/samples/RateLimitingSample/Program.cs index b43728b1baf4..d8a6fe95832e 100644 --- a/src/Middleware/RateLimiting/samples/RateLimitingSample/Program.cs +++ b/src/Middleware/RateLimiting/samples/RateLimitingSample/Program.cs @@ -24,13 +24,25 @@ // Define endpoint limiters and a global limiter. var options = new RateLimiterOptions() - .AddTokenBucketLimiter(todoName, new TokenBucketRateLimiterOptions(1, QueueProcessingOrder.OldestFirst, 1, TimeSpan.FromSeconds(10), 1)) + .AddTokenBucketLimiter(todoName, new TokenBucketRateLimiterOptions + { + TokenLimit = 1, + QueueProcessingOrder = QueueProcessingOrder.OldestFirst, + QueueLimit = 1, + ReplenishmentPeriod = TimeSpan.FromSeconds(10), + TokensPerPeriod = 1 + }) .AddPolicy(completeName, new SampleRateLimiterPolicy(NullLogger.Instance)) .AddPolicy(helloName); // The global limiter will be a concurrency limiter with a max permit count of 10 and a queue depth of 5. options.GlobalLimiter = PartitionedRateLimiter.Create(context => { - return RateLimitPartition.GetConcurrencyLimiter("globalLimiter", key => new ConcurrencyLimiterOptions(10, QueueProcessingOrder.NewestFirst, 5)); + return RateLimitPartition.GetConcurrencyLimiter("globalLimiter", key => new ConcurrencyLimiterOptions + { + PermitLimit = 10, + QueueProcessingOrder = QueueProcessingOrder.NewestFirst, + QueueLimit = 5 + }); }); app.UseRateLimiter(options); diff --git a/src/Middleware/RateLimiting/samples/RateLimitingSample/SampleRateLimiterPolicy.cs b/src/Middleware/RateLimiting/samples/RateLimitingSample/SampleRateLimiterPolicy.cs index 8844e1d65446..83d486dbf0be 100644 --- a/src/Middleware/RateLimiting/samples/RateLimitingSample/SampleRateLimiterPolicy.cs +++ b/src/Middleware/RateLimiting/samples/RateLimitingSample/SampleRateLimiterPolicy.cs @@ -25,6 +25,13 @@ public SampleRateLimiterPolicy(ILogger logger) // Use a sliding window limiter allowing 1 request every 10 seconds public RateLimitPartition GetPartition(HttpContext httpContext) { - return RateLimitPartition.GetSlidingWindowLimiter(string.Empty, key => new SlidingWindowRateLimiterOptions(1, QueueProcessingOrder.OldestFirst, 1, TimeSpan.FromSeconds(5), 1)); + return RateLimitPartition.GetSlidingWindowLimiter(string.Empty, key => new SlidingWindowRateLimiterOptions + { + PermitLimit = 1, + QueueProcessingOrder = QueueProcessingOrder.OldestFirst, + QueueLimit = 1, + Window = TimeSpan.FromSeconds(5), + SegmentsPerWindow = 1 + }); } } From 2bddbc4de57236cb3196d58ef0df86e9b57f355c Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 27 Jul 2022 18:01:55 -0700 Subject: [PATCH 6/6] Whoops --- src/Middleware/RateLimiting/test/RateLimitingMiddlewareTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Middleware/RateLimiting/test/RateLimitingMiddlewareTests.cs b/src/Middleware/RateLimiting/test/RateLimitingMiddlewareTests.cs index be45b5190bd4..aece21337bb6 100644 --- a/src/Middleware/RateLimiting/test/RateLimitingMiddlewareTests.cs +++ b/src/Middleware/RateLimiting/test/RateLimitingMiddlewareTests.cs @@ -195,7 +195,7 @@ public async Task EndpointLimiterConvenienceMethod_Rejects() var name = "myEndpoint"; options.Value.AddFixedWindowLimiter(name, new FixedWindowRateLimiterOptions { - PermitLimit = -1, + PermitLimit = 1, QueueProcessingOrder = QueueProcessingOrder.OldestFirst, QueueLimit = 0, Window = TimeSpan.Zero,