Skip to content

[main] Update dependencies from dotnet/runtime dotnet/efcore #42946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 28, 2022
Merged

[main] Update dependencies from dotnet/runtime dotnet/efcore #42946

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0e58792
Update dependencies from https://github.com/dotnet/runtime build 2022…
dotnet-maestro[bot] Jul 27, 2022
5e6b3b9
Update BasePolicy.cs
wtgodbe Jul 27, 2022
207bd1f
Fixup
wtgodbe Jul 27, 2022
86a0ebf
Update dependencies from https://github.com/dotnet/efcore build 20220…
dotnet-maestro[bot] Jul 27, 2022
7b08b64
Fix sample
wtgodbe Jul 27, 2022
2bddbc4
Whoops
wtgodbe Jul 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
276 changes: 138 additions & 138 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

138 changes: 69 additions & 69 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,77 +65,77 @@
-->
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>7.0.0-rc.1.22375.7</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-rc.1.22375.7</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.0-rc.1.22375.7</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.0-rc.1.22375.7</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.0-rc.1.22375.7</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.0-rc.1.22375.7</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationCommandLineVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationCommandLineVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationFileExtensionsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationFileExtensionsVersion>
<MicrosoftExtensionsConfigurationIniVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationIniVersion>
<MicrosoftExtensionsConfigurationJsonVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationUserSecretsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationUserSecretsVersion>
<MicrosoftExtensionsConfigurationXmlVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsConfigurationXmlVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsFileProvidersCompositeVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsFileProvidersCompositeVersion>
<MicrosoftExtensionsFileProvidersPhysicalVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsFileProvidersPhysicalVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHttpVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsHttpVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConfigurationVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsLoggingConfigurationVersion>
<MicrosoftExtensionsLoggingConsoleVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsLoggingEventSourceVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsLoggingEventSourceVersion>
<MicrosoftExtensionsLoggingEventLogVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsLoggingEventLogVersion>
<MicrosoftExtensionsLoggingVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingTraceSourceVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsLoggingTraceSourceVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
<MicrosoftExtensionsOptionsDataAnnotationsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>7.0.0-rc.1.22375.7</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.0-rc.1.22375.7</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemConfigurationConfigurationManagerVersion>7.0.0-rc.1.22375.7</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsDiagnosticSourceVersion>7.0.0-rc.1.22375.7</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>7.0.0-rc.1.22375.7</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>7.0.0-rc.1.22375.7</SystemDirectoryServicesProtocolsVersion>
<SystemIOPipelinesVersion>7.0.0-rc.1.22375.7</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>7.0.0-rc.1.22375.7</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>7.0.0-rc.1.22375.7</SystemNetHttpWinHttpHandlerVersion>
<SystemReflectionMetadataVersion>7.0.0-rc.1.22375.7</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>7.0.0-rc.1.22375.7</SystemResourcesExtensionsVersion>
<SystemSecurityCryptographyPkcsVersion>7.0.0-rc.1.22375.7</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>7.0.0-rc.1.22375.7</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>7.0.0-rc.1.22375.7</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>7.0.0-rc.1.22375.7</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>7.0.0-rc.1.22375.7</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>7.0.0-rc.1.22375.7</SystemTextJsonVersion>
<SystemThreadingAccessControlVersion>7.0.0-rc.1.22375.7</SystemThreadingAccessControlVersion>
<SystemThreadingChannelsVersion>7.0.0-rc.1.22375.7</SystemThreadingChannelsVersion>
<SystemThreadingRateLimitingVersion>7.0.0-rc.1.22375.7</SystemThreadingRateLimitingVersion>
<MicrosoftExtensionsDependencyModelVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>7.0.0-rc.1.22376.8</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0-rc.1.22376.8</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>7.0.0-rc.1.22376.8</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>7.0.0-rc.1.22376.8</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>7.0.0-rc.1.22376.8</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>7.0.0-rc.1.22376.8</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationCommandLineVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationCommandLineVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationFileExtensionsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationFileExtensionsVersion>
<MicrosoftExtensionsConfigurationIniVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationIniVersion>
<MicrosoftExtensionsConfigurationJsonVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationUserSecretsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationUserSecretsVersion>
<MicrosoftExtensionsConfigurationXmlVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsConfigurationXmlVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsFileProvidersCompositeVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsFileProvidersCompositeVersion>
<MicrosoftExtensionsFileProvidersPhysicalVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsFileProvidersPhysicalVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHttpVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsHttpVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConfigurationVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsLoggingConfigurationVersion>
<MicrosoftExtensionsLoggingConsoleVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsLoggingEventSourceVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsLoggingEventSourceVersion>
<MicrosoftExtensionsLoggingEventLogVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsLoggingEventLogVersion>
<MicrosoftExtensionsLoggingVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingTraceSourceVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsLoggingTraceSourceVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
<MicrosoftExtensionsOptionsDataAnnotationsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>7.0.0-rc.1.22376.8</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>7.0.0-rc.1.22376.8</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<SystemConfigurationConfigurationManagerVersion>7.0.0-rc.1.22376.8</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsDiagnosticSourceVersion>7.0.0-rc.1.22376.8</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>7.0.0-rc.1.22376.8</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>7.0.0-rc.1.22376.8</SystemDirectoryServicesProtocolsVersion>
<SystemIOPipelinesVersion>7.0.0-rc.1.22376.8</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>7.0.0-rc.1.22376.8</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>7.0.0-rc.1.22376.8</SystemNetHttpWinHttpHandlerVersion>
<SystemReflectionMetadataVersion>7.0.0-rc.1.22376.8</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>7.0.0-rc.1.22376.8</SystemResourcesExtensionsVersion>
<SystemSecurityCryptographyPkcsVersion>7.0.0-rc.1.22376.8</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>7.0.0-rc.1.22376.8</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>7.0.0-rc.1.22376.8</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>7.0.0-rc.1.22376.8</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>7.0.0-rc.1.22376.8</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>7.0.0-rc.1.22376.8</SystemTextJsonVersion>
<SystemThreadingAccessControlVersion>7.0.0-rc.1.22376.8</SystemThreadingAccessControlVersion>
<SystemThreadingChannelsVersion>7.0.0-rc.1.22376.8</SystemThreadingChannelsVersion>
<SystemThreadingRateLimitingVersion>7.0.0-rc.1.22376.8</SystemThreadingRateLimitingVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsVersion>7.0.0-rc.1.22375.7</MicrosoftNETCorePlatformsVersion>
<MicrosoftNETCorePlatformsVersion>7.0.0-rc.1.22376.8</MicrosoftNETCorePlatformsVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefVersion>7.0.0-rc.1.22376.4</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.0-rc.1.22376.4</MicrosoftEntityFrameworkCoreInMemoryVersion>
<MicrosoftEntityFrameworkCoreRelationalVersion>7.0.0-rc.1.22376.4</MicrosoftEntityFrameworkCoreRelationalVersion>
<MicrosoftEntityFrameworkCoreSqliteVersion>7.0.0-rc.1.22376.4</MicrosoftEntityFrameworkCoreSqliteVersion>
<MicrosoftEntityFrameworkCoreSqlServerVersion>7.0.0-rc.1.22376.4</MicrosoftEntityFrameworkCoreSqlServerVersion>
<MicrosoftEntityFrameworkCoreToolsVersion>7.0.0-rc.1.22376.4</MicrosoftEntityFrameworkCoreToolsVersion>
<MicrosoftEntityFrameworkCoreVersion>7.0.0-rc.1.22376.4</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.0-rc.1.22376.4</MicrosoftEntityFrameworkCoreDesignVersion>
<dotnetefVersion>7.0.0-rc.1.22377.1</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>7.0.0-rc.1.22377.1</MicrosoftEntityFrameworkCoreInMemoryVersion>
<MicrosoftEntityFrameworkCoreRelationalVersion>7.0.0-rc.1.22377.1</MicrosoftEntityFrameworkCoreRelationalVersion>
<MicrosoftEntityFrameworkCoreSqliteVersion>7.0.0-rc.1.22377.1</MicrosoftEntityFrameworkCoreSqliteVersion>
<MicrosoftEntityFrameworkCoreSqlServerVersion>7.0.0-rc.1.22377.1</MicrosoftEntityFrameworkCoreSqlServerVersion>
<MicrosoftEntityFrameworkCoreToolsVersion>7.0.0-rc.1.22377.1</MicrosoftEntityFrameworkCoreToolsVersion>
<MicrosoftEntityFrameworkCoreVersion>7.0.0-rc.1.22377.1</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>7.0.0-rc.1.22377.1</MicrosoftEntityFrameworkCoreDesignVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22372.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.22372.1</MicrosoftDotNetBuildTasksTemplatingVersion>
Expand Down
7 changes: 6 additions & 1 deletion src/Middleware/ConcurrencyLimiter/src/QueuePolicies/BasePolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,12 @@ public BasePolicy(IOptions<QueuePolicyOptions> 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<bool> TryEnterAsync()
Expand Down
16 changes: 14 additions & 2 deletions src/Middleware/RateLimiting/samples/RateLimitingSample/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<string>(completeName, new SampleRateLimiterPolicy(NullLogger<SampleRateLimiterPolicy>.Instance))
.AddPolicy<string, SampleRateLimiterPolicy>(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<HttpContext, string>(context =>
{
return RateLimitPartition.GetConcurrencyLimiter<string>("globalLimiter", key => new ConcurrencyLimiterOptions(10, QueueProcessingOrder.NewestFirst, 5));
return RateLimitPartition.GetConcurrencyLimiter<string>("globalLimiter", key => new ConcurrencyLimiterOptions
{
PermitLimit = 10,
QueueProcessingOrder = QueueProcessingOrder.NewestFirst,
QueueLimit = 5
});
});
app.UseRateLimiter(options);

Expand Down
9 changes: 8 additions & 1 deletion src/Middleware/RateLimiting/samples/RateLimitingSample/SampleRateLimiterPolicy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,13 @@ public SampleRateLimiterPolicy(ILogger<SampleRateLimiterPolicy> logger)
// Use a sliding window limiter allowing 1 request every 10 seconds
public RateLimitPartition<string> GetPartition(HttpContext httpContext)
{
return RateLimitPartition.GetSlidingWindowLimiter<string>(string.Empty, key => new SlidingWindowRateLimiterOptions(1, QueueProcessingOrder.OldestFirst, 1, TimeSpan.FromSeconds(5), 1));
return RateLimitPartition.GetSlidingWindowLimiter<string>(string.Empty, key => new SlidingWindowRateLimiterOptions
{
PermitLimit = 1,
QueueProcessingOrder = QueueProcessingOrder.OldestFirst,
QueueLimit = 1,
Window = TimeSpan.FromSeconds(5),
SegmentsPerWindow = 1
});
}
}
9 changes: 8 additions & 1 deletion src/Middleware/RateLimiting/test/RateLimitingMiddlewareTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down