Skip to content

Commit e421ad9

Browse files
wtgodbewtgodbe
authored
Merge pull request #52047 from vseanreesermsft/internal-merge-6.0-2023-11-14-1024
Merging internal commits for release/6.0
2 parents 0cb750d + 5af738e commit e421ad9

File tree

12 files changed

+457
-400
lines changed

12 files changed

+457
-400
lines changed

‎NuGet.config

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,10 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-e0f0de8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e0f0de87/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-runtime-e0f0de8-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e0f0de87-3/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-e0f0de8-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e0f0de87-2/nuget/v3/index.json" />
10-
<add key="darc-int-dotnet-runtime-e0f0de8-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e0f0de87-1/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-runtime-492abbe" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-492abbee/nuget/v3/index.json" />
118
<!-- End: Package sources from dotnet-runtime -->
129
<!-- Begin: Package sources from dotnet-efcore -->
10+
<add key="darc-int-dotnet-efcore-ebac228" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-ebac2284/nuget/v3/index.json" />
1311
<!-- End: Package sources from dotnet-efcore -->
1412
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1513
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -27,12 +25,10 @@
2725
<clear />
2826
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2927
<!-- Begin: Package sources from dotnet-efcore -->
28+
<add key="darc-int-dotnet-efcore-ebac228" value="true" />
3029
<!-- End: Package sources from dotnet-efcore -->
3130
<!-- Begin: Package sources from dotnet-runtime -->
32-
<add key="darc-int-dotnet-runtime-e0f0de8-1" value="true" />
33-
<add key="darc-int-dotnet-runtime-e0f0de8-2" value="true" />
34-
<add key="darc-int-dotnet-runtime-e0f0de8-3" value="true" />
35-
<add key="darc-int-dotnet-runtime-e0f0de8" value="true" />
31+
<add key="darc-int-dotnet-runtime-492abbe" value="true" />
3632
<!-- End: Package sources from dotnet-runtime -->
3733
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3834
</disabledPackageSources>

‎eng/Baseline.Designer.props

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

‎eng/Baseline.xml

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

‎eng/Version.Details.xml

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,37 @@
99
-->
1010
<Dependencies>
1111
<ProductDependencies>
12-
<Dependency Name="dotnet-ef" Version="6.0.23">
13-
<Uri>https://github.com/dotnet/efcore</Uri>
14-
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
12+
<Dependency Name="dotnet-ef" Version="6.0.25">
13+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
14+
<Sha>ebac2284d2825218fa91c188a3f428f244aa6fe3</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.23">
17-
<Uri>https://github.com/dotnet/efcore</Uri>
18-
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
16+
<Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.25">
17+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
18+
<Sha>ebac2284d2825218fa91c188a3f428f244aa6fe3</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.23">
21-
<Uri>https://github.com/dotnet/efcore</Uri>
22-
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
20+
<Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.25">
21+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
22+
<Sha>ebac2284d2825218fa91c188a3f428f244aa6fe3</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.23">
25-
<Uri>https://github.com/dotnet/efcore</Uri>
26-
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
24+
<Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.25">
25+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
26+
<Sha>ebac2284d2825218fa91c188a3f428f244aa6fe3</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.23">
29-
<Uri>https://github.com/dotnet/efcore</Uri>
30-
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
28+
<Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.25">
29+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
30+
<Sha>ebac2284d2825218fa91c188a3f428f244aa6fe3</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.23">
33-
<Uri>https://github.com/dotnet/efcore</Uri>
34-
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
32+
<Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.25">
33+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
34+
<Sha>ebac2284d2825218fa91c188a3f428f244aa6fe3</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.23">
37-
<Uri>https://github.com/dotnet/efcore</Uri>
38-
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
36+
<Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.25">
37+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
38+
<Sha>ebac2284d2825218fa91c188a3f428f244aa6fe3</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.23">
41-
<Uri>https://github.com/dotnet/efcore</Uri>
42-
<Sha>50a6896cca24b06e154bdf652c2e7aefd0dfb7a1</Sha>
40+
<Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.25">
41+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-efcore</Uri>
42+
<Sha>ebac2284d2825218fa91c188a3f428f244aa6fe3</Sha>
4343
</Dependency>
4444
<Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0">
4545
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -177,9 +177,9 @@
177177
<Uri>https://github.com/dotnet/runtime</Uri>
178178
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
179179
</Dependency>
180-
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.23-servicing.23480.2">
180+
<Dependency Name="Microsoft.Internal.Runtime.AspNetCore.Transport" Version="6.0.25-servicing.23519.12">
181181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
182-
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
182+
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
183183
</Dependency>
184184
<Dependency Name="System.Diagnostics.DiagnosticSource" Version="6.0.1">
185185
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -233,9 +233,9 @@
233233
<Uri>https://github.com/dotnet/runtime</Uri>
234234
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
235235
</Dependency>
236-
<Dependency Name="System.Text.Json" Version="6.0.8">
236+
<Dependency Name="System.Text.Json" Version="6.0.9">
237237
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
238-
<Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
238+
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
239239
</Dependency>
240240
<Dependency Name="System.Threading.Channels" Version="6.0.0">
241241
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -245,33 +245,33 @@
245245
<Uri>https://github.com/dotnet/runtime</Uri>
246246
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
247247
</Dependency>
248-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.23">
248+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.25">
249249
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
250-
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
250+
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
251251
</Dependency>
252-
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.23">
252+
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.25">
253253
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
254-
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
254+
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
255255
</Dependency>
256-
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.23">
256+
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.25">
257257
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
258-
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
258+
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
259259
</Dependency>
260260
<!--
261261
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
262262
All Runtime.$rid packages should have the same version.
263263
-->
264-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.23">
264+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.25">
265265
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
266-
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
266+
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
267267
</Dependency>
268-
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.23">
268+
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.25">
269269
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
270-
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
270+
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
271271
</Dependency>
272-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.23-servicing.23480.2">
272+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.25-servicing.23519.12">
273273
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
274-
<Sha>e0f0de876a67755a2c6cd2dc730c13f5959bdea8</Sha>
274+
<Sha>492abbeef0d8a6ea902ac8f90ed339c7b1d18bf4</Sha>
275275
</Dependency>
276276
</ProductDependencies>
277277
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>26</AspNetCorePatchVersion>
12-
<ValidateBaseline>false</ValidateBaseline>
12+
<ValidateBaseline>true</ValidateBaseline>
1313
<!--
1414
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1515
-->
@@ -63,12 +63,12 @@
6363
<PropertyGroup Label="Automated">
6464
<!-- Packages from dotnet/runtime -->
6565
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
66-
<MicrosoftNETCoreAppRefVersion>6.0.23</MicrosoftNETCoreAppRefVersion>
67-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.23</MicrosoftNETCoreAppRuntimewinx64Version>
68-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.23</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69-
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.23</MicrosoftNETRuntimeWebAssemblySdkVersion>
70-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.23</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.23-servicing.23480.2</MicrosoftNETCoreBrowserDebugHostTransportVersion>
66+
<MicrosoftNETCoreAppRefVersion>6.0.25</MicrosoftNETCoreAppRefVersion>
67+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.25</MicrosoftNETCoreAppRuntimewinx64Version>
68+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.25</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
69+
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.25</MicrosoftNETRuntimeWebAssemblySdkVersion>
70+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.25</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.25-servicing.23519.12</MicrosoftNETCoreBrowserDebugHostTransportVersion>
7272
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0</MicrosoftExtensionsCachingAbstractionsVersion>
7373
<MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion>
7474
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
@@ -103,7 +103,7 @@
103103
<MicrosoftExtensionsOptionsDataAnnotationsVersion>6.0.0</MicrosoftExtensionsOptionsDataAnnotationsVersion>
104104
<MicrosoftExtensionsOptionsVersion>6.0.0</MicrosoftExtensionsOptionsVersion>
105105
<MicrosoftExtensionsPrimitivesVersion>6.0.0</MicrosoftExtensionsPrimitivesVersion>
106-
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.23-servicing.23480.2</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
106+
<MicrosoftInternalRuntimeAspNetCoreTransportVersion>6.0.25-servicing.23519.12</MicrosoftInternalRuntimeAspNetCoreTransportVersion>
107107
<SystemDiagnosticsDiagnosticSourceVersion>6.0.1</SystemDiagnosticsDiagnosticSourceVersion>
108108
<SystemDiagnosticsEventLogVersion>6.0.0</SystemDiagnosticsEventLogVersion>
109109
<SystemDirectoryServicesProtocolsVersion>6.0.2</SystemDirectoryServicesProtocolsVersion>
@@ -117,19 +117,19 @@
117117
<SystemSecurityCryptographyXmlVersion>6.0.1</SystemSecurityCryptographyXmlVersion>
118118
<SystemServiceProcessServiceControllerVersion>6.0.1</SystemServiceProcessServiceControllerVersion>
119119
<SystemTextEncodingsWebVersion>6.0.0</SystemTextEncodingsWebVersion>
120-
<SystemTextJsonVersion>6.0.8</SystemTextJsonVersion>
120+
<SystemTextJsonVersion>6.0.9</SystemTextJsonVersion>
121121
<SystemThreadingChannelsVersion>6.0.0</SystemThreadingChannelsVersion>
122122
<!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
123123
<MicrosoftNETCorePlatformsVersion>6.0.11</MicrosoftNETCorePlatformsVersion>
124124
<!-- Packages from dotnet/efcore -->
125-
<dotnetefVersion>6.0.23</dotnetefVersion>
126-
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.23</MicrosoftEntityFrameworkCoreInMemoryVersion>
127-
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.23</MicrosoftEntityFrameworkCoreRelationalVersion>
128-
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.23</MicrosoftEntityFrameworkCoreSqliteVersion>
129-
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.23</MicrosoftEntityFrameworkCoreSqlServerVersion>
130-
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.23</MicrosoftEntityFrameworkCoreToolsVersion>
131-
<MicrosoftEntityFrameworkCoreVersion>6.0.23</MicrosoftEntityFrameworkCoreVersion>
132-
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.23</MicrosoftEntityFrameworkCoreDesignVersion>
125+
<dotnetefVersion>6.0.25</dotnetefVersion>
126+
<MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.25</MicrosoftEntityFrameworkCoreInMemoryVersion>
127+
<MicrosoftEntityFrameworkCoreRelationalVersion>6.0.25</MicrosoftEntityFrameworkCoreRelationalVersion>
128+
<MicrosoftEntityFrameworkCoreSqliteVersion>6.0.25</MicrosoftEntityFrameworkCoreSqliteVersion>
129+
<MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.25</MicrosoftEntityFrameworkCoreSqlServerVersion>
130+
<MicrosoftEntityFrameworkCoreToolsVersion>6.0.25</MicrosoftEntityFrameworkCoreToolsVersion>
131+
<MicrosoftEntityFrameworkCoreVersion>6.0.25</MicrosoftEntityFrameworkCoreVersion>
132+
<MicrosoftEntityFrameworkCoreDesignVersion>6.0.25</MicrosoftEntityFrameworkCoreDesignVersion>
133133
<!-- Packages from dotnet/arcade -->
134134
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23511.8</MicrosoftDotNetBuildTasksInstallersVersion>
135135
<MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.23511.8</MicrosoftDotNetBuildTasksTemplatingVersion>

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.123"
3+
"version": "6.0.125"
44
},
55
"tools": {
6-
"dotnet": "6.0.123",
6+
"dotnet": "6.0.125",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.30",

‎src/Components/Components/src/ComponentBase.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,5 +329,8 @@ Task IHandleAfterRender.OnAfterRenderAsync()
329329
// have to use "async void" and do their own exception handling in
330330
// the case where they want to start an async task.
331331
}
332+
333+
// Exists for 6.0/7.0 patch only. A different solution is used from .NET 8 onwards.
334+
internal bool IsComponentDisposed() => _renderHandle.IsComponentDisposed();
332335
}
333336
}

‎src/Components/Components/src/RenderHandle.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ public Dispatcher Dispatcher
5252
internal bool IsRendererDisposed => _renderer?.Disposed
5353
?? throw new InvalidOperationException("No renderer has been initialized.");
5454

55+
// Exists for 6.0/7.0 patch only. A different solution is used from .NET 8 onwards.
56+
internal bool IsComponentDisposed() => _renderer?.IsComponentDisposed(_componentId) ?? false;
57+
5558
/// <summary>
5659
/// Notifies the renderer that the component should be rendered.
5760
/// </summary>

‎src/Components/Components/src/RenderTree/Renderer.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,5 +1114,9 @@ public async ValueTask DisposeAsync()
11141114
}
11151115
}
11161116
}
1117+
1118+
// Exists for 6.0/7.0 patch only. A different solution is used from .NET 8 onwards.
1119+
internal bool IsComponentDisposed(int componentId)
1120+
=> !_componentStateById.ContainsKey(componentId);
11171121
}
11181122
}

‎src/Components/Web/src/Forms/EditForm.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,12 @@ private async Task HandleSubmitAsync()
139139
{
140140
Debug.Assert(_editContext != null);
141141

142+
// Exists for 6.0/7.0 patch only. A different solution is used from .NET 8 onwards.
143+
if (IsComponentDisposed())
144+
{
145+
return;
146+
}
147+
142148
if (OnSubmit.HasDelegate)
143149
{
144150
// When using OnSubmit, the developer takes control of the validation lifecycle

0 commit comments

Comments
 (0)