Resolving disposed service provider

docs/core/compatibility/6.0.md

@@ -83,8 +83,9 @@ If you're migrating an app to .NET 6, the breaking changes listed here might aff
 
 | Title | Binary compatible | Source compatible | Introduced |
 | - | - | - | - |
-| [FileConfigurationProvider.Load throws InvalidDataException](extensions/6.0/filename-in-load-exception.md) | ✔️ | ❌ | RC 1 |
 | [AddProvider checks for non-null provider](extensions/6.0/addprovider-null-check.md) | ✔️ | ❌ | RC 1 |
+| [FileConfigurationProvider.Load throws InvalidDataException](extensions/6.0/filename-in-load-exception.md) | ✔️ | ❌ | RC 1 |
+| [Resolving disposed ServiceProvider throws exception](extensions/6.0/service-provider-disposed.md) | ✔️ | ❌ | RC 1 |
 
 ## Globalization
 

docs/core/compatibility/extensions/6.0/service-provider-disposed.md

@@ -0,0 +1,39 @@
+---
+title: "Breaking change: Resolving disposed ServiceProvider throws exception"
+description: Learn about the .NET 6 breaking change in .NET extensions where resolving a disposed service provider throws an exception.
+ms.date: 11/08/2021
+---
+# Resolving disposed ServiceProvider throws exception
+
+When a service is resolved after the service provider has been disposed, the affected methods now throw an <xref:System.ObjectDisposedException> instead of causing a deadlock.
+
+## Version introduced
+
+6.0 RC 1
+
+## Previous behavior
+
+Previously, in the rare case that an application resolved a service after the service provider was disposed, it led to a deadlock.
+
+## New behavior
+
+Starting in .NET 6, an <xref:System.ObjectDisposedException> is thrown when a service is resolved after the service provider has been disposed, and there's no deadlock.
+
+## Type of breaking change
+
+This change can affect [source compatibility](../../categories.md#source-compatibility).
+
+## Reason for change
+
+This change was introduced to fix the deadlock scenario.
+
+## Recommended action
+
+Catch <xref:System.ObjectDisposedException> when calling any of the affected APIs.
+
+## Affected APIs
+
+- <xref:System.IServiceProvider.GetService(System.Type)?displayProperty=fullName>
+- <xref:Microsoft.Extensions.DependencyInjection.ISupportRequiredService.GetRequiredService(System.Type)?displayProperty=fullName>
+- <xref:Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService(System.IServiceProvider,System.Type)?displayProperty=fullName>
+- <xref:Microsoft.Extensions.DependencyInjection.ServiceProviderServiceExtensions.GetRequiredService%60%601(System.IServiceProvider)?displayProperty=fullName>

docs/core/compatibility/toc.yml

@@ -129,10 +129,12 @@ items:
         href: /ef/core/what-is-new/ef-core-6.0/breaking-changes?toc=/dotnet/core/compatibility/toc.json&bc=/dotnet/breadcrumb/toc.json
       - name: Extensions
         items:
-        - name: FileConfigurationProvider.Load throws InvalidDataException
-          href: extensions/6.0/filename-in-load-exception.md
         - name: AddProvider checks for non-null provider
           href: extensions/6.0/addprovider-null-check.md
+        - name: FileConfigurationProvider.Load throws InvalidDataException
+          href: extensions/6.0/filename-in-load-exception.md
+        - name: Resolving disposed ServiceProvider throws exception
+          href: extensions/6.0/service-provider-disposed.md
       - name: Globalization
         items:
         - name: Culture creation and case mapping in globalization-invariant mode
@@ -769,6 +771,8 @@ items:
           href: extensions/6.0/addprovider-null-check.md
         - name: FileConfigurationProvider.Load throws InvalidDataException
           href: extensions/6.0/filename-in-load-exception.md
+        - name: Resolving disposed ServiceProvider throws exception
+          href: extensions/6.0/service-provider-disposed.md
     - name: Globalization
       items:
       - name: .NET 6