Skip to content

Commit 784cc2b

Browse files
matthetheringtonmatthetherington
authored
Merge branch 'dotnet:main' into quickgrid-public-close-column-options
2 parents aadcc11 + 6a40a23 commit 784cc2b

File tree

6 files changed

+263
-257
lines changed

6 files changed

+263
-257
lines changed

‎eng/Version.Details.xml‎

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

‎eng/Versions.props‎

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -67,80 +67,80 @@
6767
-->
6868
<PropertyGroup Label="Automated">
6969
<!-- Packages from dotnet/runtime -->
70-
<MicrosoftExtensionsDependencyModelVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsDependencyModelVersion>
71-
<MicrosoftNETCoreAppRefVersion>10.0.0-alpha.1.24503.1</MicrosoftNETCoreAppRefVersion>
72-
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-alpha.1.24503.1</MicrosoftNETCoreAppRuntimewinx64Version>
73-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>10.0.0-alpha.1.24503.1</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
74-
<MicrosoftNETRuntimeWebAssemblySdkVersion>10.0.0-alpha.1.24503.1</MicrosoftNETRuntimeWebAssemblySdkVersion>
75-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>10.0.0-alpha.1.24503.1</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
76-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>10.0.0-alpha.1.24503.1</MicrosoftNETCoreBrowserDebugHostTransportVersion>
77-
<MicrosoftExtensionsCachingAbstractionsVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsCachingAbstractionsVersion>
78-
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsCachingMemoryVersion>
79-
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
80-
<MicrosoftExtensionsConfigurationBinderVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsConfigurationBinderVersion>
81-
<MicrosoftExtensionsConfigurationCommandLineVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsConfigurationCommandLineVersion>
82-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
83-
<MicrosoftExtensionsConfigurationFileExtensionsVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsConfigurationFileExtensionsVersion>
84-
<MicrosoftExtensionsConfigurationIniVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsConfigurationIniVersion>
85-
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsConfigurationJsonVersion>
86-
<MicrosoftExtensionsConfigurationVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsConfigurationVersion>
87-
<MicrosoftExtensionsConfigurationUserSecretsVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsConfigurationUserSecretsVersion>
88-
<MicrosoftExtensionsConfigurationXmlVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsConfigurationXmlVersion>
89-
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
90-
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsDependencyInjectionVersion>
91-
<MicrosoftExtensionsDiagnosticsAbstractionsVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsDiagnosticsAbstractionsVersion>
92-
<MicrosoftExtensionsDiagnosticsVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsDiagnosticsVersion>
93-
<MicrosoftExtensionsFileProvidersAbstractionsVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsFileProvidersAbstractionsVersion>
94-
<MicrosoftExtensionsFileProvidersCompositeVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsFileProvidersCompositeVersion>
95-
<MicrosoftExtensionsFileProvidersPhysicalVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsFileProvidersPhysicalVersion>
96-
<MicrosoftExtensionsFileSystemGlobbingVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsFileSystemGlobbingVersion>
97-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
98-
<MicrosoftExtensionsHostingAbstractionsVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsHostingAbstractionsVersion>
99-
<MicrosoftExtensionsHostingVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsHostingVersion>
100-
<MicrosoftExtensionsHttpVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsHttpVersion>
101-
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsLoggingAbstractionsVersion>
102-
<MicrosoftExtensionsLoggingConfigurationVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsLoggingConfigurationVersion>
103-
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsLoggingConsoleVersion>
104-
<MicrosoftExtensionsLoggingDebugVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsLoggingDebugVersion>
105-
<MicrosoftExtensionsLoggingEventSourceVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsLoggingEventSourceVersion>
106-
<MicrosoftExtensionsLoggingEventLogVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsLoggingEventLogVersion>
107-
<MicrosoftExtensionsLoggingVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsLoggingVersion>
108-
<MicrosoftExtensionsLoggingTraceSourceVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsLoggingTraceSourceVersion>
109-
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
110-
<MicrosoftExtensionsOptionsDataAnnotationsVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsOptionsDataAnnotationsVersion>
111-
<MicrosoftExtensionsOptionsVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsOptionsVersion>
112-
<MicrosoftExtensionsPrimitivesVersion>10.0.0-alpha.1.24503.1</MicrosoftExtensionsPrimitivesVersion>
113-
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>10.0.0-alpha.1.24503.1</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
114-
<MicrosoftSourceBuildIntermediateruntimelinuxx64Version>10.0.0-alpha.1.24503.1</MicrosoftSourceBuildIntermediateruntimelinuxx64Version>
115-
<SystemCompositionVersion>10.0.0-alpha.1.24503.1</SystemCompositionVersion>
116-
<SystemConfigurationConfigurationManagerVersion>10.0.0-alpha.1.24503.1</SystemConfigurationConfigurationManagerVersion>
117-
<SystemDiagnosticsDiagnosticSourceVersion>10.0.0-alpha.1.24503.1</SystemDiagnosticsDiagnosticSourceVersion>
118-
<SystemDiagnosticsEventLogVersion>10.0.0-alpha.1.24503.1</SystemDiagnosticsEventLogVersion>
119-
<SystemDirectoryServicesProtocolsVersion>10.0.0-alpha.1.24503.1</SystemDirectoryServicesProtocolsVersion>
120-
<SystemIOPipelinesVersion>10.0.0-alpha.1.24503.1</SystemIOPipelinesVersion>
121-
<SystemNetHttpJsonVersion>10.0.0-alpha.1.24503.1</SystemNetHttpJsonVersion>
122-
<SystemNetHttpWinHttpHandlerVersion>10.0.0-alpha.1.24503.1</SystemNetHttpWinHttpHandlerVersion>
123-
<SystemNetServerSentEventsVersion>10.0.0-alpha.1.24503.1</SystemNetServerSentEventsVersion>
124-
<SystemReflectionMetadataVersion>10.0.0-alpha.1.24503.1</SystemReflectionMetadataVersion>
125-
<SystemResourcesExtensionsVersion>10.0.0-alpha.1.24503.1</SystemResourcesExtensionsVersion>
126-
<SystemSecurityCryptographyPkcsVersion>10.0.0-alpha.1.24503.1</SystemSecurityCryptographyPkcsVersion>
127-
<SystemSecurityCryptographyXmlVersion>10.0.0-alpha.1.24503.1</SystemSecurityCryptographyXmlVersion>
128-
<SystemSecurityPermissionsVersion>10.0.0-alpha.1.24503.1</SystemSecurityPermissionsVersion>
129-
<SystemServiceProcessServiceControllerVersion>10.0.0-alpha.1.24503.1</SystemServiceProcessServiceControllerVersion>
130-
<SystemTextEncodingsWebVersion>10.0.0-alpha.1.24503.1</SystemTextEncodingsWebVersion>
131-
<SystemTextJsonVersion>10.0.0-alpha.1.24503.1</SystemTextJsonVersion>
132-
<SystemThreadingAccessControlVersion>10.0.0-alpha.1.24503.1</SystemThreadingAccessControlVersion>
133-
<SystemThreadingChannelsVersion>10.0.0-alpha.1.24503.1</SystemThreadingChannelsVersion>
134-
<SystemThreadingRateLimitingVersion>10.0.0-alpha.1.24503.1</SystemThreadingRateLimitingVersion>
70+
<MicrosoftExtensionsDependencyModelVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsDependencyModelVersion>
71+
<MicrosoftNETCoreAppRefVersion>10.0.0-alpha.1.24504.10</MicrosoftNETCoreAppRefVersion>
72+
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-alpha.1.24504.10</MicrosoftNETCoreAppRuntimewinx64Version>
73+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>10.0.0-alpha.1.24504.10</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
74+
<MicrosoftNETRuntimeWebAssemblySdkVersion>10.0.0-alpha.1.24504.10</MicrosoftNETRuntimeWebAssemblySdkVersion>
75+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>10.0.0-alpha.1.24504.10</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
76+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>10.0.0-alpha.1.24504.10</MicrosoftNETCoreBrowserDebugHostTransportVersion>
77+
<MicrosoftExtensionsCachingAbstractionsVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsCachingAbstractionsVersion>
78+
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsCachingMemoryVersion>
79+
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsConfigurationAbstractionsVersion>
80+
<MicrosoftExtensionsConfigurationBinderVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsConfigurationBinderVersion>
81+
<MicrosoftExtensionsConfigurationCommandLineVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsConfigurationCommandLineVersion>
82+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
83+
<MicrosoftExtensionsConfigurationFileExtensionsVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsConfigurationFileExtensionsVersion>
84+
<MicrosoftExtensionsConfigurationIniVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsConfigurationIniVersion>
85+
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsConfigurationJsonVersion>
86+
<MicrosoftExtensionsConfigurationVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsConfigurationVersion>
87+
<MicrosoftExtensionsConfigurationUserSecretsVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsConfigurationUserSecretsVersion>
88+
<MicrosoftExtensionsConfigurationXmlVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsConfigurationXmlVersion>
89+
<MicrosoftExtensionsDependencyInjectionAbstractionsVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsDependencyInjectionAbstractionsVersion>
90+
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsDependencyInjectionVersion>
91+
<MicrosoftExtensionsDiagnosticsAbstractionsVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsDiagnosticsAbstractionsVersion>
92+
<MicrosoftExtensionsDiagnosticsVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsDiagnosticsVersion>
93+
<MicrosoftExtensionsFileProvidersAbstractionsVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsFileProvidersAbstractionsVersion>
94+
<MicrosoftExtensionsFileProvidersCompositeVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsFileProvidersCompositeVersion>
95+
<MicrosoftExtensionsFileProvidersPhysicalVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsFileProvidersPhysicalVersion>
96+
<MicrosoftExtensionsFileSystemGlobbingVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsFileSystemGlobbingVersion>
97+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
98+
<MicrosoftExtensionsHostingAbstractionsVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsHostingAbstractionsVersion>
99+
<MicrosoftExtensionsHostingVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsHostingVersion>
100+
<MicrosoftExtensionsHttpVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsHttpVersion>
101+
<MicrosoftExtensionsLoggingAbstractionsVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsLoggingAbstractionsVersion>
102+
<MicrosoftExtensionsLoggingConfigurationVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsLoggingConfigurationVersion>
103+
<MicrosoftExtensionsLoggingConsoleVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsLoggingConsoleVersion>
104+
<MicrosoftExtensionsLoggingDebugVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsLoggingDebugVersion>
105+
<MicrosoftExtensionsLoggingEventSourceVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsLoggingEventSourceVersion>
106+
<MicrosoftExtensionsLoggingEventLogVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsLoggingEventLogVersion>
107+
<MicrosoftExtensionsLoggingVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsLoggingVersion>
108+
<MicrosoftExtensionsLoggingTraceSourceVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsLoggingTraceSourceVersion>
109+
<MicrosoftExtensionsOptionsConfigurationExtensionsVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsOptionsConfigurationExtensionsVersion>
110+
<MicrosoftExtensionsOptionsDataAnnotationsVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsOptionsDataAnnotationsVersion>
111+
<MicrosoftExtensionsOptionsVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsOptionsVersion>
112+
<MicrosoftExtensionsPrimitivesVersion>10.0.0-alpha.1.24504.10</MicrosoftExtensionsPrimitivesVersion>
113+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>10.0.0-alpha.1.24504.10</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
114+
<MicrosoftSourceBuildIntermediateruntimelinuxx64Version>10.0.0-alpha.1.24504.10</MicrosoftSourceBuildIntermediateruntimelinuxx64Version>
115+
<SystemCompositionVersion>10.0.0-alpha.1.24504.10</SystemCompositionVersion>
116+
<SystemConfigurationConfigurationManagerVersion>10.0.0-alpha.1.24504.10</SystemConfigurationConfigurationManagerVersion>
117+
<SystemDiagnosticsDiagnosticSourceVersion>10.0.0-alpha.1.24504.10</SystemDiagnosticsDiagnosticSourceVersion>
118+
<SystemDiagnosticsEventLogVersion>10.0.0-alpha.1.24504.10</SystemDiagnosticsEventLogVersion>
119+
<SystemDirectoryServicesProtocolsVersion>10.0.0-alpha.1.24504.10</SystemDirectoryServicesProtocolsVersion>
120+
<SystemIOPipelinesVersion>10.0.0-alpha.1.24504.10</SystemIOPipelinesVersion>
121+
<SystemNetHttpJsonVersion>10.0.0-alpha.1.24504.10</SystemNetHttpJsonVersion>
122+
<SystemNetHttpWinHttpHandlerVersion>10.0.0-alpha.1.24504.10</SystemNetHttpWinHttpHandlerVersion>
123+
<SystemNetServerSentEventsVersion>10.0.0-alpha.1.24504.10</SystemNetServerSentEventsVersion>
124+
<SystemReflectionMetadataVersion>10.0.0-alpha.1.24504.10</SystemReflectionMetadataVersion>
125+
<SystemResourcesExtensionsVersion>10.0.0-alpha.1.24504.10</SystemResourcesExtensionsVersion>
126+
<SystemSecurityCryptographyPkcsVersion>10.0.0-alpha.1.24504.10</SystemSecurityCryptographyPkcsVersion>
127+
<SystemSecurityCryptographyXmlVersion>10.0.0-alpha.1.24504.10</SystemSecurityCryptographyXmlVersion>
128+
<SystemSecurityPermissionsVersion>10.0.0-alpha.1.24504.10</SystemSecurityPermissionsVersion>
129+
<SystemServiceProcessServiceControllerVersion>10.0.0-alpha.1.24504.10</SystemServiceProcessServiceControllerVersion>
130+
<SystemTextEncodingsWebVersion>10.0.0-alpha.1.24504.10</SystemTextEncodingsWebVersion>
131+
<SystemTextJsonVersion>10.0.0-alpha.1.24504.10</SystemTextJsonVersion>
132+
<SystemThreadingAccessControlVersion>10.0.0-alpha.1.24504.10</SystemThreadingAccessControlVersion>
133+
<SystemThreadingChannelsVersion>10.0.0-alpha.1.24504.10</SystemThreadingChannelsVersion>
134+
<SystemThreadingRateLimitingVersion>10.0.0-alpha.1.24504.10</SystemThreadingRateLimitingVersion>
135135
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
136-
<MicrosoftNETCorePlatformsVersion>10.0.0-alpha.1.24503.1</MicrosoftNETCorePlatformsVersion>
137-
<MicrosoftBclAsyncInterfacesVersion>10.0.0-alpha.1.24503.1</MicrosoftBclAsyncInterfacesVersion>
136+
<MicrosoftNETCorePlatformsVersion>10.0.0-alpha.1.24504.10</MicrosoftNETCorePlatformsVersion>
137+
<MicrosoftBclAsyncInterfacesVersion>10.0.0-alpha.1.24504.10</MicrosoftBclAsyncInterfacesVersion>
138138
<!-- Transitive package to provide coherency in dotnet/extensions -->
139-
<MicrosoftBclTimeProviderVersion>10.0.0-alpha.1.24503.1</MicrosoftBclTimeProviderVersion>
140-
<SystemCollectionsImmutableVersion>10.0.0-alpha.1.24503.1</SystemCollectionsImmutableVersion>
141-
<SystemDiagnosticsPerformanceCounterVersion>10.0.0-alpha.1.24503.1</SystemDiagnosticsPerformanceCounterVersion>
142-
<SystemIOHashingVersion>10.0.0-alpha.1.24503.1</SystemIOHashingVersion>
143-
<SystemRuntimeCachingVersion>10.0.0-alpha.1.24503.1</SystemRuntimeCachingVersion>
139+
<MicrosoftBclTimeProviderVersion>10.0.0-alpha.1.24504.10</MicrosoftBclTimeProviderVersion>
140+
<SystemCollectionsImmutableVersion>10.0.0-alpha.1.24504.10</SystemCollectionsImmutableVersion>
141+
<SystemDiagnosticsPerformanceCounterVersion>10.0.0-alpha.1.24504.10</SystemDiagnosticsPerformanceCounterVersion>
142+
<SystemIOHashingVersion>10.0.0-alpha.1.24504.10</SystemIOHashingVersion>
143+
<SystemRuntimeCachingVersion>10.0.0-alpha.1.24504.10</SystemRuntimeCachingVersion>
144144
<!-- Packages from dotnet/extensions -->
145145
<MicrosoftExtensionsDiagnosticsTestingVersion>9.0.0-preview.9.24480.2</MicrosoftExtensionsDiagnosticsTestingVersion>
146146
<MicrosoftExtensionsTimeProviderTestingVersion>9.0.0-preview.9.24480.2</MicrosoftExtensionsTimeProviderTestingVersion>

‎src/Components/test/E2ETest/Tests/ThreadingAppTest.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ public void NavMenuHighlightsCurrentLocation()
6767
}
6868

6969
[Fact]
70+
[QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/58242")]
7071
public void CounterPageCanUseThreads()
7172
{
7273
// Navigate to "Counter"

‎src/Servers/Kestrel/Core/test/PipelineExtensionTests.cs‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
// Licensed to the .NET Foundation under one or more agreements.
22
// The .NET Foundation licenses this file to you under the MIT license.
33

4-
using System;
54
using System.Buffers;
65
using System.Globalization;
76
using System.IO.Pipelines;
87
using System.Text;
9-
using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http;
10-
using Xunit;
118

129
namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests;
1310

@@ -51,6 +48,25 @@ public void WritesNumericToAscii(ulong number)
5148
AssertExtensions.Equal(expected, reader.Buffer.Slice(0, numAsStr.Length).ToArray());
5249
}
5350

51+
[Fact]
52+
public void WritesNumericToAsciiFastPath()
53+
{
54+
for (ulong number = 0; number < 1000; number++)
55+
{
56+
var writerBuffer = _pipe.Writer;
57+
var writer = new BufferWriter<PipeWriter>(writerBuffer);
58+
writer.WriteNumeric(number);
59+
writer.Commit();
60+
writerBuffer.FlushAsync().GetAwaiter().GetResult();
61+
62+
var readResult = _pipe.Reader.ReadAsync().GetAwaiter().GetResult();
63+
var numAsStr = number.ToString(CultureInfo.InvariantCulture);
64+
var expected = Encoding.ASCII.GetBytes(numAsStr);
65+
AssertExtensions.Equal(expected, readResult.Buffer.Slice(0, numAsStr.Length).ToArray());
66+
_pipe.Reader.AdvanceTo(readResult.Buffer.End);
67+
}
68+
}
69+
5470
[Theory]
5571
[InlineData(1)]
5672
[InlineData(_ulongMaxValueLength / 2)]

0 commit comments

Comments
 (0)