From 8fa3f8e06a554bdb157e205be4cbac97e20ec6ec Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Mon, 20 May 2019 17:25:29 +0200
Subject: [PATCH 1/3] Moved more stuff

---
 src/{Umbraco.Core => Umbraco.Abstractions}/IEmailSender.cs    | 0
 src/{Umbraco.Core => Umbraco.Abstractions}/IMainDom.cs        | 0
 .../LambdaExpressionCacheKey.cs                               | 2 +-
 src/{Umbraco.Core => Umbraco.Abstractions}/MonitorLock.cs     | 0
 src/Umbraco.Core/Umbraco.Core.csproj                          | 4 ----
 5 files changed, 1 insertion(+), 5 deletions(-)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/IEmailSender.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/IMainDom.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/LambdaExpressionCacheKey.cs (98%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/MonitorLock.cs (100%)

diff --git a/src/Umbraco.Core/IEmailSender.cs b/src/Umbraco.Abstractions/IEmailSender.cs
similarity index 100%
rename from src/Umbraco.Core/IEmailSender.cs
rename to src/Umbraco.Abstractions/IEmailSender.cs
diff --git a/src/Umbraco.Core/IMainDom.cs b/src/Umbraco.Abstractions/IMainDom.cs
similarity index 100%
rename from src/Umbraco.Core/IMainDom.cs
rename to src/Umbraco.Abstractions/IMainDom.cs
diff --git a/src/Umbraco.Core/LambdaExpressionCacheKey.cs b/src/Umbraco.Abstractions/LambdaExpressionCacheKey.cs
similarity index 98%
rename from src/Umbraco.Core/LambdaExpressionCacheKey.cs
rename to src/Umbraco.Abstractions/LambdaExpressionCacheKey.cs
index 52ec786a6d..c191732acc 100644
--- a/src/Umbraco.Core/LambdaExpressionCacheKey.cs
+++ b/src/Umbraco.Abstractions/LambdaExpressionCacheKey.cs
@@ -9,7 +9,7 @@ namespace Umbraco.Core
     /// Represents a simple <see cref="LambdaExpression"/> in a form which is suitable for using as a dictionary key
     /// by exposing the return type, argument types and expression string form in a single concatenated string.
     /// </summary>
-    internal struct LambdaExpressionCacheKey
+    public struct LambdaExpressionCacheKey
     {
         public LambdaExpressionCacheKey(string returnType, string expression, params string[] argTypes)
         {
diff --git a/src/Umbraco.Core/MonitorLock.cs b/src/Umbraco.Abstractions/MonitorLock.cs
similarity index 100%
rename from src/Umbraco.Core/MonitorLock.cs
rename to src/Umbraco.Abstractions/MonitorLock.cs
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index f400595e81..00d64f4649 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -326,7 +326,6 @@
     <Compile Include="Events\ExportedMemberEventArgs.cs" />
     <Compile Include="Events\RolesEventArgs.cs" />
     <Compile Include="Events\UserGroupWithUsers.cs" />
-    <Compile Include="IMainDom.cs" />
     <Compile Include="IO\IFileSystems.cs" />
     <Compile Include="IO\IMediaFileSystem.cs" />
     <Compile Include="GuidUtils.cs" />
@@ -620,7 +619,6 @@
     <Compile Include="HashGenerator.cs" />
     <Compile Include="HttpContextExtensions.cs" />
     <Compile Include="IDisposeOnRequestEnd.cs" />
-    <Compile Include="IEmailSender.cs" />
     <Compile Include="IntExtensions.cs" />
     <Compile Include="IO\FileSecurityException.cs" />
     <Compile Include="IO\FileSystemExtensions.cs" />
@@ -638,7 +636,6 @@
     <Compile Include="IO\ViewHelper.cs" />
     <Compile Include="IRuntime.cs" />
     <Compile Include="IRuntimeState.cs" />
-    <Compile Include="LambdaExpressionCacheKey.cs" />
     <Compile Include="Logging\DebugDiagnosticsLogger.cs" />
     <Compile Include="Logging\Serilog\SerilogLogger.cs" />
     <Compile Include="Logging\LoggingTaskExtension.cs" />
@@ -868,7 +865,6 @@
     <Compile Include="Models\ObjectTypes.cs" />
     <Compile Include="Models\UserExtensions.cs" />
     <Compile Include="Models\Validation\RequiredForPersistenceAttribute.cs" />
-    <Compile Include="MonitorLock.cs" />
     <Compile Include="NamedUdiRange.cs" />
     <Compile Include="NameValueCollectionExtensions.cs" />
     <Compile Include="NetworkHelper.cs" />

From d576be35934258ace012eb8264cc3d2f58ae27f6 Mon Sep 17 00:00:00 2001
From: Lars-Erik Aabech <lea@markedspartner.no>
Date: Mon, 20 May 2019 17:25:49 +0200
Subject: [PATCH 2/3] Made DataTableExtensions and made it/methods public.

---
 src/Umbraco.Abstractions/DataTableExtensions.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Abstractions/DataTableExtensions.cs b/src/Umbraco.Abstractions/DataTableExtensions.cs
index 1c547b9d44..63b2671d09 100644
--- a/src/Umbraco.Abstractions/DataTableExtensions.cs
+++ b/src/Umbraco.Abstractions/DataTableExtensions.cs
@@ -8,7 +8,7 @@ namespace Umbraco.Core
     /// <summary>
     /// Static and extension methods for the DataTable object
     /// </summary>
-    internal static class DataTableExtensions
+    public static class DataTableExtensions
     {
         /// <summary>
         /// Creates a DataTable with the specified alias and columns and uses a callback to populate the headers.
@@ -57,7 +57,7 @@ namespace Umbraco.Core
         /// <remarks>
         /// This is for legacy code, I didn't want to go creating custom classes for these
         /// </remarks>
-        internal static List<System.Tuple<IEnumerable<KeyValuePair<string, object>>, IEnumerable<KeyValuePair<string, object>>>> CreateTableData()
+        public static List<System.Tuple<IEnumerable<KeyValuePair<string, object>>, IEnumerable<KeyValuePair<string, object>>>> CreateTableData()
         {
             return new List<System.Tuple<IEnumerable<KeyValuePair<string, object>>, IEnumerable<KeyValuePair<string, object>>>>();
         }
@@ -71,7 +71,7 @@ namespace Umbraco.Core
         /// <remarks>
         /// This is for legacy code, I didn't want to go creating custom classes for these
         /// </remarks>
-        internal static void AddRowData(
+        public static void AddRowData(
             List<System.Tuple<IEnumerable<KeyValuePair<string, object>>, IEnumerable<KeyValuePair<string, object>>>> rowData,
             IEnumerable<KeyValuePair<string, object>> standardVals,
             IEnumerable<KeyValuePair<string, object>> userVals)

From 837a7b506eff4b7e701954bbe07da1d56663a518 Mon Sep 17 00:00:00 2001
From: Lars-Erik Aabech <lea@markedspartner.no>
Date: Mon, 20 May 2019 17:25:55 +0200
Subject: [PATCH 3/3] Moved first core DI abstractions

---
 .../Composing/IFactory.cs                                    | 0
 .../Composing/IRegister.cs                                   | 0
 .../Composing/Lifetime.cs                                    | 0
 src/Umbraco.Core/Umbraco.Core.csproj                         | 5 +----
 4 files changed, 1 insertion(+), 4 deletions(-)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Composing/IFactory.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Composing/IRegister.cs (100%)
 rename src/{Umbraco.Core => Umbraco.Abstractions}/Composing/Lifetime.cs (100%)

diff --git a/src/Umbraco.Core/Composing/IFactory.cs b/src/Umbraco.Abstractions/Composing/IFactory.cs
similarity index 100%
rename from src/Umbraco.Core/Composing/IFactory.cs
rename to src/Umbraco.Abstractions/Composing/IFactory.cs
diff --git a/src/Umbraco.Core/Composing/IRegister.cs b/src/Umbraco.Abstractions/Composing/IRegister.cs
similarity index 100%
rename from src/Umbraco.Core/Composing/IRegister.cs
rename to src/Umbraco.Abstractions/Composing/IRegister.cs
diff --git a/src/Umbraco.Core/Composing/Lifetime.cs b/src/Umbraco.Abstractions/Composing/Lifetime.cs
similarity index 100%
rename from src/Umbraco.Core/Composing/Lifetime.cs
rename to src/Umbraco.Abstractions/Composing/Lifetime.cs
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 50a378fa0e..67d7bf9b97 100755
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -196,10 +196,7 @@
     <Compile Include="Composing\HideFromTypeFinderAttribute.cs" />
     <Compile Include="Composing\IBuilderCollection.cs" />
     <Compile Include="Composing\ICollectionBuilder.cs" />
-    <Compile Include="Composing\IFactory.cs" />
-    <Compile Include="Composing\IRegister.cs" />
     <Compile Include="Composing\LazyCollectionBuilderBase.cs" />
-    <Compile Include="Composing\Lifetime.cs" />
     <Compile Include="Composing\LightInject\LightInjectContainer.cs" />
     <Compile Include="Composing\LightInject\MixedLightInjectScopeManagerProvider.cs" />
     <Compile Include="Composing\OrderedCollectionBuilderBase.cs" />
@@ -1508,7 +1505,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Auditing\" />
-    <Folder Include="Exceptions" />
+    <Folder Include="Exceptions\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Umbraco.Abstractions\Umbraco.Abstractions.csproj">