Merge branch 'v8/8.1' into v8/dev

# Conflicts: # src/SolutionInfo.cs
umbraco · Sep 5, 2019 · 47f365e · 47f365e
2 parents 4b344ac + b94d78e
commit 47f365e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt
@@ -128,6 +128,7 @@
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Data.SqlServerCe')" xdt:Transform="Remove" />
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.ValueTuple')" xdt:Transform="Remove" />
       <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Net.Http.Formatting')" xdt:Transform="Remove" />
+      <dependentAssembly xdt:Locator="Condition(./_defaultNamespace:assemblyIdentity/@name='System.Collections.Immutable')" xdt:Transform="Remove" />
     </assemblyBinding>
   </runtime>
 

diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -3,7 +3,7 @@
 //
 // Container styles
 // --------------------------------------------------
-.umb-property-editor {
+.umb-property-editor { 
     width: 100%;
 }
 

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -348,9 +348,7 @@
           <DevelopmentServerPort>8200</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
           <IISUrl>http://localhost:8200/</IISUrl>
-          <DevelopmentServerPort>8130</DevelopmentServerPort>
           <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:8130</IISUrl>
           <NTLMAuthentication>False</NTLMAuthentication>
           <UseCustomServer>False</UseCustomServer>
           <CustomServerUrl>

diff --git a/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs b/src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
@@ -712,9 +712,9 @@ private void ClearBranchLocked(ContentNode content)
             var id = content.FirstChildContentId;
             while (id > 0)
             {
-                var link = GetLinkedNode(id, "child");
-                ClearBranchLocked(link.Value);
-                id = link.Value.NextSiblingContentId;
+                var child = GetLinkedNode(id, "child").Value;
+                ClearBranchLocked(child);
+                id = child.NextSiblingContentId;
             }
         }