Merge remote-tracking branch 'origin/v8/8.16' into v9/feature/merge_v8_11082021

# Conflicts: # .github/CONTRIBUTING.md # build/NuSpecs/UmbracoCms.Core.nuspec # build/NuSpecs/UmbracoCms.Web.nuspec # build/NuSpecs/UmbracoCms.nuspec # src/SolutionInfo.cs # src/Umbraco.Core/Cache/AppCaches.cs # src/Umbraco.Core/Cache/AppPolicedCacheDictionary.cs # src/Umbraco.Core/Cache/DeepCloneAppCache.cs # src/Umbraco.Core/Cache/WebCachingAppCache.cs # src/Umbraco.Core/CompositionExtensions.cs # src/Umbraco.Core/Models/Identity/BackOfficeIdentityUser.cs # src/Umbraco.Core/Models/PropertyGroupCollection.cs # src/Umbraco.Core/Models/PropertyTypeCollection.cs # src/Umbraco.Core/Persistence/Repositories/Implement/ExternalLoginRepository.cs # src/Umbraco.Core/ReadLock.cs # src/Umbraco.Core/Routing/SiteDomainMapper.cs # src/Umbraco.Core/UpgradeableReadLock.cs # src/Umbraco.Core/WriteLock.cs # src/Umbraco.Examine/ExamineExtensions.cs # src/Umbraco.Infrastructure/Examine/UmbracoFieldDefinitionCollection.cs # src/Umbraco.Infrastructure/Persistence/Dtos/ContentTypeDto.cs # src/Umbraco.Infrastructure/Persistence/Dtos/DictionaryDto.cs # src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberGroupRepository.cs # src/Umbraco.Infrastructure/Persistence/Repositories/Implement/TemplateRepository.cs # src/Umbraco.Infrastructure/Persistence/Repositories/Implement/UserRepository.cs # src/Umbraco.Infrastructure/Services/IdKeyMap.cs # src/Umbraco.Infrastructure/Services/Implement/ContentService.cs # src/Umbraco.ModelsBuilder.Embedded/PureLiveModelFactory.cs # src/Umbraco.Tests/App.config # src/Umbraco.Web.BackOffice/Controllers/EntityController.cs # src/Umbraco.Web.UI.Client/package.json # src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml # src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml # src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml # src/Umbraco.Web.UI/Umbraco.Web.UI.csproj # src/Umbraco.Web.UI/Umbraco/config/lang/cy.xml # src/Umbraco.Web.UI/web.Template.config # src/Umbraco.Web/CacheHelperExtensions.cs # src/Umbraco.Web/Editors/RelationTypeController.cs # src/Umbraco.Web/Logging/WebProfilerProvider.cs # src/Umbraco.Web/Models/Mapping/MemberMapDefinition.cs # src/Umbraco.Web/PublishedCache/NuCache/MemberCache.cs # src/Umbraco.Web/Routing/ContentFinderByConfigured404.cs # src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs # src/Umbraco.Web/Security/BackOfficeUserManager.cs # src/Umbraco.Web/Umbraco.Web.csproj
2021-08-11 19:11:35 +02:00
parent c5e882680b 9b93a8f1ab
commit 2baa1abfc4
138 changed files with 1210 additions and 1094 deletions
--- a/src/Umbraco.Web.Common/Extensions/CacheHelperExtensions.cs
+++ b/src/Umbraco.Web.Common/Extensions/CacheHelperExtensions.cs
@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
 using Umbraco.Cms.Core.Cache;
 using Umbraco.Cms.Core.Hosting;
+using Umbraco.Cms.Core.Web;

 namespace Umbraco.Extensions
 {
@@ -17,6 +18,7 @@ namespace Umbraco.Extensions
        /// </summary>
        /// <param name="appCaches"></param>
        /// <param name="hostingEnvironment"></param>
+        /// <param name="umbracoContext"></param>
        /// <param name="htmlHelper"></param>
        /// <param name="partialViewName"></param>
        /// <param name="model"></param>
@@ -27,15 +29,18 @@ namespace Umbraco.Extensions
        public static IHtmlContent CachedPartialView(
            this AppCaches appCaches,
            IHostingEnvironment hostingEnvironment,
+            IUmbracoContext umbracoContext,
            IHtmlHelper htmlHelper,
            string partialViewName,
            object model,
            TimeSpan cacheTimeout,
            string cacheKey,
-            ViewDataDictionary viewData = null)
+            ViewDataDictionary viewData = null
+            )
        {
            //disable cached partials in debug mode: http://issues.umbraco.org/issue/U4-5940
-            if (hostingEnvironment.IsDebugMode)
+            //disable cached partials in preview mode: https://github.com/umbraco/Umbraco-CMS/issues/10384
+            if (hostingEnvironment.IsDebugMode || (umbracoContext?.InPreviewMode == true))
            {
                // just return a normal partial view instead
                return htmlHelper.Partial(partialViewName, model, viewData);
--- a/src/Umbraco.Web.Common/ModelsBuilder/InMemoryModelFactory.cs
+++ b/src/Umbraco.Web.Common/ModelsBuilder/InMemoryModelFactory.cs
@@ -26,7 +26,7 @@ using File = System.IO.File;

 namespace Umbraco.Cms.Web.Common.ModelsBuilder
 {
-    internal class InMemoryModelFactory : IAutoPublishedModelFactory, IRegisteredObject
+    internal class InMemoryModelFactory : IAutoPublishedModelFactory, IRegisteredObject, IDisposable
    {
        private Infos _infos = new Infos { ModelInfos = null, ModelTypeMap = new Dictionary<string, Type>() };
        private readonly ReaderWriterLockSlim _locker = new ReaderWriterLockSlim();
@@ -52,7 +52,7 @@ namespace Umbraco.Cms.Web.Common.ModelsBuilder
        private static readonly Regex s_usingRegex = new Regex("^using(.*);", RegexOptions.Compiled | RegexOptions.Multiline);
        private static readonly Regex s_aattrRegex = new Regex("^\\[assembly:(.*)\\]", RegexOptions.Compiled | RegexOptions.Multiline);
        private readonly Lazy<string> _pureLiveDirectory;
-
+        private bool _disposedValue;


        public InMemoryModelFactory(
@@ -788,12 +788,32 @@ namespace Umbraco.Cms.Web.Common.ModelsBuilder

        public void Stop(bool immediate)
        {
-            _watcher.EnableRaisingEvents = false;
-            _watcher.Dispose();
-            _locker.Dispose();
+            Dispose();
+
            _hostingLifetime.UnregisterObject(this);
        }

+        protected virtual void Dispose(bool disposing)
+        {
+            if (!_disposedValue)
+            {
+                if (disposing)
+                {
+                    _watcher.EnableRaisingEvents = false;
+                    _watcher.Dispose();
+                    _locker.Dispose();
+                }
+
+                _disposedValue = true;
+            }
+        }
+
+        public void Dispose()
+        {
+            // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
+            Dispose(disposing: true);
+        }
+
        internal class Infos
        {
            public Dictionary<string, Type> ModelTypeMap { get; set; }
--- a/src/Umbraco.Web.Common/Security/BackOfficeUserManager.cs
+++ b/src/Umbraco.Web.Common/Security/BackOfficeUserManager.cs
@@ -143,7 +143,7 @@ namespace Umbraco.Cms.Web.Common.Security
            IdentityResult result = await base.SetLockoutEndDateAsync(user, lockoutEnd);

            // The way we unlock is by setting the lockoutEnd date to the current datetime
-            if (result.Succeeded && lockoutEnd >= DateTimeOffset.UtcNow)
+            if (result.Succeeded && lockoutEnd > DateTimeOffset.UtcNow)
            {
                NotifyAccountLocked(_httpContextAccessor.HttpContext?.User, user.Id);
            }