Merge branch 'umco-chore/housekeeping' into dev

Author: Claus

.editorconfig

@@ -0,0 +1,16 @@
+# editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Default settings:
+# A newline ending every file
+# Use 4 spaces as indentation
+[*]
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+
+# Trim trailing whitespace, limited support.
+# https://github.com/editorconfig/editorconfig/wiki/Property-research:-Trim-trailing-spaces
+trim_trailing_whitespace = true

.gitattributes

@@ -0,0 +1,49 @@
+*.doc  diff=astextplain
+*.DOC	diff=astextplain
+*.docx	diff=astextplain
+*.DOCX	diff=astextplain
+*.dot	diff=astextplain
+*.DOT	diff=astextplain
+*.pdf	diff=astextplain
+*.PDF	diff=astextplain
+*.rtf	diff=astextplain
+*.RTF	diff=astextplain
+
+*.jpg  	binary
+*.png 	binary
+*.gif 	binary
+
+*.cs text=auto diff=csharp 
+*.vb text=auto
+*.c text=auto
+*.cpp text=auto
+*.cxx text=auto
+*.h text=auto
+*.hxx text=auto
+*.py text=auto
+*.rb text=auto
+*.java text=auto
+*.html text=auto
+*.htm text=auto
+*.css text=auto
+*.scss text=auto
+*.sass text=auto
+*.less text=auto
+*.js text=auto
+*.lisp text=auto
+*.clj text=auto
+*.sql text=auto
+*.php text=auto
+*.lua text=auto
+*.m text=auto
+*.asm text=auto
+*.erl text=auto
+*.fs text=auto
+*.fsx text=auto
+*.hs text=auto
+
+*.csproj text=auto merge=union 
+*.vbproj text=auto merge=union 
+*.fsproj text=auto merge=union 
+*.dbproj text=auto merge=union 
+*.sln text=auto eol=crlf merge=union 

README.md

@@ -12,24 +12,25 @@ Primarily this project offers connectors for the most popular Umbraco community
 
 This project offers Umbraco Deploy connectors for the following community packages:
 
+- [Archetype](https://our.umbraco.org/projects/backoffice-extensions/archetype/)
+- [Content List](https://github.com/umco/umbraco-content-list)
 - [DocType Grid Editor](https://our.umbraco.org/projects/backoffice-extensions/doc-type-grid-editor/)
-- [UrlPicker](https://our.umbraco.org/projects/backoffice-extensions/urlpicker/)
 - [LeBlender](https://our.umbraco.org/projects/backoffice-extensions/leblender)
+- [Multi Url Picker](https://our.umbraco.com/projects/backoffice-extensions/multi-url-picker)
 - [Nested Content](https://our.umbraco.org/projects/backoffice-extensions/nested-content/)
-- [Stacked Content](https://github.com/umco/umbraco-stacked-content)
 - [nuPickers](https://our.umbraco.org/projects/backoffice-extensions/nupickers/)
-- [Archetype](https://our.umbraco.org/projects/backoffice-extensions/archetype/)
-- [Content List](https://github.com/umco/umbraco-content-list)
 - [Property List](https://github.com/umco/umbraco-property-list)
+- [Stacked Content](https://github.com/umco/umbraco-stacked-content)
 - [Tuple](https://github.com/umco/umbraco-tuple)
+- [UrlPicker](https://our.umbraco.org/projects/backoffice-extensions/urlpicker/)
 
 ---
 
 ## Getting Started
 
 ### Installation
 
-You can install the NuGet package using `Install-Package Umbraco.Deploy.Contrib`.  
+You can install the NuGet package using `Install-Package Umbraco.Deploy.Contrib`.
 [![NuGet release](https://img.shields.io/nuget/v/Umbraco.Deploy.Contrib.svg)](https://www.nuget.org/packages/Umbraco.Deploy.Contrib)
 
 ---

src/Umbraco.Deploy.Contrib.Connectors/GridCellValueConnectors/DocTypeGridEditorCellValueConnector.cs

@@ -69,7 +69,7 @@ public override string GetValue(GridValue.GridControl control, Property property
 
                 // throws if not found - no need for a null check
                 var propValueConnector = ValueConnectors.Get(propertyType);
-                
+
                 var mockProperty = new Property(propertyType, value);
                 var parsedValue = propValueConnector.GetValue(mockProperty, dependencies);
                 // test if the value is a json object (thus could be a nested complex editor)
@@ -83,7 +83,7 @@ public override string GetValue(GridValue.GridControl control, Property property
                 {
                     docTypeGridEditorContent.Value[propertyType.Alias] = parsedValue;
                 }
-                
+
             }
 
             var resolvedValue = JsonConvert.SerializeObject(docTypeGridEditorContent);
@@ -140,7 +140,7 @@ public override void SetValue(GridValue.GridControl control, Property property)
 
                 var mockProperty = new Property(propertyType);
                 var mockContent = new Content("mockContent", -1, new ContentType(-1),
-                    new PropertyCollection(new List<Property> {mockProperty}));
+                    new PropertyCollection(new List<Property> { mockProperty }));
 
                 {
                     propValueConnector.SetValue(mockContent, mockProperty.Alias, value.ToString());
@@ -177,7 +177,6 @@ public override void SetValue(GridValue.GridControl control, Property property)
         }
     }
 
-
     /// <summary>
     /// The value of a DocTypeGridEditor cell
     /// <example>

src/Umbraco.Deploy.Contrib.Connectors/GridCellValueConnectors/LeBlenderGridCellValueConnector.cs

@@ -201,7 +201,7 @@ public override void SetValue(GridValue.GridControl control, Property property)
                     var propValueConnector = ValueConnectors.Get(propertyType);
                     // we need to create a mocked property that we can parse in to the value connector
                     var mockProperty = new Property(propertyType);
-                    var mockContent = new Content("mockContent", -1, new ContentType(-1), new PropertyCollection(new List<Property> {mockProperty}));
+                    var mockContent = new Content("mockContent", -1, new ContentType(-1), new PropertyCollection(new List<Property> { mockProperty }));
 
                     if (leBlenderProperty.Value.Type == JTokenType.Array)
                     {

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

@@ -1,23 +1,14 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("Umbraco.Deploy.Contrib.Connectors")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Umbraco.Deploy.Contrib.Connectors")]
-[assembly: AssemblyCopyright("Copyright © 2017")]
+[assembly: AssemblyProduct("Umbraco.Deploy.Contrib")]
+[assembly: AssemblyCopyright("Copyright \xa9 2016 Umbraco")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("42fb2213-0815-41cd-94f8-dfb0ec1d8061")]
+[assembly: Guid("42fb2213-0815-41cd-94f8-dfb0ec1d8061")]