[release/6.0] Making user secrets optional by default (dotnet#62917)

* Making user secrets optional by default

* update test

* Update fix for 6.0.x servicing.

Co-authored-by: Maryam Ariyan <maryam.ariyan@microsoft.com>
Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>

Author: 3 people

src/libraries/Microsoft.Extensions.Configuration.UserSecrets/src/Microsoft.Extensions.Configuration.UserSecrets.csproj

@@ -4,6 +4,8 @@
     <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <EnableDefaultItems>true</EnableDefaultItems>
     <PackageDescription>User secrets configuration provider implementation for Microsoft.Extensions.Configuration.</PackageDescription>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <ServicingVersion>1</ServicingVersion>
   </PropertyGroup>
 
   <ItemGroup>

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>

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

@@ -85,23 +85,23 @@ 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);
         }
 
 
         [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());