Merge pull request #9961 from umbraco/netcore/feature/appsettings-local
Allow for having appsettings.local.json
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -201,3 +201,4 @@ src/Umbraco.Tests/TEMP/
|
|||||||
|
|
||||||
/src/Umbraco.Web.UI/config/umbracoSettings.config
|
/src/Umbraco.Web.UI/config/umbracoSettings.config
|
||||||
/src/Umbraco.Web.UI.NetCore/Umbraco/models/*
|
/src/Umbraco.Web.UI.NetCore/Umbraco/models/*
|
||||||
|
/src/Umbraco.Web.UI.NetCore/appsettings.Local.json
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using Microsoft.AspNetCore.Hosting;
|
using Microsoft.AspNetCore.Hosting;
|
||||||
|
using Microsoft.Extensions.Configuration;
|
||||||
using Microsoft.Extensions.Hosting;
|
using Microsoft.Extensions.Hosting;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
@@ -7,18 +8,20 @@ namespace Umbraco.Cms.Web.UI.NetCore
|
|||||||
public class Program
|
public class Program
|
||||||
{
|
{
|
||||||
public static void Main(string[] args)
|
public static void Main(string[] args)
|
||||||
{
|
=> CreateHostBuilder(args)
|
||||||
CreateHostBuilder(args)
|
|
||||||
.Build()
|
.Build()
|
||||||
.Run();
|
.Run();
|
||||||
}
|
|
||||||
|
|
||||||
public static IHostBuilder CreateHostBuilder(string[] args) =>
|
public static IHostBuilder CreateHostBuilder(string[] args) =>
|
||||||
Host.CreateDefaultBuilder(args)
|
Host.CreateDefaultBuilder(args)
|
||||||
.ConfigureLogging(x =>
|
#if DEBUG
|
||||||
{
|
.ConfigureAppConfiguration(config
|
||||||
x.ClearProviders();
|
=> config.AddJsonFile(
|
||||||
})
|
"appsettings.Local.json",
|
||||||
.ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); });
|
optional: true,
|
||||||
|
reloadOnChange: true))
|
||||||
|
#endif
|
||||||
|
.ConfigureLogging(x => x.ClearProviders())
|
||||||
|
.ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -81,6 +81,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<RazorCompileOnBuild>false</RazorCompileOnBuild>
|
<RazorCompileOnBuild>false</RazorCompileOnBuild>
|
||||||
|
<RazorCompileOnPublish>false</RazorCompileOnPublish>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -38,8 +38,8 @@
|
|||||||
"ConvertUrlsToAscii": "try"
|
"ConvertUrlsToAscii": "try"
|
||||||
},
|
},
|
||||||
"RuntimeMinification": {
|
"RuntimeMinification": {
|
||||||
"dataFolder": "App_Data/TEMP/Smidge",
|
"dataFolder": "umbraco/Data/TEMP/Smidge",
|
||||||
"version": "637432008251409860"
|
"version": "1"
|
||||||
},
|
},
|
||||||
"Security": {
|
"Security": {
|
||||||
"KeepUserLoggedIn": false,
|
"KeepUserLoggedIn": false,
|
||||||
|
|||||||
Reference in New Issue
Block a user