Skip to content

Fixed package dependencies and replaced WebApplicationBuilder with IHostApplicationBuilder in extensions #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gigi81 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed package dependencies and replaced WebApplicationBuilder with IHostApplicationBuilder in extensions #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/ConsoleApplication/ConsoleApplication.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.10.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
Expand Down
10 changes: 4 additions & 6 deletions src/ConfigurationPlaceholders/ConfigurationPlaceholders.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,12 @@
</ItemGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.10.4" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
55 changes: 30 additions & 25 deletions src/ConfigurationPlaceholders/Extensions/ConfigurationPlaceholderEx.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using ConfigurationPlaceholders;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.Hosting;

namespace Microsoft.Extensions.Configuration;
Expand All @@ -12,31 +11,38 @@ public static class ConfigurationPlaceholderEx
/// <summary>
/// Adds support for placeholders in configuration sources.
/// </summary>
/// <param name="webApplicationBuilder"><see cref="WebApplicationBuilder" />.</param>
/// <param name="applicationBuilder"><see cref="IHostApplicationBuilder" />.</param>
/// <param name="placeholderResolvers">Placeholder value resolvers.</param>
/// <param name="missingPlaceholderValueStrategy">How to handle placeholders with missing values.</param>
/// <returns><see cref="WebApplicationBuilder" />.</returns>
public static WebApplicationBuilder AddConfigurationPlaceholders( this WebApplicationBuilder webApplicationBuilder,
IList<IPlaceholderResolver> placeholderResolvers,
MissingPlaceholderValueStrategy missingPlaceholderValueStrategy = MissingPlaceholderValueStrategy.VerifyAllAtStartup )
/// <returns><paramref name="applicationBuilder"/>.</returns>
public static IHostApplicationBuilder AddConfigurationPlaceholders(
this IHostApplicationBuilder applicationBuilder,
IList<IPlaceholderResolver> placeholderResolvers,
MissingPlaceholderValueStrategy missingPlaceholderValueStrategy = MissingPlaceholderValueStrategy.VerifyAllAtStartup)
{
webApplicationBuilder.Configuration.AddConfigurationPlaceholders( placeholderResolvers,
missingPlaceholderValueStrategy );
return webApplicationBuilder;
applicationBuilder.Configuration.AddConfigurationPlaceholders(
placeholderResolvers,
missingPlaceholderValueStrategy);

return applicationBuilder;
}

/// <summary>
/// Adds support for placeholders in configuration sources.
/// </summary>
/// <param name="webApplicationBuilder"><see cref="WebApplicationBuilder" />.</param>
/// <param name="applicationBuilder"><see cref="IHostApplicationBuilder" />.</param>
/// <param name="placeholderResolver">Placeholder value resolver.</param>
/// <param name="missingPlaceholderValueStrategy">How to handle placeholders with missing values.</param>
/// <returns><see cref="WebApplicationBuilder" />.</returns>
public static WebApplicationBuilder AddConfigurationPlaceholders( this WebApplicationBuilder webApplicationBuilder,
IPlaceholderResolver placeholderResolver,
MissingPlaceholderValueStrategy missingPlaceholderValueStrategy = MissingPlaceholderValueStrategy.VerifyAllAtStartup ) =>
webApplicationBuilder.AddConfigurationPlaceholders( new List<IPlaceholderResolver> { placeholderResolver },
missingPlaceholderValueStrategy );
/// <returns><paramref name="applicationBuilder"/>.</returns>
public static IHostApplicationBuilder AddConfigurationPlaceholders(
this IHostApplicationBuilder applicationBuilder,
IPlaceholderResolver placeholderResolver,
MissingPlaceholderValueStrategy missingPlaceholderValueStrategy = MissingPlaceholderValueStrategy.VerifyAllAtStartup)
{
return applicationBuilder.AddConfigurationPlaceholders(
new List<IPlaceholderResolver> { placeholderResolver },
missingPlaceholderValueStrategy );
}

/// <summary>
/// Adds support for placeholders in configuration sources.
Expand All @@ -45,16 +51,15 @@ public static WebApplicationBuilder AddConfigurationPlaceholders( this WebApplic
/// <param name="placeholderResolvers">Placeholder value resolvers.</param>
/// <param name="missingPlaceholderValueStrategy">How to handle placeholders with missing values.</param>
/// <returns><see cref="IHostBuilder" />.</returns>
public static IHostBuilder AddConfigurationPlaceholders( this IHostBuilder hostBuilder,
IList<IPlaceholderResolver> placeholderResolvers,
MissingPlaceholderValueStrategy missingPlaceholderValueStrategy = MissingPlaceholderValueStrategy.VerifyAllAtStartup )
public static IHostBuilder AddConfigurationPlaceholders(
this IHostBuilder hostBuilder,
IList<IPlaceholderResolver> placeholderResolvers,
MissingPlaceholderValueStrategy missingPlaceholderValueStrategy = MissingPlaceholderValueStrategy.VerifyAllAtStartup )
{
hostBuilder
.ConfigureAppConfiguration( ( _, config ) =>
{
config.AddConfigurationPlaceholders( placeholderResolvers,
missingPlaceholderValueStrategy );
} );
hostBuilder.ConfigureAppConfiguration( ( _, config ) =>
{
config.AddConfigurationPlaceholders( placeholderResolvers, missingPlaceholderValueStrategy);
});

return hostBuilder;
}
Expand Down
6 changes: 5 additions & 1 deletion test/ConfigurationPlaceholders.Test/ConfigurationPlaceholders.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.10.4" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
<PackageReference Include="EntityFrameworkCoreMock.Moq" Version="2.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
Expand All @@ -24,6 +24,10 @@
</PackageReference>
</ItemGroup>

<ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\ConfigurationPlaceholders\ConfigurationPlaceholders.csproj" />
</ItemGroup>
Expand Down