From cdfd3df98a8a57033a7f6480a691ab275565d8e2 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 7 Jan 2020 14:52:59 +0100 Subject: [PATCH] AB4231 - Moved SqlCe classes to separate project --- .../FileResources/BlockingWeb.config | 18 --- .../FileResources/Files.Designer.cs | 86 ------------ src/Umbraco.Core/FileResources/Files.resx | 124 ------------------ src/Umbraco.Core/Umbraco.Core.csproj | 10 -- .../SqlCeBulkSqlInsertProvider.cs | 0 .../SqlCeSyntaxProvider.cs | 0 ...aco.Infrastrucure.Persistance.SqlCe.csproj | 27 ++++ .../Umbraco.Tests.Benchmarks.csproj | 4 + src/Umbraco.Tests/Umbraco.Tests.csproj | 4 + src/Umbraco.Web/Umbraco.Web.csproj | 4 + src/umbraco.sln | 6 + 11 files changed, 45 insertions(+), 238 deletions(-) delete mode 100644 src/Umbraco.Core/FileResources/BlockingWeb.config delete mode 100644 src/Umbraco.Core/FileResources/Files.Designer.cs delete mode 100644 src/Umbraco.Core/FileResources/Files.resx rename src/{Umbraco.Core/Persistence => Umbraco.Infrastrucure.Persistance.SqlCe}/SqlCeBulkSqlInsertProvider.cs (100%) rename src/{Umbraco.Core/Persistence/SqlSyntax => Umbraco.Infrastrucure.Persistance.SqlCe}/SqlCeSyntaxProvider.cs (100%) create mode 100644 src/Umbraco.Infrastrucure.Persistance.SqlCe/Umbraco.Infrastrucure.Persistance.SqlCe.csproj diff --git a/src/Umbraco.Core/FileResources/BlockingWeb.config b/src/Umbraco.Core/FileResources/BlockingWeb.config deleted file mode 100644 index 80182af9a1..0000000000 --- a/src/Umbraco.Core/FileResources/BlockingWeb.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/Umbraco.Core/FileResources/Files.Designer.cs b/src/Umbraco.Core/FileResources/Files.Designer.cs deleted file mode 100644 index afc88ff636..0000000000 --- a/src/Umbraco.Core/FileResources/Files.Designer.cs +++ /dev/null @@ -1,86 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.42000 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Umbraco.Core.FileResources { - using System; - - - /// - /// A strongly-typed resource class, for looking up localized strings, etc. - /// - // This class was auto-generated by the StronglyTypedResourceBuilder - // class via a tool like ResGen or Visual Studio. - // To add or remove a member, edit your .ResX file then rerun ResGen - // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Files { - - private static global::System.Resources.ResourceManager resourceMan; - - private static global::System.Globalization.CultureInfo resourceCulture; - - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Files() { - } - - /// - /// Returns the cached ResourceManager instance used by this class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { - get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Umbraco.Core.FileResources.Files", typeof(Files).Assembly); - resourceMan = temp; - } - return resourceMan; - } - } - - /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. - /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { - get { - return resourceCulture; - } - set { - resourceCulture = value; - } - } - - /// - /// Looks up a localized string similar to <?xml version="1.0"?> - /// - ///<!-- Blocks public downloading of anything in this folder and sub folders --> - /// - ///<configuration> - /// <system.web> - /// <httpHandlers> - /// <add path="*" verb="*" type="System.Web.HttpNotFoundHandler"/> - /// </httpHandlers> - /// </system.web> - /// <system.webServer> - /// <validation validateIntegratedModeConfiguration="false" /> - /// <handlers> - /// <remove name="BlockViewHandler"/> - /// <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.H [rest of string was truncated]";. - /// - internal static string BlockingWebConfig { - get { - return ResourceManager.GetString("BlockingWebConfig", resourceCulture); - } - } - } -} diff --git a/src/Umbraco.Core/FileResources/Files.resx b/src/Umbraco.Core/FileResources/Files.resx deleted file mode 100644 index 29c7feee77..0000000000 --- a/src/Umbraco.Core/FileResources/Files.resx +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - blockingweb.config;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index b194102f12..e1df95ff6f 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -116,7 +116,6 @@ 4.1.0 - - - - Properties\SolutionInfo.cs - - - - - - {29aa69d9-b597-4395-8d42-43b1263c240a} diff --git a/src/Umbraco.Core/Persistence/SqlCeBulkSqlInsertProvider.cs b/src/Umbraco.Infrastrucure.Persistance.SqlCe/SqlCeBulkSqlInsertProvider.cs similarity index 100% rename from src/Umbraco.Core/Persistence/SqlCeBulkSqlInsertProvider.cs rename to src/Umbraco.Infrastrucure.Persistance.SqlCe/SqlCeBulkSqlInsertProvider.cs diff --git a/src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs b/src/Umbraco.Infrastrucure.Persistance.SqlCe/SqlCeSyntaxProvider.cs similarity index 100% rename from src/Umbraco.Core/Persistence/SqlSyntax/SqlCeSyntaxProvider.cs rename to src/Umbraco.Infrastrucure.Persistance.SqlCe/SqlCeSyntaxProvider.cs diff --git a/src/Umbraco.Infrastrucure.Persistance.SqlCe/Umbraco.Infrastrucure.Persistance.SqlCe.csproj b/src/Umbraco.Infrastrucure.Persistance.SqlCe/Umbraco.Infrastrucure.Persistance.SqlCe.csproj new file mode 100644 index 0000000000..ae40051129 --- /dev/null +++ b/src/Umbraco.Infrastrucure.Persistance.SqlCe/Umbraco.Infrastrucure.Persistance.SqlCe.csproj @@ -0,0 +1,27 @@ + + + + net472 + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj index 45026b974f..d4901942b4 100644 --- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj +++ b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj @@ -82,6 +82,10 @@ {3ae7bf57-966b-45a5-910a-954d7c554441} Umbraco.Infrastructure + + {33085570-9bf2-4065-a9b0-a29d920d13ba} + Umbraco.Infrastrucure.Persistance.SqlCe + {5d3b8245-ada6-453f-a008-50ed04bfe770} Umbraco.Tests diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index 6ad9ca5f78..1729bd5c20 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -570,6 +570,10 @@ {3ae7bf57-966b-45a5-910a-954d7c554441} Umbraco.Infrastructure + + {33085570-9bf2-4065-a9b0-a29d920d13ba} + Umbraco.Infrastrucure.Persistance.SqlCe + {52ac0ba8-a60e-4e36-897b-e8b97a54ed1c} Umbraco.ModelsBuilder.Embedded diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index feea890438..9b2408da99 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -119,6 +119,10 @@ {3ae7bf57-966b-45a5-910a-954d7c554441} Umbraco.Infrastructure + + {33085570-9bf2-4065-a9b0-a29d920d13ba} + Umbraco.Infrastrucure.Persistance.SqlCe + diff --git a/src/umbraco.sln b/src/umbraco.sln index c70f10bdb3..1a83587ab8 100644 --- a/src/umbraco.sln +++ b/src/umbraco.sln @@ -110,6 +110,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Infrastructure", "U EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Configuration", "Umbraco.Configuration\Umbraco.Configuration.csproj", "{FBE7C065-DAC0-4025-A78B-63B24D3AB00B}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Infrastrucure.Persistance.SqlCe", "Umbraco.Infrastrucure.Persistance.SqlCe\Umbraco.Infrastrucure.Persistance.SqlCe.csproj", "{33085570-9BF2-4065-A9B0-A29D920D13BA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -158,6 +160,10 @@ Global {FBE7C065-DAC0-4025-A78B-63B24D3AB00B}.Debug|Any CPU.Build.0 = Debug|Any CPU {FBE7C065-DAC0-4025-A78B-63B24D3AB00B}.Release|Any CPU.ActiveCfg = Release|Any CPU {FBE7C065-DAC0-4025-A78B-63B24D3AB00B}.Release|Any CPU.Build.0 = Release|Any CPU + {33085570-9BF2-4065-A9B0-A29D920D13BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {33085570-9BF2-4065-A9B0-A29D920D13BA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {33085570-9BF2-4065-A9B0-A29D920D13BA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {33085570-9BF2-4065-A9B0-A29D920D13BA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE