Skip to content

Merging internal commits for release/9.0 #66316

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
wtgodbe merged 27 commits into from
Apr 14, 2026
Merged

Merging internal commits for release/9.0 #66316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
0a3652b
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Feb 23, 2026
67eec0d
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Feb 27, 2026
9786fca
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 2, 2026
e1cf34d
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 3, 2026
68e9d0e
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 5, 2026
65e576a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 9, 2026
c621ec1
Merged PR 58376: [SignalR] Extra backpressure timeout
BrennanConroy Mar 13, 2026
282c278
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 14, 2026
fee9107
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 16, 2026
79bc7a9
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 16, 2026
366b3f9
Merged PR 58266: [internal/release/9.0] Update dependencies from dnce…
Mar 16, 2026
34a4f72
update dependencies from roslyn for 4.14
vseanreesermsft Mar 16, 2026
99a60e7
Merged PR 59116: internal/release/9.0 - update dependencies from roslyn
vseanreesermsft Mar 16, 2026
cfcaca4
Updated Versions.props - update pinned mca
vseanreesermsft Mar 16, 2026
befa921
Merged PR 59121: Updated Versions.props - update pinned roslyn packages
vseanreesermsft Mar 16, 2026
0c14907
Revert "Updated Versions.props - update pinned mca"
vseanreesermsft Mar 17, 2026
4bd59f3
Revert "update dependencies from roslyn for 4.14"
vseanreesermsft Mar 17, 2026
576654e
Merged PR 59175: Revert "update dependencies from roslyn for 4.14"
vseanreesermsft Mar 17, 2026
65e11bc
Merged PR 59174: Revert "Updated Versions.props - update pinned mca"
vseanreesermsft Mar 17, 2026
722d16d
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 18, 2026
15d4730
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 20, 2026
6e36553
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 21, 2026
4f29334
Merged PR 59216: [internal/release/9.0] Update dependencies from dnce…
Mar 21, 2026
8d1f8f0
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 26, 2026
b1da711
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 26, 2026
324a351
Merged PR 59429: [internal/release/9.0] Update dependencies from dnce…
Mar 26, 2026
78c0105
Merge commit '324a351f7f1ae6c17b6a8661903e2a7921a7d75c' into internal…
vseanreesermsft Apr 14, 2026
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
4 changes: 4 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
<!-- Begin: Package sources from dotnet-extensions -->
<!-- End: Package sources from dotnet-extensions -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-4250c83" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4250c839/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-001e1d3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-001e1d31/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-efcore -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand All @@ -30,8 +32,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-efcore -->
<add key="darc-int-dotnet-efcore-001e1d3" value="true" />
<!-- End: Package sources from dotnet-efcore -->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-4250c83" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
320 changes: 160 additions & 160 deletions eng/Version.Details.xml
View file
Open in desktop

Large diffs are not rendered by default.

160 changes: 80 additions & 80 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,92 +67,92 @@
-->
<PropertyGroup Label="Automated">
<!-- Packages from dotnet/runtime -->
<MicrosoftExtensionsDependencyModelVersion>9.0.14</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>9.0.14</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.14</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>9.0.14</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>9.0.14</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>9.0.14</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.14-servicing.26119.10</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>9.0.14</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>9.0.14</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.14</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>9.0.14</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationCommandLineVersion>9.0.14</MicrosoftExtensionsConfigurationCommandLineVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.14</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationFileExtensionsVersion>9.0.14</MicrosoftExtensionsConfigurationFileExtensionsVersion>
<MicrosoftExtensionsConfigurationIniVersion>9.0.14</MicrosoftExtensionsConfigurationIniVersion>
<MicrosoftExtensionsConfigurationJsonVersion>9.0.14</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>9.0.14</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationUserSecretsVersion>9.0.14</MicrosoftExtensionsConfigurationUserSecretsVersion>
<MicrosoftExtensionsConfigurationXmlVersion>9.0.14</MicrosoftExtensionsConfigurationXmlVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.14</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionVersion>9.0.14</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDiagnosticsAbstractionsVersion>9.0.14</MicrosoftExtensionsDiagnosticsAbstractionsVersion>
<MicrosoftExtensionsDiagnosticsVersion>9.0.14</MicrosoftExtensionsDiagnosticsVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>9.0.14</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsFileProvidersCompositeVersion>9.0.14</MicrosoftExtensionsFileProvidersCompositeVersion>
<MicrosoftExtensionsFileProvidersPhysicalVersion>9.0.14</MicrosoftExtensionsFileProvidersPhysicalVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>9.0.14</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.14-servicing.26119.10</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>9.0.14</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>9.0.14</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHttpVersion>9.0.14</MicrosoftExtensionsHttpVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.14</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConfigurationVersion>9.0.14</MicrosoftExtensionsLoggingConfigurationVersion>
<MicrosoftExtensionsLoggingConsoleVersion>9.0.14</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>9.0.14</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsLoggingEventSourceVersion>9.0.14</MicrosoftExtensionsLoggingEventSourceVersion>
<MicrosoftExtensionsLoggingEventLogVersion>9.0.14</MicrosoftExtensionsLoggingEventLogVersion>
<MicrosoftExtensionsLoggingVersion>9.0.14</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingTraceSourceVersion>9.0.14</MicrosoftExtensionsLoggingTraceSourceVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.14</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
<MicrosoftExtensionsOptionsDataAnnotationsVersion>9.0.14</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>9.0.14</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>9.0.14</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>9.0.14-servicing.26119.10</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<MicrosoftSourceBuildIntermediateruntimelinuxx64Version>9.0.14-servicing.26119.10</MicrosoftSourceBuildIntermediateruntimelinuxx64Version>
<SystemCompositionVersion>9.0.14</SystemCompositionVersion>
<SystemConfigurationConfigurationManagerVersion>9.0.14</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsDiagnosticSourceVersion>9.0.14</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>9.0.14</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>9.0.14</SystemDirectoryServicesProtocolsVersion>
<SystemIOPipelinesVersion>9.0.14</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>9.0.14</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>9.0.14</SystemNetHttpWinHttpHandlerVersion>
<SystemNetServerSentEventsVersion>9.0.14</SystemNetServerSentEventsVersion>
<SystemReflectionMetadataVersion>9.0.14</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>9.0.14</SystemResourcesExtensionsVersion>
<SystemSecurityCryptographyPkcsVersion>9.0.14</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>9.0.14</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>9.0.14</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>9.0.14</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>9.0.14</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>9.0.14</SystemTextJsonVersion>
<SystemThreadingAccessControlVersion>9.0.14</SystemThreadingAccessControlVersion>
<SystemThreadingChannelsVersion>9.0.14</SystemThreadingChannelsVersion>
<SystemThreadingRateLimitingVersion>9.0.14</SystemThreadingRateLimitingVersion>
<MicrosoftExtensionsDependencyModelVersion>9.0.15</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>9.0.15</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.15</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>9.0.15</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>9.0.15</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>9.0.15</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.15-servicing.26175.22</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>9.0.15</MicrosoftExtensionsCachingAbstractionsVersion>
<MicrosoftExtensionsCachingMemoryVersion>9.0.15</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.15</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationBinderVersion>9.0.15</MicrosoftExtensionsConfigurationBinderVersion>
<MicrosoftExtensionsConfigurationCommandLineVersion>9.0.15</MicrosoftExtensionsConfigurationCommandLineVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.15</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationFileExtensionsVersion>9.0.15</MicrosoftExtensionsConfigurationFileExtensionsVersion>
<MicrosoftExtensionsConfigurationIniVersion>9.0.15</MicrosoftExtensionsConfigurationIniVersion>
<MicrosoftExtensionsConfigurationJsonVersion>9.0.15</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsConfigurationVersion>9.0.15</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationUserSecretsVersion>9.0.15</MicrosoftExtensionsConfigurationUserSecretsVersion>
<MicrosoftExtensionsConfigurationXmlVersion>9.0.15</MicrosoftExtensionsConfigurationXmlVersion>
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>9.0.15</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
<MicrosoftExtensionsDependencyInjectionVersion>9.0.15</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDiagnosticsAbstractionsVersion>9.0.15</MicrosoftExtensionsDiagnosticsAbstractionsVersion>
<MicrosoftExtensionsDiagnosticsVersion>9.0.15</MicrosoftExtensionsDiagnosticsVersion>
<MicrosoftExtensionsFileProvidersAbstractionsVersion>9.0.15</MicrosoftExtensionsFileProvidersAbstractionsVersion>
<MicrosoftExtensionsFileProvidersCompositeVersion>9.0.15</MicrosoftExtensionsFileProvidersCompositeVersion>
<MicrosoftExtensionsFileProvidersPhysicalVersion>9.0.15</MicrosoftExtensionsFileProvidersPhysicalVersion>
<MicrosoftExtensionsFileSystemGlobbingVersion>9.0.15</MicrosoftExtensionsFileSystemGlobbingVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.15-servicing.26175.22</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsHostingAbstractionsVersion>9.0.15</MicrosoftExtensionsHostingAbstractionsVersion>
<MicrosoftExtensionsHostingVersion>9.0.15</MicrosoftExtensionsHostingVersion>
<MicrosoftExtensionsHttpVersion>9.0.15</MicrosoftExtensionsHttpVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.15</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConfigurationVersion>9.0.15</MicrosoftExtensionsLoggingConfigurationVersion>
<MicrosoftExtensionsLoggingConsoleVersion>9.0.15</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingDebugVersion>9.0.15</MicrosoftExtensionsLoggingDebugVersion>
<MicrosoftExtensionsLoggingEventSourceVersion>9.0.15</MicrosoftExtensionsLoggingEventSourceVersion>
<MicrosoftExtensionsLoggingEventLogVersion>9.0.15</MicrosoftExtensionsLoggingEventLogVersion>
<MicrosoftExtensionsLoggingVersion>9.0.15</MicrosoftExtensionsLoggingVersion>
<MicrosoftExtensionsLoggingTraceSourceVersion>9.0.15</MicrosoftExtensionsLoggingTraceSourceVersion>
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>9.0.15</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
<MicrosoftExtensionsOptionsDataAnnotationsVersion>9.0.15</MicrosoftExtensionsOptionsDataAnnotationsVersion>
<MicrosoftExtensionsOptionsVersion>9.0.15</MicrosoftExtensionsOptionsVersion>
<MicrosoftExtensionsPrimitivesVersion>9.0.15</MicrosoftExtensionsPrimitivesVersion>
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>9.0.15-servicing.26175.22</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
<MicrosoftSourceBuildIntermediateruntimelinuxx64Version>9.0.15-servicing.26175.22</MicrosoftSourceBuildIntermediateruntimelinuxx64Version>
<SystemCompositionVersion>9.0.15</SystemCompositionVersion>
<SystemConfigurationConfigurationManagerVersion>9.0.15</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsDiagnosticSourceVersion>9.0.15</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsEventLogVersion>9.0.15</SystemDiagnosticsEventLogVersion>
<SystemDirectoryServicesProtocolsVersion>9.0.15</SystemDirectoryServicesProtocolsVersion>
<SystemIOPipelinesVersion>9.0.15</SystemIOPipelinesVersion>
<SystemNetHttpJsonVersion>9.0.15</SystemNetHttpJsonVersion>
<SystemNetHttpWinHttpHandlerVersion>9.0.15</SystemNetHttpWinHttpHandlerVersion>
<SystemNetServerSentEventsVersion>9.0.15</SystemNetServerSentEventsVersion>
<SystemReflectionMetadataVersion>9.0.15</SystemReflectionMetadataVersion>
<SystemResourcesExtensionsVersion>9.0.15</SystemResourcesExtensionsVersion>
<SystemSecurityCryptographyPkcsVersion>9.0.15</SystemSecurityCryptographyPkcsVersion>
<SystemSecurityCryptographyXmlVersion>9.0.15</SystemSecurityCryptographyXmlVersion>
<SystemSecurityPermissionsVersion>9.0.15</SystemSecurityPermissionsVersion>
<SystemServiceProcessServiceControllerVersion>9.0.15</SystemServiceProcessServiceControllerVersion>
<SystemTextEncodingsWebVersion>9.0.15</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>9.0.15</SystemTextJsonVersion>
<SystemThreadingAccessControlVersion>9.0.15</SystemThreadingAccessControlVersion>
<SystemThreadingChannelsVersion>9.0.15</SystemThreadingChannelsVersion>
<SystemThreadingRateLimitingVersion>9.0.15</SystemThreadingRateLimitingVersion>
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
<MicrosoftNETCorePlatformsVersion>9.0.14-servicing.26119.10</MicrosoftNETCorePlatformsVersion>
<MicrosoftBclAsyncInterfacesVersion>9.0.14</MicrosoftBclAsyncInterfacesVersion>
<MicrosoftNETCorePlatformsVersion>9.0.15-servicing.26175.22</MicrosoftNETCorePlatformsVersion>
<MicrosoftBclAsyncInterfacesVersion>9.0.15</MicrosoftBclAsyncInterfacesVersion>
<!-- Transitive package to provide coherency in dotnet/extensions -->
<MicrosoftBclTimeProviderVersion>9.0.14</MicrosoftBclTimeProviderVersion>
<SystemCollectionsImmutableVersion>9.0.14</SystemCollectionsImmutableVersion>
<SystemDiagnosticsPerformanceCounterVersion>9.0.14</SystemDiagnosticsPerformanceCounterVersion>
<SystemIOHashingVersion>9.0.14</SystemIOHashingVersion>
<SystemRuntimeCachingVersion>9.0.14</SystemRuntimeCachingVersion>
<MicrosoftBclTimeProviderVersion>9.0.15</MicrosoftBclTimeProviderVersion>
<SystemCollectionsImmutableVersion>9.0.15</SystemCollectionsImmutableVersion>
<SystemDiagnosticsPerformanceCounterVersion>9.0.15</SystemDiagnosticsPerformanceCounterVersion>
<SystemIOHashingVersion>9.0.15</SystemIOHashingVersion>
<SystemRuntimeCachingVersion>9.0.15</SystemRuntimeCachingVersion>
<!-- Packages from dotnet/extensions -->
<MicrosoftExtensionsDiagnosticsTestingVersion>10.6.0-preview.1.26210.2</MicrosoftExtensionsDiagnosticsTestingVersion>
<MicrosoftExtensionsTimeProviderTestingVersion>10.6.0-preview.1.26210.2</MicrosoftExtensionsTimeProviderTestingVersion>
<!-- Packages from dotnet/efcore -->
<dotnetefVersion>9.0.14</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>9.0.14</MicrosoftEntityFrameworkCoreInMemoryVersion>
<MicrosoftEntityFrameworkCoreRelationalVersion>9.0.14</MicrosoftEntityFrameworkCoreRelationalVersion>
<MicrosoftEntityFrameworkCoreSqliteVersion>9.0.14</MicrosoftEntityFrameworkCoreSqliteVersion>
<MicrosoftEntityFrameworkCoreSqlServerVersion>9.0.14</MicrosoftEntityFrameworkCoreSqlServerVersion>
<MicrosoftEntityFrameworkCoreToolsVersion>9.0.14</MicrosoftEntityFrameworkCoreToolsVersion>
<MicrosoftEntityFrameworkCoreVersion>9.0.14</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>9.0.14</MicrosoftEntityFrameworkCoreDesignVersion>
<dotnetefVersion>9.0.15</dotnetefVersion>
<MicrosoftEntityFrameworkCoreInMemoryVersion>9.0.15</MicrosoftEntityFrameworkCoreInMemoryVersion>
<MicrosoftEntityFrameworkCoreRelationalVersion>9.0.15</MicrosoftEntityFrameworkCoreRelationalVersion>
<MicrosoftEntityFrameworkCoreSqliteVersion>9.0.15</MicrosoftEntityFrameworkCoreSqliteVersion>
<MicrosoftEntityFrameworkCoreSqlServerVersion>9.0.15</MicrosoftEntityFrameworkCoreSqlServerVersion>
<MicrosoftEntityFrameworkCoreToolsVersion>9.0.15</MicrosoftEntityFrameworkCoreToolsVersion>
<MicrosoftEntityFrameworkCoreVersion>9.0.15</MicrosoftEntityFrameworkCoreVersion>
<MicrosoftEntityFrameworkCoreDesignVersion>9.0.15</MicrosoftEntityFrameworkCoreDesignVersion>
<!-- Packages from dotnet/roslyn -->
<MicrosoftCodeAnalysisCommonVersion>4.11.0-3.24554.2</MicrosoftCodeAnalysisCommonVersion>
<MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.11.0-3.24554.2</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>
Expand Down
16 changes: 10 additions & 6 deletions src/SignalR/common/Shared/MessageBuffer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ internal sealed class MessageBuffer : IDisposable

#if NET8_0_OR_GREATER
private readonly PeriodicTimer _timer;
private readonly TimeProvider _timeProvider;
#else
private readonly TimerAwaitable _timer = new(AckRate, AckRate);
#endif
Expand Down Expand Up @@ -68,8 +69,8 @@ public MessageBuffer(ConnectionContext connection, IHubProtocol protocol, long b
public MessageBuffer(ConnectionContext connection, IHubProtocol protocol, long bufferLimit, ILogger logger, TimeProvider timeProvider)
{
#if NET8_0_OR_GREATER
timeProvider ??= TimeProvider.System;
_timer = new(AckRate, timeProvider);
_timeProvider = timeProvider;
_timer = new(AckRate, _timeProvider);
#endif

_buffer = new LinkedBuffer();
Expand Down Expand Up @@ -132,14 +133,17 @@ public ValueTask<FlushResult> WriteAsync(HubMessage hubMessage, CancellationToke

private async ValueTask<FlushResult> WriteAsyncCore(Type hubMessageType, ReadOnlyMemory<byte> messageBytes, CancellationToken cancellationToken)
{
// If backpressure is being observed a cancelable token is needed to make sure we can break out of waiting when the connection is closed
Debug.Assert(cancellationToken.CanBeCanceled);

// TODO: Add backpressure based on message count
if (_bufferedByteCount > _bufferLimit)
{
#if NET
using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5), _timeProvider);
#else
using var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5));
#endif
using var _ = CancellationTokenUtils.CreateLinkedToken(cts.Token, cancellationToken, out var linkedToken);
// primitive backpressure if buffer is full
while (await _waitForAck.Reader.WaitToReadAsync(cancellationToken).ConfigureAwait(false))
while (await _waitForAck.Reader.WaitToReadAsync(linkedToken).ConfigureAwait(false))
{
if (_waitForAck.Reader.TryRead(out var count) && count < _bufferLimit)
{
Expand Down
Loading
Loading