Merge branch 'v4/4.1' into v9/9.0

# Conflicts:
#	build/version.txt
#	src/Umbraco.Deploy.Contrib.Connectors/GridCellValueConnectors/DocTypeGridEditorCellValueConnector.cs
#	src/Umbraco.Deploy.Contrib/Properties/VersionInfo.cs
#	src/Umbraco.Deploy.Contrib/ValueConnectors/MultiUrlPickerValueConnector.cs

Author: AndyButland

src/Umbraco.Deploy.Contrib/Properties/VersionInfo.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-[assembly: System.Reflection.AssemblyInformationalVersion("9.0.1")]
-[assembly: System.Reflection.AssemblyVersion("9.0.1")]
+[assembly: System.Reflection.AssemblyInformationalVersion("9.0.2")]
+[assembly: System.Reflection.AssemblyVersion("9.0.2")]
 
 

src/Umbraco.Deploy.Contrib/ValueConnectors/MultiUrlPickerValueConnector.cs

@@ -100,9 +100,11 @@ public string ToArtifact(object value, IPropertyType propertyType, ICollection<A
                     }
                     else if (TryParseJTokenAttr(link, "udi", out guidUdi))
                     {
-                        var entity = _entityService.Get(guidUdi.Guid, UdiEntityTypeHelper.ToUmbracoObjectType(guidUdi.EntityType));
-                        if (entity == null)
+                        var entityExists = _entityService.Exists(guidUdi.Guid);
+                        if (!entityExists)
+                        {
                             continue;
+                        }
 
                         // Add the artifact dependency
                         dependencies.Add(new ArtifactDependency(guidUdi, false, ArtifactDependencyMode.Exist));

src/Umbraco.Deploy.Contrib/ValueConnectors/NestedContentValueConnector.cs

@@ -114,7 +114,12 @@ public string ToArtifact(object value, IPropertyType propertyType, ICollection<A
 
                     // pass the value, property type and the dependencies collection to the connector to get a "artifact" value
                     var innerValue = row.PropertyValues[key];
-                    object parsedValue = propertyValueConnector.ToArtifact(innerValue, innerPropertyType, dependencies);
+
+                    // connectors are expecting strings, not JTokens
+                    object preparedValue = innerValue is JToken
+                        ? innerValue?.ToString()
+                        : innerValue;
+                    object parsedValue = propertyValueConnector.ToArtifact(preparedValue, innerPropertyType, dependencies);
 
                     // getting Map image value umb://media/43e7401fb3cd48ceaa421df511ec703c to (nothing) - why?!
                     _logger.LogDebug("Mapped {Key} value '{PropertyValue}' to '{ParsedValue}' using {PropertyValueConnectorType} for {PropertyType}.", key, row.PropertyValues[key], parsedValue, propertyValueConnector.GetType(), innerPropertyType.Alias);
@@ -202,6 +207,11 @@ public object FromArtifact(string value, IPropertyType propertyType, object curr
                         {
                             row.PropertyValues[key] = convertedValue.ToString();
                         }
+                        // json strings need to be converted into JTokens
+                        else if (convertedValue is string convertedStringValue && convertedStringValue.DetectIsJson())
+                        {
+                            row.PropertyValues[key] = JToken.Parse(convertedStringValue);
+                        }
                         else
                         {
                             row.PropertyValues[key] = convertedValue;