Merge branch 'v9/dev' into v9/feature/add-notifcation-for-url-collision

Author: Zeegaan

build/templates/UmbracoProject/UmbracoProject.csproj

@@ -8,6 +8,12 @@
         <DefaultItemExcludes>$(DefaultItemExcludes);wwwroot/media/**;</DefaultItemExcludes>
     </PropertyGroup>
 
+    <!-- Force windows to use ICU. Otherwise Windows 10 2019H1+ will do it, but older windows 10 and most if not all winodws servers will run NLS -->
+    <ItemGroup Condition="'$(OS)' == 'Windows_NT'">
+        <PackageReference Include="Microsoft.ICU.ICU4C.Runtime" Version="68.2.0.6" />
+        <RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="68.2" />
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="Umbraco.Cms" Version="UMBRACO_VERSION_FROM_TEMPLATE" />
         <PackageReference Include="Umbraco.Cms.SqlCe" Version="UMBRACO_VERSION_FROM_TEMPLATE" Condition="'$(UseSqlCe)' == 'true'" />
@@ -30,6 +36,10 @@
         <Compile Include="umbraco/models/**" Exclude="**/*.flag" />
     </ItemGroup>
 
+    <PropertyGroup>
+        <CopyRazorGenerateFilesToPublishDirectory>true</CopyRazorGenerateFilesToPublishDirectory>
+    </PropertyGroup>
+
     <!-- Set this to true if ModelsBuilder mode is not InMemoryAuto-->
     <PropertyGroup>
         <RazorCompileOnBuild>false</RazorCompileOnBuild>

src/JsonSchema/AppSettings.cs

@@ -47,6 +47,7 @@ public class CmsDefinition
                 public RichTextEditorSettings RichTextEditor { get; set; }
                 public RuntimeMinificationSettings RuntimeMinification { get; set; }
                 public BasicAuthSettings BasicAuth { get; set; }
+                public PackageMigrationSettings PackageMigration { get; set; }
             }
 
             /// <summary>

src/Umbraco.Core/Configuration/Models/PackageMigrationSettings.cs

@@ -0,0 +1,40 @@
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
+
+using System.ComponentModel;
+
+namespace Umbraco.Cms.Core.Configuration.Models
+{
+    /// <summary>
+    /// Typed configuration options for package migration settings.
+    /// </summary>
+    [UmbracoOptions(Constants.Configuration.ConfigPackageMigration)]
+    public class PackageMigrationSettings
+    {
+        private const bool StaticRunSchemaAndContentMigrations = true;
+        private const bool StaticAllowComponentOverrideOfRunSchemaAndContentMigrations = true;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether package migration steps that install schema and content should run.
+        /// </summary>
+        /// <remarks>
+        /// By default this is true and schema and content defined in a package migration are installed.
+        /// Using configuration, administrators can optionally switch this off in certain environments.
+        /// Deployment tools such as Umbraco Deploy can also configure this option to run or not run these migration
+        /// steps as is appropriate for normal use of the tool.
+        /// </remarks>
+        [DefaultValue(StaticRunSchemaAndContentMigrations)]
+        public bool RunSchemaAndContentMigrations { get; set; } = StaticRunSchemaAndContentMigrations;
+
+        /// <summary>
+        /// Gets or sets a value indicating whether components can override the configured value for <see cref="RunSchemaAndContentMigrations"/>.
+        /// </summary>
+        /// <remarks>
+        /// By default this is true and components can override the configured setting for <see cref="RunSchemaAndContentMigrations"/>.
+        /// If an administrator wants explicit control over which environments migration steps installing schema and content can run,
+        /// they can set this to false. Components should respect this and not override the configuration.
+        /// </remarks>
+        [DefaultValue(StaticAllowComponentOverrideOfRunSchemaAndContentMigrations)]
+        public bool AllowComponentOverrideOfRunSchemaAndContentMigrations { get; set; } = StaticAllowComponentOverrideOfRunSchemaAndContentMigrations;
+    }
+}

src/Umbraco.Core/Configuration/Models/RuntimeMinificationSettings.cs

@@ -7,6 +7,7 @@ public class RuntimeMinificationSettings
     {
         internal const bool StaticUseInMemoryCache = false;
         internal const string StaticCacheBuster = "Version";
+        internal const string StaticVersion = null;
 
         /// <summary>
         /// Use in memory cache
@@ -19,5 +20,11 @@ public class RuntimeMinificationSettings
         /// </summary>
         [DefaultValue(StaticCacheBuster)]
         public RuntimeMinificationCacheBuster CacheBuster { get; set; } = Enum<RuntimeMinificationCacheBuster>.Parse(StaticCacheBuster);
+
+        /// <summary>
+        /// The unique version string used if CacheBuster is 'Version'.
+        /// </summary>
+        [DefaultValue(StaticVersion)]
+        public string Version { get; set; } = StaticVersion;
     }
 }

src/Umbraco.Core/Configuration/Models/UnattendedSettings.cs

@@ -1,17 +1,19 @@
-using System.ComponentModel;
+// Copyright (c) Umbraco.
+// See LICENSE for more details.
+
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 namespace Umbraco.Cms.Core.Configuration.Models
 {
-
     /// <summary>
     /// Typed configuration options for unattended settings.
     /// </summary>
     [UmbracoOptions(Constants.Configuration.ConfigUnattended)]
     public class UnattendedSettings
     {
-        internal const bool StaticInstallUnattended = false;
-        internal const bool StaticUpgradeUnattended = false;
+        private const bool StaticInstallUnattended = false;
+        private const bool StaticUpgradeUnattended = false;
 
         /// <summary>
         /// Gets or sets a value indicating whether unattended installs are enabled.

src/Umbraco.Core/Constants-Configuration.cs

@@ -52,6 +52,7 @@ public static class Configuration
             public const string ConfigWebRouting = ConfigPrefix + "WebRouting";
             public const string ConfigUserPassword = ConfigPrefix + "Security:UserPassword";
             public const string ConfigRichTextEditor = ConfigPrefix + "RichTextEditor";
+            public const string ConfigPackageMigration = ConfigPrefix + "PackageMigration";
         }
     }
 }

src/Umbraco.Web.Common/DependencyInjection/StaticServiceProvider.cs renamed to src/Umbraco.Core/DependencyInjection/StaticServiceProvider.cs

@@ -4,22 +4,22 @@
 namespace Umbraco.Cms.Web.Common.DependencyInjection
 {
     /// <summary>
-    /// INTERNAL Service locator. Should only be used if no other ways exist.
+    /// Service locator for internal (umbraco cms) only purposes. Should only be used if no other ways exist.
     /// </summary>
     /// <remarks>
     /// It is created with only two goals in mind
     /// 1) Continue to have the same extension methods on IPublishedContent and IPublishedElement as in V8. To make migration easier.
-    /// 2) To have a tool to avoid breaking changes in minor versions. All methods using this should in theory be obsolete.
+    /// 2) To have a tool to avoid breaking changes in minor and patch versions. All methods using this should in theory be obsolete.
     ///
     /// Keep in mind, every time this is used, the code becomes basically untestable.
     /// </remarks>
     [EditorBrowsable(EditorBrowsableState.Never)]
-    internal static class StaticServiceProvider
+    public static class StaticServiceProvider
     {
         /// <summary>
         /// The service locator.
         /// </summary>
         [EditorBrowsable(EditorBrowsableState.Never)]
-        internal static IServiceProvider Instance { get; set; }
+        public static IServiceProvider Instance { get; set; }
     }
 }

src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Configuration.cs

@@ -72,7 +72,8 @@ public static IUmbracoBuilder AddConfiguration(this IUmbracoBuilder builder)
                 .AddUmbracoOptions<UnattendedSettings>()
                 .AddUmbracoOptions<RichTextEditorSettings>()
                 .AddUmbracoOptions<BasicAuthSettings>()
-                .AddUmbracoOptions<RuntimeMinificationSettings>();
+                .AddUmbracoOptions<RuntimeMinificationSettings>()
+                .AddUmbracoOptions<PackageMigrationSettings>();
 
             return builder;
         }

src/Umbraco.Core/DependencyInjection/UmbracoBuilder.cs

@@ -38,6 +38,7 @@
 using Umbraco.Cms.Core.Sync;
 using Umbraco.Cms.Core.Templates;
 using Umbraco.Cms.Core.Web;
+using Umbraco.Cms.Web.Common.DependencyInjection;
 using Umbraco.Extensions;
 
 namespace Umbraco.Cms.Core.DependencyInjection
@@ -179,6 +180,7 @@ private void AddCoreServices()
             Services.AddUnique<UriUtility>();
 
             Services.AddUnique<IDashboardService, DashboardService>();
+            Services.AddUnique<IUserDataService, UserDataService>();
 
             // will be injected in controllers when needed to invoke rest endpoints on Our
             Services.AddUnique<IInstallationService, InstallationService>();

src/Umbraco.Core/Models/UserData.cs

@@ -0,0 +1,19 @@
+using System.Runtime.Serialization;
+
+namespace Umbraco.Cms.Core.Models
+{
+    [DataContract]
+    public class UserData
+    {
+        [DataMember(Name = "name")]
+        public string Name { get; }
+        [DataMember(Name = "data")]
+        public string Data { get; }
+
+        public UserData(string name, string data)
+        {
+            Name = name;
+            Data = data;
+        }
+    }
+}