diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/Helpers.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/Helpers.cs index cf9511cf5a6f90..f80edafeced652 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/Helpers.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Emitter/Helpers.cs @@ -53,10 +53,10 @@ private static class Expression private static class TypeDisplayString { public const string NullableActionOfBinderOptions = "Action?"; - public const string OptionsBuilderOfTOptions = $"OptionsBuilder<{Identifier.TOptions}>"; - public const string HashSetOfString = "HashSet"; - public const string LazyHashSetOfString = "Lazy>"; - public const string ListOfString = "List"; + public const string OptionsBuilderOfTOptions = $"global::Microsoft.Extensions.Options.OptionsBuilder<{Identifier.TOptions}>"; + public const string HashSetOfString = "global::System.Collections.Generic.HashSet"; + public const string LazyHashSetOfString = "Lazy>"; + public const string ListOfString = "global::System.Collections.Generic.List"; } private static class Identifier diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/TypeIndex.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/TypeIndex.cs index 5328d1da922a3a..74ab042c2a7969 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/TypeIndex.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/gen/Specs/TypeIndex.cs @@ -85,7 +85,12 @@ public static string GetPopulationCastTypeDisplayString(CollectionWithCtorInitSp public static string GetGenericTypeDisplayString(CollectionWithCtorInitSpec type, Enum genericProxyTypeName) { - string proxyTypeNameStr = genericProxyTypeName.ToString(); + string typeFNQ = type.TypeRef.FullyQualifiedName; + int genericIndex = typeFNQ.IndexOf('<'); + + // To get the namespace. + int lastDotIndex = genericIndex > 0 ? typeFNQ.LastIndexOf('.', genericIndex) : -1; + string proxyTypeNameStr = lastDotIndex >= 0 ? $"{typeFNQ.Substring(0, lastDotIndex + 1)}{genericProxyTypeName}" : genericProxyTypeName.ToString(); string elementTypeFQN = type.ElementTypeRef.FullyQualifiedName; if (type is EnumerableSpec) diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Bind.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Bind.generated.txt index 0b2716ecc60795..c86526984b3d40 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Bind.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Bind.generated.txt @@ -90,7 +90,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyDictionary", "MyComplexDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyDictionary", "MyComplexDictionary" }); public static void BindCore(IConfiguration configuration, ref global::System.Collections.Generic.List instance, bool defaultValueIfNotFound, BinderOptions? binderOptions) { @@ -212,17 +212,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Bind_Instance.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Bind_Instance.generated.txt index db4973ec820491..5bc1ad637bd7b5 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Bind_Instance.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Bind_Instance.generated.txt @@ -54,7 +54,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyDictionary", "MyComplexDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyDictionary", "MyComplexDictionary" }); public static void BindCore(IConfiguration configuration, ref global::System.Collections.Generic.List instance, bool defaultValueIfNotFound, BinderOptions? binderOptions) { @@ -176,17 +176,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Bind_Instance_BinderOptions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Bind_Instance_BinderOptions.generated.txt index 8107c8e1f5be88..c6c7feafc3cd66 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Bind_Instance_BinderOptions.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Bind_Instance_BinderOptions.generated.txt @@ -54,7 +54,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyDictionary", "MyComplexDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyDictionary", "MyComplexDictionary" }); public static void BindCore(IConfiguration configuration, ref global::System.Collections.Generic.List instance, bool defaultValueIfNotFound, BinderOptions? binderOptions) { @@ -176,17 +176,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Bind_Key_Instance.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Bind_Key_Instance.generated.txt index 790287e96b73e8..27ada27eeb2f74 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Bind_Key_Instance.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Bind_Key_Instance.generated.txt @@ -54,7 +54,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyDictionary", "MyComplexDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyDictionary", "MyComplexDictionary" }); public static void BindCore(IConfiguration configuration, ref global::System.Collections.Generic.List instance, bool defaultValueIfNotFound, BinderOptions? binderOptions) { @@ -176,17 +176,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get.generated.txt index 5cec1445fafd02..07b5468ceea345 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get.generated.txt @@ -52,8 +52,8 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyArray", "MyDictionary" }); - private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyArray", "MyDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); public static object? GetCore(this IConfiguration configuration, Type type, Action? configureOptions) { @@ -234,17 +234,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get_T.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get_T.generated.txt index cb1da974cf3580..2067a714833529 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get_T.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get_T.generated.txt @@ -40,7 +40,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyArray", "MyDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyArray", "MyDictionary" }); public static object? GetCore(this IConfiguration configuration, Type type, Action? configureOptions) { @@ -198,17 +198,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get_T_BinderOptions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get_T_BinderOptions.generated.txt index 76fb75a9f188d5..7f443cb8ec7c26 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get_T_BinderOptions.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get_T_BinderOptions.generated.txt @@ -40,7 +40,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyArray", "MyDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyArray", "MyDictionary" }); public static object? GetCore(this IConfiguration configuration, Type type, Action? configureOptions) { @@ -198,17 +198,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get_TypeOf.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get_TypeOf.generated.txt index cf0957f55679a9..aa8ad68a97fb6f 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get_TypeOf.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get_TypeOf.generated.txt @@ -40,7 +40,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); + private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); public static object? GetCore(this IConfiguration configuration, Type type, Action? configureOptions) { @@ -97,17 +97,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get_TypeOf_BinderOptions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get_TypeOf_BinderOptions.generated.txt index 9dd72429d26c97..b95a885ec261a7 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get_TypeOf_BinderOptions.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ConfigurationBinder/Version1/Get_TypeOf_BinderOptions.generated.txt @@ -40,7 +40,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); + private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); public static object? GetCore(this IConfiguration configuration, Type type, Action? configureOptions) { @@ -97,17 +97,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/OptionsBuilder/Version1/BindConfiguration.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/OptionsBuilder/Version1/BindConfiguration.generated.txt index 70a314c7f6381b..0a2c4f8f3f95a8 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/OptionsBuilder/Version1/BindConfiguration.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/OptionsBuilder/Version1/BindConfiguration.generated.txt @@ -35,10 +35,10 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration [GeneratedCode("Microsoft.Extensions.Configuration.Binder.SourceGeneration", "42.42.42.42")] file static class BindingExtensions { - #region OptionsBuilder extensions. + #region global::Microsoft.Extensions.Options.OptionsBuilder extensions. /// Registers the dependency injection container to bind against the obtained from the DI service provider. [InterceptsLocation(1, "dQtLTBW+V+KExKSKfSGYWHgBAABzcmMtMC5jcw==")] // src-0.cs(12,24) - public static OptionsBuilder BindConfiguration(this OptionsBuilder optionsBuilder, string configSectionPath, Action? configureBinder = null) where TOptions : class + public static global::Microsoft.Extensions.Options.OptionsBuilder BindConfiguration(this global::Microsoft.Extensions.Options.OptionsBuilder optionsBuilder, string configSectionPath, Action? configureBinder = null) where TOptions : class { if (optionsBuilder is null) { @@ -68,10 +68,10 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration return optionsBuilder; } - #endregion OptionsBuilder extensions. + #endregion global::Microsoft.Extensions.Options.OptionsBuilder extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList" }); public static void BindCoreMain(IConfiguration configuration, object instance, Type type, Action? configureOptions) { @@ -168,17 +168,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/OptionsBuilder/Version1/BindConfigurationWithConfigureActions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/OptionsBuilder/Version1/BindConfigurationWithConfigureActions.generated.txt index 4f2e4f38881727..b357b97fc261a0 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/OptionsBuilder/Version1/BindConfigurationWithConfigureActions.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/OptionsBuilder/Version1/BindConfigurationWithConfigureActions.generated.txt @@ -35,10 +35,10 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration [GeneratedCode("Microsoft.Extensions.Configuration.Binder.SourceGeneration", "42.42.42.42")] file static class BindingExtensions { - #region OptionsBuilder extensions. + #region global::Microsoft.Extensions.Options.OptionsBuilder extensions. /// Registers the dependency injection container to bind against the obtained from the DI service provider. [InterceptsLocation(1, "+juUY8RZzi0MOViHimSQBXgBAABzcmMtMC5jcw==")] // src-0.cs(12,24) - public static OptionsBuilder BindConfiguration(this OptionsBuilder optionsBuilder, string configSectionPath, Action? configureBinder = null) where TOptions : class + public static global::Microsoft.Extensions.Options.OptionsBuilder BindConfiguration(this global::Microsoft.Extensions.Options.OptionsBuilder optionsBuilder, string configSectionPath, Action? configureBinder = null) where TOptions : class { if (optionsBuilder is null) { @@ -68,10 +68,10 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration return optionsBuilder; } - #endregion OptionsBuilder extensions. + #endregion global::Microsoft.Extensions.Options.OptionsBuilder extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList" }); public static void BindCoreMain(IConfiguration configuration, object instance, Type type, Action? configureOptions) { @@ -168,17 +168,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/OptionsBuilder/Version1/Bind_T.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/OptionsBuilder/Version1/Bind_T.generated.txt index 32d1b8094aaa98..013ef9e450173f 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/OptionsBuilder/Version1/Bind_T.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/OptionsBuilder/Version1/Bind_T.generated.txt @@ -35,16 +35,16 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration [GeneratedCode("Microsoft.Extensions.Configuration.Binder.SourceGeneration", "42.42.42.42")] file static class BindingExtensions { - #region OptionsBuilder extensions. + #region global::Microsoft.Extensions.Options.OptionsBuilder extensions. /// Registers a configuration instance which will bind against. [InterceptsLocation(1, "/HkAEr/Ik8W47keDiXaNkeEBAABzcmMtMC5jcw==")] // src-0.cs(15,24) - public static OptionsBuilder Bind(this OptionsBuilder optionsBuilder, IConfiguration config) where TOptions : class + public static global::Microsoft.Extensions.Options.OptionsBuilder Bind(this global::Microsoft.Extensions.Options.OptionsBuilder optionsBuilder, IConfiguration config) where TOptions : class { return Bind(optionsBuilder, config, configureBinder: null); } /// Registers a configuration instance which will bind against. - public static OptionsBuilder Bind(this OptionsBuilder optionsBuilder, IConfiguration config, Action? configureBinder) where TOptions : class + public static global::Microsoft.Extensions.Options.OptionsBuilder Bind(this global::Microsoft.Extensions.Options.OptionsBuilder optionsBuilder, IConfiguration config, Action? configureBinder) where TOptions : class { if (optionsBuilder is null) { @@ -54,7 +54,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration Configure(optionsBuilder.Services, optionsBuilder.Name, config, configureBinder); return optionsBuilder; } - #endregion OptionsBuilder extensions. + #endregion global::Microsoft.Extensions.Options.OptionsBuilder extensions. #region IServiceCollection extensions. /// Registers a configuration instance which TOptions will bind against. @@ -77,7 +77,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IServiceCollection extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList" }); public static void BindCoreMain(IConfiguration configuration, object instance, Type type, Action? configureOptions) { @@ -174,17 +174,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/OptionsBuilder/Version1/Bind_T_BinderOptions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/OptionsBuilder/Version1/Bind_T_BinderOptions.generated.txt index 25178f08033f36..eccfa299c31c60 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/OptionsBuilder/Version1/Bind_T_BinderOptions.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/OptionsBuilder/Version1/Bind_T_BinderOptions.generated.txt @@ -35,10 +35,10 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration [GeneratedCode("Microsoft.Extensions.Configuration.Binder.SourceGeneration", "42.42.42.42")] file static class BindingExtensions { - #region OptionsBuilder extensions. + #region global::Microsoft.Extensions.Options.OptionsBuilder extensions. /// Registers a configuration instance which will bind against. [InterceptsLocation(1, "eAEQHTx/qUZMzyaWapEG3uEBAABzcmMtMC5jcw==")] // src-0.cs(15,24) - public static OptionsBuilder Bind(this OptionsBuilder optionsBuilder, IConfiguration config, Action? configureBinder) where TOptions : class + public static global::Microsoft.Extensions.Options.OptionsBuilder Bind(this global::Microsoft.Extensions.Options.OptionsBuilder optionsBuilder, IConfiguration config, Action? configureBinder) where TOptions : class { if (optionsBuilder is null) { @@ -48,7 +48,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration Configure(optionsBuilder.Services, optionsBuilder.Name, config, configureBinder); return optionsBuilder; } - #endregion OptionsBuilder extensions. + #endregion global::Microsoft.Extensions.Options.OptionsBuilder extensions. #region IServiceCollection extensions. /// Registers a configuration instance which TOptions will bind against. @@ -71,7 +71,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IServiceCollection extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList" }); public static void BindCoreMain(IConfiguration configuration, object instance, Type type, Action? configureOptions) { @@ -168,17 +168,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ServiceCollection/Version1/Configure_T.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ServiceCollection/Version1/Configure_T.generated.txt index f163010342e3e9..c7848d855b7ebd 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ServiceCollection/Version1/Configure_T.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ServiceCollection/Version1/Configure_T.generated.txt @@ -64,8 +64,8 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IServiceCollection extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyList2", "MyDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyList2", "MyDictionary" }); public static void BindCoreMain(IConfiguration configuration, object instance, Type type, Action? configureOptions) { @@ -230,17 +230,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ServiceCollection/Version1/Configure_T_BinderOptions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ServiceCollection/Version1/Configure_T_BinderOptions.generated.txt index 659ba0253896a8..074cead2a39a8b 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ServiceCollection/Version1/Configure_T_BinderOptions.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ServiceCollection/Version1/Configure_T_BinderOptions.generated.txt @@ -64,8 +64,8 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IServiceCollection extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyList2", "MyDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyList2", "MyDictionary" }); public static void BindCoreMain(IConfiguration configuration, object instance, Type type, Action? configureOptions) { @@ -230,17 +230,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ServiceCollection/Version1/Configure_T_name.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ServiceCollection/Version1/Configure_T_name.generated.txt index c41ec585212ae1..8500b226e943a5 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ServiceCollection/Version1/Configure_T_name.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ServiceCollection/Version1/Configure_T_name.generated.txt @@ -64,8 +64,8 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IServiceCollection extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyList2", "MyDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyList2", "MyDictionary" }); public static void BindCoreMain(IConfiguration configuration, object instance, Type type, Action? configureOptions) { @@ -230,17 +230,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ServiceCollection/Version1/Configure_T_name_BinderOptions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ServiceCollection/Version1/Configure_T_name_BinderOptions.generated.txt index 6ef54170c0696e..8a6cbcdd238908 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ServiceCollection/Version1/Configure_T_name_BinderOptions.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/ServiceCollection/Version1/Configure_T_name_BinderOptions.generated.txt @@ -58,8 +58,8 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IServiceCollection extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyList2", "MyDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyList2", "MyDictionary" }); public static void BindCoreMain(IConfiguration configuration, object instance, Type type, Action? configureOptions) { @@ -224,17 +224,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/Collections.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/Collections.generated.txt index 7ff43631ba430d..668cbc6f836bd0 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/Collections.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/Collections.generated.txt @@ -41,7 +41,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClassWithCustomCollections = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "CustomDictionary", "CustomList", "ICustomDictionary", "ICustomCollection", "IReadOnlyList", "UnsupportedIReadOnlyDictionaryUnsupported", "IReadOnlyDictionary", "CollectionStructExplicit" }); + private readonly static Lazy> s_configKeys_Program__MyClassWithCustomCollections = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "CustomDictionary", "CustomList", "ICustomDictionary", "ICustomCollection", "IReadOnlyList", "UnsupportedIReadOnlyDictionaryUnsupported", "IReadOnlyDictionary", "CollectionStructExplicit" }); public static object? GetCore(this IConfiguration configuration, Type type, Action? configureOptions) { @@ -94,7 +94,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration public static void BindCore(IConfiguration configuration, ref global::System.Collections.Generic.IReadOnlyList instance, bool defaultValueIfNotFound, BinderOptions? binderOptions) { - if (instance is not ICollection temp) + if (instance is not global::System.Collections.Generic.ICollection temp) { return; } @@ -113,7 +113,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration public static void BindCore(IConfiguration configuration, ref global::System.Collections.Generic.IReadOnlyDictionary instance, bool defaultValueIfNotFound, BinderOptions? binderOptions) { - if (instance is not IDictionary temp) + if (instance is not global::System.Collections.Generic.IDictionary temp) { return; } @@ -177,7 +177,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration if (AsConfigWithChildren(value9) is IConfigurationSection section10) { global::System.Collections.Generic.IReadOnlyList? temp12 = instance.IReadOnlyList; - temp12 = temp12 is null ? (global::System.Collections.Generic.IReadOnlyList)new List() : (global::System.Collections.Generic.IReadOnlyList)new List(temp12); + temp12 = temp12 is null ? (global::System.Collections.Generic.IReadOnlyList)new global::System.Collections.Generic.List() : (global::System.Collections.Generic.IReadOnlyList)new global::System.Collections.Generic.List(temp12); BindCore(section10, ref temp12, defaultValueIfNotFound: false, binderOptions); instance.IReadOnlyList = temp12; } @@ -190,7 +190,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration if (AsConfigWithChildren(value13) is IConfigurationSection section14) { global::System.Collections.Generic.IReadOnlyDictionary? temp16 = instance.IReadOnlyDictionary; - temp16 = temp16 is null ? (global::System.Collections.Generic.IReadOnlyDictionary)new Dictionary() : (global::System.Collections.Generic.IReadOnlyDictionary)temp16.ToDictionary(pair => pair.Key, pair => pair.Value); + temp16 = temp16 is null ? (global::System.Collections.Generic.IReadOnlyDictionary)new global::System.Collections.Generic.Dictionary() : (global::System.Collections.Generic.IReadOnlyDictionary)temp16.ToDictionary(pair => pair.Key, pair => pair.Value); BindCore(section14, ref temp16, defaultValueIfNotFound: false, binderOptions); instance.IReadOnlyDictionary = temp16; } @@ -228,17 +228,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/DefaultConstructorParameters.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/DefaultConstructorParameters.generated.txt index 869cdd2bc10612..9ce7c5c2076008 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/DefaultConstructorParameters.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/DefaultConstructorParameters.generated.txt @@ -54,7 +54,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__ClassWhereParametersHaveDefaultValue = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "Name", "Address", "Age", "F", "D", "M", "SC", "C", "NAge", "NF", "ND", "NM", "NSC", "NC" }); + private readonly static Lazy> s_configKeys_Program__ClassWhereParametersHaveDefaultValue = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "Name", "Address", "Age", "F", "D", "M", "SC", "C", "NAge", "NF", "ND", "NM", "NSC", "NC" }); public static void BindCore(IConfiguration configuration, ref global::Program.ClassWhereParametersHaveDefaultValue instance, bool defaultValueIfNotFound, BinderOptions? binderOptions) { @@ -242,17 +242,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/EmptyConfigType.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/EmptyConfigType.generated.txt index 56e3b5dffb1b21..5a3d9373a5e849 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/EmptyConfigType.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/EmptyConfigType.generated.txt @@ -61,7 +61,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_TypeWithNoMembers_Wrapper = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "Member" }); + private readonly static Lazy> s_configKeys_TypeWithNoMembers_Wrapper = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "Member" }); public static void BindCore(IConfiguration configuration, ref global::TypeWithNoMembers_Wrapper instance, bool defaultValueIfNotFound, BinderOptions? binderOptions) { @@ -88,17 +88,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/Primitives.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/Primitives.generated.txt index 0a5bfeaa6a1eab..c04c278e695ee9 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/Primitives.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/Primitives.generated.txt @@ -54,7 +54,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "Prop0", "Prop1", "Prop2", "Prop3", "Prop4", "Prop5", "Prop6", "Prop8", "Prop9", "Prop10", "Prop13", "Prop14", "Prop15", "Prop16", "Prop17", "Prop19", "Prop20", "Prop21", "Prop23", "Prop24", "Prop25", "Prop26", "Prop27", "Prop28", "Prop29", "Prop30" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "Prop0", "Prop1", "Prop2", "Prop3", "Prop4", "Prop5", "Prop6", "Prop8", "Prop9", "Prop10", "Prop13", "Prop14", "Prop15", "Prop16", "Prop17", "Prop19", "Prop20", "Prop21", "Prop23", "Prop24", "Prop25", "Prop26", "Prop27", "Prop28", "Prop29", "Prop30" }); public static void BindCore(IConfiguration configuration, ref global::Program.MyClass instance, bool defaultValueIfNotFound, BinderOptions? binderOptions) { @@ -437,17 +437,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/UnsupportedTypes.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/UnsupportedTypes.generated.txt index f654bdd3d1b468..39b49f50deea16 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/UnsupportedTypes.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/net462/Version1/UnsupportedTypes.generated.txt @@ -60,8 +60,8 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Record___System__Action___ = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "x" }); - private readonly static Lazy> s_configKeys_Options = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "Name", "Age", "List", "Array", "Record" }); + private readonly static Lazy> s_configKeys_Record___System__Action___ = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "x" }); + private readonly static Lazy> s_configKeys_Options = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "Name", "Age", "List", "Array", "Record" }); public static object? GetCore(this IConfiguration configuration, Type type, Action? configureOptions) { @@ -230,17 +230,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Bind.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Bind.generated.txt index 790474dbfc1dd6..7f4fd63b274009 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Bind.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Bind.generated.txt @@ -81,7 +81,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyDictionary", "MyComplexDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyDictionary", "MyComplexDictionary" }); public static void BindCore(IConfiguration configuration, ref global::System.Collections.Generic.List instance, bool defaultValueIfNotFound, BinderOptions? binderOptions) { @@ -203,17 +203,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Bind_Instance.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Bind_Instance.generated.txt index 402443ec1d66b2..60a5eb1103e120 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Bind_Instance.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Bind_Instance.generated.txt @@ -51,7 +51,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyDictionary", "MyComplexDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyDictionary", "MyComplexDictionary" }); public static void BindCore(IConfiguration configuration, ref global::System.Collections.Generic.List instance, bool defaultValueIfNotFound, BinderOptions? binderOptions) { @@ -173,17 +173,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Bind_Instance_BinderOptions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Bind_Instance_BinderOptions.generated.txt index 613c71fc65c901..fcd3c5465d9021 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Bind_Instance_BinderOptions.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Bind_Instance_BinderOptions.generated.txt @@ -51,7 +51,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyDictionary", "MyComplexDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyDictionary", "MyComplexDictionary" }); public static void BindCore(IConfiguration configuration, ref global::System.Collections.Generic.List instance, bool defaultValueIfNotFound, BinderOptions? binderOptions) { @@ -173,17 +173,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Bind_Key_Instance.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Bind_Key_Instance.generated.txt index 0311e156bf301f..88c3f160a93ba6 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Bind_Key_Instance.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Bind_Key_Instance.generated.txt @@ -51,7 +51,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyDictionary", "MyComplexDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyDictionary", "MyComplexDictionary" }); public static void BindCore(IConfiguration configuration, ref global::System.Collections.Generic.List instance, bool defaultValueIfNotFound, BinderOptions? binderOptions) { @@ -173,17 +173,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get.generated.txt index 85cf5811d9c82a..99e17ad2ff8418 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get.generated.txt @@ -52,8 +52,8 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyArray", "MyDictionary" }); - private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyArray", "MyDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); public static object? GetCore(this IConfiguration configuration, Type type, Action? configureOptions) { @@ -231,17 +231,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get_T.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get_T.generated.txt index 6b19b19d4105cf..437bce7d135008 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get_T.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get_T.generated.txt @@ -40,7 +40,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyArray", "MyDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyArray", "MyDictionary" }); public static object? GetCore(this IConfiguration configuration, Type type, Action? configureOptions) { @@ -195,17 +195,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get_T_BinderOptions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get_T_BinderOptions.generated.txt index 875cf9916f18ac..654d5d65e0192b 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get_T_BinderOptions.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get_T_BinderOptions.generated.txt @@ -40,7 +40,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyArray", "MyDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyArray", "MyDictionary" }); public static object? GetCore(this IConfiguration configuration, Type type, Action? configureOptions) { @@ -195,17 +195,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get_TypeOf.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get_TypeOf.generated.txt index f921461fcfc74f..08b582ec3f93d9 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get_TypeOf.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get_TypeOf.generated.txt @@ -40,7 +40,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); + private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); public static object? GetCore(this IConfiguration configuration, Type type, Action? configureOptions) { @@ -94,17 +94,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get_TypeOf_BinderOptions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get_TypeOf_BinderOptions.generated.txt index 3f89385e70f136..e7a5e8ac0194eb 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get_TypeOf_BinderOptions.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ConfigurationBinder/Version1/Get_TypeOf_BinderOptions.generated.txt @@ -40,7 +40,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); + private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); public static object? GetCore(this IConfiguration configuration, Type type, Action? configureOptions) { @@ -94,17 +94,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/OptionsBuilder/Version1/BindConfiguration.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/OptionsBuilder/Version1/BindConfiguration.generated.txt index 3f1dae70e25480..d66b850ec73a64 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/OptionsBuilder/Version1/BindConfiguration.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/OptionsBuilder/Version1/BindConfiguration.generated.txt @@ -35,10 +35,10 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration [GeneratedCode("Microsoft.Extensions.Configuration.Binder.SourceGeneration", "42.42.42.42")] file static class BindingExtensions { - #region OptionsBuilder extensions. + #region global::Microsoft.Extensions.Options.OptionsBuilder extensions. /// Registers the dependency injection container to bind against the obtained from the DI service provider. [InterceptsLocation(1, "dQtLTBW+V+KExKSKfSGYWHgBAABzcmMtMC5jcw==")] // src-0.cs(12,24) - public static OptionsBuilder BindConfiguration(this OptionsBuilder optionsBuilder, string configSectionPath, Action? configureBinder = null) where TOptions : class + public static global::Microsoft.Extensions.Options.OptionsBuilder BindConfiguration(this global::Microsoft.Extensions.Options.OptionsBuilder optionsBuilder, string configSectionPath, Action? configureBinder = null) where TOptions : class { ArgumentNullException.ThrowIfNull(optionsBuilder); @@ -59,10 +59,10 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration return optionsBuilder; } - #endregion OptionsBuilder extensions. + #endregion global::Microsoft.Extensions.Options.OptionsBuilder extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList" }); public static void BindCoreMain(IConfiguration configuration, object instance, Type type, Action? configureOptions) { @@ -159,17 +159,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/OptionsBuilder/Version1/BindConfigurationWithConfigureActions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/OptionsBuilder/Version1/BindConfigurationWithConfigureActions.generated.txt index 99bbd6f712f020..32ee775fe8bb0b 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/OptionsBuilder/Version1/BindConfigurationWithConfigureActions.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/OptionsBuilder/Version1/BindConfigurationWithConfigureActions.generated.txt @@ -35,10 +35,10 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration [GeneratedCode("Microsoft.Extensions.Configuration.Binder.SourceGeneration", "42.42.42.42")] file static class BindingExtensions { - #region OptionsBuilder extensions. + #region global::Microsoft.Extensions.Options.OptionsBuilder extensions. /// Registers the dependency injection container to bind against the obtained from the DI service provider. [InterceptsLocation(1, "+juUY8RZzi0MOViHimSQBXgBAABzcmMtMC5jcw==")] // src-0.cs(12,24) - public static OptionsBuilder BindConfiguration(this OptionsBuilder optionsBuilder, string configSectionPath, Action? configureBinder = null) where TOptions : class + public static global::Microsoft.Extensions.Options.OptionsBuilder BindConfiguration(this global::Microsoft.Extensions.Options.OptionsBuilder optionsBuilder, string configSectionPath, Action? configureBinder = null) where TOptions : class { ArgumentNullException.ThrowIfNull(optionsBuilder); @@ -59,10 +59,10 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration return optionsBuilder; } - #endregion OptionsBuilder extensions. + #endregion global::Microsoft.Extensions.Options.OptionsBuilder extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList" }); public static void BindCoreMain(IConfiguration configuration, object instance, Type type, Action? configureOptions) { @@ -159,17 +159,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/OptionsBuilder/Version1/Bind_T.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/OptionsBuilder/Version1/Bind_T.generated.txt index bb0f5335de3ba6..c152aae35ed352 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/OptionsBuilder/Version1/Bind_T.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/OptionsBuilder/Version1/Bind_T.generated.txt @@ -35,23 +35,23 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration [GeneratedCode("Microsoft.Extensions.Configuration.Binder.SourceGeneration", "42.42.42.42")] file static class BindingExtensions { - #region OptionsBuilder extensions. + #region global::Microsoft.Extensions.Options.OptionsBuilder extensions. /// Registers a configuration instance which will bind against. [InterceptsLocation(1, "/HkAEr/Ik8W47keDiXaNkeEBAABzcmMtMC5jcw==")] // src-0.cs(15,24) - public static OptionsBuilder Bind(this OptionsBuilder optionsBuilder, IConfiguration config) where TOptions : class + public static global::Microsoft.Extensions.Options.OptionsBuilder Bind(this global::Microsoft.Extensions.Options.OptionsBuilder optionsBuilder, IConfiguration config) where TOptions : class { return Bind(optionsBuilder, config, configureBinder: null); } /// Registers a configuration instance which will bind against. - public static OptionsBuilder Bind(this OptionsBuilder optionsBuilder, IConfiguration config, Action? configureBinder) where TOptions : class + public static global::Microsoft.Extensions.Options.OptionsBuilder Bind(this global::Microsoft.Extensions.Options.OptionsBuilder optionsBuilder, IConfiguration config, Action? configureBinder) where TOptions : class { ArgumentNullException.ThrowIfNull(optionsBuilder); Configure(optionsBuilder.Services, optionsBuilder.Name, config, configureBinder); return optionsBuilder; } - #endregion OptionsBuilder extensions. + #endregion global::Microsoft.Extensions.Options.OptionsBuilder extensions. #region IServiceCollection extensions. /// Registers a configuration instance which TOptions will bind against. @@ -68,7 +68,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IServiceCollection extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList" }); public static void BindCoreMain(IConfiguration configuration, object instance, Type type, Action? configureOptions) { @@ -165,17 +165,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/OptionsBuilder/Version1/Bind_T_BinderOptions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/OptionsBuilder/Version1/Bind_T_BinderOptions.generated.txt index b2c20c9474cd38..b6d2f75982baaf 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/OptionsBuilder/Version1/Bind_T_BinderOptions.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/OptionsBuilder/Version1/Bind_T_BinderOptions.generated.txt @@ -35,17 +35,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration [GeneratedCode("Microsoft.Extensions.Configuration.Binder.SourceGeneration", "42.42.42.42")] file static class BindingExtensions { - #region OptionsBuilder extensions. + #region global::Microsoft.Extensions.Options.OptionsBuilder extensions. /// Registers a configuration instance which will bind against. [InterceptsLocation(1, "eAEQHTx/qUZMzyaWapEG3uEBAABzcmMtMC5jcw==")] // src-0.cs(15,24) - public static OptionsBuilder Bind(this OptionsBuilder optionsBuilder, IConfiguration config, Action? configureBinder) where TOptions : class + public static global::Microsoft.Extensions.Options.OptionsBuilder Bind(this global::Microsoft.Extensions.Options.OptionsBuilder optionsBuilder, IConfiguration config, Action? configureBinder) where TOptions : class { ArgumentNullException.ThrowIfNull(optionsBuilder); Configure(optionsBuilder.Services, optionsBuilder.Name, config, configureBinder); return optionsBuilder; } - #endregion OptionsBuilder extensions. + #endregion global::Microsoft.Extensions.Options.OptionsBuilder extensions. #region IServiceCollection extensions. /// Registers a configuration instance which TOptions will bind against. @@ -62,7 +62,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IServiceCollection extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList" }); public static void BindCoreMain(IConfiguration configuration, object instance, Type type, Action? configureOptions) { @@ -159,17 +159,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ServiceCollection/Version1/Configure_T.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ServiceCollection/Version1/Configure_T.generated.txt index 4605c469ae68e4..d9645e2b579072 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ServiceCollection/Version1/Configure_T.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ServiceCollection/Version1/Configure_T.generated.txt @@ -58,8 +58,8 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IServiceCollection extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyList2", "MyDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyList2", "MyDictionary" }); public static void BindCoreMain(IConfiguration configuration, object instance, Type type, Action? configureOptions) { @@ -224,17 +224,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ServiceCollection/Version1/Configure_T_BinderOptions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ServiceCollection/Version1/Configure_T_BinderOptions.generated.txt index 886cdf53adef48..065a4d45a779f2 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ServiceCollection/Version1/Configure_T_BinderOptions.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ServiceCollection/Version1/Configure_T_BinderOptions.generated.txt @@ -58,8 +58,8 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IServiceCollection extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyList2", "MyDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyList2", "MyDictionary" }); public static void BindCoreMain(IConfiguration configuration, object instance, Type type, Action? configureOptions) { @@ -224,17 +224,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ServiceCollection/Version1/Configure_T_name.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ServiceCollection/Version1/Configure_T_name.generated.txt index 9a6acd00a7916c..eeafcceb582d8c 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ServiceCollection/Version1/Configure_T_name.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ServiceCollection/Version1/Configure_T_name.generated.txt @@ -58,8 +58,8 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IServiceCollection extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyList2", "MyDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyList2", "MyDictionary" }); public static void BindCoreMain(IConfiguration configuration, object instance, Type type, Action? configureOptions) { @@ -224,17 +224,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ServiceCollection/Version1/Configure_T_name_BinderOptions.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ServiceCollection/Version1/Configure_T_name_BinderOptions.generated.txt index 972d7f9e02bda0..6bcaeac55f93a6 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ServiceCollection/Version1/Configure_T_name_BinderOptions.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/ServiceCollection/Version1/Configure_T_name_BinderOptions.generated.txt @@ -52,8 +52,8 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IServiceCollection extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyList2", "MyDictionary" }); + private readonly static Lazy> s_configKeys_Program__MyClass2 = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyInt" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "MyString", "MyInt", "MyList", "MyList2", "MyDictionary" }); public static void BindCoreMain(IConfiguration configuration, object instance, Type type, Action? configureOptions) { @@ -218,17 +218,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/Collections.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/Collections.generated.txt index 3cb2bbb2134ec6..5de3a0ef86dd9d 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/Collections.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/Collections.generated.txt @@ -41,7 +41,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClassWithCustomCollections = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "CustomDictionary", "CustomList", "ICustomDictionary", "ICustomCollection", "IReadOnlyList", "UnsupportedIReadOnlyDictionaryUnsupported", "IReadOnlyDictionary", "CollectionStructExplicit" }); + private readonly static Lazy> s_configKeys_Program__MyClassWithCustomCollections = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "CustomDictionary", "CustomList", "ICustomDictionary", "ICustomCollection", "IReadOnlyList", "UnsupportedIReadOnlyDictionaryUnsupported", "IReadOnlyDictionary", "CollectionStructExplicit" }); public static object? GetCore(this IConfiguration configuration, Type type, Action? configureOptions) { @@ -91,7 +91,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration public static void BindCore(IConfiguration configuration, ref global::System.Collections.Generic.IReadOnlyList instance, bool defaultValueIfNotFound, BinderOptions? binderOptions) { - if (instance is not ICollection temp) + if (instance is not global::System.Collections.Generic.ICollection temp) { return; } @@ -110,7 +110,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration public static void BindCore(IConfiguration configuration, ref global::System.Collections.Generic.IReadOnlyDictionary instance, bool defaultValueIfNotFound, BinderOptions? binderOptions) { - if (instance is not IDictionary temp) + if (instance is not global::System.Collections.Generic.IDictionary temp) { return; } @@ -174,7 +174,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration if (AsConfigWithChildren(value9) is IConfigurationSection section10) { global::System.Collections.Generic.IReadOnlyList? temp12 = instance.IReadOnlyList; - temp12 = temp12 is null ? (global::System.Collections.Generic.IReadOnlyList)new List() : (global::System.Collections.Generic.IReadOnlyList)new List(temp12); + temp12 = temp12 is null ? (global::System.Collections.Generic.IReadOnlyList)new global::System.Collections.Generic.List() : (global::System.Collections.Generic.IReadOnlyList)new global::System.Collections.Generic.List(temp12); BindCore(section10, ref temp12, defaultValueIfNotFound: false, binderOptions); instance.IReadOnlyList = temp12; } @@ -187,7 +187,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration if (AsConfigWithChildren(value13) is IConfigurationSection section14) { global::System.Collections.Generic.IReadOnlyDictionary? temp16 = instance.IReadOnlyDictionary; - temp16 = temp16 is null ? (global::System.Collections.Generic.IReadOnlyDictionary)new Dictionary() : (global::System.Collections.Generic.IReadOnlyDictionary)temp16.ToDictionary(pair => pair.Key, pair => pair.Value); + temp16 = temp16 is null ? (global::System.Collections.Generic.IReadOnlyDictionary)new global::System.Collections.Generic.Dictionary() : (global::System.Collections.Generic.IReadOnlyDictionary)temp16.ToDictionary(pair => pair.Key, pair => pair.Value); BindCore(section14, ref temp16, defaultValueIfNotFound: false, binderOptions); instance.IReadOnlyDictionary = temp16; } @@ -225,17 +225,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/DefaultConstructorParameters.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/DefaultConstructorParameters.generated.txt index 2f93b0d8e1451a..eeb157b6c76622 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/DefaultConstructorParameters.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/DefaultConstructorParameters.generated.txt @@ -51,7 +51,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__ClassWhereParametersHaveDefaultValue = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "Name", "Address", "Age", "F", "D", "M", "SC", "C", "NAge", "NF", "ND", "NM", "NSC", "NC" }); + private readonly static Lazy> s_configKeys_Program__ClassWhereParametersHaveDefaultValue = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "Name", "Address", "Age", "F", "D", "M", "SC", "C", "NAge", "NF", "ND", "NM", "NSC", "NC" }); public static void BindCore(IConfiguration configuration, ref global::Program.ClassWhereParametersHaveDefaultValue instance, bool defaultValueIfNotFound, BinderOptions? binderOptions) { @@ -239,17 +239,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/EmptyConfigType.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/EmptyConfigType.generated.txt index 03084d47bd9c25..7475df7afb33da 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/EmptyConfigType.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/EmptyConfigType.generated.txt @@ -58,7 +58,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_TypeWithNoMembers_Wrapper = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "Member" }); + private readonly static Lazy> s_configKeys_TypeWithNoMembers_Wrapper = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "Member" }); public static void BindCore(IConfiguration configuration, ref global::TypeWithNoMembers_Wrapper instance, bool defaultValueIfNotFound, BinderOptions? binderOptions) { @@ -85,17 +85,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/Primitives.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/Primitives.generated.txt index 4678b0ed8ef89a..376e88d4635d13 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/Primitives.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/Primitives.generated.txt @@ -51,7 +51,7 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "Prop0", "Prop1", "Prop2", "Prop3", "Prop4", "Prop5", "Prop6", "Prop8", "Prop9", "Prop10", "Prop13", "Prop14", "Prop15", "Prop16", "Prop17", "Prop19", "Prop20", "Prop21", "Prop23", "Prop24", "Prop25", "Prop26", "Prop27", "Prop7", "Prop11", "Prop12", "Prop18", "Prop22", "Prop28", "Prop29", "Prop30" }); + private readonly static Lazy> s_configKeys_Program__MyClass = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "Prop0", "Prop1", "Prop2", "Prop3", "Prop4", "Prop5", "Prop6", "Prop8", "Prop9", "Prop10", "Prop13", "Prop14", "Prop15", "Prop16", "Prop17", "Prop19", "Prop20", "Prop21", "Prop23", "Prop24", "Prop25", "Prop26", "Prop27", "Prop7", "Prop11", "Prop12", "Prop18", "Prop22", "Prop28", "Prop29", "Prop30" }); public static void BindCore(IConfiguration configuration, ref global::Program.MyClass instance, bool defaultValueIfNotFound, BinderOptions? binderOptions) { @@ -494,17 +494,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/UnsupportedTypes.generated.txt b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/UnsupportedTypes.generated.txt index 588b203db49b98..52b7919f8fa19b 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/UnsupportedTypes.generated.txt +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/Baselines/netcoreapp/Version1/UnsupportedTypes.generated.txt @@ -57,8 +57,8 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration #endregion IConfiguration extensions. #region Core binding extensions. - private readonly static Lazy> s_configKeys_Record___System__Action___ = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "x" }); - private readonly static Lazy> s_configKeys_Options = new(() => new HashSet(StringComparer.OrdinalIgnoreCase) { "Name", "Age", "List", "Array", "Record" }); + private readonly static Lazy> s_configKeys_Record___System__Action___ = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "x" }); + private readonly static Lazy> s_configKeys_Options = new(() => new global::System.Collections.Generic.HashSet(StringComparer.OrdinalIgnoreCase) { "Name", "Age", "List", "Array", "Record" }); public static object? GetCore(this IConfiguration configuration, Type type, Action? configureOptions) { @@ -224,17 +224,17 @@ namespace Microsoft.Extensions.Configuration.Binder.SourceGeneration /// If required by the binder options, validates that there are no unknown keys in the input configuration object. - public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) + public static void ValidateConfigurationKeys(Type type, Lazy> keys, IConfiguration configuration, BinderOptions? binderOptions) { if (binderOptions?.ErrorOnUnknownConfiguration is true) { - List? temp = null; + global::System.Collections.Generic.List? temp = null; foreach (IConfigurationSection section in configuration.GetChildren()) { if (!keys.Value.Contains(section.Key)) { - (temp ??= new List()).Add($"'{section.Key}'"); + (temp ??= new global::System.Collections.Generic.List()).Add($"'{section.Key}'"); } } diff --git a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/GeneratorTests.cs b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/GeneratorTests.cs index 00a038bdf5c8c8..7eee48fdeb28ca 100644 --- a/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/GeneratorTests.cs +++ b/src/libraries/Microsoft.Extensions.Configuration.Binder/tests/SourceGenerationTests/GeneratorTests.cs @@ -294,6 +294,38 @@ public class Settings Assert.NotNull(emittedAssemblyImage); } + [Fact] + public async Task BindingToCollectionOnlyTest() + { + string source = """ + using Microsoft.Extensions.Configuration; + using System; + using System.Collections.Generic; + + public class Program + { + public static void Main() + { + ConfigurationBuilder configurationBuilder = new(); + IConfiguration config = configurationBuilder.Build(); + + var settingsSection = config.GetSection("Settings"); + + IDictionary options = settingsSection.Get>()!; + } + } + """; + + ConfigBindingGenRunResult result = await RunGeneratorAndUpdateCompilation(source, assemblyReferences: GetAssemblyRefsWithAdditional(typeof(ConfigurationBuilder), typeof(List<>))); + Assert.NotNull(result.GeneratedSource); + Assert.Empty(result.Diagnostics); + + // Ensure the generated code can be compiled. + // If there is any compilation error, exception will be thrown with the list of the errors in the exception message. + byte[] emittedAssemblyImage = CreateAssemblyImage(result.OutputCompilation); + Assert.NotNull(emittedAssemblyImage); + } + /// /// We binding the type "SslClientAuthenticationOptions" which has a property "CipherSuitesPolicy" of type "CipherSuitesPolicy". We can't bind this type. /// This test is to ensure not including the property "CipherSuitesPolicy" in the generated code caused a build break.