Fix missing import statements in FileSystemMainDomLock

Bump version
Fix attempting to write lock files to LocalTempPath before it exists (#12563 )
2022-06-13 10:02:05 +02:00 · 2022-06-13 08:35:03 +02:00 · 2022-06-10 14:09:24 +02:00 · 2022-06-09 10:49:12 +02:00 · 2022-06-09 09:46:42 +02:00 · 2022-06-08 08:25:25 +01:00
9 changed files with 21186 additions and 57 deletions
@@ -3,10 +3,10 @@
  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />

  <PropertyGroup>
-    <Version>9.5.1</Version>
-    <AssemblyVersion>9.5.1</AssemblyVersion>
-    <InformationalVersion>9.5.1</InformationalVersion>
-    <FileVersion>9.5.1</FileVersion>
+    <Version>9.5.2</Version>
+    <AssemblyVersion>9.5.2</AssemblyVersion>
+    <InformationalVersion>9.5.2</InformationalVersion>
+    <FileVersion>9.5.2</FileVersion>
    <LangVersion Condition="'$(LangVersion)' == ''">9.0</LangVersion>
    <NeutralLanguage>en-US</NeutralLanguage>
    <Company>Umbraco CMS</Company>
@@ -42,18 +42,17 @@ namespace Umbraco.Cms.Core.Configuration.Models
        /// </remarks>
        public bool FlagOutOfDateModels
        {
-            get => _flagOutOfDateModels;
-
-            set
+            get
            {
-                if (!ModelsMode.IsAuto())
+                if (ModelsMode == ModelsMode.Nothing || ModelsMode.IsAuto())
                {
-                    _flagOutOfDateModels = false;
-                    return;
+                    return false;
                }

-                _flagOutOfDateModels = value;
+                return _flagOutOfDateModels;
            }
+
+            set => _flagOutOfDateModels = value;
        }

        /// <summary>
@@ -20,7 +20,7 @@ namespace Umbraco.Cms.Core.Models
        public string NodeType { get; set; }

        [DataMember(Name = "udi")]
-        public Udi NodeUdi => Udi.Create(NodeType, NodeKey);
+        public Udi NodeUdi => NodeType == Constants.UdiEntityType.Unknown ? null : Udi.Create(NodeType, NodeKey);

        [DataMember(Name = "icon")]
        public string ContentTypeIcon { get; set; }
@@ -195,7 +195,7 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Repositories.Implement
                                                                            aliasRight: "ct")
                                                                        .LeftJoin<NodeDto>("ctn").On<ContentTypeDto, NodeDto>((left, right) => left.NodeId == right.NodeId,
                                                                            aliasLeft: "ct", aliasRight: "ctn")
-                                                                        .Where<UnionHelperDto>(x => x.OtherId != id, "x");
+                                                                        .Where<UnionHelperDto>(x => x.Id == id, "x");

            if (filterMustBeIsDependency)
            {
@@ -14,6 +14,7 @@ namespace Umbraco.Cms.Infrastructure.Runtime
    internal class FileSystemMainDomLock : IMainDomLock
    {
        private readonly ILogger<FileSystemMainDomLock> _logger;
+        private readonly IHostingEnvironment _hostingEnvironment;
        private readonly IOptionsMonitor<GlobalSettings> _globalSettings;
        private readonly CancellationTokenSource _cancellationTokenSource = new();
        private readonly string _lockFilePath;
@@ -29,6 +30,7 @@ namespace Umbraco.Cms.Infrastructure.Runtime
            IOptionsMonitor<GlobalSettings> globalSettings)
        {
            _logger = logger;
+            _hostingEnvironment = hostingEnvironment;
            _globalSettings = globalSettings;

            var lockFileName = $"MainDom_{mainDomKeyGenerator.GenerateKey()}.lock";
@@ -45,6 +47,7 @@ namespace Umbraco.Cms.Infrastructure.Runtime
            {
                try
                {
+                    Directory.CreateDirectory(_hostingEnvironment.LocalTempPath);
                    _logger.LogDebug("Attempting to obtain MainDom lock file handle {lockFilePath}", _lockFilePath);
                    _lockFileStream = File.Open(_lockFilePath, FileMode.OpenOrCreate, FileAccess.ReadWrite, FileShare.None);
                    DeleteLockReleaseSignalFile();
@@ -39,8 +39,8 @@
    "diff": "3.5.0",
    "flatpickr": "4.6.9",
    "font-awesome": "4.7.0",
-    "jquery": "^3.5.1",
-    "jquery-ui-dist": "1.12.1",
+    "jquery": "3.6.0",
+    "jquery-ui-dist": "1.13.1",
    "jquery-ui-touch-punch": "0.2.3",
    "lazyload-js": "1.0.0",
    "moment": "2.22.2",
@@ -46,7 +46,7 @@
      "description": "The version of Umbraco.Cms to add as PackageReference.",
      "type": "parameter",
      "datatype": "string",
-      "defaultValue": "9.5.1",
+      "defaultValue": "9.5.2",
      "replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
    },
    "namespaceReplacer": {
@@ -44,7 +44,7 @@
      "description": "The version of Umbraco.Cms to add as PackageReference.",
      "type": "parameter",
      "datatype": "string",
-      "defaultValue": "9.5.1",
+      "defaultValue": "9.5.2",
      "replaces": "UMBRACO_VERSION_FROM_TEMPLATE"
    },
    "UseHttpsRedirect": {
Author	SHA1	Message	Date
Nikolaj	2bcf052d9b	Fix missing import statements in FileSystemMainDomLock	2022-06-13 10:02:05 +02:00
Nikolaj	39eec09209	Bump version	2022-06-13 08:35:03 +02:00
Paul JohnsonandBjarke Berg	e536f9fd10	Fix attempting to write lock files to LocalTempPath before it exists (#12563 )	2022-06-10 14:09:24 +02:00
Bjarke BergandGitHub	a5b7794207	Merge pull request #12555 from umbraco/v9/hotfix/fix_relation_issue_when_moving_root_item_to_recycle_bin V9: fix relation issue when moving root item to recycle bin	2022-06-09 10:49:12 +02:00
Bjarke Berg	1923a20da7	Fixes relation issue, when moving a root item to recycle bin, the "Relate Parent Media Folder On Delete"/"Relate Parent Document On Delete" cannot get the parent node type, because it is a fake root.	2022-06-09 09:46:42 +02:00
Paul Johnson	54077725c3	Improve FlagOutOfDateModels property behaviour.	2022-06-08 08:25:25 +01:00
Paul JohnsonandGitHub	6b0149803a	Fix logic error WRT models builder flag out of date models. (#12548 )	2022-06-08 09:16:26 +02:00
Jacob OvergaardandBjarke Berg	833c2ed13b	update jquery to 3.6.0 and jquery-ui to 1.13.1 because of CVE-2021-41184 (#12533 ) (cherry picked from commit `61068e6ef0`)	2022-06-08 09:06:55 +02:00
Bjarke BergandGitHub	3cd17b7ede	Fixed query after tests on sqlite (#12544 ) (cherry picked from commit `0beaf19063`)	2022-06-07 15:26:32 +02:00