Merge branch 'develop' into develop_umb_8

# Conflicts: # src/DeployCmsData.Core/Properties/AssemblyInfo.cs # src/DeployCmsData.UmbracoCms/Builders/MultiNodeTreePickerBuilder.cs # src/DeployCmsData.UmbracoCms/DeployCmsData.UmbracoCms.nuspec # src/DeployCmsData.UmbracoCms/Properties/AssemblyInfo.cs # src/Integration.Web.Umb8.0/packages.config
programystic · Mar 26, 2019 · 6ba0d1a · 6ba0d1a
2 parents 10d9a14 + 0352878
commit 6ba0d1a
Show file tree

Hide file tree

Showing 23 changed files with 128 additions and 1,647 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,6 +8,7 @@
 **/App_Data/Logs/
 **/App_Data/[Pp]review/
 **/App_Data/TEMP/
+**/App_Data/Models/
 **/App_Data/NuGetBackup/
 **/Umbraco
 **/Umbraco_Client

diff --git a/src/DeployCmsData.Core/Properties/AssemblyInfo.cs b/src/DeployCmsData.Core/Properties/AssemblyInfo.cs
@@ -5,7 +5,7 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("DeployCmsData.Core")]
-[assembly: AssemblyDescription("Run code on startup")]
+[assembly: AssemblyDescription("Upgrade script management core code for DeployCmsData.UmbracoCms")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Programystic")]
 [assembly: AssemblyProduct("DeployCmsData.Core")]

diff --git a/src/DeployCmsData.IntegrationTest/Tests/IntegrationTests.cs b/src/DeployCmsData.IntegrationTest/Tests/IntegrationTests.cs
@@ -20,6 +20,7 @@ internal class IntegrationTests
         [TestCase("MultiNodeTreePicker")]
         [TestCase("AllDataTypes")]
         [TestCase("UpdateHomePage")]
+        [TestCase("RemoveAllowedDocType")]        
         public void CallUpgradeScriptApi(string apiMethodName)
         {
             GetResponse(apiMethodName);

diff --git a/src/DeployCmsData.UmbracoCms/Builders/DocumentTypeBuilder.cs b/src/DeployCmsData.UmbracoCms/Builders/DocumentTypeBuilder.cs
@@ -31,7 +31,7 @@ public class DocumentTypeBuilder
         internal readonly IList<string> RemoveFieldList = new List<string>();
         internal readonly IList<IContentTypeComposition> Compositions = new List<IContentTypeComposition>();
         internal IList<ContentTypeSort> AllowedChildNodeTypes = new List<ContentTypeSort>();
-        internal IList<ContentTypeSort> RemoveAllowedChildNodeTypes = new List<ContentTypeSort>();
+        internal IList<int> RemoveAllowedChildNodeTypes = new List<int>();
         public IList<PropertyBuilder> FieldList { get; } = new List<PropertyBuilder>();
 
         public DocumentTypeBuilder(string alias)
@@ -204,11 +204,12 @@ private void CopyExistingAllowedTypes(IContentType documentType)
 
         private void RemoveNotAllowedTypes()
         {
-            foreach (var allowedType in RemoveAllowedChildNodeTypes)
+            foreach (var typeIdToRemove in RemoveAllowedChildNodeTypes)
             {
-                if (AllowedChildNodeTypes.Any(x => x.Id.Value == allowedType.Id.Value))
+                var typeToRemove = AllowedChildNodeTypes.FirstOrDefault(x => x.Id.Value == typeIdToRemove);
+                if (typeToRemove != null)
                 {
-                    AllowedChildNodeTypes.Remove(allowedType);
+                    AllowedChildNodeTypes.Remove(typeToRemove);
                 }
             }
         }
@@ -428,7 +429,7 @@ public DocumentTypeBuilder RemoveAllowedChildNodeType(string alias)
             var documentType = _contentTypeService.Get(alias);
             if (documentType != null)
             {
-                RemoveAllowedChildNodeTypes.Add(new ContentTypeSort(documentType.Id, RemoveAllowedChildNodeTypes.Count + 1));
+                RemoveAllowedChildNodeTypes.Add(documentType.Id);
             }
 
             return this;

diff --git a/src/DeployCmsData.UmbracoCms/DeployCmsData.UmbracoCms.nuspec b/src/DeployCmsData.UmbracoCms/DeployCmsData.UmbracoCms.nuspec
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>$description$</description>    
     <copyright>Copyright 2019</copyright>
-    <tags>umbraco deployment startup</tags>
+    <tags>umbraco deployment migration startup</tags>
     <dependencies>
       <dependency id="DeployCmsData.Core" version="2.0.0" />
     </dependencies>

diff --git a/src/DeployCmsData.UmbracoCms/Properties/AssemblyInfo.cs b/src/DeployCmsData.UmbracoCms/Properties/AssemblyInfo.cs
@@ -1,11 +1,12 @@
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("DeployCmsData.UmbracoCms")]
-[assembly: AssemblyDescription("Build deployment scripts for your Umbraco CMS updates")]
+[assembly: AssemblyDescription("Create migration scripts for your CI/CD Umbraco CMS deployments.")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("Programystic")]
 [assembly: AssemblyProduct("DeployCmsData.UmbracoCms")]
@@ -32,4 +33,3 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("8.0.0.7")]
-//[assembly: AssemblyInformationalVersion("8.0.0.0")]
diff --git a/src/DeployCmsData.UpgradeScripts.7.0/DeployCmsData.UpgradeScripts.7.0.csproj b/src/DeployCmsData.UpgradeScripts.7.0/DeployCmsData.UpgradeScripts.7.0.csproj
@@ -56,11 +56,11 @@
     <Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
       <HintPath>..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll</HintPath>
     </Reference>
-    <Reference Include="DeployCmsData.Core, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DeployCmsData.Core.1.0.2\lib\net461\DeployCmsData.Core.dll</HintPath>
+    <Reference Include="DeployCmsData.Core, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DeployCmsData.Core.1.0.3\lib\net461\DeployCmsData.Core.dll</HintPath>
     </Reference>
-    <Reference Include="DeployCmsData.UmbracoCms, Version=7.4.0.4, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\DeployCmsData.UmbracoCms.7.4.0.4\lib\net461\DeployCmsData.UmbracoCms.dll</HintPath>
+    <Reference Include="DeployCmsData.UmbracoCms, Version=7.4.0.5, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DeployCmsData.UmbracoCms.7.4.0.5\lib\net461\DeployCmsData.UmbracoCms.dll</HintPath>
     </Reference>
     <Reference Include="Examine, Version=0.1.68.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\Examine.0.1.68.0\lib\Examine.dll</HintPath>
@@ -222,6 +222,7 @@
     <Compile Include="UpgradeScripts\ClearTheDecks.cs" />
     <Compile Include="UpgradeScripts\CreateContent.cs" />
     <Compile Include="UpgradeScripts\MultiNodeTreePicker.cs" />
+    <Compile Include="UpgradeScripts\RemoveAllowedDocType.cs" />
     <Compile Include="UpgradeScripts\Templates.cs" />
     <Compile Include="UpgradeScripts\UpdateHomePage.cs" />
     <Compile Include="UpgradeScripts\Upgrade01.cs" />

diff --git a/src/DeployCmsData.UpgradeScripts.7.0/UpgradeScripts/RemoveAllowedDocType.cs b/src/DeployCmsData.UpgradeScripts.7.0/UpgradeScripts/RemoveAllowedDocType.cs
@@ -0,0 +1,43 @@
+using DeployCmsData.Core.Attributes;
+using DeployCmsData.Core.Interfaces;
+using DeployCmsData.UmbracoCms.Builders;
+using DeployCmsData.UmbracoCms.Constants;
+using DeployCmsData.UpgradeScripts_7.Constants;
+
+namespace DeployCmsData.UpgradeScripts_7.UpgradeScripts
+{
+    [DoNotAutoRun]
+    public class RemoveAllowedDocType : IUpgradeScript
+    {
+        public bool RunScript()
+        {
+            new DocumentTypeBuilder("allowedChildNodeType1").BuildInFolder("Pages");
+            new DocumentTypeBuilder("allowedChildNodeType2").BuildInFolder("Pages");
+            new DocumentTypeBuilder("allowedChildNodeType3").BuildInFolder("Pages");
+
+            var builder = new DocumentTypeBuilder("removeAllowedDocType");
+
+            builder
+                .Icon(Icons.Home)
+                .AddComposition("pageMetaData")
+                .AddComposition("contentBase")
+                .AddComposition("navigationBase")
+                .AddAllowedChildNodeType("allowedChildNodeType1")
+                .AddAllowedChildNodeType("allowedChildNodeType2")
+                .AddAllowedChildNodeType("allowedChildNodeType3");
+
+            builder.AddField("mainContent")
+                .DataType(LocalDataTypes.Grid)
+                .Tab("Content");
+
+            builder.BuildInFolder("Pages");
+
+
+            new DocumentTypeBuilder("removeAllowedDocType")
+                .RemoveAllowedChildNodeType("allowedChildNodeType2")
+                .Update();
+
+            return true;
+        }
+    }
+}
diff --git a/src/DeployCmsData.UpgradeScripts.7.0/packages.config b/src/DeployCmsData.UpgradeScripts.7.0/packages.config
@@ -3,8 +3,8 @@
   <package id="AutoMapper" version="3.0.0" targetFramework="net472" />
   <package id="ClientDependency" version="1.9.7" targetFramework="net472" />
   <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net472" />
-  <package id="DeployCmsData.Core" version="1.0.2" targetFramework="net472" />
-  <package id="DeployCmsData.UmbracoCms" version="7.4.0.4" targetFramework="net461" />
+  <package id="DeployCmsData.Core" version="1.0.3" targetFramework="net461" />
+  <package id="DeployCmsData.UmbracoCms" version="7.4.0.5" targetFramework="net461" />
   <package id="Examine" version="0.1.68.0" targetFramework="net472" />
   <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net472" />
   <package id="ImageProcessor" version="2.3.3.0" targetFramework="net472" />

diff --git a/src/DeployCmsData.UpgradeScripts.8.0/DeployCmsData.UpgradeScripts.8.0.csproj b/src/DeployCmsData.UpgradeScripts.8.0/DeployCmsData.UpgradeScripts.8.0.csproj
@@ -251,6 +251,7 @@
     <Compile Include="UpgradeScripts\ClearTheDecks.cs" />
     <Compile Include="UpgradeScripts\CreateContent.cs" />
     <Compile Include="UpgradeScripts\MultiNodeTreePicker.cs" />
+    <Compile Include="UpgradeScripts\RemoveAllowedDocType.cs" />
     <Compile Include="UpgradeScripts\Templates.cs" />
     <Compile Include="UpgradeScripts\UpdateHomePage.cs" />
     <Compile Include="UpgradeScripts\Upgrade01.cs" />

diff --git a/src/DeployCmsData.UpgradeScripts.8.0/UpgradeScripts/RemoveAllowedDocType.cs b/src/DeployCmsData.UpgradeScripts.8.0/UpgradeScripts/RemoveAllowedDocType.cs
@@ -0,0 +1,43 @@
+using DeployCmsData.Core.Attributes;
+using DeployCmsData.Core.Interfaces;
+using DeployCmsData.UmbracoCms.Builders;
+using DeployCmsData.UmbracoCms.Constants;
+using DeployCmsData.UpgradeScripts_8.Constants;
+
+namespace DeployCmsData.UpgradeScripts_8.UpgradeScripts
+{
+    [DoNotAutoRun]
+    public class RemoveAllowedDocType : IUpgradeScript
+    {
+        public bool RunScript()
+        {
+            new DocumentTypeBuilder("allowedChildNodeType1").BuildInFolder("Pages");
+            new DocumentTypeBuilder("allowedChildNodeType2").BuildInFolder("Pages");
+            new DocumentTypeBuilder("allowedChildNodeType3").BuildInFolder("Pages");
+
+            var builder = new DocumentTypeBuilder("removeAllowedDocType");
+
+            builder
+                .Icon(Icons.Home)
+                .AddComposition("pageMetaData")
+                .AddComposition("contentBase")
+                .AddComposition("navigationBase")
+                .AddAllowedChildNodeType("allowedChildNodeType1")
+                .AddAllowedChildNodeType("allowedChildNodeType2")
+                .AddAllowedChildNodeType("allowedChildNodeType3");
+
+            builder.AddField("mainContent")
+                .DataType(LocalDataTypes.Grid)
+                .Tab("Content");
+
+            builder.BuildInFolder("Pages");
+
+
+            new DocumentTypeBuilder("removeAllowedDocType")
+                .RemoveAllowedChildNodeType("allowedChildNodeType2")
+                .Update();
+
+            return true;
+        }
+    }
+}