Merge branch 'netcore/dev' into netcore/feature/in-memory-runtime-minifier

src/Umbraco.Web.UI.NetCore/Program.cs

@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Hosting;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
@@ -7,18 +8,20 @@ namespace Umbraco.Cms.Web.UI.NetCore
     public class Program
     {
         public static void Main(string[] args)
-        {
-            CreateHostBuilder(args)
+            => CreateHostBuilder(args)
                 .Build()
                 .Run();
-        }
 
         public static IHostBuilder CreateHostBuilder(string[] args) =>
             Host.CreateDefaultBuilder(args)
-                .ConfigureLogging(x =>
-                {
-                    x.ClearProviders();
-                })
-                .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); });
+#if DEBUG
+                .ConfigureAppConfiguration(config
+                    => config.AddJsonFile(
+                            "appsettings.Local.json",
+                            optional: true,
+                            reloadOnChange: true))
+#endif
+                .ConfigureLogging(x => x.ClearProviders())
+                .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());
     }
 }

src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj

@@ -81,6 +81,7 @@
 
   <PropertyGroup>
     <RazorCompileOnBuild>false</RazorCompileOnBuild>
+    <RazorCompileOnPublish>false</RazorCompileOnPublish>
   </PropertyGroup>
 
 </Project>

src/Umbraco.Web.UI.NetCore/appsettings.json

@@ -38,8 +38,8 @@
         "ConvertUrlsToAscii": "try"
       },
       "RuntimeMinification": {
-        "dataFolder": "App_Data/TEMP/Smidge",
-        "version": "637513704485999245"
+        "dataFolder": "umbraco/Data/TEMP/Smidge",
+        "version": "1"
       },
       "Security": {
         "KeepUserLoggedIn": false,