Fix: MemberType sync removes well known membertype properties

KevinJump · Aug 5, 2020 · 6ccf84e · 6ccf84e
1 parent 213bd44
commit 6ccf84e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/uSync8.Core/Serialization/Serializers/ContentTypeBaseSerializer.cs b/uSync8.Core/Serialization/Serializers/ContentTypeBaseSerializer.cs
@@ -324,8 +324,7 @@ protected void DeserializeProperties(TObject item, XElement node)
                 var alias = propertyNode.Element("Alias").ValueOrDefault(string.Empty);
                 if (string.IsNullOrEmpty(alias)) continue;
 
-
-                var key = propertyNode.Element("Key").ValueOrDefault(Guid.Empty);
+                var key = propertyNode.Element("Key").ValueOrDefault(alias.GetHashCode().ToGuid());
                 var definitionKey = propertyNode.Element("Definition").ValueOrDefault(Guid.Empty);
                 var propertyEditorAlias = propertyNode.Element("Type").ValueOrDefault(string.Empty);
 
@@ -672,11 +671,10 @@ private void RemoveProperties(IContentTypeBase item, XElement properties)
             List<string> removals = new List<string>();
 
             var nodes = properties.Elements("GenericProperty")
-                .Where(x => x.Element("Key").ValueOrDefault(Guid.Empty) != Guid.Empty)
                 .Select(x =>
                     new
                     {
-                        Key = x.Element("Key").ValueOrDefault(Guid.Empty),
+                        Key = (x.Element("Key").ValueOrDefault(Guid.NewGuid()) == Guid.Empty ? Guid.NewGuid() : x.Element("Key").ValueOrDefault(Guid.NewGuid())),
                         Alias = x.Element("Alias").ValueOrDefault(string.Empty)
                     })
                 .ToDictionary(k => k.Key, a => a.Alias);

diff --git a/uSync8.Core/Serialization/Serializers/MemberTypeSerializer.cs b/uSync8.Core/Serialization/Serializers/MemberTypeSerializer.cs
@@ -90,7 +90,7 @@ protected override XElement SerializeProperties(IMemberType item)
                 var alias = property.Element("Alias").ValueOrDefault(string.Empty);
                 if (!string.IsNullOrWhiteSpace(alias) && buildInProperties.InvariantContains(alias))
                 {
-                    property.Element("Key").Value = Guid.Empty.ToString();
+                    property.Element("Key").Value = alias.GetHashCode().ToGuid().ToString();
                 }
             }
             return node;