From 52812672fc23ccf77d0b91c6e132c3e09f10b1b0 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 10 Mar 2021 15:22:45 +1100
Subject: [PATCH 1/4] Allow for having appsettings.Local.json

this file is not checked in and can be used to overwrite any custom settings that are in the repo without worrying about accidentally checking in developer settings as you work.
---
 .gitignore                                    |  1 +
 src/Umbraco.Web.UI.NetCore/Program.cs         | 19 +++++++++++--------
 .../Umbraco.Web.UI.NetCore.csproj             |  1 +
 src/Umbraco.Web.UI.NetCore/appsettings.json   |  4 ++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0cffac8343..5f2768f575 100644
--- a/.gitignore
+++ b/.gitignore
@@ -201,3 +201,4 @@ src/Umbraco.Tests/TEMP/
 
 /src/Umbraco.Web.UI/config/umbracoSettings.config
 /src/Umbraco.Web.UI.NetCore/Umbraco/models/*
+/src/Umbraco.Web.UI.NetCore/appsettings.local.json
diff --git a/src/Umbraco.Web.UI.NetCore/Program.cs b/src/Umbraco.Web.UI.NetCore/Program.cs
index 89ce7d92bc..7a6ee4dcfd 100644
--- a/src/Umbraco.Web.UI.NetCore/Program.cs
+++ b/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>());
     }
 }
diff --git a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
index 5aeb0e8bb1..2324c4c252 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -81,6 +81,7 @@
 
   <PropertyGroup>
     <RazorCompileOnBuild>false</RazorCompileOnBuild>
+    <RazorCompileOnPublish>false</RazorCompileOnPublish>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
index 382ee11590..0fae4fd724 100644
--- a/src/Umbraco.Web.UI.NetCore/appsettings.json
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.json
@@ -38,8 +38,8 @@
         "ConvertUrlsToAscii": "try"
       },
       "RuntimeMinification": {
-        "dataFolder": "App_Data/TEMP/Smidge",
-        "version": "637432008251409860"
+        "dataFolder": "Umbraco/TEMP/Smidge",
+        "version": "1"
       },
       "Security": {
         "KeepUserLoggedIn": false,

From e6f73b26ce7a8ef67eb96326fa18049085bdcf8a Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Thu, 11 Mar 2021 14:09:23 +1100
Subject: [PATCH 2/4] Update src/Umbraco.Web.UI.NetCore/appsettings.json

---
 src/Umbraco.Web.UI.NetCore/appsettings.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
index 0fae4fd724..72af7afb5b 100644
--- a/src/Umbraco.Web.UI.NetCore/appsettings.json
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.json
@@ -38,7 +38,7 @@
         "ConvertUrlsToAscii": "try"
       },
       "RuntimeMinification": {
-        "dataFolder": "Umbraco/TEMP/Smidge",
+        "dataFolder": "Umbraco/Data/TEMP/Smidge",
         "version": "1"
       },
       "Security": {
@@ -71,4 +71,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}

From 71e59e2ba8c2bccae391239330dbaf148ff41371 Mon Sep 17 00:00:00 2001
From: Shannon Deminick <sdeminick@gmail.com>
Date: Mon, 15 Mar 2021 11:35:09 +1100
Subject: [PATCH 3/4] Update .gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 5f2768f575..95295e44c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -201,4 +201,4 @@ src/Umbraco.Tests/TEMP/
 
 /src/Umbraco.Web.UI/config/umbracoSettings.config
 /src/Umbraco.Web.UI.NetCore/Umbraco/models/*
-/src/Umbraco.Web.UI.NetCore/appsettings.local.json
+/src/Umbraco.Web.UI.NetCore/appsettings.Local.json

From 375609bc6e601645309dde16bb41e9064c2c5849 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 16 Mar 2021 08:05:33 +0100
Subject: [PATCH 4/4] Update src/Umbraco.Web.UI.NetCore/appsettings.json

---
 src/Umbraco.Web.UI.NetCore/appsettings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
index 72af7afb5b..53a30cbcea 100644
--- a/src/Umbraco.Web.UI.NetCore/appsettings.json
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.json
@@ -38,7 +38,7 @@
         "ConvertUrlsToAscii": "try"
       },
       "RuntimeMinification": {
-        "dataFolder": "Umbraco/Data/TEMP/Smidge",
+        "dataFolder": "umbraco/Data/TEMP/Smidge",
         "version": "1"
       },
       "Security": {