Merge pull request #18 from umbraco/temp-deploy-493

fixes deploy-493 InnerContent connector has a regression issue with g…

Author: robert-cpl

src/Umbraco.Deploy.Contrib.Connectors/ValueConnectors/InnerContentConnector.cs

@@ -63,7 +63,9 @@ public string GetValue(Property property, ICollection<ArtifactDependency> depend
             var distinctContentTypes = new Dictionary<GuidUdi, IContentType>();
             foreach (var innerContentItem in innerContent)
             {
-                var contentType = _contentTypeService.GetContentType(innerContentItem.IcContentTypeGuid);
+                IContentType contentType = null;
+                if (innerContentItem.IcContentTypeGuid.HasValue)
+                    contentType = _contentTypeService.GetContentType(innerContentItem.IcContentTypeGuid.Value);
                 if (contentType == null)
                     contentType = _contentTypeService.GetContentType(innerContentItem.IcContentTypeAlias);
                 if (contentType == null)
@@ -146,13 +148,14 @@ public void SetValue(IContentBase content, string alias, string value)
 
             foreach (var innerContentItem in innerContent)
             {
-                var contentType = _contentTypeService.GetContentType(innerContentItem.IcContentTypeGuid);
+                IContentType contentType = null;
+                if (innerContentItem.IcContentTypeGuid.HasValue)
+                    contentType = _contentTypeService.GetContentType(innerContentItem.IcContentTypeGuid.Value);
                 if (contentType == null)
                     contentType = _contentTypeService.GetContentType(innerContentItem.IcContentTypeAlias);
                 if (contentType == null)
                     throw new InvalidOperationException($"Could not resolve these content types for the Inner Content property with key: {innerContentItem.Key}, and name: {innerContentItem.Name}");
 
-
                 var mocks = new Dictionary<IContentType, IContent>();
 
                 // note
@@ -243,7 +246,7 @@ public class InnerContentValue
             [JsonProperty("icContentTypeAlias")]
             public string IcContentTypeAlias { get; set; }
             [JsonProperty("icContentTypeGuid")]
-            public Guid IcContentTypeGuid { get; set; }
+            public Guid? IcContentTypeGuid { get; set; }
 
             /// <summary>
             /// The remaining properties will be serialized to a dictionary