Skip to content

Commit 4b12dd5

Browse files
committed
Merge branch 'v4/dev' into v9/dev
# Conflicts: # .gitignore # build/version.txt # src/Umbraco.Deploy.Contrib.Connectors/Umbraco.Deploy.Contrib.Connectors.csproj # src/Umbraco.Deploy.Contrib/GridCellValueConnectors/DocTypeGridEditorCellValueConnector.cs # src/Umbraco.Deploy.Contrib/GridCellValueConnectors/dummy.txt # src/Umbraco.Deploy.Contrib/Properties/VersionInfo.cs # src/Umbraco.Deploy.Contrib/ValueConnectors/NestedContentValueConnector.cs
2 parents 50f862a + 7ef049f commit 4b12dd5

File tree

5 files changed

+18
-12
lines changed

5 files changed

+18
-12
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ MigrationBackup/
3737

3838
build.tmp
3939
build.out
40-
build/temp
40+
build/temp

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,13 @@ Primarily this project offers connectors for the most popular Umbraco community
1111

1212
This project offers Umbraco Deploy connectors for the following community packages:
1313

14-
None so far.
14+
-
15+
16+
Value connectors for certain core property editors are also included:
17+
18+
- Block List
19+
- Multi URL Picker
20+
- Nested Content
1521

1622
---
1723

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[assembly: AssemblyConfiguration("")]
77
[assembly: AssemblyCompany("")]
88
[assembly: AssemblyProduct("Umbraco.Deploy.Contrib")]
9-
[assembly: AssemblyCopyright("Copyright © Umbraco 2021")]
9+
[assembly: AssemblyCopyright("Copyright © Umbraco 2022")]
1010
[assembly: AssemblyTrademark("")]
1111
[assembly: AssemblyCulture("")]
1212

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
// </auto-generated>
99
//------------------------------------------------------------------------------
1010

11-
[assembly: System.Reflection.AssemblyInformationalVersion("9.0.0-beta001")]
12-
[assembly: System.Reflection.AssemblyVersion("9.0.0")]
11+
[assembly: System.Reflection.AssemblyInformationalVersion("9.0.1")]
12+
[assembly: System.Reflection.AssemblyVersion("9.0.1")]
1313

1414

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using Microsoft.Extensions.Logging;
1+
using Microsoft.Extensions.Logging;
22
using Newtonsoft.Json;
33
using Newtonsoft.Json.Linq;
44
using System;
@@ -41,12 +41,12 @@ public NestedContentValueConnector(IContentTypeService contentTypeService, Lazy<
4141

4242
public string ToArtifact(object value, IPropertyType propertyType, ICollection<ArtifactDependency> dependencies)
4343
{
44-
_logger.LogInformation("Converting {PropertyType} to artifact.", propertyType.Alias);
44+
_logger.LogDebug("Converting {PropertyType} to artifact.", propertyType.Alias);
4545
var svalue = value as string;
4646

4747
if (string.IsNullOrWhiteSpace(svalue))
4848
{
49-
_logger.LogWarning($"Value is null or whitespace. Skipping conversion to artifact.");
49+
_logger.LogDebug($"Value is null or whitespace. Skipping conversion to artifact.");
5050
return null;
5151
}
5252

@@ -126,16 +126,16 @@ public string ToArtifact(object value, IPropertyType propertyType, ICollection<A
126126
}
127127

128128
value = JsonConvert.SerializeObject(nestedContent);
129-
_logger.LogInformation("Finished converting {PropertyType} to artifact.", propertyType.Alias);
129+
_logger.LogDebug("Finished converting {PropertyType} to artifact.", propertyType.Alias);
130130
return (string)value;
131131
}
132132

133133
public object FromArtifact(string value, IPropertyType propertyType, object currentValue)
134134
{
135-
_logger.LogInformation("Converting {PropertyType} from artifact.", propertyType.Alias);
135+
_logger.LogDebug("Converting {PropertyType} from artifact.", propertyType.Alias);
136136
if (string.IsNullOrWhiteSpace(value))
137137
{
138-
_logger.LogWarning($"Value is null or whitespace. Skipping conversion from artifact.");
138+
_logger.LogDebug($"Value is null or whitespace. Skipping conversion from artifact.");
139139
return value;
140140
}
141141

@@ -219,7 +219,7 @@ public object FromArtifact(string value, IPropertyType propertyType, object curr
219219
// Note: NestedContent does not use formatting when serializing JSON values.
220220
value = JArray.FromObject(nestedContent).ToString(Formatting.None);
221221

222-
_logger.LogInformation("Finished converting {PropertyType} from artifact.", propertyType.Alias);
222+
_logger.LogDebug("Finished converting {PropertyType} from artifact.", propertyType.Alias);
223223

224224
return value;
225225
}

0 commit comments

Comments
 (0)