From f344479b40168433e5c237fc4e9c634190105cbd Mon Sep 17 00:00:00 2001
From: Warren Buckley <warren@umbraco.com>
Date: Tue, 4 May 2021 10:06:25 +0100
Subject: [PATCH] Netcore: dotnet new template updates and change
 HideTopLevelNodeFromPath default value to `true` (#10222)

* As we always ship with config in V8 to set this to be true makes sense it now because default in code

* Explicitly add JSON Schema property incase user IDE does not automap it

* Escaping issue with example usages
---
 .../UmbracoProject/.template.config/dotnetcli.host.json       | 2 +-
 build/templates/UmbracoProject/appsettings.Development.json   | 4 ++++
 build/templates/UmbracoProject/appsettings.json               | 1 +
 src/Umbraco.Core/Configuration/Models/GlobalSettings.cs       | 2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/build/templates/UmbracoProject/.template.config/dotnetcli.host.json b/build/templates/UmbracoProject/.template.config/dotnetcli.host.json
index 2727c1dbcc..fb990c8902 100644
--- a/build/templates/UmbracoProject/.template.config/dotnetcli.host.json
+++ b/build/templates/UmbracoProject/.template.config/dotnetcli.host.json
@@ -34,6 +34,6 @@
         "dotnet new umbraco -n MyNewProject",
         "dotnet new umbraco -n MyNewProjectWithCE -ce",
         "dotnet new umbraco -n MyNewProject --no-restore",
-        "dotnet new umbraco -n MyNewProject --friendly-name "Friendly User" --email user@email.com --password password1234 --connection-string "Server=ConnectionStringHere""
+        "dotnet new umbraco -n MyNewProject --friendly-name \"Friendly User\" --email user@email.com --password password1234 --connection-string \"Server=ConnectionStringHere\""
     ]
 }
diff --git a/build/templates/UmbracoProject/appsettings.Development.json b/build/templates/UmbracoProject/appsettings.Development.json
index 0823d89494..a02bad241d 100644
--- a/build/templates/UmbracoProject/appsettings.Development.json
+++ b/build/templates/UmbracoProject/appsettings.Development.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://json.schemastore.org/appsettings.json",
   "Serilog": {
     "MinimumLevel": {
       "Default": "Information"
@@ -23,6 +24,9 @@
   //#endif
   "Umbraco": {
     "CMS": {
+      "Content": {
+        "MacroErrors": "Throw"
+      },
       //#if (UsingUnattenedInstall)
       "Unattended": {
         "InstallUnattended": true,
diff --git a/build/templates/UmbracoProject/appsettings.json b/build/templates/UmbracoProject/appsettings.json
index 140c970ebb..324b99f42c 100644
--- a/build/templates/UmbracoProject/appsettings.json
+++ b/build/templates/UmbracoProject/appsettings.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://json.schemastore.org/appsettings.json",
   "Serilog": {
     "MinimumLevel": {
       "Default": "Information",
diff --git a/src/Umbraco.Core/Configuration/Models/GlobalSettings.cs b/src/Umbraco.Core/Configuration/Models/GlobalSettings.cs
index b20ac84700..b27b60ec8e 100644
--- a/src/Umbraco.Core/Configuration/Models/GlobalSettings.cs
+++ b/src/Umbraco.Core/Configuration/Models/GlobalSettings.cs
@@ -39,7 +39,7 @@ namespace Umbraco.Cms.Core.Configuration.Models
         /// <summary>
         /// Gets or sets a value indicating whether to hide the top level node from the path.
         /// </summary>
-        public bool HideTopLevelNodeFromPath { get; set; } = false;
+        public bool HideTopLevelNodeFromPath { get; set; } = true;
 
         /// <summary>
         /// Gets or sets a value indicating whether HTTPS should be used.