From 5452ebaf6d95611dfa62cecacce112c2935b8cfb Mon Sep 17 00:00:00 2001
From: Andy Butland <abutland@zonedigital.com>
Date: Fri, 2 Aug 2019 14:54:01 +0100
Subject: [PATCH] Import and export of document type and property variations
 setting in packages

---
 .../Packaging/PackageDataInstallation.cs      | 19 +++++++++++++------
 .../Services/Implement/EntityXmlSerializer.cs |  6 ++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
index c811f484bc..2f6b91edee 100644
--- a/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
+++ b/src/Umbraco.Core/Packaging/PackageDataInstallation.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
-using System.Text.RegularExpressions;
 using System.Web;
 using System.Xml.Linq;
 using System.Xml.XPath;
@@ -575,12 +574,11 @@ namespace Umbraco.Core.Packaging
             contentType.Thumbnail = infoElement.Element("Thumbnail").Value;
             contentType.Description = infoElement.Element("Description").Value;
 
-            //NOTE AllowAtRoot is a new property in the package xml so we need to verify it exists before using it.
+            //NOTE AllowAtRoot, IsListView, IsElement and Variations are new properties in the package xml so we need to verify it exists before using it.
             var allowAtRoot = infoElement.Element("AllowAtRoot");
             if (allowAtRoot != null)
                 contentType.AllowedAsRoot = allowAtRoot.Value.InvariantEquals("true");
 
-            //NOTE IsListView is a new property in the package xml so we need to verify it exists before using it.
             var isListView = infoElement.Element("IsListView");
             if (isListView != null)
                 contentType.IsContainer = isListView.Value.InvariantEquals("true");
@@ -589,6 +587,10 @@ namespace Umbraco.Core.Packaging
             if (isElement != null)
                 contentType.IsElement = isElement.Value.InvariantEquals("true");
 
+            var variationsElement = infoElement.Element("Variations");
+            if (variationsElement != null)
+                contentType.Variations = (ContentVariation)Enum.Parse(typeof(ContentVariation), variationsElement.Value);
+
             //Name of the master corresponds to the parent and we need to ensure that the Parent Id is set
             var masterElement = infoElement.Element("Master");
             if (masterElement != null)
@@ -614,7 +616,7 @@ namespace Umbraco.Core.Packaging
                         var compositionContentType = importedContentTypes.ContainsKey(compositionAlias)
                             ? importedContentTypes[compositionAlias]
                             : _contentTypeService.Get(compositionAlias);
-                        var added = contentType.AddContentType(compositionContentType);
+                        contentType.AddContentType(compositionContentType);
                     }
                 }
             }
@@ -748,9 +750,14 @@ namespace Umbraco.Core.Packaging
                 {
                     Name = property.Element("Name").Value,
                     Description = (string)property.Element("Description"),
-                    Mandatory = property.Element("Mandatory") != null ? property.Element("Mandatory").Value.ToLowerInvariant().Equals("true") : false,
+                    Mandatory = property.Element("Mandatory") != null
+                        ? property.Element("Mandatory").Value.ToLowerInvariant().Equals("true")
+                        : false,
                     ValidationRegExp = (string)property.Element("Validation"),
-                    SortOrder = sortOrder
+                    SortOrder = sortOrder,
+                    Variations = property.Element("Variations") != null
+                        ? (ContentVariation)Enum.Parse(typeof(ContentVariation), property.Element("Variations").Value)
+                        : ContentVariation.Nothing
                 };
 
                 var tab = (string)property.Element("Tab");
diff --git a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
index 863ecc0b1b..ace740a831 100644
--- a/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
+++ b/src/Umbraco.Core/Services/Implement/EntityXmlSerializer.cs
@@ -437,7 +437,8 @@ namespace Umbraco.Core.Services.Implement
                                     new XElement("Description", contentType.Description),
                                     new XElement("AllowAtRoot", contentType.AllowedAsRoot.ToString()),
                                     new XElement("IsListView", contentType.IsContainer.ToString()),
-                                    new XElement("IsElement", contentType.IsElement.ToString()));
+                                    new XElement("IsElement", contentType.IsElement.ToString()),
+                                    new XElement("Variations", contentType.Variations.ToString()));
 
             var masterContentType = contentType.ContentTypeComposition.FirstOrDefault(x => x.Id == contentType.ParentId);
             if(masterContentType != null)
@@ -487,7 +488,8 @@ namespace Umbraco.Core.Services.Implement
                                                    new XElement("SortOrder", propertyType.SortOrder),
                                                    new XElement("Mandatory", propertyType.Mandatory.ToString()),
                                                    propertyType.ValidationRegExp != null ? new XElement("Validation", propertyType.ValidationRegExp) : null,
-                                                   propertyType.Description != null ? new XElement("Description", new XCData(propertyType.Description)) : null);
+                                                   propertyType.Description != null ? new XElement("Description", new XCData(propertyType.Description)) : null,
+                                                   new XElement("Variations", propertyType.Variations.ToString()));
 
                 genericProperties.Add(genericProperty);
             }