Merge remote-tracking branch 'origin/netcore/netcore' into feature/8651-config-options-validation

# Conflicts:
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/PropertyEditorValueEditorTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/CmsHelperCasingTests.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Core/ShortStringHelper/DefaultShortStringHelperTestsWithoutSetup.cs
#	src/Umbraco.Tests.UnitTests/Umbraco.Web.Website/Controllers/SurfaceControllerTests.cs
#	src/Umbraco.Tests/Models/MediaXmlTest.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
#	src/Umbraco.Tests/PublishedContent/NuCacheTests.cs
#	src/Umbraco.Tests/TestHelpers/TestWithDatabaseBase.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
         <TargetFramework>netcoreapp3.1</TargetFramework>
@@ -71,7 +71,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.3" />
+      <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8" />
         <!-- TODO: remove the reference to System.Configuration.ConfigurationManager when Examine/lucene dont need it-->
         <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
     </ItemGroup>

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

@@ -3,9 +3,9 @@
         "CMS": {
             "Global":{
                 "Smtp": {
-                    "From": "your@email.here",
-                    "Host": "localhost",
-                    "Port": "25"
+//                    "From": "your@email.here",
+//                    "Host": "localhost",
+//                    "Port": "25"
                 }
             },
             "Hosting": {

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

@@ -24,10 +24,6 @@
         "DisableKeepAliveTask": false,
         "KeepAlivePingUrl": "{umbracoApplicationUrl}/api/keepalive/ping"
       },
-      "ModelsBuilder": {
-        "ModelsMode": "Nothing",
-        "Enable": "true"
-      },
       "RequestHandler": {
         "ConvertUrlsToAscii": "try"
       },
@@ -58,6 +54,10 @@
       },
       "Tours": {
         "EnableTours": true
+      },
+      "ModelsBuilder": {
+        "ModelsMode": "Nothing",
+        "Enable": "true"
       }
     }
   }

src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml

@@ -8,6 +8,7 @@
 @using Umbraco.Core.Hosting
 @using Umbraco.Extensions
 @using Umbraco.Core.Logging
+@using Umbraco.Core.Services
 @using Umbraco.Web.BackOffice.Controllers
 @inject BackOfficeSignInManager signInManager
 @inject BackOfficeServerVariables backOfficeServerVariables
@@ -16,7 +17,7 @@
 @inject IOptions<GlobalSettings> globalSettings
 @inject IRuntimeMinifier runtimeMinifier
 @inject IProfilerHtml profilerHtml
-
+@inject IIconService IconService
 @{
     bool.TryParse(Context.Request.Query["umbDebug"], out bool isDebug);
     var backOfficePath = globalSettings.Value.GetBackOfficePath(hostingEnvironment);
@@ -111,6 +112,13 @@
             @await Html.AngularValueExternalLoginInfoScriptAsync(signInManager, ViewData.GetExternalSignInError())
             @Html.AngularValueResetPasswordCodeInfoScript(ViewData["PasswordResetCode"])
             @await Html.AngularValueTinyMceAssetsAsync(runtimeMinifier)
+
+            app.run(["iconHelper", function (iconHelper) {
+                @* We inject icons to the icon helper(service), since icons can only be loaded if user is authorized. By injecting these to the service they will not be requested as they will become cached. *@
+                iconHelper.defineIcon("icon-check", '@Html.Raw(IconService.GetIcon("icon-check")?.SvgString)');
+                iconHelper.defineIcon("icon-delete", '@Html.Raw(IconService.GetIcon("icon-delete")?.SvgString)');
+            }]);
+
             //required for the noscript trick
             document.getElementById("mainwrapper").style.display = "inherit";
         }