From 99d2509eaae4f48fabeb8ac339ff48c06082f26c Mon Sep 17 00:00:00 2001 From: Lars-Erik Aabech Date: Mon, 20 May 2019 17:20:52 +0200 Subject: [PATCH] Moved several poco extensions and removed BindingRedirects --- .../AssemblyExtensions.cs | 4 +- .../DataTableExtensions.cs | 8 ---- .../DateTimeExtensions.cs | 0 .../DecimalExtensions.cs | 0 src/Umbraco.Core/BindingRedirects.cs | 45 ------------------- src/Umbraco.Core/Umbraco.Core.csproj | 5 --- 6 files changed, 1 insertion(+), 61 deletions(-) rename src/{Umbraco.Core => Umbraco.Abstractions}/AssemblyExtensions.cs (95%) rename src/{Umbraco.Core => Umbraco.Abstractions}/DataTableExtensions.cs (97%) rename src/{Umbraco.Core => Umbraco.Abstractions}/DateTimeExtensions.cs (100%) rename src/{Umbraco.Core => Umbraco.Abstractions}/DecimalExtensions.cs (100%) delete mode 100644 src/Umbraco.Core/BindingRedirects.cs 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/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 c8d582dc97..20c62aef75 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -116,10 +116,8 @@ Constants.cs --> - - @@ -547,9 +545,6 @@ - - -