Skip to content

Commit eadea25

Browse files
wtgodbewtgodbe
authored
Merge pull request #64314 from vseanreesermsft/internal-merge-8.0-2025-11-11-1150
Merging internal commits for release/8.0
2 parents 47719da + 0477421 commit eadea25

File tree

7 files changed

+138
-74
lines changed

7 files changed

+138
-74
lines changed

‎Directory.Build.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,11 @@
234234
<CustomBeforeMicrosoftCommonCrossTargetingTargets>$(MSBuildThisFileDirectory)Directory.Build.BeforeCommonTargets.targets</CustomBeforeMicrosoftCommonCrossTargetingTargets>
235235
</PropertyGroup>
236236

237+
<!-- TODO: Re-enable NuGet Audit and fix alerts: https://github.com/dotnet/aspnetcore/issues/64177 -->
238+
<PropertyGroup>
239+
<NuGetAudit>false</NuGetAudit>
240+
</PropertyGroup>
241+
237242
<Import Project="eng\Workarounds.props" />
238243
<Import Project="artifacts\bin\GenerateFiles\Directory.Build.props" Condition=" '$(MSBuildProjectName)' != 'GenerateFiles' " />
239244
<Import Project="eng\Dependencies.props" />

‎NuGet.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@
66
<!-- Begin: Package sources from dotnet-extensions -->
77
<!-- End: Package sources from dotnet-extensions -->
88
<!-- Begin: Package sources from dotnet-efcore -->
9+
<add key="darc-int-dotnet-efcore-489d66c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-489d66cd/nuget/v3/index.json" />
910
<!-- End: Package sources from dotnet-efcore -->
1011
<!-- Begin: Package sources from dotnet-runtime -->
12+
<add key="darc-int-dotnet-runtime-a2266c7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a2266c72/nuget/v3/index.json" />
1113
<!-- End: Package sources from dotnet-runtime -->
1214
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1315
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -28,8 +30,10 @@
2830
<clear />
2931
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3032
<!-- Begin: Package sources from dotnet-efcore -->
33+
<add key="darc-int-dotnet-efcore-489d66c" value="true" />
3134
<!-- End: Package sources from dotnet-efcore -->
3235
<!-- Begin: Package sources from dotnet-runtime -->
36+
<add key="darc-int-dotnet-runtime-a2266c7" value="true" />
3337
<!-- End: Package sources from dotnet-runtime -->
3438
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3539
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,37 @@
99
-->
1010
<Dependencies>
1111
<ProductDependencies>
12-
<Dependency Name="dotnet-ef" Version="8.0.21">
12+
<Dependency Name="dotnet-ef" Version="8.0.22">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14-
<Sha>bd381fa6af1f80b3b6a52739729596cd68b6f5c8</Sha>
14+
<Sha>489d66cd0a20b7ed776a904051729e3b4d3cba13</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.21">
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.22">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18-
<Sha>bd381fa6af1f80b3b6a52739729596cd68b6f5c8</Sha>
18+
<Sha>489d66cd0a20b7ed776a904051729e3b4d3cba13</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="8.0.21">
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="8.0.22">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22-
<Sha>bd381fa6af1f80b3b6a52739729596cd68b6f5c8</Sha>
22+
<Sha>489d66cd0a20b7ed776a904051729e3b4d3cba13</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.21">
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.22">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26-
<Sha>bd381fa6af1f80b3b6a52739729596cd68b6f5c8</Sha>
26+
<Sha>489d66cd0a20b7ed776a904051729e3b4d3cba13</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.21">
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.22">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30-
<Sha>bd381fa6af1f80b3b6a52739729596cd68b6f5c8</Sha>
30+
<Sha>489d66cd0a20b7ed776a904051729e3b4d3cba13</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="8.0.21">
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="8.0.22">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34-
<Sha>bd381fa6af1f80b3b6a52739729596cd68b6f5c8</Sha>
34+
<Sha>489d66cd0a20b7ed776a904051729e3b4d3cba13</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="8.0.21">
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="8.0.22">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38-
<Sha>bd381fa6af1f80b3b6a52739729596cd68b6f5c8</Sha>
38+
<Sha>489d66cd0a20b7ed776a904051729e3b4d3cba13</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="8.0.21">
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="8.0.22">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42-
<Sha>bd381fa6af1f80b3b6a52739729596cd68b6f5c8</Sha>
42+
<Sha>489d66cd0a20b7ed776a904051729e3b4d3cba13</Sha>
4343
</Dependency>
4444
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0">
4545
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -121,9 +121,9 @@
121121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
122122
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
123123
</Dependency>
124-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.21-servicing.25475.13">
124+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.22-servicing.25527.7">
125125
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
126-
<Sha>362ab6669d55a75d51166f01b596c967c734ef4c</Sha>
126+
<Sha>a2266c728f63a494ccb6786d794da2df135030be</Sha>
127127
</Dependency>
128128
<Dependency Name="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1">
129129
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -185,9 +185,9 @@
185185
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
186186
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
187187
</Dependency>
188-
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="8.0.21-servicing.25475.13">
188+
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="8.0.22-servicing.25527.7">
189189
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
190-
<Sha>362ab6669d55a75d51166f01b596c967c734ef4c</Sha>
190+
<Sha>a2266c728f63a494ccb6786d794da2df135030be</Sha>
191191
</Dependency>
192192
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="8.0.0-alpha.1.25202.2">
193193
<Uri>https://github.com/dotnet/source-build-externals</Uri>
@@ -275,17 +275,17 @@
275275
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
276276
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
277277
</Dependency>
278-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.21">
278+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.22">
279279
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
280-
<Sha>362ab6669d55a75d51166f01b596c967c734ef4c</Sha>
280+
<Sha>a2266c728f63a494ccb6786d794da2df135030be</Sha>
281281
</Dependency>
282-
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="8.0.21">
282+
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="8.0.22">
283283
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
284-
<Sha>362ab6669d55a75d51166f01b596c967c734ef4c</Sha>
284+
<Sha>a2266c728f63a494ccb6786d794da2df135030be</Sha>
285285
</Dependency>
286-
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="8.0.21">
286+
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="8.0.22">
287287
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
288-
<Sha>362ab6669d55a75d51166f01b596c967c734ef4c</Sha>
288+
<Sha>a2266c728f63a494ccb6786d794da2df135030be</Sha>
289289
</Dependency>
290290
<Dependency Name="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0">
291291
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -316,22 +316,22 @@
316316
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
317317
All Runtime.$rid packages should have the same version.
318318
-->
319-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.21">
319+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.22">
320320
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
321-
<Sha>362ab6669d55a75d51166f01b596c967c734ef4c</Sha>
321+
<Sha>a2266c728f63a494ccb6786d794da2df135030be</Sha>
322322
</Dependency>
323-
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="8.0.21-servicing.25475.13">
323+
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="8.0.22-servicing.25527.7">
324324
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
325-
<Sha>362ab6669d55a75d51166f01b596c967c734ef4c</Sha>
325+
<Sha>a2266c728f63a494ccb6786d794da2df135030be</Sha>
326326
<SourceBuild RepoName="runtime" ManagedOnly="false" />
327327
</Dependency>
328-
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="8.0.21">
328+
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="8.0.22">
329329
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
330-
<Sha>362ab6669d55a75d51166f01b596c967c734ef4c</Sha>
330+
<Sha>a2266c728f63a494ccb6786d794da2df135030be</Sha>
331331
</Dependency>
332-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.21-servicing.25475.13">
332+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.22-servicing.25527.7">
333333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
334-
<Sha>362ab6669d55a75d51166f01b596c967c734ef4c</Sha>
334+
<Sha>a2266c728f63a494ccb6786d794da2df135030be</Sha>
335335
</Dependency>
336336
<Dependency Name="Microsoft.Web.Xdt" Version="7.0.0-preview.22423.2">
337337
<Uri>https://github.com/dotnet/xdt</Uri>
@@ -368,9 +368,9 @@
368368
</ProductDependencies>
369369
<ToolsetDependencies>
370370
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
371-
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.21-servicing.25475.13">
371+
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.22-servicing.25527.7">
372372
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
373-
<Sha>362ab6669d55a75d51166f01b596c967c734ef4c</Sha>
373+
<Sha>a2266c728f63a494ccb6786d794da2df135030be</Sha>
374374
</Dependency>
375375
<Dependency Name="System.Drawing.Common" Version="8.0.0-rtm.23520.14">
376376
<Uri>https://github.com/dotnet/winforms</Uri>

‎eng/Versions.props‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@
6767
<PropertyGroup Label="Automated">
6868
<!-- Packages from dotnet/runtime -->
6969
<MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
70-
<MicrosoftNETCoreAppRefVersion>8.0.21</MicrosoftNETCoreAppRefVersion>
71-
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.21</MicrosoftNETCoreAppRuntimewinx64Version>
72-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>8.0.21</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
73-
<MicrosoftNETRuntimeWebAssemblySdkVersion>8.0.21</MicrosoftNETRuntimeWebAssemblySdkVersion>
74-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>8.0.21</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
75-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.21-servicing.25475.13</MicrosoftNETCoreBrowserDebugHostTransportVersion>
70+
<MicrosoftNETCoreAppRefVersion>8.0.22</MicrosoftNETCoreAppRefVersion>
71+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.22</MicrosoftNETCoreAppRuntimewinx64Version>
72+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>8.0.22</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
73+
<MicrosoftNETRuntimeWebAssemblySdkVersion>8.0.22</MicrosoftNETRuntimeWebAssemblySdkVersion>
74+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>8.0.22</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
75+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.22-servicing.25527.7</MicrosoftNETCoreBrowserDebugHostTransportVersion>
7676
<MicrosoftExtensionsCachingAbstractionsVersion>8.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
7777
<MicrosoftExtensionsCachingMemoryVersion>8.0.1</MicrosoftExtensionsCachingMemoryVersion>
7878
<MicrosoftExtensionsConfigurationAbstractionsVersion>8.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
@@ -93,7 +93,7 @@
9393
<MicrosoftExtensionsFileProvidersCompositeVersion>8.0.0</MicrosoftExtensionsFileProvidersCompositeVersion>
9494
<MicrosoftExtensionsFileProvidersPhysicalVersion>8.0.0</MicrosoftExtensionsFileProvidersPhysicalVersion>
9595
<MicrosoftExtensionsFileSystemGlobbingVersion>8.0.0</MicrosoftExtensionsFileSystemGlobbingVersion>
96-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.21-servicing.25475.13</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
96+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.22-servicing.25527.7</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
9797
<MicrosoftExtensionsHostingAbstractionsVersion>8.0.1</MicrosoftExtensionsHostingAbstractionsVersion>
9898
<MicrosoftExtensionsHostingVersion>8.0.1</MicrosoftExtensionsHostingVersion>
9999
<MicrosoftExtensionsHttpVersion>8.0.1</MicrosoftExtensionsHttpVersion>
@@ -109,7 +109,7 @@
109109
<MicrosoftExtensionsOptionsDataAnnotationsVersion>8.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
110110
<MicrosoftExtensionsOptionsVersion>8.0.2</MicrosoftExtensionsOptionsVersion>
111111
<MicrosoftExtensionsPrimitivesVersion>8.0.0</MicrosoftExtensionsPrimitivesVersion>
112-
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>8.0.21-servicing.25475.13</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
112+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>8.0.22-servicing.25527.7</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
113113
<SystemConfigurationConfigurationManagerVersion>8.0.1</SystemConfigurationConfigurationManagerVersion>
114114
<SystemDiagnosticsDiagnosticSourceVersion>8.0.1</SystemDiagnosticsDiagnosticSourceVersion>
115115
<SystemDiagnosticsEventLogVersion>8.0.2</SystemDiagnosticsEventLogVersion>
@@ -129,9 +129,9 @@
129129
<SystemThreadingAccessControlVersion>8.0.0</SystemThreadingAccessControlVersion>
130130
<SystemThreadingChannelsVersion>8.0.0</SystemThreadingChannelsVersion>
131131
<SystemThreadingRateLimitingVersion>8.0.0</SystemThreadingRateLimitingVersion>
132-
<MicrosoftSourceBuildIntermediateruntimelinuxx64Version>8.0.21-servicing.25475.13</MicrosoftSourceBuildIntermediateruntimelinuxx64Version>
132+
<MicrosoftSourceBuildIntermediateruntimelinuxx64Version>8.0.22-servicing.25527.7</MicrosoftSourceBuildIntermediateruntimelinuxx64Version>
133133
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
134-
<MicrosoftNETCorePlatformsVersion>8.0.21-servicing.25475.13</MicrosoftNETCorePlatformsVersion>
134+
<MicrosoftNETCorePlatformsVersion>8.0.22-servicing.25527.7</MicrosoftNETCorePlatformsVersion>
135135
<MicrosoftBclAsyncInterfacesVersion>8.0.0</MicrosoftBclAsyncInterfacesVersion>
136136
<!-- Transitive package to provide coherency in dotnet/extensions -->
137137
<MicrosoftBclTimeProviderVersion>8.0.1</MicrosoftBclTimeProviderVersion>
@@ -143,14 +143,14 @@
143143
<MicrosoftExtensionsDiagnosticsTestingVersion>9.0.0-preview.9.24518.1</MicrosoftExtensionsDiagnosticsTestingVersion>
144144
<MicrosoftExtensionsTimeProviderTestingVersion>9.0.0-preview.9.24518.1</MicrosoftExtensionsTimeProviderTestingVersion>
145145
<!-- Packages from dotnet/efcore -->
146-
<dotnetefVersion>8.0.21</dotnetefVersion>
147-
<MicrosoftEntityFrameworkCoreInMemoryVersion>8.0.21</MicrosoftEntityFrameworkCoreInMemoryVersion>
148-
<MicrosoftEntityFrameworkCoreRelationalVersion>8.0.21</MicrosoftEntityFrameworkCoreRelationalVersion>
149-
<MicrosoftEntityFrameworkCoreSqliteVersion>8.0.21</MicrosoftEntityFrameworkCoreSqliteVersion>
150-
<MicrosoftEntityFrameworkCoreSqlServerVersion>8.0.21</MicrosoftEntityFrameworkCoreSqlServerVersion>
151-
<MicrosoftEntityFrameworkCoreToolsVersion>8.0.21</MicrosoftEntityFrameworkCoreToolsVersion>
152-
<MicrosoftEntityFrameworkCoreVersion>8.0.21</MicrosoftEntityFrameworkCoreVersion>
153-
<MicrosoftEntityFrameworkCoreDesignVersion>8.0.21</MicrosoftEntityFrameworkCoreDesignVersion>
146+
<dotnetefVersion>8.0.22</dotnetefVersion>
147+
<MicrosoftEntityFrameworkCoreInMemoryVersion>8.0.22</MicrosoftEntityFrameworkCoreInMemoryVersion>
148+
<MicrosoftEntityFrameworkCoreRelationalVersion>8.0.22</MicrosoftEntityFrameworkCoreRelationalVersion>
149+
<MicrosoftEntityFrameworkCoreSqliteVersion>8.0.22</MicrosoftEntityFrameworkCoreSqliteVersion>
150+
<MicrosoftEntityFrameworkCoreSqlServerVersion>8.0.22</MicrosoftEntityFrameworkCoreSqlServerVersion>
151+
<MicrosoftEntityFrameworkCoreToolsVersion>8.0.22</MicrosoftEntityFrameworkCoreToolsVersion>
152+
<MicrosoftEntityFrameworkCoreVersion>8.0.22</MicrosoftEntityFrameworkCoreVersion>
153+
<MicrosoftEntityFrameworkCoreDesignVersion>8.0.22</MicrosoftEntityFrameworkCoreDesignVersion>
154154
<!-- Packages from dotnet/roslyn -->
155155
<MicrosoftCodeAnalysisCommonVersion>4.8.0-7.24574.2</MicrosoftCodeAnalysisCommonVersion>
156156
<MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>4.8.0-7.24574.2</MicrosoftCodeAnalysisExternalAccessAspNetCoreVersion>

‎src/Servers/Kestrel/Core/src/Internal/Http3/Http3ControlStream.cs‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,12 @@ public Http3ControlStream(Http3StreamContext context, long? headerType)
6565
context.ClientPeerSettings,
6666
this);
6767
_frameWriter.Reset(context.Transport.Output, context.ConnectionId);
68+
69+
_streamClosedFeature.OnClosed(static state =>
70+
{
71+
var stream = (Http3ControlStream)state!;
72+
stream.OnStreamClosed();
73+
}, this);
6874
}
6975

7076
private void OnStreamClosed()
@@ -135,12 +141,6 @@ private bool TryClose()
135141

136142
internal async ValueTask ProcessOutboundSendsAsync(long id)
137143
{
138-
_streamClosedFeature.OnClosed(static state =>
139-
{
140-
var stream = (Http3ControlStream)state!;
141-
stream.OnStreamClosed();
142-
}, this);
143-
144144
await _frameWriter.WriteStreamIdAsync(id);
145145
await _frameWriter.WriteSettingsAsync(_serverPeerSettings.GetNonProtocolDefaults());
146146
}
@@ -311,18 +311,13 @@ private async Task HandleControlStream()
311311
}
312312
}
313313

314-
private async ValueTask HandleEncodingDecodingTask()
314+
private Task HandleEncodingDecodingTask()
315315
{
316316
// Noop encoding and decoding task. Settings make it so we don't need to read content of encoder and decoder.
317317
// An endpoint MUST allow its peer to create an encoder stream and a
318318
// decoder stream even if the connection's settings prevent their use.
319319

320-
while (_isClosed == 0)
321-
{
322-
var result = await Input.ReadAsync();
323-
var readableBuffer = result.Buffer;
324-
Input.AdvanceTo(readableBuffer.End);
325-
}
320+
return Input.CopyToAsync(Stream.Null);
326321
}
327322

328323
private ValueTask ProcessHttp3ControlStream(Http3RawFrame incomingFrame, bool isContinuedFrame, in ReadOnlySequence<byte> payload, out SequencePosition consumed)
@@ -372,11 +367,6 @@ private ValueTask ProcessSettingsFrameAsync(bool isContinuedFrame, ReadOnlySeque
372367
}
373368

374369
_haveReceivedSettingsFrame = true;
375-
_streamClosedFeature.OnClosed(static state =>
376-
{
377-
var stream = (Http3ControlStream)state!;
378-
stream.OnStreamClosed();
379-
}, this);
380370
}
381371

382372
while (true)

0 commit comments

Comments
 (0)