From 3ee18b89752e992921d4b74bc3a3adfb7a914cb0 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Tue, 19 Nov 2019 09:46:51 +0100
Subject: [PATCH] AB3743 - Moved the remaining Udi stuff and the required
 deploy stuff

---
 .../Deploy/ArtifactDependency.cs              |  0
 .../Deploy/ArtifactDependencyCollection.cs    |  0
 .../Deploy/ArtifactDependencyMode.cs          |  0
 .../Deploy/ArtifactDeployState.cs             |  0
 .../ArtifactDeployStateOfTArtifactTEntity.cs  |  0
 .../Deploy/Difference.cs                      |  0
 .../Deploy/IArtifact.cs                       |  0
 .../Deploy/IArtifactSignature.cs              |  0
 .../Deploy/IDeployContext.cs                  |  0
 .../Deploy/IFileSource.cs                     |  0
 .../Deploy/IFileType.cs                       |  0
 .../Deploy/IFileTypeCollection.cs             |  0
 .../Deploy/IServiceConnector.cs               |  0
 .../GuidUtils.cs                              |  2 +-
 src/Umbraco.Abstractions/TypeExtensions.cs    | 23 +++++++++++++++++++
 .../UdiEntityTypeHelper.cs                    |  0
 .../UdiGetterExtensions.cs                    |  0
 .../UdiParserServiceConnectors.cs             |  0
 src/Umbraco.Core/TypeExtensions.cs            | 14 +----------
 src/Umbraco.Core/Umbraco.Core.csproj          | 17 --------------
 20 files changed, 25 insertions(+), 31 deletions(-)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Deploy/ArtifactDependency.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Deploy/ArtifactDependencyCollection.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Deploy/ArtifactDependencyMode.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Deploy/ArtifactDeployState.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Deploy/ArtifactDeployStateOfTArtifactTEntity.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Deploy/Difference.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Deploy/IArtifact.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Deploy/IArtifactSignature.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Deploy/IDeployContext.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Deploy/IFileSource.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Deploy/IFileType.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Deploy/IFileTypeCollection.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Deploy/IServiceConnector.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/GuidUtils.cs (99%)
 create mode 100644 src/Umbraco.Abstractions/TypeExtensions.cs
 rename src/{Umbraco.Core => Umbraco.Abstractions}/UdiEntityTypeHelper.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/UdiGetterExtensions.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/UdiParserServiceConnectors.cs (100%)

diff --git a/src/Umbraco.Core/Deploy/ArtifactDependency.cs b/src/Umbraco.Abstractions/Deploy/ArtifactDependency.cs
similarity index 100%
rename from src/Umbraco.Core/Deploy/ArtifactDependency.cs
rename to src/Umbraco.Abstractions/Deploy/ArtifactDependency.cs
diff --git a/src/Umbraco.Core/Deploy/ArtifactDependencyCollection.cs b/src/Umbraco.Abstractions/Deploy/ArtifactDependencyCollection.cs
similarity index 100%
rename from src/Umbraco.Core/Deploy/ArtifactDependencyCollection.cs
rename to src/Umbraco.Abstractions/Deploy/ArtifactDependencyCollection.cs
diff --git a/src/Umbraco.Core/Deploy/ArtifactDependencyMode.cs b/src/Umbraco.Abstractions/Deploy/ArtifactDependencyMode.cs
similarity index 100%
rename from src/Umbraco.Core/Deploy/ArtifactDependencyMode.cs
rename to src/Umbraco.Abstractions/Deploy/ArtifactDependencyMode.cs
diff --git a/src/Umbraco.Core/Deploy/ArtifactDeployState.cs b/src/Umbraco.Abstractions/Deploy/ArtifactDeployState.cs
similarity index 100%
rename from src/Umbraco.Core/Deploy/ArtifactDeployState.cs
rename to src/Umbraco.Abstractions/Deploy/ArtifactDeployState.cs
diff --git a/src/Umbraco.Core/Deploy/ArtifactDeployStateOfTArtifactTEntity.cs b/src/Umbraco.Abstractions/Deploy/ArtifactDeployStateOfTArtifactTEntity.cs
similarity index 100%
rename from src/Umbraco.Core/Deploy/ArtifactDeployStateOfTArtifactTEntity.cs
rename to src/Umbraco.Abstractions/Deploy/ArtifactDeployStateOfTArtifactTEntity.cs
diff --git a/src/Umbraco.Core/Deploy/Difference.cs b/src/Umbraco.Abstractions/Deploy/Difference.cs
similarity index 100%
rename from src/Umbraco.Core/Deploy/Difference.cs
rename to src/Umbraco.Abstractions/Deploy/Difference.cs
diff --git a/src/Umbraco.Core/Deploy/IArtifact.cs b/src/Umbraco.Abstractions/Deploy/IArtifact.cs
similarity index 100%
rename from src/Umbraco.Core/Deploy/IArtifact.cs
rename to src/Umbraco.Abstractions/Deploy/IArtifact.cs
diff --git a/src/Umbraco.Core/Deploy/IArtifactSignature.cs b/src/Umbraco.Abstractions/Deploy/IArtifactSignature.cs
similarity index 100%
rename from src/Umbraco.Core/Deploy/IArtifactSignature.cs
rename to src/Umbraco.Abstractions/Deploy/IArtifactSignature.cs
diff --git a/src/Umbraco.Core/Deploy/IDeployContext.cs b/src/Umbraco.Abstractions/Deploy/IDeployContext.cs
similarity index 100%
rename from src/Umbraco.Core/Deploy/IDeployContext.cs
rename to src/Umbraco.Abstractions/Deploy/IDeployContext.cs
diff --git a/src/Umbraco.Core/Deploy/IFileSource.cs b/src/Umbraco.Abstractions/Deploy/IFileSource.cs
similarity index 100%
rename from src/Umbraco.Core/Deploy/IFileSource.cs
rename to src/Umbraco.Abstractions/Deploy/IFileSource.cs
diff --git a/src/Umbraco.Core/Deploy/IFileType.cs b/src/Umbraco.Abstractions/Deploy/IFileType.cs
similarity index 100%
rename from src/Umbraco.Core/Deploy/IFileType.cs
rename to src/Umbraco.Abstractions/Deploy/IFileType.cs
diff --git a/src/Umbraco.Core/Deploy/IFileTypeCollection.cs b/src/Umbraco.Abstractions/Deploy/IFileTypeCollection.cs
similarity index 100%
rename from src/Umbraco.Core/Deploy/IFileTypeCollection.cs
rename to src/Umbraco.Abstractions/Deploy/IFileTypeCollection.cs
diff --git a/src/Umbraco.Core/Deploy/IServiceConnector.cs b/src/Umbraco.Abstractions/Deploy/IServiceConnector.cs
similarity index 100%
rename from src/Umbraco.Core/Deploy/IServiceConnector.cs
rename to src/Umbraco.Abstractions/Deploy/IServiceConnector.cs
diff --git a/src/Umbraco.Core/GuidUtils.cs b/src/Umbraco.Abstractions/GuidUtils.cs
similarity index 99%
rename from src/Umbraco.Core/GuidUtils.cs
rename to src/Umbraco.Abstractions/GuidUtils.cs
index d878cee16b..ba07d09236 100644
--- a/src/Umbraco.Core/GuidUtils.cs
+++ b/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.
diff --git a/src/Umbraco.Abstractions/TypeExtensions.cs b/src/Umbraco.Abstractions/TypeExtensions.cs
new file mode 100644
index 0000000000..4f55b6458c
--- /dev/null
+++ b/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>();
+        }
+
+    }
+}
diff --git a/src/Umbraco.Core/UdiEntityTypeHelper.cs b/src/Umbraco.Abstractions/UdiEntityTypeHelper.cs
similarity index 100%
rename from src/Umbraco.Core/UdiEntityTypeHelper.cs
rename to src/Umbraco.Abstractions/UdiEntityTypeHelper.cs
diff --git a/src/Umbraco.Core/UdiGetterExtensions.cs b/src/Umbraco.Abstractions/UdiGetterExtensions.cs
similarity index 100%
rename from src/Umbraco.Core/UdiGetterExtensions.cs
rename to src/Umbraco.Abstractions/UdiGetterExtensions.cs
diff --git a/src/Umbraco.Core/UdiParserServiceConnectors.cs b/src/Umbraco.Abstractions/UdiParserServiceConnectors.cs
similarity index 100%
rename from src/Umbraco.Core/UdiParserServiceConnectors.cs
rename to src/Umbraco.Abstractions/UdiParserServiceConnectors.cs
diff --git a/src/Umbraco.Core/TypeExtensions.cs b/src/Umbraco.Core/TypeExtensions.cs
index f867b1cd14..9d4d196bb5 100644
--- a/src/Umbraco.Core/TypeExtensions.cs
+++ b/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.
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index b02a7df78c..da5da1f88c 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -252,7 +252,6 @@
     <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" />
@@ -377,25 +376,12 @@
     <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" />
@@ -927,9 +913,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>