diff --git a/src/Umbraco.Core/AssemblyExtensions.cs b/src/Umbraco.Abstractions/AssemblyExtensions.cs similarity index 95% rename from src/Umbraco.Core/AssemblyExtensions.cs rename to src/Umbraco.Abstractions/AssemblyExtensions.cs index 7bc0d79b22..0d0115ce20 100644 --- a/src/Umbraco.Core/AssemblyExtensions.cs +++ b/src/Umbraco.Abstractions/AssemblyExtensions.cs @@ -1,12 +1,10 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; using System.Reflection; namespace Umbraco.Core { - internal static class AssemblyExtensions + public static class AssemblyExtensions { /// /// Returns the file used to load the assembly diff --git a/src/Umbraco.Core/DataTableExtensions.cs b/src/Umbraco.Abstractions/DataTableExtensions.cs similarity index 97% rename from src/Umbraco.Core/DataTableExtensions.cs rename to src/Umbraco.Abstractions/DataTableExtensions.cs index a0539ee114..1c547b9d44 100644 --- a/src/Umbraco.Core/DataTableExtensions.cs +++ b/src/Umbraco.Abstractions/DataTableExtensions.cs @@ -1,23 +1,15 @@ using System; -using System.Collections; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Data; using System.Linq; -using System.Text; -using System.Threading; namespace Umbraco.Core { - - /// /// Static and extension methods for the DataTable object /// internal static class DataTableExtensions { - - /// /// Creates a DataTable with the specified alias and columns and uses a callback to populate the headers. /// diff --git a/src/Umbraco.Core/DateTimeExtensions.cs b/src/Umbraco.Abstractions/DateTimeExtensions.cs similarity index 100% rename from src/Umbraco.Core/DateTimeExtensions.cs rename to src/Umbraco.Abstractions/DateTimeExtensions.cs diff --git a/src/Umbraco.Core/DecimalExtensions.cs b/src/Umbraco.Abstractions/DecimalExtensions.cs similarity index 100% rename from src/Umbraco.Core/DecimalExtensions.cs rename to src/Umbraco.Abstractions/DecimalExtensions.cs diff --git a/src/Umbraco.Core/Logging/DisposableTimer.cs b/src/Umbraco.Abstractions/Logging/DisposableTimer.cs similarity index 98% rename from src/Umbraco.Core/Logging/DisposableTimer.cs rename to src/Umbraco.Abstractions/Logging/DisposableTimer.cs index ed98e5cfab..d854813b7d 100644 --- a/src/Umbraco.Core/Logging/DisposableTimer.cs +++ b/src/Umbraco.Abstractions/Logging/DisposableTimer.cs @@ -80,7 +80,7 @@ namespace Umbraco.Core.Logging if ((Stopwatch.ElapsedMilliseconds >= _thresholdMilliseconds || _failed) && _loggerType != null && _logger != null - && (_endMessage.IsNullOrWhiteSpace() == false || _failed)) + && (string.IsNullOrWhiteSpace(_endMessage) == false || _failed)) { if (_failed) { diff --git a/src/Umbraco.Core/Logging/ILogger.cs b/src/Umbraco.Abstractions/Logging/ILogger.cs similarity index 100% rename from src/Umbraco.Core/Logging/ILogger.cs rename to src/Umbraco.Abstractions/Logging/ILogger.cs diff --git a/src/Umbraco.Core/Logging/IProfiler.cs b/src/Umbraco.Abstractions/Logging/IProfiler.cs similarity index 100% rename from src/Umbraco.Core/Logging/IProfiler.cs rename to src/Umbraco.Abstractions/Logging/IProfiler.cs diff --git a/src/Umbraco.Core/Logging/IProfilingLogger.cs b/src/Umbraco.Abstractions/Logging/IProfilingLogger.cs similarity index 100% rename from src/Umbraco.Core/Logging/IProfilingLogger.cs rename to src/Umbraco.Abstractions/Logging/IProfilingLogger.cs diff --git a/src/Umbraco.Core/Logging/LogLevel.cs b/src/Umbraco.Abstractions/Logging/LogLevel.cs similarity index 100% rename from src/Umbraco.Core/Logging/LogLevel.cs rename to src/Umbraco.Abstractions/Logging/LogLevel.cs diff --git a/src/Umbraco.Core/Logging/LoggerExtensions.cs b/src/Umbraco.Abstractions/Logging/LoggerExtensions.cs similarity index 100% rename from src/Umbraco.Core/Logging/LoggerExtensions.cs rename to src/Umbraco.Abstractions/Logging/LoggerExtensions.cs diff --git a/src/Umbraco.Core/Logging/ProfilerExtensions.cs b/src/Umbraco.Abstractions/Logging/ProfilerExtensions.cs similarity index 100% rename from src/Umbraco.Core/Logging/ProfilerExtensions.cs rename to src/Umbraco.Abstractions/Logging/ProfilerExtensions.cs diff --git a/src/Umbraco.Core/Logging/ProfilingLogger.cs b/src/Umbraco.Abstractions/Logging/ProfilingLogger.cs similarity index 100% rename from src/Umbraco.Core/Logging/ProfilingLogger.cs rename to src/Umbraco.Abstractions/Logging/ProfilingLogger.cs diff --git a/src/Umbraco.Core/RuntimeLevel.cs b/src/Umbraco.Abstractions/RuntimeLevel.cs similarity index 100% rename from src/Umbraco.Core/RuntimeLevel.cs rename to src/Umbraco.Abstractions/RuntimeLevel.cs diff --git a/src/Umbraco.Core/RuntimeLevelReason.cs b/src/Umbraco.Abstractions/RuntimeLevelReason.cs similarity index 100% rename from src/Umbraco.Core/RuntimeLevelReason.cs rename to src/Umbraco.Abstractions/RuntimeLevelReason.cs diff --git a/src/Umbraco.Core/Settable.cs b/src/Umbraco.Abstractions/Settable.cs similarity index 100% rename from src/Umbraco.Core/Settable.cs rename to src/Umbraco.Abstractions/Settable.cs diff --git a/src/Umbraco.Core/ThreadExtensions.cs b/src/Umbraco.Abstractions/ThreadExtensions.cs similarity index 98% rename from src/Umbraco.Core/ThreadExtensions.cs rename to src/Umbraco.Abstractions/ThreadExtensions.cs index 68f6959e91..3c9001ac48 100644 --- a/src/Umbraco.Core/ThreadExtensions.cs +++ b/src/Umbraco.Abstractions/ThreadExtensions.cs @@ -3,7 +3,7 @@ using System.Threading; namespace Umbraco.Core { - static class ThreadExtensions + public static class ThreadExtensions { public static void SanitizeThreadCulture(this Thread thread) { diff --git a/src/Umbraco.Core/BindingRedirects.cs b/src/Umbraco.Core/BindingRedirects.cs deleted file mode 100644 index e698ffa646..0000000000 --- a/src/Umbraco.Core/BindingRedirects.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Reflection; -using System.Web; -using Umbraco.Core; - -// no binding redirect for now = de-activate -//[assembly: PreApplicationStartMethod(typeof(BindingRedirects), "Initialize")] - -namespace Umbraco.Core -{ - /// - /// Manages any assembly binding redirects that cannot be done via config (i.e. unsigned --> signed assemblies) - /// - public sealed class BindingRedirects - { - public static void Initialize() - { - // this only gets called when an assembly can't be resolved - AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve; - } - - /// - /// This is used to do an assembly binding redirect via code - normally required due to signature changes in assemblies - /// - /// - /// - /// - private static Assembly CurrentDomain_AssemblyResolve(object sender, ResolveEventArgs args) - { - // When an assembly can't be resolved. In here we can do magic with the assembly name and try loading another. - - // keep here for reference - we don't use AutoMapper - /* - //AutoMapper: - // this is used for loading a signed assembly of AutoMapper (v. 3.1+) without having to recompile old code. - // ensure the assembly is indeed AutoMapper and that the PublicKeyToken is null before trying to Load again - // do NOT just replace this with 'return Assembly', as it will cause an infinite loop -> stackoverflow - if (args.Name.StartsWith("AutoMapper") && args.Name.EndsWith("PublicKeyToken=null")) - return Assembly.Load(args.Name.Replace(", PublicKeyToken=null", ", PublicKeyToken=be96cd2c38ef1005")); - */ - - return null; - } - } -} diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index f02fc7b0bc..2e57d8aa3b 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -116,10 +116,8 @@ Constants.cs --> - - @@ -348,9 +346,7 @@ - - @@ -533,7 +529,6 @@ - @@ -545,9 +540,6 @@ - - - @@ -575,7 +567,6 @@ - @@ -648,16 +639,11 @@ - - - - - @@ -1293,7 +1279,6 @@ - @@ -1437,7 +1422,6 @@ - @@ -1471,6 +1455,7 @@ +