Revert "Support Parameters Store syntax"

m-sadegh-sh · m-sadegh-sh · commit 76d015e244dc · 2026-02-25T20:11:31.000+03:30
This reverts commit c9326eb.
diff --git a/Billing.Server.AppStore/Billing.Server.AppStore.csproj b/Billing.Server.AppStore/Billing.Server.AppStore.csproj
@@ -5,7 +5,7 @@
     <RootNamespace>Zebble</RootNamespace>
     <PackageId>Zebble.Billing.Server.AppStore</PackageId>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>1.0.70.0</Version>
+    <Version>1.0.71.0</Version>
     <PackOnBuild>true</PackOnBuild>
     <NeutralLanguage>en</NeutralLanguage>
     <DefineConstants>$(DefineConstants)</DefineConstants>
diff --git a/Billing.Server.AppStore/Extensions/ZebbleBillingServicesBuilderExtensions.cs b/Billing.Server.AppStore/Extensions/ZebbleBillingServicesBuilderExtensions.cs
@@ -13,11 +13,7 @@ public static partial class ZebbleBillingServicesBuilderExtensions
         public static ZebbleBillingServicesBuilder AddAppStore(this ZebbleBillingServicesBuilder builder, string configKey = "ZebbleBilling:AppStore")
         {
             builder.Services.AddOptions<AppStoreOptions>()
-                            .Configure<IConfiguration>((opts, config) =>
-                            {
-                                config.GetSection(configKey)?.Bind(opts);
-                                config.GetSection(ConfigurationPath.KeyDelimiter + configKey)?.Bind(opts);
-                            })
+                            .Configure<IConfiguration>((opts, config) => config.GetSection(configKey)?.Bind(opts))
                             .Validate(opts => opts.PackageName.HasValue(), $"{nameof(AppStoreOptions.PackageName)} is empty.")
                             .Validate(opts => opts.SharedSecret.HasValue(), $"{nameof(AppStoreOptions.SharedSecret)} is empty.")
                             .Validate(opts => opts.PrivateKey.HasValue(), $"{nameof(AppStoreOptions.PrivateKey)} is empty.")
diff --git a/Billing.Server.CafeBazaar/Billing.Server.CafeBazaar.csproj b/Billing.Server.CafeBazaar/Billing.Server.CafeBazaar.csproj
@@ -5,7 +5,7 @@
     <RootNamespace>Zebble</RootNamespace>
     <PackageId>Zebble.Billing.Server.CafeBazaar</PackageId>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>1.0.34.0</Version>
+    <Version>1.0.35.0</Version>
     <PackOnBuild>true</PackOnBuild>
     <NeutralLanguage>en</NeutralLanguage>
     <DefineConstants>$(DefineConstants)</DefineConstants>
@@ -37,7 +37,7 @@
     <None Remove=".gitignore" />
     <None Remove="icon.png" />
     <None Remove="README.md" />
-    <PackageReference Include="CafeBazaar.DeveloperApi" Version="1.0.22" />
+    <PackageReference Include="CafeBazaar.DeveloperApi" Version="1.0.23" />
     <ProjectReference Include="..\Billing.Server\Billing.Server.csproj" />
   </ItemGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent" Condition="'$(Running)'=='local'">
diff --git a/Billing.Server.CafeBazaar/Extensions/ZebbleBillingServicesBuilderExtensions.cs b/Billing.Server.CafeBazaar/Extensions/ZebbleBillingServicesBuilderExtensions.cs
@@ -12,11 +12,7 @@ public static ZebbleBillingServicesBuilder AddCafeBazaar(this ZebbleBillingServi
             builder.Services.AddCafeBazaarDeveloperApi($"{configKey}:DeveloperApi");
 
             builder.Services.AddOptions<CafeBazaarOptions>()
-                            .Configure<IConfiguration>((opts, config) =>
-                            {
-                                config.GetSection(configKey)?.Bind(opts);
-                                config.GetSection(ConfigurationPath.KeyDelimiter + configKey)?.Bind(opts);
-                            })
+                            .Configure<IConfiguration>((opts, config) => config.GetSection(configKey)?.Bind(opts))
                             .Validate(opts => opts.PackageName.HasValue(), $"{nameof(CafeBazaarOptions.PackageName)} is empty.");
 
             builder.Services.AddStoreConnector<CafeBazaarConnector>("CafeBazaar");
diff --git a/Billing.Server.DynamoDb/Billing.Server.DynamoDb.csproj b/Billing.Server.DynamoDb/Billing.Server.DynamoDb.csproj
@@ -5,7 +5,7 @@
     <RootNamespace>Zebble</RootNamespace>
     <PackageId>Zebble.Billing.Server.DynamoDb</PackageId>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>1.0.46.0</Version>
+    <Version>1.0.47.0</Version>
     <PackOnBuild>true</PackOnBuild>
     <NeutralLanguage>en</NeutralLanguage>
     <DefineConstants>$(DefineConstants)</DefineConstants>
diff --git a/Billing.Server.EntityFramework/Billing.Server.EntityFramework.csproj b/Billing.Server.EntityFramework/Billing.Server.EntityFramework.csproj
@@ -5,7 +5,7 @@
     <RootNamespace>Zebble</RootNamespace>
     <PackageId>Zebble.Billing.Server.EntityFramework</PackageId>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>1.0.43.0</Version>
+    <Version>1.0.44.0</Version>
     <PackOnBuild>true</PackOnBuild>
     <NeutralLanguage>en</NeutralLanguage>
     <DefineConstants>$(DefineConstants)</DefineConstants>
diff --git a/Billing.Server.EntityFramework/Extensions/ZebbleBillingServicesBuilderExtensions.cs b/Billing.Server.EntityFramework/Extensions/ZebbleBillingServicesBuilderExtensions.cs
@@ -9,11 +9,7 @@ public static partial class ZebbleBillingServicesBuilderExtensions
         public static ZebbleBillingServicesBuilder AddEntityFramework(this ZebbleBillingServicesBuilder builder, string configKey = "ZebbleBilling:EntityFramework")
         {
             builder.Services.AddOptions<EntityFrameworkOptions>()
-                            .Configure<IConfiguration>((opts, config) =>
-                            {
-                                config.GetSection(configKey)?.Bind(opts);
-                                config.GetSection(ConfigurationPath.KeyDelimiter + configKey)?.Bind(opts);
-                            })
+                            .Configure<IConfiguration>((opts, config) => config.GetSection(configKey)?.Bind(opts))
                             .Validate(opts => opts.ConnectionString.HasValue(), $"{nameof(EntityFrameworkOptions.ConnectionString)} is empty.");
 
             builder.Services.AddDbContext<SubscriptionDbContext>();
diff --git a/Billing.Server.GooglePlay/Billing.Server.GooglePlay.csproj b/Billing.Server.GooglePlay/Billing.Server.GooglePlay.csproj
@@ -5,7 +5,7 @@
     <RootNamespace>Zebble</RootNamespace>
     <PackageId>Zebble.Billing.Server.GooglePlay</PackageId>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>1.0.67.0</Version>
+    <Version>1.0.68.0</Version>
     <PackOnBuild>true</PackOnBuild>
     <NeutralLanguage>en</NeutralLanguage>
     <DefineConstants>$(DefineConstants)</DefineConstants>
diff --git a/Billing.Server.GooglePlay/Extensions/ZebbleBillingServicesBuilderExtensions.cs b/Billing.Server.GooglePlay/Extensions/ZebbleBillingServicesBuilderExtensions.cs
@@ -16,11 +16,7 @@ public static partial class ZebbleBillingServicesBuilderExtensions
         public static ZebbleBillingServicesBuilder AddGooglePlay(this ZebbleBillingServicesBuilder builder, string configKey = "ZebbleBilling:GooglePlay")
         {
             builder.Services.AddOptions<GooglePlayOptions>()
-                            .Configure<IConfiguration>((opts, config) =>
-                            {
-                                config.GetSection(configKey)?.Bind(opts);
-                                config.GetSection(ConfigurationPath.KeyDelimiter + configKey)?.Bind(opts);
-                            })
+                            .Configure<IConfiguration>((opts, config) => config.GetSection(configKey)?.Bind(opts))
                             .Validate(opts => opts.PackageName.HasValue(), $"{nameof(GooglePlayOptions.PackageName)} is empty.")
                             .Validate(opts => opts.Store.ProjectId.HasValue(), $"{nameof(GooglePlayStoreOptions.ProjectId)} is empty.")
                             .Validate(opts => opts.Store.PrivateKeyId.HasValue(), $"{nameof(GooglePlayStoreOptions.PrivateKeyId)} is empty.")
diff --git a/Billing.Server.Huawei/Billing.Server.Huawei.csproj b/Billing.Server.Huawei/Billing.Server.Huawei.csproj
@@ -5,7 +5,7 @@
     <RootNamespace>Zebble</RootNamespace>
     <PackageId>Zebble.Billing.Server.Huawei</PackageId>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>1.0.18.0</Version>
+    <Version>1.0.19.0</Version>
     <PackOnBuild>true</PackOnBuild>
     <NeutralLanguage>en</NeutralLanguage>
     <DefineConstants>$(DefineConstants)</DefineConstants>
@@ -37,7 +37,7 @@
     <None Remove=".gitignore" />
     <None Remove="icon.png" />
     <None Remove="README.md" />
-    <PackageReference Include="Huawei.DeveloperApi" Version="1.0.4" />
+    <PackageReference Include="Huawei.DeveloperApi" Version="1.0.5" />
     <PackageReference Include="Macross.Json.Extensions" Version="3.0.0" />
     <ProjectReference Include="..\Billing.Server\Billing.Server.csproj" />
   </ItemGroup>
diff --git a/Billing.Server.Huawei/Extensions/ZebbleBillingServicesBuilderExtensions.cs b/Billing.Server.Huawei/Extensions/ZebbleBillingServicesBuilderExtensions.cs
@@ -12,11 +12,7 @@ public static ZebbleBillingServicesBuilder AddHuawei(this ZebbleBillingServicesB
             builder.Services.AddHuaweiDeveloperApi($"{configKey}:DeveloperApi");
 
             builder.Services.AddOptions<HuaweiOptions>()
-                            .Configure<IConfiguration>((opts, config) =>
-                            {
-                                config.GetSection(configKey)?.Bind(opts);
-                                config.GetSection(ConfigurationPath.KeyDelimiter + configKey)?.Bind(opts);
-                            })
+                            .Configure<IConfiguration>((opts, config) => config.GetSection(configKey)?.Bind(opts))
                             .Validate(opts => opts.PackageName.HasValue(), $"{nameof(HuaweiOptions.PackageName)} is empty.")
                             .Validate(opts => opts.PublicKey.HasValue(), $"{nameof(HuaweiOptions.PublicKey)} is empty.");
 
diff --git a/Billing.Server.Voucher.DynamoDb/Billing.Server.Voucher.DynamoDb.csproj b/Billing.Server.Voucher.DynamoDb/Billing.Server.Voucher.DynamoDb.csproj
@@ -5,7 +5,7 @@
     <RootNamespace>Zebble</RootNamespace>
     <PackageId>Zebble.Billing.Server.Voucher.DynamoDb</PackageId>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>1.0.23.0</Version>
+    <Version>1.0.24.0</Version>
     <PackOnBuild>true</PackOnBuild>
     <NeutralLanguage>en</NeutralLanguage>
     <DefineConstants>$(DefineConstants)</DefineConstants>
diff --git a/Billing.Server.Voucher.EntityFramework/Billing.Server.Voucher.EntityFramework.csproj b/Billing.Server.Voucher.EntityFramework/Billing.Server.Voucher.EntityFramework.csproj
@@ -5,7 +5,7 @@
     <RootNamespace>Zebble</RootNamespace>
     <PackageId>Zebble.Billing.Server.Voucher.EntityFramework</PackageId>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>1.0.32.0</Version>
+    <Version>1.0.33.0</Version>
     <PackOnBuild>true</PackOnBuild>
     <NeutralLanguage>en</NeutralLanguage>
     <DefineConstants>$(DefineConstants)</DefineConstants>
diff --git a/Billing.Server.Voucher/Billing.Server.Voucher.csproj b/Billing.Server.Voucher/Billing.Server.Voucher.csproj
@@ -5,7 +5,7 @@
     <RootNamespace>Zebble</RootNamespace>
     <PackageId>Zebble.Billing.Server.Voucher</PackageId>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>1.0.47.0</Version>
+    <Version>1.0.48.0</Version>
     <PackOnBuild>true</PackOnBuild>
     <NeutralLanguage>en</NeutralLanguage>
     <DefineConstants>$(DefineConstants)</DefineConstants>
diff --git a/Billing.Server.Voucher/Extensions/ZebbleBillingServicesBuilderExtensions.cs b/Billing.Server.Voucher/Extensions/ZebbleBillingServicesBuilderExtensions.cs
@@ -14,11 +14,7 @@ public static ZebbleBillingServicesBuilder AddVoucher(
         )
         {
             builder.Services.AddOptions<VoucherOptions>()
-                            .Configure<IConfiguration>((opts, config) =>
-                            {
-                                config.GetSection(configKey)?.Bind(opts);
-                                config.GetSection(ConfigurationPath.KeyDelimiter + configKey)?.Bind(opts);
-                            })
+                            .Configure<IConfiguration>((opts, config) => config.GetSection(configKey)?.Bind(opts))
                             .Validate(opts => opts.VoucherApplyPath.HasValue(), $"{nameof(VoucherOptions.VoucherApplyPath)} is empty.");
 
             builder.Services.AddStoreConnector<VoucherConnector>("Voucher");
diff --git a/Billing.Server/Billing.Server.csproj b/Billing.Server/Billing.Server.csproj
@@ -5,7 +5,7 @@
     <RootNamespace>Zebble</RootNamespace>
     <PackageId>Zebble.Billing.Server</PackageId>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <Version>1.0.87.0</Version>
+    <Version>1.0.88.0</Version>
     <PackOnBuild>true</PackOnBuild>
     <NeutralLanguage>en</NeutralLanguage>
     <DefineConstants>$(DefineConstants)</DefineConstants>
diff --git a/Billing.Server/Extensions/ServiceCollectionExtensions.cs b/Billing.Server/Extensions/ServiceCollectionExtensions.cs
@@ -18,21 +18,12 @@ public static IServiceCollection AddZebbleBilling(
             if (services is null) throw new ArgumentNullException(nameof(services));
 
             services.AddOptions<BillingOptions>()
-                    .Configure<IConfiguration>((opts, config) =>
-                    {
-                        config.GetSection(configKey)?.Bind(opts);
-                        config.GetSection(ConfigurationPath.KeyDelimiter + configKey)?.Bind(opts);
-                    })
+                    .Configure<IConfiguration>((opts, config) => config.GetSection(configKey)?.Bind(opts))
                     .Validate(opts => opts.PurchaseAttemptPath is not null, $"{nameof(BillingOptions.PurchaseAttemptPath)} is null.")
                     .Validate(opts => opts.SubscriptionStatusPath is not null, $"{nameof(BillingOptions.SubscriptionStatusPath)} is null.");
 
             services.AddOptions<CatalogOptions>()
-                    .Configure<IConfiguration>((opts, config) =>
-                    {
-                        var key = ConfigurationPath.Combine(configKey, "Catalog");
-                        config.GetSection(key)?.Bind(opts);
-                        config.GetSection(ConfigurationPath.KeyDelimiter + key)?.Bind(opts);
-                    })
+                    .Configure<IConfiguration>((opts, config) => config.GetSection(ConfigurationPath.Combine(configKey, "Catalog"))?.Bind(opts))
                     .Validate(opts => opts.Products is not null, $"{nameof(CatalogOptions.Products)} is null.")
                     .Validate(opts => opts.Products.Any(), $"{nameof(CatalogOptions.Products)} is empty.");
 
