From 956dd7e89d63d4b0d3415b4106217880afbc3d10 Mon Sep 17 00:00:00 2001
From: Maryam Ariyan <maryam.ariyan@microsoft.com>
Date: Tue, 14 Dec 2021 15:56:13 -0800
Subject: [PATCH 1/2] Making user secrets optional by default

---
 .../src/UserSecretsConfigurationExtensions.cs                 | 4 ++--
 .../tests/ConfigurationExtensionTest.cs                       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/UserSecretsConfigurationExtensions.cs b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/UserSecretsConfigurationExtensions.cs
index 86139faf9b021d..963ac77a30eea6 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/UserSecretsConfigurationExtensions.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/UserSecretsConfigurationExtensions.cs
@@ -29,7 +29,7 @@ public static class UserSecretsConfigurationExtensions
         /// <returns>The configuration builder.</returns>
         public static IConfigurationBuilder AddUserSecrets<T>(this IConfigurationBuilder configuration)
             where T : class
-            => configuration.AddUserSecrets(typeof(T).Assembly, optional: false, reloadOnChange: false);
+            => configuration.AddUserSecrets(typeof(T).Assembly, optional: true, reloadOnChange: false);
 
         /// <summary>
         /// <para>
@@ -82,7 +82,7 @@ public static IConfigurationBuilder AddUserSecrets<T>(this IConfigurationBuilder
         /// <exception cref="InvalidOperationException">Thrown when <paramref name="assembly"/> does not have a valid <see cref="UserSecretsIdAttribute"/></exception>
         /// <returns>The configuration builder.</returns>
         public static IConfigurationBuilder AddUserSecrets(this IConfigurationBuilder configuration, Assembly assembly)
-            => configuration.AddUserSecrets(assembly, optional: false, reloadOnChange: false);
+            => configuration.AddUserSecrets(assembly, optional: true, reloadOnChange: false);
 
         /// <summary>
         /// <para>
diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs
index e0d86e456227c6..8d1dae90ec24d4 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs
@@ -87,12 +87,12 @@ public void AddUserSecrets_FindsAssemblyAttributeFromType()
         public void AddUserSecrets_ThrowsIfAssemblyAttributeFromType()
         {
             var ex = Assert.Throws<InvalidOperationException>(() =>
-                new ConfigurationBuilder().AddUserSecrets<string>());
+                new ConfigurationBuilder().AddUserSecrets<string>(optional: false));
             Assert.Equal(SR.Format(SR.Error_Missing_UserSecretsIdAttribute, typeof(string).Assembly.GetName().Name),
                 ex.Message);
 
             ex = Assert.Throws<InvalidOperationException>(() =>
-                new ConfigurationBuilder().AddUserSecrets(typeof(JObject).Assembly));
+                new ConfigurationBuilder().AddUserSecrets(typeof(JObject).Assembly, optional: false));
             Assert.Equal(SR.Format(SR.Error_Missing_UserSecretsIdAttribute, typeof(JObject).Assembly.GetName().Name),
                 ex.Message);
         }

From be9e9a5d2caf99870c3853f2f08ab4ee29aa305d Mon Sep 17 00:00:00 2001
From: Maryam Ariyan <maryam.ariyan@microsoft.com>
Date: Wed, 15 Dec 2021 12:02:30 -0800
Subject: [PATCH 2/2] update test

---
 .../tests/ConfigurationExtensionTest.cs                     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs
index 8d1dae90ec24d4..82391a90645af6 100644
--- a/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs
+++ b/src/libraries/Microsoft.Extensions.Configuration.UserSecrets/tests/ConfigurationExtensionTest.cs
@@ -99,11 +99,11 @@ public void AddUserSecrets_ThrowsIfAssemblyAttributeFromType()
 
 
         [Fact]
-        public void AddUserSecrets_DoesNotThrowsIfOptional()
+        public void AddUserSecrets_DoesNotThrowsIfOptionalByDefault()
         {
             var config = new ConfigurationBuilder()
-                .AddUserSecrets<string>(optional: true)
-                .AddUserSecrets(typeof(List<>).Assembly, optional: true)
+                .AddUserSecrets<string>()
+                .AddUserSecrets(typeof(List<>).Assembly)
                 .Build();
 
             Assert.Empty(config.AsEnumerable());