Merge branch 'v9/dev' into v9/9.1

Author: bergmania

build/build.ps1

@@ -449,12 +449,6 @@
     if ($this.OnError()) { return }
   })
 
-  $ubuild.DefineMethod("PrepareAzureGallery",
-  {
-    Write-Host "Prepare Azure Gallery"
-    $this.CopyFile("$($this.SolutionRoot)\build\Azure\azuregalleryrelease.ps1", $this.BuildOutput)
-  })
-
   $ubuild.DefineMethod("PrepareCSharpDocs",
   {
     Write-Host "Prepare C# Documentation"
@@ -528,8 +522,6 @@
     if ($this.OnError()) { return }
     $this.PackageNuGet()
     if ($this.OnError()) { return }
-    $this.PrepareAzureGallery()
-    if ($this.OnError()) { return }
     $this.PostPackageHook()
     if ($this.OnError()) { return }
 

build/templates/UmbracoPackage/.template.config/template.json

@@ -24,7 +24,7 @@
         "version": {
             "type": "parameter",
             "datatype": "string",
-            "defaultValue": "9.1.0-rc",
+            "defaultValue": "9.2.0-rc",
             "description": "The version of Umbraco to load using NuGet",
             "replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
         },

build/templates/UmbracoProject/.template.config/template.json

@@ -57,7 +57,7 @@
         "version": {
             "type": "parameter",
             "datatype": "string",
-            "defaultValue": "9.1.0-rc",
+            "defaultValue": "9.2.0-rc",
             "description": "The version of Umbraco to load using NuGet",
             "replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
         },

build/templates/UmbracoProject/UmbracoProject.csproj

@@ -1,25 +1,23 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
         <RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Umbraco.Cms.Web.UI</RootNamespace>
     </PropertyGroup>
 
-
     <ItemGroup>
         <PackageReference Include="Umbraco.Cms" Version="UMBRACO_VERSION_FROM_TEMPLATE" />
         <PackageReference Include="Umbraco.Cms.SqlCe" Version="UMBRACO_VERSION_FROM_TEMPLATE" Condition="'$(UseSqlCe)' == 'true'" />
         <PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" Condition="'$(UseSqlCe)' == 'true'" />
     </ItemGroup>
 
-  <!-- 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.9" />
-    <RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="68.2" />
-  </ItemGroup>
-
+    <!-- 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.9" />
+        <RuntimeHostConfigurationOption Include="System.Globalization.AppLocalIcu" Value="68.2" />
+    </ItemGroup>
 
-  <Import Project="..\PackageTestSiteName\build\PackageTestSiteName.targets" Condition="'$(PackageTestSiteName)' != ''" />
+    <Import Project="..\PackageTestSiteName\build\PackageTestSiteName.targets" Condition="'$(PackageTestSiteName)' != ''" />
 
     <ItemGroup Condition="'$(PackageTestSiteName)' != ''">
         <ProjectReference Include="..\PackageTestSiteName\PackageTestSiteName.csproj" />

src/Directory.Build.props

@@ -3,10 +3,10 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
   <PropertyGroup>
-    <Version>9.1.0</Version>
-    <AssemblyVersion>9.1.0</AssemblyVersion>
-    <InformationalVersion>9.1.0-rc</InformationalVersion>
-    <FileVersion>9.1.0</FileVersion>
+    <Version>9.2.0</Version>
+    <AssemblyVersion>9.2.0</AssemblyVersion>
+    <InformationalVersion>9.2.0-rc</InformationalVersion>
+    <FileVersion>9.2.0</FileVersion>
     <LangVersion Condition="'$(LangVersion)' == ''">9.0</LangVersion>
     <NeutralLanguage>en-US</NeutralLanguage>
     <Company>Umbraco CMS</Company>

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

@@ -11,8 +11,6 @@ namespace Umbraco.Cms.Core.Configuration.Models
     [UmbracoOptions(Constants.Configuration.ConfigPlugins)]
     public class UmbracoPluginSettings
     {
-        
-
         /// <summary>
         /// Gets or sets the allowed file extensions (including the period ".") that should be accessible from the browser.
         /// </summary>
@@ -25,7 +23,8 @@ public class UmbracoPluginSettings
             ".jpg", ".jpeg", ".gif", ".png", ".svg", // images
             ".eot", ".ttf", ".woff", // fonts
             ".xml", ".json", ".config", // configurations
-            ".lic" // license
+            ".lic", // license
+            ".map" // js map files
         });
     }
 }

src/Umbraco.Core/Notifications/UmbracoApplicationComponentsInstallingNotification.cs

@@ -1,15 +1,22 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
+using System;
+
 namespace Umbraco.Cms.Core.Notifications
 {
+    // TODO (V10): Remove this class.
+
     /// <summary>
     /// Notification that occurs during the Umbraco boot process, before instances of <see cref="IComponent"/> initialize.
     /// </summary>
+    [Obsolete("This notification was added to the core runtime start-up as a hook for Umbraco Cloud local connection string and database setup. " +
+        "Following re-work they are no longer used (from Deploy 9.2.0)." +
+        "Given they are non-documented and no other use is expected, they can be removed in the next major release")]
     public class UmbracoApplicationComponentsInstallingNotification : INotification
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="UmbracoApplicationStartingNotification"/> class.
+        /// Initializes a new instance of the <see cref="UmbracoApplicationComponentsInstallingNotification"/> class.
         /// </summary>
         /// <param name="runtimeLevel">The runtime level</param>
         public UmbracoApplicationComponentsInstallingNotification(RuntimeLevel runtimeLevel) => RuntimeLevel = runtimeLevel;

src/Umbraco.Core/Notifications/UmbracoApplicationMainDomAcquiredNotification.cs

@@ -1,11 +1,18 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
+using System;
+
 namespace Umbraco.Cms.Core.Notifications
 {
+    // TODO (V10): Remove this class.
+
     /// <summary>
     /// Notification that occurs during Umbraco boot after the MainDom has been acquired.
     /// </summary>
+    [Obsolete("This notification was added to the core runtime start-up as a hook for Umbraco Cloud local connection string and database setup. " +
+        "Following re-work they are no longer used (from Deploy 9.2.0)." +
+        "Given they are non-documented and no other use is expected, they can be removed in the next major release")]
     public class UmbracoApplicationMainDomAcquiredNotification : INotification
     {
         /// <summary>

src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs

@@ -133,6 +133,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
             // acquire the main domain - if this fails then anything that should be registered with MainDom will not operate
             AcquireMainDom();
 
+            // TODO (V10): Remove this obsoleted notification publish.
             await _eventAggregator.PublishAsync(new UmbracoApplicationMainDomAcquiredNotification(), cancellationToken);
 
             // notify for unattended install
@@ -171,6 +172,7 @@ public async Task StartAsync(CancellationToken cancellationToken)
                     break;
             }
 
+            // TODO (V10): Remove this obsoleted notification publish.
             await _eventAggregator.PublishAsync(new UmbracoApplicationComponentsInstallingNotification(State.Level), cancellationToken);
 
             // create & initialize the components

src/Umbraco.Infrastructure/Services/Implement/ContentVersionService.cs

@@ -41,11 +41,14 @@ public ContentVersionService(
         ///     In v9 this can live in another class as we publish the notifications via IEventAggregator.
         ///     But for v8 must be here for access to the static events.
         /// </remarks>
-        public IReadOnlyCollection<HistoricContentVersionMeta> PerformContentVersionCleanup(DateTime asAtDate) =>
-            CleanupDocumentVersions(asAtDate);
+        public IReadOnlyCollection<HistoricContentVersionMeta> PerformContentVersionCleanup(DateTime asAtDate)
+        {
+            // Media - ignored
+            // Members - ignored
+            return CleanupDocumentVersions(asAtDate);
+        }
+
 
-        // Media - ignored
-        // Members - ignored
         /// <remarks>
         ///     v9 - move to another class
         /// </remarks>