From 7a431a7184142503f7a61b4ea01b7d3f97e1f148 Mon Sep 17 00:00:00 2001
From: Zeegaan <70372949+Zeegaan@users.noreply.github.com>
Date: Mon, 16 Aug 2021 14:57:27 +0200
Subject: [PATCH 1/2] Renamed appsettings to appsettings.template

---
 .../Umbraco.Web.UI.NetCore.csproj             | 15 ++++
 .../appsettings.Development.template.json     | 59 ++++++++++++++
 .../appsettings.template.json                 | 76 +++++++++++++++++++
 3 files changed, 150 insertions(+)
 create mode 100644 src/Umbraco.Web.UI.NetCore/appsettings.Development.template.json
 create mode 100644 src/Umbraco.Web.UI.NetCore/appsettings.template.json

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 b14848bae5..7979338f47 100644
--- a/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
+++ b/src/Umbraco.Web.UI.NetCore/Umbraco.Web.UI.NetCore.csproj
@@ -84,6 +84,7 @@
   <PropertyGroup>
     <BellePath>$(ProjectDir)wwwroot/umbraco</BellePath>
     <JsonSchemaPath>$(ProjectDir)umbraco/config/appsettings-schema.json</JsonSchemaPath>
+
   </PropertyGroup>
   <Target Name="CheckPreconditions" BeforeTargets="Build">
     <Message Text="-CheckPreconditions-" Importance="high" />
@@ -100,6 +101,11 @@
     <Message Text="Generate the appsettings json schema." Importance="High" Condition="!Exists('$(JsonSchemaPath)') and '$(UmbracoBuild)' == ''" />
 
     <CallTarget Targets="JsonSchemaBuild" Condition="!Exists('$(JsonSchemaPath)') and '$(UmbracoBuild)' == ''" />
+    
+   
+    <CallTarget Targets="AppsettingsBuild" Condition="!Exists('appsettings.json')" />
+    <CallTarget Targets="AppsettingsDevBuild" Condition="!Exists('appsettings.Development.json')" />
+
   </Target>
   <Target Name="BelleBuild">
 <!--    <Exec WorkingDirectory="$(ProjectDir)/../../src/Umbraco.Web.UI.Client/" Command="powershell -ExecutionPolicy RemoteSigned -Command '&amp;{ npm install ; npm run build }'" />-->
@@ -107,6 +113,15 @@
   <Target Name="JsonSchemaBuild">
 <!--    <Exec WorkingDirectory="$(ProjectDir)/../../" Command="powershell -ExecutionPolicy RemoteSigned -Command '&amp;dotnet run &#45;&#45;project $pwd/src/JsonSchema/JsonSchema.csproj -c Release &#45;&#45; &#45;&#45;outputFile $pwd/src/Umbraco.Web.UI.NetCore/$(JsonSchemaPath)'" />-->
   </Target>
+  <Target Name="AppsettingsBuild">
+     <Message Text="Generating appsettings.json because it doesnt exist" Importance="High" />
+     <Copy SourceFiles="$(Projectdir)/appsettings.template.json" DestinationFiles="$(ProjectDir)/appsettings.json" />
+  </Target>
+  <Target Name="AppsettingsDevBuild">
+    <Message Text="Generating appsettings.Development.json because it doesnt exist" Importance="High" />
+    <Copy SourceFiles="$(ProjectDir)appsettings.Development.template.json" DestinationFiles="$(ProjectDir)appsettings.Development.json" />
+  </Target>
+
 
   <!-- clean Belle when cleaning and rebuilding, but only in Visual Studio -->
   <Target Name="CleanPreconditions" AfterTargets="Clean" Condition="'$(UmbracoBuild)' == ''">
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.Development.template.json b/src/Umbraco.Web.UI.NetCore/appsettings.Development.template.json
new file mode 100644
index 0000000000..9cac2c3dd9
--- /dev/null
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.Development.template.json
@@ -0,0 +1,59 @@
+{
+  "$schema" : "./umbraco/config/appsettings-schema.json",
+  "Serilog": {
+    "MinimumLevel": {
+      "Default": "Information",
+      "Override": {
+        "Examine.Lucene.Providers.LuceneIndex": "Debug",
+        "Examine.BaseIndexProvider": "Debug",
+        "Examine.Lucene.LoggingReplicationClient": "Debug",
+        "Examine.Lucene.ExamineReplicator": "Debug"
+      }
+    },
+    "WriteTo": [
+      {
+        "Name": "Async",
+        "Args": {
+          "configure": [
+            {
+              "Name": "Console"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  "Umbraco": {
+    "CMS": {
+      "Examine": {
+        "LuceneDirectoryFactory": "TempFileSystemDirectoryFactory"
+      },
+      "Global": {
+        "Smtp": {
+          //"From": "your@email.here",
+          //"Host": "localhost",
+          // "Port": "25"
+        }
+      },
+      "Hosting": {
+        "Debug": true
+      },
+      "RuntimeMinification": {
+        "useInMemoryCache": true,
+        "cacheBuster": "Timestamp"
+      },
+      "RichTextEditor": {
+        "Commands": [
+          {
+            "Alias": "fullscreen",
+            "Name": "Full Screen",
+            "Mode": "All"
+          }
+        ],
+        "Plugins": [
+          "fullscreen"
+        ]
+      }
+    }
+  }
+}
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.template.json b/src/Umbraco.Web.UI.NetCore/appsettings.template.json
new file mode 100644
index 0000000000..cef926fad2
--- /dev/null
+++ b/src/Umbraco.Web.UI.NetCore/appsettings.template.json
@@ -0,0 +1,76 @@
+{
+  "$schema": "./umbraco/config/appsettings-schema.json",
+  "ConnectionStrings": {
+    "umbracoDbDSN": ""
+  },
+  "Serilog": {
+    "MinimumLevel": {
+      "Default": "Information",
+      "Override": {
+        "Microsoft": "Warning",
+        "Microsoft.Hosting.Lifetime": "Information",
+        "System": "Warning"
+      }
+    }
+  },
+  "Umbraco": {
+    "CMS": {
+      "Content": {
+        "Notifications": {
+          "Email": "your@email.here"
+        },
+        "MacroErrors": "Throw"
+      },
+      "Global": {
+        "DefaultUILanguage": "en-us",
+        "HideTopLevelNodeFromPath": true,
+        "UmbracoPath": "~/umbraco",
+        "TimeOutInMinutes": 20,
+        "UseHttps": false
+      },
+      "Hosting": {
+        "Debug": false
+      },
+      "KeepAlive": {
+        "DisableKeepAliveTask": false,
+        "KeepAlivePingUrl": "{umbracoApplicationUrl}/api/keepalive/ping"
+      },
+      "RequestHandler": {
+        "ConvertUrlsToAscii": "try"
+      },
+      "RuntimeMinification": {
+        "dataFolder": "umbraco/Data/TEMP/Smidge",
+        "version": "637642136775050602"
+      },
+      "Security": {
+        "KeepUserLoggedIn": false,
+        "UsernameIsEmail": true,
+        "HideDisabledUsersInBackoffice": false,
+        "AllowedUserNameCharacters": "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._@+\\",
+        "UserPassword": {
+          "RequiredLength": 10,
+          "RequireNonLetterOrDigit": false,
+          "RequireDigit": false,
+          "RequireLowercase": false,
+          "RequireUppercase": false,
+          "MaxFailedAccessAttemptsBeforeLockout": 5
+        },
+        "MemberPassword": {
+          "RequiredLength": 10,
+          "RequireNonLetterOrDigit": false,
+          "RequireDigit": false,
+          "RequireLowercase": false,
+          "RequireUppercase": false,
+          "MaxFailedAccessAttemptsBeforeLockout": 5
+        }
+      },
+      "Tours": {
+        "EnableTours": true
+      },
+      "ModelsBuilder": {
+        "ModelsMode": "InMemoryAuto",
+        "Enable": true
+      }
+    }
+  }
+}

From ea530e786effcefb7b55c254b324264de7b3fd48 Mon Sep 17 00:00:00 2001
From: Zeegaan <70372949+Zeegaan@users.noreply.github.com>
Date: Tue, 17 Aug 2021 12:14:46 +0200
Subject: [PATCH 2/2] Changed gitignore to ignore appsettings.json

---
 .gitignore                                    |  2 +
 .../appsettings.Development.json              | 59 --------------
 src/Umbraco.Web.UI.NetCore/appsettings.json   | 76 -------------------
 3 files changed, 2 insertions(+), 135 deletions(-)
 delete mode 100644 src/Umbraco.Web.UI.NetCore/appsettings.Development.json
 delete mode 100644 src/Umbraco.Web.UI.NetCore/appsettings.json

diff --git a/.gitignore b/.gitignore
index f5249bb70b..fb5e701d1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -193,6 +193,8 @@ src/Umbraco.Web.UI/Umbraco/telemetrics-id.umb
 /src/Umbraco.Web.UI.NetCore/[Uu]mbraco/[Ll]ogs
 /src/Umbraco.Web.UI.NetCore/[Uu]mbraco/[Dd]ata/*
 /src/Umbraco.Web.UI.NetCore/[Uu]mbraco/[Mm]odels/*
+/src/Umbraco.Web.UI.NetCore/appsettings.json
+/src/Umbraco.Web.UI.NetCore/appsettings.Development.json
 
 
 src/Umbraco.Tests.Integration/umbraco/Data/
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.Development.json b/src/Umbraco.Web.UI.NetCore/appsettings.Development.json
deleted file mode 100644
index 9cac2c3dd9..0000000000
--- a/src/Umbraco.Web.UI.NetCore/appsettings.Development.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "$schema" : "./umbraco/config/appsettings-schema.json",
-  "Serilog": {
-    "MinimumLevel": {
-      "Default": "Information",
-      "Override": {
-        "Examine.Lucene.Providers.LuceneIndex": "Debug",
-        "Examine.BaseIndexProvider": "Debug",
-        "Examine.Lucene.LoggingReplicationClient": "Debug",
-        "Examine.Lucene.ExamineReplicator": "Debug"
-      }
-    },
-    "WriteTo": [
-      {
-        "Name": "Async",
-        "Args": {
-          "configure": [
-            {
-              "Name": "Console"
-            }
-          ]
-        }
-      }
-    ]
-  },
-  "Umbraco": {
-    "CMS": {
-      "Examine": {
-        "LuceneDirectoryFactory": "TempFileSystemDirectoryFactory"
-      },
-      "Global": {
-        "Smtp": {
-          //"From": "your@email.here",
-          //"Host": "localhost",
-          // "Port": "25"
-        }
-      },
-      "Hosting": {
-        "Debug": true
-      },
-      "RuntimeMinification": {
-        "useInMemoryCache": true,
-        "cacheBuster": "Timestamp"
-      },
-      "RichTextEditor": {
-        "Commands": [
-          {
-            "Alias": "fullscreen",
-            "Name": "Full Screen",
-            "Mode": "All"
-          }
-        ],
-        "Plugins": [
-          "fullscreen"
-        ]
-      }
-    }
-  }
-}
diff --git a/src/Umbraco.Web.UI.NetCore/appsettings.json b/src/Umbraco.Web.UI.NetCore/appsettings.json
deleted file mode 100644
index cef926fad2..0000000000
--- a/src/Umbraco.Web.UI.NetCore/appsettings.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "$schema": "./umbraco/config/appsettings-schema.json",
-  "ConnectionStrings": {
-    "umbracoDbDSN": ""
-  },
-  "Serilog": {
-    "MinimumLevel": {
-      "Default": "Information",
-      "Override": {
-        "Microsoft": "Warning",
-        "Microsoft.Hosting.Lifetime": "Information",
-        "System": "Warning"
-      }
-    }
-  },
-  "Umbraco": {
-    "CMS": {
-      "Content": {
-        "Notifications": {
-          "Email": "your@email.here"
-        },
-        "MacroErrors": "Throw"
-      },
-      "Global": {
-        "DefaultUILanguage": "en-us",
-        "HideTopLevelNodeFromPath": true,
-        "UmbracoPath": "~/umbraco",
-        "TimeOutInMinutes": 20,
-        "UseHttps": false
-      },
-      "Hosting": {
-        "Debug": false
-      },
-      "KeepAlive": {
-        "DisableKeepAliveTask": false,
-        "KeepAlivePingUrl": "{umbracoApplicationUrl}/api/keepalive/ping"
-      },
-      "RequestHandler": {
-        "ConvertUrlsToAscii": "try"
-      },
-      "RuntimeMinification": {
-        "dataFolder": "umbraco/Data/TEMP/Smidge",
-        "version": "637642136775050602"
-      },
-      "Security": {
-        "KeepUserLoggedIn": false,
-        "UsernameIsEmail": true,
-        "HideDisabledUsersInBackoffice": false,
-        "AllowedUserNameCharacters": "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-._@+\\",
-        "UserPassword": {
-          "RequiredLength": 10,
-          "RequireNonLetterOrDigit": false,
-          "RequireDigit": false,
-          "RequireLowercase": false,
-          "RequireUppercase": false,
-          "MaxFailedAccessAttemptsBeforeLockout": 5
-        },
-        "MemberPassword": {
-          "RequiredLength": 10,
-          "RequireNonLetterOrDigit": false,
-          "RequireDigit": false,
-          "RequireLowercase": false,
-          "RequireUppercase": false,
-          "MaxFailedAccessAttemptsBeforeLockout": 5
-        }
-      },
-      "Tours": {
-        "EnableTours": true
-      },
-      "ModelsBuilder": {
-        "ModelsMode": "InMemoryAuto",
-        "Enable": true
-      }
-    }
-  }
-}