Fix order of ops

shinyorg · Dec 20, 2023 · 731b7d4 · 731b7d4
1 parent c9e2d62
commit 731b7d4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/Shiny.Extensions.Configuration/Platforms/Android/ConfigurationBuilderExtensions.cs b/src/Shiny.Extensions.Configuration/Platforms/Android/ConfigurationBuilderExtensions.cs
@@ -17,10 +17,11 @@ public static partial class ConfigurationBuilderExtensions
     /// <returns></returns>
     public static IConfigurationBuilder AddJsonAndroidAsset(this IConfigurationBuilder builder, string? environment = null, bool optional = true, bool includePlatformSpecific = true)
     {
+        builder.AddJsonAssetInternal("appsettings.json", environment, optional);
         if (includePlatformSpecific)
             builder.AddJsonAssetInternal("appsettings.android.json", environment, true);
 
-        return builder.AddJsonAssetInternal("appsettings.json", environment, optional);
+        return builder;
     }
 
 

diff --git a/src/Shiny.Extensions.Configuration/Platforms/Apple/ConfigurationBuilderExtensions.cs b/src/Shiny.Extensions.Configuration/Platforms/Apple/ConfigurationBuilderExtensions.cs
@@ -17,6 +17,7 @@ public static partial class ConfigurationBuilderExtensions
     /// <returns></returns>
     public static IConfigurationBuilder AddJsonIosBundle(this IConfigurationBuilder builder, string? environment = null, bool optional = true, bool reloadOnChange = true, bool includePlatformSpecific = true)
     {
+        builder.AddJsonFileInternal("appsettings.json", environment, optional, reloadOnChange);
         if (includePlatformSpecific)
         {
             builder.AddJsonFileInternal("appsettings.apple.json", environment, true, reloadOnChange);
@@ -26,7 +27,7 @@ public static IConfigurationBuilder AddJsonIosBundle(this IConfigurationBuilder
             builder.AddJsonFileInternal("appsettings.maccatalyst.json", environment, true, reloadOnChange);
 #endif
         }
-        return builder.AddJsonFileInternal("appsettings.json", environment, optional, reloadOnChange);
+        return builder;
     }
 
 
@@ -41,12 +42,13 @@ public static IConfigurationBuilder AddIosUserDefaults(this IConfigurationBuilde
 
     static IConfigurationBuilder AddJsonFileInternal(this IConfigurationBuilder builder, string fileName, string? environment, bool optional, bool reloadOnChange)
     {
+        builder.AddJsonFileInternal(fileName, true, reloadOnChange);
         if (!String.IsNullOrWhiteSpace(environment))
         {
             var newFileName = GetEnvFileName(fileName, environment);
             builder.AddJsonFileInternal(newFileName, true, reloadOnChange);
         }
-        return builder.AddJsonFileInternal(fileName, true, reloadOnChange);
+        return builder;
     }