From c9bbb158be1d81cc7e9842dfa437c9ca1c617394 Mon Sep 17 00:00:00 2001 From: Benjamin Carleski Date: Tue, 21 Jan 2020 17:50:20 -0800 Subject: [PATCH 1/6] Remove obsolete Stylesheet constant and references --- src/Umbraco.Abstractions/Constants-ObjectTypes.cs | 3 --- src/Umbraco.Abstractions/Models/UmbracoObjectTypes.cs | 8 -------- src/Umbraco.Abstractions/UdiEntityTypeHelper.cs | 4 ---- .../Services/Implement/FileService.cs | 2 -- src/Umbraco.Web/Editors/RelationTypeController.cs | 1 - 5 files changed, 18 deletions(-) diff --git a/src/Umbraco.Abstractions/Constants-ObjectTypes.cs b/src/Umbraco.Abstractions/Constants-ObjectTypes.cs index 51adc69963..dacd7d9fc5 100644 --- a/src/Umbraco.Abstractions/Constants-ObjectTypes.cs +++ b/src/Umbraco.Abstractions/Constants-ObjectTypes.cs @@ -68,9 +68,6 @@ namespace Umbraco.Core public const string IdReservation = "92849B1E-3904-4713-9356-F646F87C25F4"; - [Obsolete("This no longer exists in the database")] - public const string Stylesheet = "9F68DA4F-A3A8-44C2-8226-DCBD125E4840"; - // ReSharper restore MemberHidesStaticFromOuterClass } diff --git a/src/Umbraco.Abstractions/Models/UmbracoObjectTypes.cs b/src/Umbraco.Abstractions/Models/UmbracoObjectTypes.cs index a9bcbc2b65..f403ea6e67 100644 --- a/src/Umbraco.Abstractions/Models/UmbracoObjectTypes.cs +++ b/src/Umbraco.Abstractions/Models/UmbracoObjectTypes.cs @@ -83,14 +83,6 @@ namespace Umbraco.Core.Models [FriendlyName("Recycle Bin")] RecycleBin, - /// - /// Stylesheet - /// - [UmbracoObjectType(Constants.ObjectTypes.Strings.Stylesheet)] - [FriendlyName("Stylesheet")] - [UmbracoUdiType(Constants.UdiEntityType.Stylesheet)] - Stylesheet, - /// /// Member /// diff --git a/src/Umbraco.Abstractions/UdiEntityTypeHelper.cs b/src/Umbraco.Abstractions/UdiEntityTypeHelper.cs index 12e934b9ec..39ee28488f 100644 --- a/src/Umbraco.Abstractions/UdiEntityTypeHelper.cs +++ b/src/Umbraco.Abstractions/UdiEntityTypeHelper.cs @@ -38,8 +38,6 @@ namespace Umbraco.Core return Constants.UdiEntityType.MemberType; case UmbracoObjectTypes.MemberGroup: return Constants.UdiEntityType.MemberGroup; - case UmbracoObjectTypes.Stylesheet: - return Constants.UdiEntityType.Stylesheet; case UmbracoObjectTypes.RelationType: return Constants.UdiEntityType.RelationType; case UmbracoObjectTypes.FormsForm: @@ -86,8 +84,6 @@ namespace Umbraco.Core return UmbracoObjectTypes.MemberType; case Constants.UdiEntityType.MemberGroup: return UmbracoObjectTypes.MemberGroup; - case Constants.UdiEntityType.Stylesheet: - return UmbracoObjectTypes.Stylesheet; case Constants.UdiEntityType.RelationType: return UmbracoObjectTypes.RelationType; case Constants.UdiEntityType.FormsForm: diff --git a/src/Umbraco.Infrastructure/Services/Implement/FileService.cs b/src/Umbraco.Infrastructure/Services/Implement/FileService.cs index 25f2c619d2..2b33b54cc8 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/FileService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/FileService.cs @@ -88,7 +88,6 @@ namespace Umbraco.Core.Services.Implement saveEventArgs.CanCancel = false; scope.Events.Dispatch(SavedStylesheet, this, saveEventArgs); - Audit(AuditType.Save, userId, -1, UmbracoObjectTypes.Stylesheet.GetName()); scope.Complete(); } } @@ -116,7 +115,6 @@ namespace Umbraco.Core.Services.Implement deleteEventArgs.CanCancel = false; scope.Events.Dispatch(DeletedStylesheet, this, deleteEventArgs); - Audit(AuditType.Delete, userId, -1, UmbracoObjectTypes.Stylesheet.GetName()); scope.Complete(); } } diff --git a/src/Umbraco.Web/Editors/RelationTypeController.cs b/src/Umbraco.Web/Editors/RelationTypeController.cs index 73a659bde5..9910bce2d0 100644 --- a/src/Umbraco.Web/Editors/RelationTypeController.cs +++ b/src/Umbraco.Web/Editors/RelationTypeController.cs @@ -96,7 +96,6 @@ namespace Umbraco.Web.Editors new ObjectType{Id = UmbracoObjectTypes.MemberType.GetGuid(), Name = UmbracoObjectTypes.MemberType.GetFriendlyName()}, new ObjectType{Id = UmbracoObjectTypes.DataType.GetGuid(), Name = UmbracoObjectTypes.DataType.GetFriendlyName()}, new ObjectType{Id = UmbracoObjectTypes.MemberGroup.GetGuid(), Name = UmbracoObjectTypes.MemberGroup.GetFriendlyName()}, - new ObjectType{Id = UmbracoObjectTypes.Stylesheet.GetGuid(), Name = UmbracoObjectTypes.Stylesheet.GetFriendlyName()}, new ObjectType{Id = UmbracoObjectTypes.ROOT.GetGuid(), Name = UmbracoObjectTypes.ROOT.GetFriendlyName()}, new ObjectType{Id = UmbracoObjectTypes.RecycleBin.GetGuid(), Name = UmbracoObjectTypes.RecycleBin.GetFriendlyName()}, }; From a3867d93ddda6f81dc9df416417b30a36156fa95 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 5 Feb 2020 08:17:30 +0100 Subject: [PATCH 2/6] Replaced the Umbraco.Examine.Lucene.csproj with the new format (PackageReferences) --- .../Properties/AssemblyInfo.cs | 15 -- .../Umbraco.Examine.Lucene.csproj | 140 +++++------------- .../Umbraco.Tests.Benchmarks.csproj | 4 - src/Umbraco.Tests/Umbraco.Tests.csproj | 8 +- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 +- src/umbraco.sln | 12 +- 6 files changed, 48 insertions(+), 135 deletions(-) delete mode 100644 src/Umbraco.Examine.Lucene/Properties/AssemblyInfo.cs diff --git a/src/Umbraco.Examine.Lucene/Properties/AssemblyInfo.cs b/src/Umbraco.Examine.Lucene/Properties/AssemblyInfo.cs deleted file mode 100644 index 5c42a236f4..0000000000 --- a/src/Umbraco.Examine.Lucene/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -[assembly: AssemblyTitle("Umbraco.Examine")] -[assembly: AssemblyDescription("Umbraco Examine")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyProduct("Umbraco CMS")] - -// Umbraco Cms -[assembly: InternalsVisibleTo("Umbraco.Tests")] -[assembly: InternalsVisibleTo("Umbraco.Web")] - -// code analysis -// IDE1006 is broken, wants _value syntax for consts, etc - and it's even confusing ppl at MS, kill it -[assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "~_~")] diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj index f91cc02a71..c67ab779f7 100644 --- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj +++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj @@ -1,104 +1,36 @@ - - - - - v4.7.2 - false - {07FBC26B-2927-4A22-8D96-D644C667FECC} - Library - Umbraco.Examine.Lucene - Umbraco.Examine - ..\ - - $(AdditionalFileItemNames);Content - - - true - portable - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - false - latest - - - portable - true - bin\Release\ - TRACE - prompt - 4 - bin\Release\Umbraco.Examine.Lucene.xml - false - latest - - - - - - - - - - - - - - - - - - 2.0.0-alpha.20200128.15 - - - 1.0.0-beta2-19554-01 - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - 3.3.0 - runtime; build; native; contentfiles; analyzers - all - - - - - - - - - - - - - - - - - - - - - Properties\SolutionInfo.cs - - - - - {29aa69d9-b597-4395-8d42-43b1263c240a} - Umbraco.Abstractions - - - {f9b7fe05-0f93-4d0d-9c10-690b33ecbbd8} - Umbraco.Examine - - - {3ae7bf57-966b-45a5-910a-954d7c554441} - Umbraco.Infrastructure - - - - \ No newline at end of file + + + + net472 + Umbraco.Examine + Umbraco CMS + Umbraco.Examine.Lucene + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj index 2ed47f85c3..3490a34d77 100644 --- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj +++ b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj @@ -70,10 +70,6 @@ {29aa69d9-b597-4395-8d42-43b1263c240a} Umbraco.Abstractions - - {07fbc26b-2927-4a22-8d96-d644c667fecc} - Umbraco.Examine.Lucene - {3ae7bf57-966b-45a5-910a-954d7c554441} Umbraco.Infrastructure diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index 887ee3c01f..e3a1699530 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -564,6 +564,10 @@ {fbe7c065-dac0-4025-a78b-63b24d3ab00b} Umbraco.Configuration + + {0fad7d2a-d7dd-45b1-91fd-488bb6cdacea} + Umbraco.Examine.Lucene + {f9b7fe05-0f93-4d0d-9c10-690b33ecbbd8} Umbraco.Examine @@ -584,10 +588,6 @@ {651E1350-91B6-44B7-BD60-7207006D7003} Umbraco.Web - - {07fbc26b-2927-4a22-8d96-d644c667fecc} - Umbraco.Examine.Lucene - diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index fd20d0cea1..9650fb6bb8 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -117,8 +117,8 @@ Umbraco.Abstractions + {0fad7d2a-d7dd-45b1-91fd-488bb6cdacea} Umbraco.Examine.Lucene - {07FBC26B-2927-4A22-8D96-D644C667FECC} {52ac0ba8-a60e-4e36-897b-e8b97a54ed1c} @@ -427,4 +427,4 @@ - + \ No newline at end of file diff --git a/src/umbraco.sln b/src/umbraco.sln index 338bc3f3dd..6411b210c6 100644 --- a/src/umbraco.sln +++ b/src/umbraco.sln @@ -63,8 +63,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Web", "Umbraco.Web\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests", "Umbraco.Tests\Umbraco.Tests.csproj", "{5D3B8245-ADA6-453F-A008-50ED04BFE770}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Examine.Lucene", "Umbraco.Examine.Lucene\Umbraco.Examine.Lucene.csproj", "{07FBC26B-2927-4A22-8D96-D644C667FECC}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{E3F9F378-AFE1-40A5-90BD-82833375DBFE}" ProjectSection(SolutionItems) = preProject ..\build\NuSpecs\tools\applications.config.install.xdt = ..\build\NuSpecs\tools\applications.config.install.xdt @@ -115,6 +113,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.TestData", "Umbraco EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Examine", "Umbraco.Examine\Umbraco.Examine.csproj", "{F9B7FE05-0F93-4D0D-9C10-690B33ECBBD8}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Examine.Lucene", "Umbraco.Examine.Lucene\Umbraco.Examine.Lucene.csproj", "{0FAD7D2A-D7DD-45B1-91FD-488BB6CDACEA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -135,10 +135,6 @@ Global {5D3B8245-ADA6-453F-A008-50ED04BFE770}.Debug|Any CPU.Build.0 = Debug|Any CPU {5D3B8245-ADA6-453F-A008-50ED04BFE770}.Release|Any CPU.ActiveCfg = Release|Any CPU {5D3B8245-ADA6-453F-A008-50ED04BFE770}.Release|Any CPU.Build.0 = Release|Any CPU - {07FBC26B-2927-4A22-8D96-D644C667FECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {07FBC26B-2927-4A22-8D96-D644C667FECC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {07FBC26B-2927-4A22-8D96-D644C667FECC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {07FBC26B-2927-4A22-8D96-D644C667FECC}.Release|Any CPU.Build.0 = Release|Any CPU {3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}.Debug|Any CPU.Build.0 = Debug|Any CPU {3A33ADC9-C6C0-4DB1-A613-A9AF0210DF3D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -171,6 +167,10 @@ Global {F9B7FE05-0F93-4D0D-9C10-690B33ECBBD8}.Debug|Any CPU.Build.0 = Debug|Any CPU {F9B7FE05-0F93-4D0D-9C10-690B33ECBBD8}.Release|Any CPU.ActiveCfg = Release|Any CPU {F9B7FE05-0F93-4D0D-9C10-690B33ECBBD8}.Release|Any CPU.Build.0 = Release|Any CPU + {0FAD7D2A-D7DD-45B1-91FD-488BB6CDACEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0FAD7D2A-D7DD-45B1-91FD-488BB6CDACEA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0FAD7D2A-D7DD-45B1-91FD-488BB6CDACEA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0FAD7D2A-D7DD-45B1-91FD-488BB6CDACEA}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From e13c17b02dbdf85da9484540ee87bbd0ff2ed6a3 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 5 Feb 2020 08:43:23 +0100 Subject: [PATCH 3/6] Updated and aligned nuget package versions --- .../Umbraco.Examine.Lucene.csproj | 14 +++- src/Umbraco.Examine/Umbraco.Examine.csproj | 2 +- .../Umbraco.Infrastructure.csproj | 2 +- .../Umbraco.ModelsBuilder.Embedded.csproj | 2 +- src/Umbraco.Tests/Umbraco.Tests.csproj | 2 +- src/Umbraco.Tests/Views/web.config | 74 ------------------- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 6 +- src/Umbraco.Web/Umbraco.Web.csproj | 6 +- 8 files changed, 21 insertions(+), 87 deletions(-) delete mode 100644 src/Umbraco.Tests/Views/web.config diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj index c67ab779f7..a9c7d0f275 100644 --- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj +++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj @@ -26,11 +26,19 @@ - - + + + 1.0.0 + runtime; build; native; contentfiles; analyzers; buildtransitive + all + - + + 3.4.0 + runtime; build; native; contentfiles; analyzers + all + diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj index 93edee43f5..03fab50692 100644 --- a/src/Umbraco.Examine/Umbraco.Examine.csproj +++ b/src/Umbraco.Examine/Umbraco.Examine.csproj @@ -1,4 +1,4 @@ - + netstandard2.0 diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index 4613553612..38e9168e0d 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj index 073a6566d0..9107c0f9d4 100644 --- a/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj +++ b/src/Umbraco.ModelsBuilder.Embedded/Umbraco.ModelsBuilder.Embedded.csproj @@ -92,7 +92,7 @@ 2.10.0 - 1.0.0-beta2-19554-01 + 1.0.0 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index e3a1699530..6c825a6b5e 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -104,7 +104,7 @@ - + diff --git a/src/Umbraco.Tests/Views/web.config b/src/Umbraco.Tests/Views/web.config deleted file mode 100644 index efd80424e5..0000000000 --- a/src/Umbraco.Tests/Views/web.config +++ /dev/null @@ -1,74 +0,0 @@ - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 9650fb6bb8..55471dfffe 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -97,14 +97,14 @@ - 1.0.0-beta2-19554-01 + 1.0.0 runtime; build; native; contentfiles; analyzers; buildtransitive all - + - 3.3.0 + 3.4.0 runtime; build; native; contentfiles; analyzers all diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 061f0cd3cd..31d551f18a 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -86,15 +86,15 @@ - 1.0.0-beta2-19554-01 + 1.0.0 runtime; build; native; contentfiles; analyzers; buildtransitive all - + - 3.3.0 + 3.4.0 runtime; build; native; contentfiles; analyzers all From 27cae2bbde8804c5c4192013f19184423d589114 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Wed, 5 Feb 2020 08:47:59 +0100 Subject: [PATCH 4/6] Genererate xmldoc on release --- src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj index a9c7d0f275..264f487b70 100644 --- a/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj +++ b/src/Umbraco.Examine.Lucene/Umbraco.Examine.Lucene.csproj @@ -6,6 +6,11 @@ Umbraco CMS Umbraco.Examine.Lucene + + + true + bin\Release\Umbraco.Examine.Lucene.xml + From 0e150161f76447ce3dc29cf86893da60538978f8 Mon Sep 17 00:00:00 2001 From: Benjamin Carleski Date: Wed, 5 Feb 2020 01:52:10 -0800 Subject: [PATCH 5/6] Add audit messages back --- src/Umbraco.Infrastructure/Services/Implement/FileService.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Umbraco.Infrastructure/Services/Implement/FileService.cs b/src/Umbraco.Infrastructure/Services/Implement/FileService.cs index 2b33b54cc8..2a7a743273 100644 --- a/src/Umbraco.Infrastructure/Services/Implement/FileService.cs +++ b/src/Umbraco.Infrastructure/Services/Implement/FileService.cs @@ -87,6 +87,7 @@ namespace Umbraco.Core.Services.Implement _stylesheetRepository.Save(stylesheet); saveEventArgs.CanCancel = false; scope.Events.Dispatch(SavedStylesheet, this, saveEventArgs); + Audit(AuditType.Save, userId, -1, "Stylesheet"); scope.Complete(); } @@ -114,6 +115,7 @@ namespace Umbraco.Core.Services.Implement _stylesheetRepository.Delete(stylesheet); deleteEventArgs.CanCancel = false; scope.Events.Dispatch(DeletedStylesheet, this, deleteEventArgs); + Audit(AuditType.Delete, userId, -1, "Stylesheet"); scope.Complete(); } From c0a59cbad7c75b3fc34c750ea9d59e4cf1fa9320 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Thu, 6 Feb 2020 08:49:02 +0100 Subject: [PATCH 6/6] Renamed SqlCe Project --- .../SqlCeBulkSqlInsertProvider.cs | 0 .../SqlCeSyntaxProvider.cs | 0 .../Umbraco.Persistance.SqlCe.csproj} | 0 .../Umbraco.Tests.Benchmarks.csproj | 4 ++-- src/Umbraco.Tests/Umbraco.Tests.csproj | 8 ++++---- src/Umbraco.Web/Umbraco.Web.csproj | 4 ++-- src/umbraco.sln | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) rename src/{Umbraco.Infrastrucure.Persistance.SqlCe => Umbraco.Persistance.SqlCe}/SqlCeBulkSqlInsertProvider.cs (100%) rename src/{Umbraco.Infrastrucure.Persistance.SqlCe => Umbraco.Persistance.SqlCe}/SqlCeSyntaxProvider.cs (100%) rename src/{Umbraco.Infrastrucure.Persistance.SqlCe/Umbraco.Infrastrucure.Persistance.SqlCe.csproj => Umbraco.Persistance.SqlCe/Umbraco.Persistance.SqlCe.csproj} (100%) diff --git a/src/Umbraco.Infrastrucure.Persistance.SqlCe/SqlCeBulkSqlInsertProvider.cs b/src/Umbraco.Persistance.SqlCe/SqlCeBulkSqlInsertProvider.cs similarity index 100% rename from src/Umbraco.Infrastrucure.Persistance.SqlCe/SqlCeBulkSqlInsertProvider.cs rename to src/Umbraco.Persistance.SqlCe/SqlCeBulkSqlInsertProvider.cs diff --git a/src/Umbraco.Infrastrucure.Persistance.SqlCe/SqlCeSyntaxProvider.cs b/src/Umbraco.Persistance.SqlCe/SqlCeSyntaxProvider.cs similarity index 100% rename from src/Umbraco.Infrastrucure.Persistance.SqlCe/SqlCeSyntaxProvider.cs rename to src/Umbraco.Persistance.SqlCe/SqlCeSyntaxProvider.cs diff --git a/src/Umbraco.Infrastrucure.Persistance.SqlCe/Umbraco.Infrastrucure.Persistance.SqlCe.csproj b/src/Umbraco.Persistance.SqlCe/Umbraco.Persistance.SqlCe.csproj similarity index 100% rename from src/Umbraco.Infrastrucure.Persistance.SqlCe/Umbraco.Infrastrucure.Persistance.SqlCe.csproj rename to src/Umbraco.Persistance.SqlCe/Umbraco.Persistance.SqlCe.csproj diff --git a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj index 3490a34d77..be120eea08 100644 --- a/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj +++ b/src/Umbraco.Tests.Benchmarks/Umbraco.Tests.Benchmarks.csproj @@ -74,9 +74,9 @@ {3ae7bf57-966b-45a5-910a-954d7c554441} Umbraco.Infrastructure - + {33085570-9bf2-4065-a9b0-a29d920d13ba} - Umbraco.Infrastrucure.Persistance.SqlCe + Umbraco.Persistance.SqlCe {5d3b8245-ada6-453f-a008-50ed04bfe770} diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index 6c825a6b5e..6a7f0e16d2 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -576,14 +576,14 @@ {3ae7bf57-966b-45a5-910a-954d7c554441} Umbraco.Infrastructure - - {33085570-9bf2-4065-a9b0-a29d920d13ba} - Umbraco.Infrastrucure.Persistance.SqlCe - {52ac0ba8-a60e-4e36-897b-e8b97a54ed1c} Umbraco.ModelsBuilder.Embedded + + {33085570-9bf2-4065-a9b0-a29d920d13ba} + Umbraco.Persistance.SqlCe + {651E1350-91B6-44B7-BD60-7207006D7003} Umbraco.Web diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 31d551f18a..42d85b61e2 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -120,9 +120,9 @@ {3ae7bf57-966b-45a5-910a-954d7c554441} Umbraco.Infrastructure - + {33085570-9bf2-4065-a9b0-a29d920d13ba} - Umbraco.Infrastrucure.Persistance.SqlCe + Umbraco.Persistance.SqlCe diff --git a/src/umbraco.sln b/src/umbraco.sln index 6411b210c6..4c128ee0b1 100644 --- a/src/umbraco.sln +++ b/src/umbraco.sln @@ -107,7 +107,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Infrastructure", "U EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Configuration", "Umbraco.Configuration\Umbraco.Configuration.csproj", "{FBE7C065-DAC0-4025-A78B-63B24D3AB00B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Infrastrucure.Persistance.SqlCe", "Umbraco.Infrastrucure.Persistance.SqlCe\Umbraco.Infrastrucure.Persistance.SqlCe.csproj", "{33085570-9BF2-4065-A9B0-A29D920D13BA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Umbraco.Persistance.SqlCe", "Umbraco.Persistance.SqlCe\Umbraco.Persistance.SqlCe.csproj", "{33085570-9BF2-4065-A9B0-A29D920D13BA}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.TestData", "Umbraco.TestData\Umbraco.TestData.csproj", "{FB5676ED-7A69-492C-B802-E7B24144C0FC}" EndProject