Skip to content

Commit 5c79e41

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/runtime dotnet/efcore (#42946)
[main] Update dependencies from dotnet/runtime dotnet/efcore - Update BasePolicy.cs - Fixup - Fix sample - Whoops
1 parent 64744fd commit 5c79e41

File tree

6 files changed

+243
-212
lines changed

6 files changed

+243
-212
lines changed

‎eng/Version.Details.xml

Lines changed: 138 additions & 138 deletions
Large diffs are not rendered by default.

‎eng/Versions.props

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -65,77 +65,77 @@
6565
-->
6666
<PropertyGroup Label="Automated">
6767
<!-- Packages from dotnet/runtime -->
68-
<MicrosoftExtensionsDependencyModelVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsDependencyModelVersion>
69-
<MicrosoftNETCoreAppRefVersion>7.0.0-rc.1.22375.7</MicrosoftNETCoreAppRefVersion>
70-
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-rc.1.22375.7</MicrosoftNETCoreAppRuntimewinx64Version>
71-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.0-rc.1.22375.7</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
72-
<MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.0-rc.1.22375.7</MicrosoftNETRuntimeWebAssemblySdkVersion>
73-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.0-rc.1.22375.7</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
74-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.0-rc.1.22375.7</MicrosoftNETCoreBrowserDebugHostTransportVersion>
75-
<MicrosoftExtensionsCachingAbstractionsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsCachingAbstractionsVersion>
76-
<MicrosoftExtensionsCachingMemoryVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsCachingMemoryVersion>
77-
<MicrosoftExtensionsConfigurationAbstractionsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationAbstractionsVersion>
78-
<MicrosoftExtensionsConfigurationBinderVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationBinderVersion>
79-
<MicrosoftExtensionsConfigurationCommandLineVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationCommandLineVersion>
80-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
81-
<MicrosoftExtensionsConfigurationFileExtensionsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationFileExtensionsVersion>
82-
<MicrosoftExtensionsConfigurationIniVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationIniVersion>
83-
<MicrosoftExtensionsConfigurationJsonVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationJsonVersion>
84-
<MicrosoftExtensionsConfigurationVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationVersion>
85-
<MicrosoftExtensionsConfigurationUserSecretsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationUserSecretsVersion>
86-
<MicrosoftExtensionsConfigurationXmlVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationXmlVersion>
87-
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
88-
<MicrosoftExtensionsDependencyInjectionVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsDependencyInjectionVersion>
89-
<MicrosoftExtensionsFileProvidersAbstractionsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsFileProvidersAbstractionsVersion>
90-
<MicrosoftExtensionsFileProvidersCompositeVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsFileProvidersCompositeVersion>
91-
<MicrosoftExtensionsFileProvidersPhysicalVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsFileProvidersPhysicalVersion>
92-
<MicrosoftExtensionsFileSystemGlobbingVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsFileSystemGlobbingVersion>
93-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
94-
<MicrosoftExtensionsHostingAbstractionsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsHostingAbstractionsVersion>
95-
<MicrosoftExtensionsHostingVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsHostingVersion>
96-
<MicrosoftExtensionsHttpVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsHttpVersion>
97-
<MicrosoftExtensionsLoggingAbstractionsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsLoggingAbstractionsVersion>
98-
<MicrosoftExtensionsLoggingConfigurationVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsLoggingConfigurationVersion>
99-
<MicrosoftExtensionsLoggingConsoleVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsLoggingConsoleVersion>
100-
<MicrosoftExtensionsLoggingDebugVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsLoggingDebugVersion>
101-
<MicrosoftExtensionsLoggingEventSourceVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsLoggingEventSourceVersion>
102-
<MicrosoftExtensionsLoggingEventLogVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsLoggingEventLogVersion>
103-
<MicrosoftExtensionsLoggingVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsLoggingVersion>
104-
<MicrosoftExtensionsLoggingTraceSourceVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsLoggingTraceSourceVersion>
105-
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
106-
<MicrosoftExtensionsOptionsDataAnnotationsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsOptionsDataAnnotationsVersion>
107-
<MicrosoftExtensionsOptionsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsOptionsVersion>
108-
<MicrosoftExtensionsPrimitivesVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsPrimitivesVersion>
109-
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.0-rc.1.22375.7</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
110-
<SystemConfigurationConfigurationManagerVersion>7.0.0-rc.1.22375.7</SystemConfigurationConfigurationManagerVersion>
111-
<SystemDiagnosticsDiagnosticSourceVersion>7.0.0-rc.1.22375.7</SystemDiagnosticsDiagnosticSourceVersion>
112-
<SystemDiagnosticsEventLogVersion>7.0.0-rc.1.22375.7</SystemDiagnosticsEventLogVersion>
113-
<SystemDirectoryServicesProtocolsVersion>7.0.0-rc.1.22375.7</SystemDirectoryServicesProtocolsVersion>
114-
<SystemIOPipelinesVersion>7.0.0-rc.1.22375.7</SystemIOPipelinesVersion>
115-
<SystemNetHttpJsonVersion>7.0.0-rc.1.22375.7</SystemNetHttpJsonVersion>
116-
<SystemNetHttpWinHttpHandlerVersion>7.0.0-rc.1.22375.7</SystemNetHttpWinHttpHandlerVersion>
117-
<SystemReflectionMetadataVersion>7.0.0-rc.1.22375.7</SystemReflectionMetadataVersion>
118-
<SystemResourcesExtensionsVersion>7.0.0-rc.1.22375.7</SystemResourcesExtensionsVersion>
119-
<SystemSecurityCryptographyPkcsVersion>7.0.0-rc.1.22375.7</SystemSecurityCryptographyPkcsVersion>
120-
<SystemSecurityCryptographyXmlVersion>7.0.0-rc.1.22375.7</SystemSecurityCryptographyXmlVersion>
121-
<SystemSecurityPermissionsVersion>7.0.0-rc.1.22375.7</SystemSecurityPermissionsVersion>
122-
<SystemServiceProcessServiceControllerVersion>7.0.0-rc.1.22375.7</SystemServiceProcessServiceControllerVersion>
123-
<SystemTextEncodingsWebVersion>7.0.0-rc.1.22375.7</SystemTextEncodingsWebVersion>
124-
<SystemTextJsonVersion>7.0.0-rc.1.22375.7</SystemTextJsonVersion>
125-
<SystemThreadingAccessControlVersion>7.0.0-rc.1.22375.7</SystemThreadingAccessControlVersion>
126-
<SystemThreadingChannelsVersion>7.0.0-rc.1.22375.7</SystemThreadingChannelsVersion>
127-
<SystemThreadingRateLimitingVersion>7.0.0-rc.1.22375.7</SystemThreadingRateLimitingVersion>
68+
<MicrosoftExtensionsDependencyModelVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsDependencyModelVersion>
69+
<MicrosoftNETCoreAppRefVersion>7.0.0-rc.1.22376.8</MicrosoftNETCoreAppRefVersion>
70+
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-rc.1.22376.8</MicrosoftNETCoreAppRuntimewinx64Version>
71+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.0-rc.1.22376.8</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
72+
<MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.0-rc.1.22376.8</MicrosoftNETRuntimeWebAssemblySdkVersion>
73+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.0-rc.1.22376.8</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
74+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.0-rc.1.22376.8</MicrosoftNETCoreBrowserDebugHostTransportVersion>
75+
<MicrosoftExtensionsCachingAbstractionsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsCachingAbstractionsVersion>
76+
<MicrosoftExtensionsCachingMemoryVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsCachingMemoryVersion>
77+
<MicrosoftExtensionsConfigurationAbstractionsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationAbstractionsVersion>
78+
<MicrosoftExtensionsConfigurationBinderVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationBinderVersion>
79+
<MicrosoftExtensionsConfigurationCommandLineVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationCommandLineVersion>
80+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
81+
<MicrosoftExtensionsConfigurationFileExtensionsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationFileExtensionsVersion>
82+
<MicrosoftExtensionsConfigurationIniVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationIniVersion>
83+
<MicrosoftExtensionsConfigurationJsonVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationJsonVersion>
84+
<MicrosoftExtensionsConfigurationVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationVersion>
85+
<MicrosoftExtensionsConfigurationUserSecretsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationUserSecretsVersion>
86+
<MicrosoftExtensionsConfigurationXmlVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationXmlVersion>
87+
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
88+
<MicrosoftExtensionsDependencyInjectionVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsDependencyInjectionVersion>
89+
<MicrosoftExtensionsFileProvidersAbstractionsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsFileProvidersAbstractionsVersion>
90+
<MicrosoftExtensionsFileProvidersCompositeVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsFileProvidersCompositeVersion>
91+
<MicrosoftExtensionsFileProvidersPhysicalVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsFileProvidersPhysicalVersion>
92+
<MicrosoftExtensionsFileSystemGlobbingVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsFileSystemGlobbingVersion>
93+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
94+
<MicrosoftExtensionsHostingAbstractionsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsHostingAbstractionsVersion>
95+
<MicrosoftExtensionsHostingVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsHostingVersion>
96+
<MicrosoftExtensionsHttpVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsHttpVersion>
97+
<MicrosoftExtensionsLoggingAbstractionsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsLoggingAbstractionsVersion>
98+
<MicrosoftExtensionsLoggingConfigurationVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsLoggingConfigurationVersion>
99+
<MicrosoftExtensionsLoggingConsoleVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsLoggingConsoleVersion>
100+
<MicrosoftExtensionsLoggingDebugVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsLoggingDebugVersion>
101+
<MicrosoftExtensionsLoggingEventSourceVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsLoggingEventSourceVersion>
102+
<MicrosoftExtensionsLoggingEventLogVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsLoggingEventLogVersion>
103+
<MicrosoftExtensionsLoggingVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsLoggingVersion>
104+
<MicrosoftExtensionsLoggingTraceSourceVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsLoggingTraceSourceVersion>
105+
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
106+
<MicrosoftExtensionsOptionsDataAnnotationsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsOptionsDataAnnotationsVersion>
107+
<MicrosoftExtensionsOptionsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsOptionsVersion>
108+
<MicrosoftExtensionsPrimitivesVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsPrimitivesVersion>
109+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.0-rc.1.22376.8</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
110+
<SystemConfigurationConfigurationManagerVersion>7.0.0-rc.1.22376.8</SystemConfigurationConfigurationManagerVersion>
111+
<SystemDiagnosticsDiagnosticSourceVersion>7.0.0-rc.1.22376.8</SystemDiagnosticsDiagnosticSourceVersion>
112+
<SystemDiagnosticsEventLogVersion>7.0.0-rc.1.22376.8</SystemDiagnosticsEventLogVersion>
113+
<SystemDirectoryServicesProtocolsVersion>7.0.0-rc.1.22376.8</SystemDirectoryServicesProtocolsVersion>
114+
<SystemIOPipelinesVersion>7.0.0-rc.1.22376.8</SystemIOPipelinesVersion>
115+
<SystemNetHttpJsonVersion>7.0.0-rc.1.22376.8</SystemNetHttpJsonVersion>
116+
<SystemNetHttpWinHttpHandlerVersion>7.0.0-rc.1.22376.8</SystemNetHttpWinHttpHandlerVersion>
117+
<SystemReflectionMetadataVersion>7.0.0-rc.1.22376.8</SystemReflectionMetadataVersion>
118+
<SystemResourcesExtensionsVersion>7.0.0-rc.1.22376.8</SystemResourcesExtensionsVersion>
119+
<SystemSecurityCryptographyPkcsVersion>7.0.0-rc.1.22376.8</SystemSecurityCryptographyPkcsVersion>
120+
<SystemSecurityCryptographyXmlVersion>7.0.0-rc.1.22376.8</SystemSecurityCryptographyXmlVersion>
121+
<SystemSecurityPermissionsVersion>7.0.0-rc.1.22376.8</SystemSecurityPermissionsVersion>
122+
<SystemServiceProcessServiceControllerVersion>7.0.0-rc.1.22376.8</SystemServiceProcessServiceControllerVersion>
123+
<SystemTextEncodingsWebVersion>7.0.0-rc.1.22376.8</SystemTextEncodingsWebVersion>
124+
<SystemTextJsonVersion>7.0.0-rc.1.22376.8</SystemTextJsonVersion>
125+
<SystemThreadingAccessControlVersion>7.0.0-rc.1.22376.8</SystemThreadingAccessControlVersion>
126+
<SystemThreadingChannelsVersion>7.0.0-rc.1.22376.8</SystemThreadingChannelsVersion>
127+
<SystemThreadingRateLimitingVersion>7.0.0-rc.1.22376.8</SystemThreadingRateLimitingVersion>
128128
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
129-
<MicrosoftNETCorePlatformsVersion>7.0.0-rc.1.22375.7</MicrosoftNETCorePlatformsVersion>
129+
<MicrosoftNETCorePlatformsVersion>7.0.0-rc.1.22376.8</MicrosoftNETCorePlatformsVersion>
130130
<!-- Packages from dotnet/efcore -->
131-
<dotnetefVersion>7.0.0-rc.1.22376.4</dotnetefVersion>
132-
<MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.0-rc.1.22376.4</MicrosoftEntityFrameworkCoreInMemoryVersion>
133-
<MicrosoftEntityFrameworkCoreRelationalVersion>7.0.0-rc.1.22376.4</MicrosoftEntityFrameworkCoreRelationalVersion>
134-
<MicrosoftEntityFrameworkCoreSqliteVersion>7.0.0-rc.1.22376.4</MicrosoftEntityFrameworkCoreSqliteVersion>
135-
<MicrosoftEntityFrameworkCoreSqlServerVersion>7.0.0-rc.1.22376.4</MicrosoftEntityFrameworkCoreSqlServerVersion>
136-
<MicrosoftEntityFrameworkCoreToolsVersion>7.0.0-rc.1.22376.4</MicrosoftEntityFrameworkCoreToolsVersion>
137-
<MicrosoftEntityFrameworkCoreVersion>7.0.0-rc.1.22376.4</MicrosoftEntityFrameworkCoreVersion>
138-
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.0-rc.1.22376.4</MicrosoftEntityFrameworkCoreDesignVersion>
131+
<dotnetefVersion>7.0.0-rc.1.22377.1</dotnetefVersion>
132+
<MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.0-rc.1.22377.1</MicrosoftEntityFrameworkCoreInMemoryVersion>
133+
<MicrosoftEntityFrameworkCoreRelationalVersion>7.0.0-rc.1.22377.1</MicrosoftEntityFrameworkCoreRelationalVersion>
134+
<MicrosoftEntityFrameworkCoreSqliteVersion>7.0.0-rc.1.22377.1</MicrosoftEntityFrameworkCoreSqliteVersion>
135+
<MicrosoftEntityFrameworkCoreSqlServerVersion>7.0.0-rc.1.22377.1</MicrosoftEntityFrameworkCoreSqlServerVersion>
136+
<MicrosoftEntityFrameworkCoreToolsVersion>7.0.0-rc.1.22377.1</MicrosoftEntityFrameworkCoreToolsVersion>
137+
<MicrosoftEntityFrameworkCoreVersion>7.0.0-rc.1.22377.1</MicrosoftEntityFrameworkCoreVersion>
138+
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.0-rc.1.22377.1</MicrosoftEntityFrameworkCoreDesignVersion>
139139
<!-- Packages from dotnet/arcade -->
140140
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22372.1</MicrosoftDotNetBuildTasksInstallersVersion>
141141
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22372.1</MicrosoftDotNetBuildTasksTemplatingVersion>

‎src/Middleware/ConcurrencyLimiter/src/QueuePolicies/BasePolicy.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,12 @@ public BasePolicy(IOptions<QueuePolicyOptions> options, QueueProcessingOrder ord
3232
throw new ArgumentException("The RequestQueueLimit cannot be a negative number.", nameof(options));
3333
}
3434

35-
_limiter = new Limiter(new LimiterOptions(permitLimit: maxConcurrentRequests, order, queueLimit: requestQueueLimit));
35+
_limiter = new Limiter(new LimiterOptions
36+
{
37+
PermitLimit = maxConcurrentRequests,
38+
QueueProcessingOrder = order,
39+
QueueLimit = requestQueueLimit
40+
});
3641
}
3742

3843
public ValueTask<bool> TryEnterAsync()

‎src/Middleware/RateLimiting/samples/RateLimitingSample/Program.cs

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,25 @@
2424

2525
// Define endpoint limiters and a global limiter.
2626
var options = new RateLimiterOptions()
27-
.AddTokenBucketLimiter(todoName, new TokenBucketRateLimiterOptions(1, QueueProcessingOrder.OldestFirst, 1, TimeSpan.FromSeconds(10), 1))
27+
.AddTokenBucketLimiter(todoName, new TokenBucketRateLimiterOptions
28+
{
29+
TokenLimit = 1,
30+
QueueProcessingOrder = QueueProcessingOrder.OldestFirst,
31+
QueueLimit = 1,
32+
ReplenishmentPeriod = TimeSpan.FromSeconds(10),
33+
TokensPerPeriod = 1
34+
})
2835
.AddPolicy<string>(completeName, new SampleRateLimiterPolicy(NullLogger<SampleRateLimiterPolicy>.Instance))
2936
.AddPolicy<string, SampleRateLimiterPolicy>(helloName);
3037
// The global limiter will be a concurrency limiter with a max permit count of 10 and a queue depth of 5.
3138
options.GlobalLimiter = PartitionedRateLimiter.Create<HttpContext, string>(context =>
3239
{
33-
return RateLimitPartition.GetConcurrencyLimiter<string>("globalLimiter", key => new ConcurrencyLimiterOptions(10, QueueProcessingOrder.NewestFirst, 5));
40+
return RateLimitPartition.GetConcurrencyLimiter<string>("globalLimiter", key => new ConcurrencyLimiterOptions
41+
{
42+
PermitLimit = 10,
43+
QueueProcessingOrder = QueueProcessingOrder.NewestFirst,
44+
QueueLimit = 5
45+
});
3446
});
3547
app.UseRateLimiter(options);
3648

‎src/Middleware/RateLimiting/samples/RateLimitingSample/SampleRateLimiterPolicy.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ public SampleRateLimiterPolicy(ILogger<SampleRateLimiterPolicy> logger)
2525
// Use a sliding window limiter allowing 1 request every 10 seconds
2626
public RateLimitPartition<string> GetPartition(HttpContext httpContext)
2727
{
28-
return RateLimitPartition.GetSlidingWindowLimiter<string>(string.Empty, key => new SlidingWindowRateLimiterOptions(1, QueueProcessingOrder.OldestFirst, 1, TimeSpan.FromSeconds(5), 1));
28+
return RateLimitPartition.GetSlidingWindowLimiter<string>(string.Empty, key => new SlidingWindowRateLimiterOptions
29+
{
30+
PermitLimit = 1,
31+
QueueProcessingOrder = QueueProcessingOrder.OldestFirst,
32+
QueueLimit = 1,
33+
Window = TimeSpan.FromSeconds(5),
34+
SegmentsPerWindow = 1
35+
});
2936
}
3037
}

‎src/Middleware/RateLimiting/test/RateLimitingMiddlewareTests.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,14 @@ public async Task EndpointLimiterConvenienceMethod_Rejects()
193193
var onRejectedInvoked = false;
194194
var options = CreateOptionsAccessor();
195195
var name = "myEndpoint";
196-
options.Value.AddFixedWindowLimiter(name, new FixedWindowRateLimiterOptions(1, QueueProcessingOrder.OldestFirst, 0, TimeSpan.Zero, autoReplenishment: false));
196+
options.Value.AddFixedWindowLimiter(name, new FixedWindowRateLimiterOptions
197+
{
198+
PermitLimit = 1,
199+
QueueProcessingOrder = QueueProcessingOrder.OldestFirst,
200+
QueueLimit = 0,
201+
Window = TimeSpan.Zero,
202+
AutoReplenishment = false
203+
});
197204
options.Value.OnRejected = (context, token) =>
198205
{
199206
onRejectedInvoked = true;

0 commit comments

Comments
 (0)