Merge remote-tracking branch 'origin/v11/dev' into v11/bugfix/fix-more-unstable-acceptance-tests

Zeegaan · Zeegaan · commit d090b898489b · 2022-10-17T15:52:49.000+02:00
diff --git a/src/Umbraco.Core/Extensions/ConfigurationExtensions.cs b/src/Umbraco.Core/Extensions/ConfigurationExtensions.cs
@@ -103,6 +103,5 @@ public static class ConfigurationExtensions
     public static RuntimeMode GetRuntimeMode(this IConfiguration configuration)
         => configuration.GetValue<RuntimeMode>(Constants.Configuration.ConfigRuntimeMode);
 
-    public static ModelsMode GetModelsMode(this IConfiguration configuration) =>
-        configuration.GetValue<ModelsMode>(Constants.Configuration.ConfigModelsMode);
+    public static ModelsMode GetModelsMode(this IConfiguration configuration) => (configuration.GetSection(Constants.Configuration.ConfigModelsBuilder).Get<ModelsBuilderSettings>() ?? new ModelsBuilderSettings()).ModelsMode;
 }

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,5 @@ public static class ConfigurationExtensions`
`103`	`103`	`public static RuntimeMode GetRuntimeMode(this IConfiguration configuration)`
`104`	`104`	`=> configuration.GetValue<RuntimeMode>(Constants.Configuration.ConfigRuntimeMode);`
`105`	`105`
`106`		`- public static ModelsMode GetModelsMode(this IConfiguration configuration) =>`
`107`		`- configuration.GetValue<ModelsMode>(Constants.Configuration.ConfigModelsMode);`
	`106`	`+ public static ModelsMode GetModelsMode(this IConfiguration configuration) => (configuration.GetSection(Constants.Configuration.ConfigModelsBuilder).Get<ModelsBuilderSettings>() ?? new ModelsBuilderSettings()).ModelsMode;`
`108`	`107`	`}`