From 648fbdd3f33f9eb642ed3d1ea23bec9d8369912f Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 9 May 2016 10:05:55 +0200 Subject: [PATCH] moves packaging models to models/packaging --- .../Events/ImportPackageEventArgs.cs | 2 +- .../Packaging}/InstallationSummary.cs | 85 +++++++++---------- .../Models => Models/Packaging}/MetaData.cs | 2 +- .../Packaging}/PackageAction.cs | 74 ++++++++-------- .../Packaging}/PreInstallWarnings.cs | 33 ++++--- .../Packaging/IPackageInstallation.cs | 2 +- .../Packaging/PackageInstallation.cs | 2 +- src/Umbraco.Core/Services/PackagingService.cs | 2 +- src/Umbraco.Core/Umbraco.Core.csproj | 8 +- .../Packaging/PackageInstallationTest.cs | 2 +- .../Services/PackagingServiceTests.cs | 2 +- .../Editors/PackageInstallController.cs | 1 - 12 files changed, 106 insertions(+), 109 deletions(-) rename src/Umbraco.Core/{Packaging/Models => Models/Packaging}/InstallationSummary.cs (94%) rename src/Umbraco.Core/{Packaging/Models => Models/Packaging}/MetaData.cs (94%) rename src/Umbraco.Core/{Packaging/Models => Models/Packaging}/PackageAction.cs (92%) rename src/Umbraco.Core/{Packaging/Models => Models/Packaging}/PreInstallWarnings.cs (87%) diff --git a/src/Umbraco.Core/Events/ImportPackageEventArgs.cs b/src/Umbraco.Core/Events/ImportPackageEventArgs.cs index 8596629731..acc19ae968 100644 --- a/src/Umbraco.Core/Events/ImportPackageEventArgs.cs +++ b/src/Umbraco.Core/Events/ImportPackageEventArgs.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using Umbraco.Core.Packaging.Models; +using Umbraco.Core.Models.Packaging; namespace Umbraco.Core.Events { diff --git a/src/Umbraco.Core/Packaging/Models/InstallationSummary.cs b/src/Umbraco.Core/Models/Packaging/InstallationSummary.cs similarity index 94% rename from src/Umbraco.Core/Packaging/Models/InstallationSummary.cs rename to src/Umbraco.Core/Models/Packaging/InstallationSummary.cs index a3c394946a..46d454a2b9 100644 --- a/src/Umbraco.Core/Packaging/Models/InstallationSummary.cs +++ b/src/Umbraco.Core/Models/Packaging/InstallationSummary.cs @@ -1,44 +1,43 @@ -using System; -using System.Collections.Generic; -using System.Runtime.Serialization; -using Umbraco.Core.Models; - -namespace Umbraco.Core.Packaging.Models -{ - [Serializable] - [DataContract(IsReference = true)] - internal class InstallationSummary - { - public MetaData MetaData { get; set; } - public IEnumerable DataTypesInstalled { get; set; } - public IEnumerable LanguagesInstalled { get; set; } - public IEnumerable DictionaryItemsInstalled { get; set; } - public IEnumerable MacrosInstalled { get; set; } - public IEnumerable FilesInstalled { get; set; } - public IEnumerable TemplatesInstalled { get; set; } - public IEnumerable ContentTypesInstalled { get; set; } - public IEnumerable StylesheetsInstalled { get; set; } - public IEnumerable ContentInstalled { get; set; } - public IEnumerable Actions { get; set; } - public bool PackageInstalled { get; set; } - } - - internal static class InstallationSummaryExtentions - { - public static InstallationSummary InitEmpty(this InstallationSummary summary) - { - summary.Actions = new List(); - summary.ContentInstalled = new List(); - summary.ContentTypesInstalled = new List(); - summary.DataTypesInstalled = new List(); - summary.DictionaryItemsInstalled = new List(); - summary.FilesInstalled = new List(); - summary.LanguagesInstalled = new List(); - summary.MacrosInstalled = new List(); - summary.MetaData = new MetaData(); - summary.TemplatesInstalled = new List(); - summary.PackageInstalled = false; - return summary; - } - } +using System; +using System.Collections.Generic; +using System.Runtime.Serialization; + +namespace Umbraco.Core.Models.Packaging +{ + [Serializable] + [DataContract(IsReference = true)] + internal class InstallationSummary + { + public MetaData MetaData { get; set; } + public IEnumerable DataTypesInstalled { get; set; } + public IEnumerable LanguagesInstalled { get; set; } + public IEnumerable DictionaryItemsInstalled { get; set; } + public IEnumerable MacrosInstalled { get; set; } + public IEnumerable FilesInstalled { get; set; } + public IEnumerable TemplatesInstalled { get; set; } + public IEnumerable ContentTypesInstalled { get; set; } + public IEnumerable StylesheetsInstalled { get; set; } + public IEnumerable ContentInstalled { get; set; } + public IEnumerable Actions { get; set; } + public bool PackageInstalled { get; set; } + } + + internal static class InstallationSummaryExtentions + { + public static InstallationSummary InitEmpty(this InstallationSummary summary) + { + summary.Actions = new List(); + summary.ContentInstalled = new List(); + summary.ContentTypesInstalled = new List(); + summary.DataTypesInstalled = new List(); + summary.DictionaryItemsInstalled = new List(); + summary.FilesInstalled = new List(); + summary.LanguagesInstalled = new List(); + summary.MacrosInstalled = new List(); + summary.MetaData = new MetaData(); + summary.TemplatesInstalled = new List(); + summary.PackageInstalled = false; + return summary; + } + } } \ No newline at end of file diff --git a/src/Umbraco.Core/Packaging/Models/MetaData.cs b/src/Umbraco.Core/Models/Packaging/MetaData.cs similarity index 94% rename from src/Umbraco.Core/Packaging/Models/MetaData.cs rename to src/Umbraco.Core/Models/Packaging/MetaData.cs index 28f1af230e..faa4cfa3df 100644 --- a/src/Umbraco.Core/Packaging/Models/MetaData.cs +++ b/src/Umbraco.Core/Models/Packaging/MetaData.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.Serialization; -namespace Umbraco.Core.Packaging.Models +namespace Umbraco.Core.Models.Packaging { [Serializable] [DataContract(IsReference = true)] diff --git a/src/Umbraco.Core/Packaging/Models/PackageAction.cs b/src/Umbraco.Core/Models/Packaging/PackageAction.cs similarity index 92% rename from src/Umbraco.Core/Packaging/Models/PackageAction.cs rename to src/Umbraco.Core/Models/Packaging/PackageAction.cs index 0e20786a72..507ece2b02 100644 --- a/src/Umbraco.Core/Packaging/Models/PackageAction.cs +++ b/src/Umbraco.Core/Models/Packaging/PackageAction.cs @@ -1,38 +1,38 @@ -using System; -using System.Runtime.Serialization; -using System.Xml.Linq; - -namespace Umbraco.Core.Packaging.Models -{ - internal enum ActionRunAt - { - Undefined = 0, - Install, - Uninstall - } - - [Serializable] - [DataContract(IsReference = true)] - internal class PackageAction - { - private ActionRunAt _runAt; - private bool? _undo; - public string Alias { get; set; } - - public string PackageName { get; set; } - - public ActionRunAt RunAt - { - get { return _runAt == ActionRunAt.Undefined ? ActionRunAt.Install : _runAt; } - set { _runAt = value; } - } - - public bool Undo //NOTE: Should thid default to "False"? but the documentation says default "True" (http://our.umbraco.org/wiki/reference/packaging/package-actions) - { - get { return _undo ?? true; } - set { _undo = value; } - } - - public XElement XmlData { get; set; } - } +using System; +using System.Runtime.Serialization; +using System.Xml.Linq; + +namespace Umbraco.Core.Models.Packaging +{ + internal enum ActionRunAt + { + Undefined = 0, + Install, + Uninstall + } + + [Serializable] + [DataContract(IsReference = true)] + internal class PackageAction + { + private ActionRunAt _runAt; + private bool? _undo; + public string Alias { get; set; } + + public string PackageName { get; set; } + + public ActionRunAt RunAt + { + get { return _runAt == ActionRunAt.Undefined ? ActionRunAt.Install : _runAt; } + set { _runAt = value; } + } + + public bool Undo //NOTE: Should thid default to "False"? but the documentation says default "True" (http://our.umbraco.org/wiki/reference/packaging/package-actions) + { + get { return _undo ?? true; } + set { _undo = value; } + } + + public XElement XmlData { get; set; } + } } \ No newline at end of file diff --git a/src/Umbraco.Core/Packaging/Models/PreInstallWarnings.cs b/src/Umbraco.Core/Models/Packaging/PreInstallWarnings.cs similarity index 87% rename from src/Umbraco.Core/Packaging/Models/PreInstallWarnings.cs rename to src/Umbraco.Core/Models/Packaging/PreInstallWarnings.cs index 4280e25c04..25fd2b5585 100644 --- a/src/Umbraco.Core/Packaging/Models/PreInstallWarnings.cs +++ b/src/Umbraco.Core/Models/Packaging/PreInstallWarnings.cs @@ -1,18 +1,17 @@ -using System; -using System.Collections.Generic; -using System.Runtime.Serialization; -using Umbraco.Core.Models; - -namespace Umbraco.Core.Packaging.Models -{ - [Serializable] - [DataContract(IsReference = true)] - internal class PreInstallWarnings - { - public KeyValuePair[] UnsecureFiles { get; set; } - public KeyValuePair[] FilesReplaced { get; set; } - public IEnumerable ConflictingMacroAliases { get; set; } - public IEnumerable ConflictingTemplateAliases { get; set; } - public IEnumerable ConflictingStylesheetNames { get; set; } - } +using System; +using System.Collections.Generic; +using System.Runtime.Serialization; + +namespace Umbraco.Core.Models.Packaging +{ + [Serializable] + [DataContract(IsReference = true)] + internal class PreInstallWarnings + { + public KeyValuePair[] UnsecureFiles { get; set; } + public KeyValuePair[] FilesReplaced { get; set; } + public IEnumerable ConflictingMacroAliases { get; set; } + public IEnumerable ConflictingTemplateAliases { get; set; } + public IEnumerable ConflictingStylesheetNames { get; set; } + } } \ No newline at end of file diff --git a/src/Umbraco.Core/Packaging/IPackageInstallation.cs b/src/Umbraco.Core/Packaging/IPackageInstallation.cs index 2a0b764a37..cee8d6251c 100644 --- a/src/Umbraco.Core/Packaging/IPackageInstallation.cs +++ b/src/Umbraco.Core/Packaging/IPackageInstallation.cs @@ -1,5 +1,5 @@ using System.Xml.Linq; -using Umbraco.Core.Packaging.Models; +using Umbraco.Core.Models.Packaging; namespace Umbraco.Core.Packaging { diff --git a/src/Umbraco.Core/Packaging/PackageInstallation.cs b/src/Umbraco.Core/Packaging/PackageInstallation.cs index 592ef01c3d..6c8b4cc43e 100644 --- a/src/Umbraco.Core/Packaging/PackageInstallation.cs +++ b/src/Umbraco.Core/Packaging/PackageInstallation.cs @@ -8,7 +8,7 @@ using System.Xml.XPath; using Umbraco.Core.Configuration; using Umbraco.Core.IO; using Umbraco.Core.Models; -using Umbraco.Core.Packaging.Models; +using Umbraco.Core.Models.Packaging; using Umbraco.Core.Services; using File = System.IO.File; diff --git a/src/Umbraco.Core/Services/PackagingService.cs b/src/Umbraco.Core/Services/PackagingService.cs index 1eaeaf59ad..5f52031e5f 100644 --- a/src/Umbraco.Core/Services/PackagingService.cs +++ b/src/Umbraco.Core/Services/PackagingService.cs @@ -14,9 +14,9 @@ using Umbraco.Core.IO; using Umbraco.Core.Logging; using Umbraco.Core.Models; using Umbraco.Core.Models.EntityBase; +using Umbraco.Core.Models.Packaging; using Umbraco.Core.Models.Rdbms; using Umbraco.Core.Packaging; -using Umbraco.Core.Packaging.Models; using Umbraco.Core.Persistence; using Umbraco.Core.Persistence.Querying; using Umbraco.Core.Persistence.Repositories; diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 90afb9e0e0..4b9fec968f 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -612,10 +612,10 @@ - - - - + + + + diff --git a/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs b/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs index a0a5f9f5da..78dd1c17d3 100644 --- a/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs +++ b/src/Umbraco.Tests/Packaging/PackageInstallationTest.cs @@ -1,8 +1,8 @@ using Moq; using NUnit.Framework; using Umbraco.Core; +using Umbraco.Core.Models.Packaging; using Umbraco.Core.Packaging; -using Umbraco.Core.Packaging.Models; using Umbraco.Core.Services; namespace Umbraco.Tests.Packaging diff --git a/src/Umbraco.Tests/Services/PackagingServiceTests.cs b/src/Umbraco.Tests/Services/PackagingServiceTests.cs index 72b1323e65..02bfa1293e 100644 --- a/src/Umbraco.Tests/Services/PackagingServiceTests.cs +++ b/src/Umbraco.Tests/Services/PackagingServiceTests.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Xml.Linq; using NUnit.Framework; using Umbraco.Core.Models; -using Umbraco.Core.Packaging.Models; +using Umbraco.Core.Models.Packaging; using Umbraco.Core.Services; using Umbraco.Tests.Services.Importing; using Umbraco.Tests.TestHelpers; diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs index 8ad9ca2649..65c4cd81d5 100644 --- a/src/Umbraco.Web/Editors/PackageInstallController.cs +++ b/src/Umbraco.Web/Editors/PackageInstallController.cs @@ -14,7 +14,6 @@ using Umbraco.Core.Auditing; using umbraco.BusinessLogic; using umbraco.cms.businesslogic.packager.repositories; using Umbraco.Core.IO; -using Umbraco.Core.Packaging.Models; using Umbraco.Core.Services; using Umbraco.Web.Models; using Umbraco.Web.Mvc;