Merge branch 'netcore/dev' into netcore/feature/AB3789-move-propertyeditors

src/Umbraco.Abstractions/Deploy/IValueConnector.cs

@@ -23,7 +23,7 @@ namespace Umbraco.Core.Deploy
         /// <param name="propertyType">The value property type</param>
         /// <param name="dependencies">The content dependencies.</param>
         /// <returns>The deploy property value.</returns>
-        string ToArtifact(object value, PropertyType propertyType, ICollection<ArtifactDependency> dependencies);
+        string ToArtifact(object value, IPropertyType propertyType, ICollection<ArtifactDependency> dependencies);
 
         /// <summary>
         /// Gets the content property value corresponding to a deploy property value.
@@ -32,6 +32,6 @@ namespace Umbraco.Core.Deploy
         /// <param name="propertyType">The value property type<</param>
         /// <param name="currentValue">The current content property value.</param>
         /// <returns>The content property value.</returns>
-        object FromArtifact(string value, PropertyType propertyType, object currentValue);
+        object FromArtifact(string value, IPropertyType propertyType, object currentValue);
     }
 }

src/Umbraco.Abstractions/GuidUtils.cs

@@ -7,7 +7,7 @@ namespace Umbraco.Core
     /// <summary>
     /// Utility methods for the <see cref="Guid"/> struct.
     /// </summary>
-    internal static class GuidUtils
+    public static class GuidUtils
     {
         /// <summary>
         /// Combines two guid instances utilizing an exclusive disjunction.

src/Umbraco.Abstractions/TypeExtensions.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Umbraco.Core
+{
+    public static class TypeExtensions
+    {
+        public static T GetCustomAttribute<T>(this Type type, bool inherit)
+            where T : Attribute
+        {
+            return type.GetCustomAttributes<T>(inherit).SingleOrDefault();
+        }
+
+        public static IEnumerable<T> GetCustomAttributes<T>(this Type type, bool inherited)
+            where T : Attribute
+        {
+            if (type == null) return Enumerable.Empty<T>();
+            return type.GetCustomAttributes(typeof (T), inherited).OfType<T>();
+        }
+
+    }
+}

src/Umbraco.Core/TypeExtensions.cs

@@ -97,19 +97,7 @@ namespace Umbraco.Core
                    && (type.Attributes & TypeAttributes.NotPublic) == TypeAttributes.NotPublic;
         }
 
-        public static T GetCustomAttribute<T>(this Type type, bool inherit)
-            where T : Attribute
-        {
-            return type.GetCustomAttributes<T>(inherit).SingleOrDefault();
-        }
-
-        public static IEnumerable<T> GetCustomAttributes<T>(this Type type, bool inherited)
-            where T : Attribute
-        {
-            if (type == null) return Enumerable.Empty<T>();
-            return type.GetCustomAttributes(typeof (T), inherited).OfType<T>();
-        }
-
+ 
 
         /// <summary>
         /// Determines whether the specified type is enumerable.

src/Umbraco.Core/Umbraco.Core.csproj

@@ -151,6 +151,7 @@
     <Compile Include="CompositionExtensions_FileSystems.cs" />
     <Compile Include="Configuration\GlobalSettingsExtensions.cs" />
     <Compile Include="ConventionsHelper.cs" />
+    <Compile Include="Deploy\IGridCellValueConnector.cs" />
     <Compile Include="Events\ContentPublishedEventArgs.cs" />
     <Compile Include="Events\ContentPublishingEventArgs.cs" />
     <Compile Include="Events\ContentSavedEventArgs.cs" />
@@ -257,8 +258,6 @@
     <Compile Include="TypeExtensions.cs" />
     <Compile Include="TypeLoaderExtensions.cs" />
     <Compile Include="ContentVariationExtensions.cs" />
-    <Compile Include="Deploy\IDataTypeConfigurationConnector.cs" />
-    <Compile Include="GuidUtils.cs" />
     <Compile Include="IO\MediaPathSchemes\CombinedGuidsMediaPathScheme.cs" />
     <Compile Include="IO\MediaPathSchemes\OriginalMediaPathScheme.cs" />
     <Compile Include="IO\MediaPathSchemes\TwoGuidsMediaPathScheme.cs" />
@@ -370,27 +369,6 @@
     <Compile Include="Migrations\Expressions\Delete\KeysAndIndexes\DeleteKeysAndIndexesBuilder.cs" />
     <Compile Include="Migrations\Install\DatabaseBuilder.cs" />
     <Compile Include="Deploy\ArtifactBase.cs" />
-    <Compile Include="Deploy\ArtifactDependency.cs" />
-    <Compile Include="Deploy\ArtifactDependencyCollection.cs" />
-    <Compile Include="Deploy\ArtifactDependencyMode.cs" />
-    <Compile Include="Deploy\ArtifactDeployState.cs" />
-    <Compile Include="Deploy\ArtifactDeployStateOfTArtifactTEntity.cs" />
-    <Compile Include="Deploy\ArtifactSignature.cs" />
-    <Compile Include="Deploy\Difference.cs" />
-    <Compile Include="Deploy\Direction.cs" />
-    <Compile Include="Deploy\IArtifact.cs" />
-    <Compile Include="Deploy\IArtifactSignature.cs" />
-    <Compile Include="Deploy\IDeployContext.cs" />
-    <Compile Include="Deploy\IFileSource.cs" />
-    <Compile Include="Deploy\IFileType.cs" />
-    <Compile Include="Deploy\IFileTypeCollection.cs" />
-    <Compile Include="Deploy\IGridCellValueConnector.cs" />
-    <Compile Include="Deploy\IImageSourceParser.cs" />
-    <Compile Include="Deploy\ILocalLinkParser.cs" />
-    <Compile Include="Deploy\IMacroParser.cs" />
-    <Compile Include="Deploy\IServiceConnector.cs" />
-    <Compile Include="Deploy\IUniqueIdentifyingServiceConnector.cs" />
-    <Compile Include="Deploy\IValueConnector.cs" />
     <Compile Include="Diagnostics\MiniDump.cs" />
     <Compile Include="EmailSender.cs" />
     <Compile Include="Events\QueuingEventDispatcher.cs" />
@@ -893,9 +871,6 @@
     <Compile Include="Sync\DatabaseServerMessenger.cs" />
     <Compile Include="Sync\RefreshInstruction.cs" />
     <Compile Include="Sync\ServerMessengerBase.cs" />
-    <Compile Include="UdiEntityTypeHelper.cs" />
-    <Compile Include="UdiGetterExtensions.cs" />
-    <Compile Include="UdiParserServiceConnectors.cs" />
     <Compile Include="UriExtensions.cs" />
     <Compile Include="Persistence\FaultHandling\RetryDbConnection.cs">
       <SubType>Component</SubType>