From 1897c0f162bdb85a7c54fc3706aa435aa4ea5ddd Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 29 Jan 2019 23:31:59 +1100 Subject: [PATCH] moves package actions to correct namespace, no more _Legacy namespace --- .../Components/CompositionExtensions.cs | 2 +- src/Umbraco.Core/Composing/Current.cs | 2 +- .../Composing/TypeLoaderExtensions.cs | 2 +- .../PackageActions/AllowDoctype.cs} | 10 +-- .../PackageActions/IPackageAction.cs | 3 +- .../PackageActions/PackageActionCollection.cs | 2 +- .../PackageActionCollectionBuilder.cs | 2 +- .../PackageActions/PublishRootDocument.cs} | 10 +-- .../Packaging/PackageActionRunner.cs | 2 +- .../Runtime/CoreRuntimeComposer.cs | 2 +- src/Umbraco.Core/Umbraco.Core.csproj | 8 +- .../Composing/PackageActionCollectionTests.cs | 2 +- src/Umbraco.Web/Composing/Current.cs | 2 +- src/Umbraco.Web/Umbraco.Web.csproj | 2 - .../PackageActions/addProxyFeedHost.cs | 81 ------------------- 15 files changed, 21 insertions(+), 111 deletions(-) rename src/{Umbraco.Web/_Legacy/PackageActions/allowDoctype.cs => Umbraco.Core/PackageActions/AllowDoctype.cs} (94%) rename src/Umbraco.Core/{_Legacy => }/PackageActions/IPackageAction.cs (80%) rename src/Umbraco.Core/{_Legacy => }/PackageActions/PackageActionCollection.cs (86%) rename src/Umbraco.Core/{_Legacy => }/PackageActions/PackageActionCollectionBuilder.cs (85%) rename src/{Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs => Umbraco.Core/PackageActions/PublishRootDocument.cs} (91%) delete mode 100644 src/Umbraco.Web/_Legacy/PackageActions/addProxyFeedHost.cs diff --git a/src/Umbraco.Core/Components/CompositionExtensions.cs b/src/Umbraco.Core/Components/CompositionExtensions.cs index 4e3e4816e5..8810213421 100644 --- a/src/Umbraco.Core/Components/CompositionExtensions.cs +++ b/src/Umbraco.Core/Components/CompositionExtensions.cs @@ -9,8 +9,8 @@ using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Strings; using Umbraco.Core.Sync; -using Umbraco.Core._Legacy.PackageActions; using Umbraco.Core.Logging.Viewer; +using Umbraco.Core.PackageActions; namespace Umbraco.Core.Components { diff --git a/src/Umbraco.Core/Composing/Current.cs b/src/Umbraco.Core/Composing/Current.cs index 12672bcc9a..1b16ad2b8e 100644 --- a/src/Umbraco.Core/Composing/Current.cs +++ b/src/Umbraco.Core/Composing/Current.cs @@ -5,6 +5,7 @@ using Umbraco.Core.Dictionary; using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Models.PublishedContent; +using Umbraco.Core.PackageActions; using Umbraco.Core.Packaging; using Umbraco.Core.Persistence; using Umbraco.Core.PropertyEditors; @@ -12,7 +13,6 @@ using Umbraco.Core.Scoping; using Umbraco.Core.Services; using Umbraco.Core.Strings; using Umbraco.Core.Sync; -using Umbraco.Core._Legacy.PackageActions; namespace Umbraco.Core.Composing { diff --git a/src/Umbraco.Core/Composing/TypeLoaderExtensions.cs b/src/Umbraco.Core/Composing/TypeLoaderExtensions.cs index ba57243071..5d17b0f53c 100644 --- a/src/Umbraco.Core/Composing/TypeLoaderExtensions.cs +++ b/src/Umbraco.Core/Composing/TypeLoaderExtensions.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Linq; using Umbraco.Core.Cache; +using Umbraco.Core.PackageActions; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.Persistence.SqlSyntax; using Umbraco.Core.PropertyEditors; -using Umbraco.Core._Legacy.PackageActions; namespace Umbraco.Core.Composing { diff --git a/src/Umbraco.Web/_Legacy/PackageActions/allowDoctype.cs b/src/Umbraco.Core/PackageActions/AllowDoctype.cs similarity index 94% rename from src/Umbraco.Web/_Legacy/PackageActions/allowDoctype.cs rename to src/Umbraco.Core/PackageActions/AllowDoctype.cs index f4b206a9ad..2e37061c31 100644 --- a/src/Umbraco.Web/_Legacy/PackageActions/allowDoctype.cs +++ b/src/Umbraco.Core/PackageActions/AllowDoctype.cs @@ -1,14 +1,10 @@ -using System; -using System.Collections; +using System.Collections; using System.Linq; -using System.Xml; using System.Xml.Linq; -using Umbraco.Core; +using Umbraco.Core.Composing; using Umbraco.Core.Models; -using Umbraco.Core._Legacy.PackageActions; -using Umbraco.Web.Composing; -namespace Umbraco.Web._Legacy.PackageActions +namespace Umbraco.Core.PackageActions { /// /// This class implements the IPackageAction Interface, used to execute code when packages are installed. diff --git a/src/Umbraco.Core/_Legacy/PackageActions/IPackageAction.cs b/src/Umbraco.Core/PackageActions/IPackageAction.cs similarity index 80% rename from src/Umbraco.Core/_Legacy/PackageActions/IPackageAction.cs rename to src/Umbraco.Core/PackageActions/IPackageAction.cs index b58ea34a60..d4dfb4079b 100644 --- a/src/Umbraco.Core/_Legacy/PackageActions/IPackageAction.cs +++ b/src/Umbraco.Core/PackageActions/IPackageAction.cs @@ -1,8 +1,7 @@ -using System.Xml; using System.Xml.Linq; using Umbraco.Core.Composing; -namespace Umbraco.Core._Legacy.PackageActions +namespace Umbraco.Core.PackageActions { public interface IPackageAction : IDiscoverable { diff --git a/src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollection.cs b/src/Umbraco.Core/PackageActions/PackageActionCollection.cs similarity index 86% rename from src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollection.cs rename to src/Umbraco.Core/PackageActions/PackageActionCollection.cs index a38c8cea56..813695f84c 100644 --- a/src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollection.cs +++ b/src/Umbraco.Core/PackageActions/PackageActionCollection.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Umbraco.Core.Composing; -namespace Umbraco.Core._Legacy.PackageActions +namespace Umbraco.Core.PackageActions { public sealed class PackageActionCollection : BuilderCollectionBase { diff --git a/src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollectionBuilder.cs b/src/Umbraco.Core/PackageActions/PackageActionCollectionBuilder.cs similarity index 85% rename from src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollectionBuilder.cs rename to src/Umbraco.Core/PackageActions/PackageActionCollectionBuilder.cs index 2f73a2b489..fdb118ae06 100644 --- a/src/Umbraco.Core/_Legacy/PackageActions/PackageActionCollectionBuilder.cs +++ b/src/Umbraco.Core/PackageActions/PackageActionCollectionBuilder.cs @@ -1,6 +1,6 @@ using Umbraco.Core.Composing; -namespace Umbraco.Core._Legacy.PackageActions +namespace Umbraco.Core.PackageActions { internal class PackageActionCollectionBuilder : LazyCollectionBuilderBase { diff --git a/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs b/src/Umbraco.Core/PackageActions/PublishRootDocument.cs similarity index 91% rename from src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs rename to src/Umbraco.Core/PackageActions/PublishRootDocument.cs index c6bbbfa00b..55955a4c8f 100644 --- a/src/Umbraco.Web/_Legacy/PackageActions/publishRootDocument.cs +++ b/src/Umbraco.Core/PackageActions/PublishRootDocument.cs @@ -1,11 +1,7 @@ -using System; -using System.Xml; -using System.Xml.Linq; -using Umbraco.Core; -using Umbraco.Core._Legacy.PackageActions; -using Umbraco.Web.Composing; +using System.Xml.Linq; +using Umbraco.Core.Composing; -namespace Umbraco.Web._Legacy.PackageActions +namespace Umbraco.Core.PackageActions { /// /// This class implements the IPackageAction Interface, used to execute code when packages are installed. diff --git a/src/Umbraco.Core/Packaging/PackageActionRunner.cs b/src/Umbraco.Core/Packaging/PackageActionRunner.cs index dba2690c0c..8434f52f30 100644 --- a/src/Umbraco.Core/Packaging/PackageActionRunner.cs +++ b/src/Umbraco.Core/Packaging/PackageActionRunner.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Xml.Linq; using Umbraco.Core.Logging; -using Umbraco.Core._Legacy.PackageActions; +using Umbraco.Core.PackageActions; namespace Umbraco.Core.Packaging { diff --git a/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs b/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs index 8285b9b4fd..ee289ddcfa 100644 --- a/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs +++ b/src/Umbraco.Core/Runtime/CoreRuntimeComposer.cs @@ -11,6 +11,7 @@ using Umbraco.Core.Manifest; using Umbraco.Core.Migrations; using Umbraco.Core.Migrations.Install; using Umbraco.Core.Models.PublishedContent; +using Umbraco.Core.PackageActions; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Mappers; using Umbraco.Core.PropertyEditors; @@ -19,7 +20,6 @@ using Umbraco.Core.Scoping; using Umbraco.Core.Services; using Umbraco.Core.Strings; using Umbraco.Core.Sync; -using Umbraco.Core._Legacy.PackageActions; using IntegerValidator = Umbraco.Core.PropertyEditors.Validators.IntegerValidator; namespace Umbraco.Core.Runtime diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 588c66cd3d..e31579c9f7 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -454,6 +454,8 @@ + + @@ -1516,9 +1518,9 @@ - - - + + + Component diff --git a/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs b/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs index 75030decbf..fe8ca7dadc 100644 --- a/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs +++ b/src/Umbraco.Tests/Composing/PackageActionCollectionTests.cs @@ -8,7 +8,7 @@ using Umbraco.Core; using Umbraco.Core.Components; using Umbraco.Core.Composing; using Umbraco.Core.Logging; -using Umbraco.Core._Legacy.PackageActions; +using Umbraco.Core.PackageActions; using Umbraco.Tests.Components; namespace Umbraco.Tests.Composing diff --git a/src/Umbraco.Web/Composing/Current.cs b/src/Umbraco.Web/Composing/Current.cs index 70b0927c43..b394684f56 100644 --- a/src/Umbraco.Web/Composing/Current.cs +++ b/src/Umbraco.Web/Composing/Current.cs @@ -11,13 +11,13 @@ using Umbraco.Core.Models.PublishedContent; using Umbraco.Core.Persistence; using Umbraco.Core.Composing; using Umbraco.Core.Configuration; +using Umbraco.Core.PackageActions; using Umbraco.Core.Packaging; using Umbraco.Core.PropertyEditors; using Umbraco.Core.Scoping; using Umbraco.Core.Services; using Umbraco.Core.Strings; using Umbraco.Core.Sync; -using Umbraco.Core._Legacy.PackageActions; using Umbraco.Web.Actions; using Umbraco.Web.Cache; using Umbraco.Web.Editors; diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 463b72e3e9..89e35b4e07 100755 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -1135,8 +1135,6 @@ - - diff --git a/src/Umbraco.Web/_Legacy/PackageActions/addProxyFeedHost.cs b/src/Umbraco.Web/_Legacy/PackageActions/addProxyFeedHost.cs deleted file mode 100644 index f53adb3be0..0000000000 --- a/src/Umbraco.Web/_Legacy/PackageActions/addProxyFeedHost.cs +++ /dev/null @@ -1,81 +0,0 @@ -using System.Xml; -using System.Xml.Linq; -using Umbraco.Core; -using Umbraco.Core.IO; -using Umbraco.Core.Xml; -using Umbraco.Core._Legacy.PackageActions; - -namespace Umbraco.Web._Legacy.PackageActions -{ - public class AddProxyFeedHost : IPackageAction - { - #region IPackageAction Members - - public bool Execute(string packageName, XElement xmlData) - { - var hostname = xmlData.AttributeValue("host"); - if (string.IsNullOrEmpty(hostname)) - return false; - - var xdoc = XDocument.Load(IOHelper.MapPath(SystemFiles.FeedProxyConfig)); - - var insert = true; - - if (xdoc.Root.HasElements) - { - foreach (var node in xdoc.Root.Elements("allow")) - { - if (node.AttributeValue("host") != null && node.AttributeValue("host") == hostname) - insert = false; - } - } - - if (insert) - { - xdoc.Root.Add(new XElement("allow", new XAttribute("host", hostname))); - xdoc.Save(IOHelper.MapPath(SystemFiles.FeedProxyConfig)); - - return true; - } - return false; - } - - public string Alias() - { - return "addProxyFeedHost"; - } - - public bool Undo(string packageName, XElement xmlData) - { - var hostname = xmlData.AttributeValue("host"); - if (string.IsNullOrEmpty(hostname)) - return false; - - var xdoc = XDocument.Load(IOHelper.MapPath(SystemFiles.FeedProxyConfig)); - - bool inserted = false; - if (xdoc.Root.HasElements) - { - foreach (var node in xdoc.Root.Elements("allow")) - { - if (node.AttributeValue("host") != null && node.AttributeValue("host") == hostname) - { - node.Remove(); - inserted = true; - } - } - } - - if (inserted) - { - xdoc.Save(IOHelper.MapPath(SystemFiles.FeedProxyConfig)); - return true; - } - - return false; - } - - #endregion - - } -}