Skip to content

Commit 6caad2b

Browse files
authored
Merge pull request #36767 from dotnet/main
Merge to Live
2 parents 63d230c + 8c6d294 commit 6caad2b

File tree

563 files changed

+1499
-362147
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

563 files changed

+1499
-362147
lines changed

aspnetcore/blazor/fundamentals/configuration.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,9 +309,7 @@ For more information on how background updates are handled by PWAs, see <xref:bl
309309

310310
## Options configuration
311311

312-
[Options configuration](xref:fundamentals/configuration/options) requires adding a package reference for the [`Microsoft.Extensions.Options.ConfigurationExtensions`](https://www.nuget.org/packages/Microsoft.Extensions.Options.ConfigurationExtensions) NuGet package.
313-
314-
[!INCLUDE[](~/includes/package-reference.md)]
312+
[Options configuration](xref:fundamentals/configuration/options) uses API in the [`Microsoft.Extensions.Options.ConfigurationExtensions`](https://www.nuget.org/packages/Microsoft.Extensions.Options.ConfigurationExtensions) NuGet package.
315313

316314
Example:
317315

aspnetcore/fundamentals/configuration/index.md

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,6 @@ uid: fundamentals/configuration/index
1111
---
1212
# Configuration in ASP.NET Core
1313

14-
<!-- DOC AUTHOR NOTE
15-
16-
includes/bind6.md and includes/bind7.md are being retained
17-
at the moment for comparison for work on this article
18-
on https://github.com/dotnet/AspNetCore.Docs/issues/36220.
19-
Those two files will be deleted when working #36220.
20-
The includes/bind6.md file is being removed here in favor
21-
of cross-linking the Options article, which is what IMO
22-
should've been done in the first place.
23-
24-
Although the sample apps, which aren't Blazor-based, were
25-
moved to the ASP.NET Core samples repo, I can't remove them
26-
from the doc set until the Options article is also overhauled,
27-
which will take place on another PR later.
28-
29-
-->
30-
3114
[!INCLUDE[](~/includes/not-latest-version.md)]
3215

3316
App configuration in ASP.NET Core is performed using one or more [configuration providers](#configuration-providers). Configuration providers read configuration data from key-value pairs using a variety of configuration sources:

aspnetcore/fundamentals/configuration/index/samples/2.x/ConfigurationSample/ConfigurationSample.csproj

Lines changed: 0 additions & 11 deletions
This file was deleted.

aspnetcore/fundamentals/configuration/index/samples/2.x/ConfigurationSample/EFConfigurationProvider/EFConfigurationContext.cs

Lines changed: 0 additions & 16 deletions
This file was deleted.

aspnetcore/fundamentals/configuration/index/samples/2.x/ConfigurationSample/EFConfigurationProvider/EFConfigurationProvider.cs

Lines changed: 0 additions & 64 deletions
This file was deleted.

aspnetcore/fundamentals/configuration/index/samples/2.x/ConfigurationSample/EFConfigurationProvider/EFConfigurationSource.cs

Lines changed: 0 additions & 23 deletions
This file was deleted.

aspnetcore/fundamentals/configuration/index/samples/2.x/ConfigurationSample/Extensions/EntityFrameworkExtensions.cs

Lines changed: 0 additions & 19 deletions
This file was deleted.

aspnetcore/fundamentals/configuration/index/samples/2.x/ConfigurationSample/Models/ArrayExample.cs

Lines changed: 0 additions & 9 deletions
This file was deleted.

aspnetcore/fundamentals/configuration/index/samples/2.x/ConfigurationSample/Models/EFConfigurationValue.cs

Lines changed: 0 additions & 10 deletions
This file was deleted.

aspnetcore/fundamentals/configuration/index/samples/2.x/ConfigurationSample/Models/JsonArrayExample.cs

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)