Skip to content

Commit 0c5e9e5

Browse files
authored
Making user secrets optional by default (#62821)
1 parent 4dd867f commit 0c5e9e5

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/UserSecretsConfigurationExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public static class UserSecretsConfigurationExtensions
2929
/// <returns>The configuration builder.</returns>
3030
public static IConfigurationBuilder AddUserSecrets<T>(this IConfigurationBuilder configuration)
3131
where T : class
32-
=> configuration.AddUserSecrets(typeof(T).Assembly, optional: false, reloadOnChange: false);
32+
=> configuration.AddUserSecrets(typeof(T).Assembly, optional: true, reloadOnChange: false);
3333

3434
/// <summary>
3535
/// <para>
@@ -82,7 +82,7 @@ public static IConfigurationBuilder AddUserSecrets<T>(this IConfigurationBuilder
8282
/// <exception cref="InvalidOperationException">Thrown when <paramref name="assembly"/> does not have a valid <see cref="UserSecretsIdAttribute"/></exception>
8383
/// <returns>The configuration builder.</returns>
8484
public static IConfigurationBuilder AddUserSecrets(this IConfigurationBuilder configuration, Assembly assembly)
85-
=> configuration.AddUserSecrets(assembly, optional: false, reloadOnChange: false);
85+
=> configuration.AddUserSecrets(assembly, optional: true, reloadOnChange: false);
8686

8787
/// <summary>
8888
/// <para>

src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,23 +87,23 @@ public void AddUserSecrets_FindsAssemblyAttributeFromType()
8787
public void AddUserSecrets_ThrowsIfAssemblyAttributeFromType()
8888
{
8989
var ex = Assert.Throws<InvalidOperationException>(() =>
90-
new ConfigurationBuilder().AddUserSecrets<string>());
90+
new ConfigurationBuilder().AddUserSecrets<string>(optional: false));
9191
Assert.Equal(SR.Format(SR.Error_Missing_UserSecretsIdAttribute, typeof(string).Assembly.GetName().Name),
9292
ex.Message);
9393

9494
ex = Assert.Throws<InvalidOperationException>(() =>
95-
new ConfigurationBuilder().AddUserSecrets(typeof(JObject).Assembly));
95+
new ConfigurationBuilder().AddUserSecrets(typeof(JObject).Assembly, optional: false));
9696
Assert.Equal(SR.Format(SR.Error_Missing_UserSecretsIdAttribute, typeof(JObject).Assembly.GetName().Name),
9797
ex.Message);
9898
}
9999

100100

101101
[Fact]
102-
public void AddUserSecrets_DoesNotThrowsIfOptional()
102+
public void AddUserSecrets_DoesNotThrowsIfOptionalByDefault()
103103
{
104104
var config = new ConfigurationBuilder()
105-
.AddUserSecrets<string>(optional: true)
106-
.AddUserSecrets(typeof(List<>).Assembly, optional: true)
105+
.AddUserSecrets<string>()
106+
.AddUserSecrets(typeof(List<>).Assembly)
107107
.Build();
108108

109109
Assert.Empty(config.AsEnumerable());

0 commit comments

Comments
 (0)