diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs index 8728bb30ff..7086b67c7a 100644 --- a/src/Umbraco.Core/Configuration/GlobalSettings.cs +++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs @@ -181,32 +181,7 @@ namespace Umbraco.Core.Configuration SaveSetting("umbracoConfigurationStatus", value); } } - - /// - /// Returns the configuration status version as a versoin object or null if it cannot parse - /// - /// - internal static Version GetConfigurationVersion() - { - //create a real version out of the one stored in the settings - var configVersion = ConfigurationStatus.Split(new[] { '.' }, StringSplitOptions.RemoveEmptyEntries); - if (configVersion.Length == 0) - return null; - - int major; - var minor = 0; - var patch = 0; - int currentPart; - if (configVersion.Length > 0 && int.TryParse(configVersion[0], out currentPart)) - major = currentPart; - else - return null; //couldn't parse, no valid version - if (configVersion.Length > 1 && int.TryParse(configVersion[1], out currentPart)) minor = currentPart; - if (configVersion.Length > 2 && int.TryParse(configVersion[2], out currentPart)) patch = currentPart; - - return new Version(major, minor, patch); - } - + /// /// Saves a setting into the configuration file. /// diff --git a/src/Umbraco.Tests/Install/UpgradeScriptsTests.cs b/src/Umbraco.Tests/Install/UpgradeScriptsTests.cs deleted file mode 100644 index daf95b2241..0000000000 --- a/src/Umbraco.Tests/Install/UpgradeScriptsTests.cs +++ /dev/null @@ -1,68 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using NUnit.Framework; -using Umbraco.Web.Install.UpgradeScripts; - -namespace Umbraco.Tests.Install -{ - [TestFixture] - public class UpgradeScriptsTests - { - [TearDown] - public void TearDown() - { - UpgradeScriptManager.Clear(); - } - - [TestCase("0.0.0", "6.0.0", "4.10.0", true)] - [TestCase("4.10.0", "6.0.0", "4.10.0", true)] - [TestCase("4.10.0", "4.11.4", "4.10.0", true)] - [TestCase("4.11.0", "4.11.4", "4.10.0", false)] - [TestCase("4.11.0", "6.0.0", "4.10.0", false)] - [TestCase("6.0.0", "6.0.0", "6.0.0", false)] //this is not in range because it is up to 6.0 but not including 6.0 - [TestCase("6.0.0", "6.0.0", "6.0.1", false)] - public void Test_Version_Range(string startVersion, string endVersion, string current, bool inRange) - { - var currVersionParts = current.Split('.').Select(int.Parse).ToArray(); - var currentVersion = new Version(currVersionParts[0], currVersionParts[1], currVersionParts[2]); - - var startVersionParts = startVersion.Split('.').Select(int.Parse).ToArray(); - var endVersionParts = endVersion.Split('.').Select(int.Parse).ToArray(); - - UpgradeScriptManager.AddUpgradeScript( - () => new UpgradeScript1(), - new VersionRange( - new Version(startVersionParts[0], startVersionParts[1], startVersionParts[2]), - new Version(endVersionParts[0], endVersionParts[1], endVersionParts[2]))); - - Assert.AreEqual(inRange, UpgradeScriptManager.HasScriptsForVersion(currentVersion)); - } - - [Test] - public void Test_Specific_Version() - { - var currentVersion = new Version(4, 10, 0); - - UpgradeScriptManager.AddUpgradeScript( - () => new UpgradeScript1(), - new VersionRange( - new Version(4, 10, 0))); - - Assert.IsTrue(UpgradeScriptManager.HasScriptsForVersion(currentVersion)); - Assert.IsFalse(UpgradeScriptManager.HasScriptsForVersion(new Version(4, 10, 11))); - Assert.IsFalse(UpgradeScriptManager.HasScriptsForVersion(new Version(4, 11, 0))); - } - - public class UpgradeScript1 : IUpgradeScript - { - public void Execute() - { - Debug.WriteLine("Executing!"); - } - } - - } -} diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index 0634e58db7..c7bfb8cba0 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -63,7 +63,6 @@ - diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index b99a660c02..09d081e51f 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -289,13 +289,6 @@ loadStarterKits.ascx - - UpgradeScripts.ascx - ASPXCodeBehind - - - UpgradeScripts.ascx - editMacro.aspx @@ -425,7 +418,6 @@ UI.xml - diff --git a/src/Umbraco.Web.UI/install/steps/UpgradeScripts.ascx b/src/Umbraco.Web.UI/install/steps/UpgradeScripts.ascx deleted file mode 100644 index 2728a12f66..0000000000 --- a/src/Umbraco.Web.UI/install/steps/UpgradeScripts.ascx +++ /dev/null @@ -1,14 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="UpgradeScripts.ascx.cs" Inherits="Umbraco.Web.UI.Install.Steps.UpgradeScripts" %> -
-
-

Upgrade scripts

-

- We need to run a few upgrade scripts, press Continue to execute these scripts and continue to the next step. -

-
- -
-
 
- Continue -
-
\ No newline at end of file diff --git a/src/Umbraco.Web.UI/install/steps/UpgradeScripts.ascx.cs b/src/Umbraco.Web.UI/install/steps/UpgradeScripts.ascx.cs deleted file mode 100644 index 0d94b30821..0000000000 --- a/src/Umbraco.Web.UI/install/steps/UpgradeScripts.ascx.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.UI; -using System.Web.UI.WebControls; -using Umbraco.Core.Configuration; -using umbraco.presentation.install; -using Umbraco.Web.Install.UpgradeScripts; - -namespace Umbraco.Web.UI.Install.Steps -{ - public partial class UpgradeScripts : System.Web.UI.UserControl - { - protected void Page_Load(object sender, EventArgs e) - { - - } - - protected void RunScripts(object sender, EventArgs e) - { - //run the scripts and then go to the next step - UpgradeScriptManager.ExecuteScriptsForVersion(GlobalSettings.GetConfigurationVersion()); - - Helper.RedirectToNextStep(Page); - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/install/steps/UpgradeScripts.ascx.designer.cs b/src/Umbraco.Web.UI/install/steps/UpgradeScripts.ascx.designer.cs deleted file mode 100644 index a55927fd35..0000000000 --- a/src/Umbraco.Web.UI/install/steps/UpgradeScripts.ascx.designer.cs +++ /dev/null @@ -1,24 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -namespace Umbraco.Web.UI.Install.Steps { - - - public partial class UpgradeScripts { - - /// - /// btnNext control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.LinkButton btnNext; - } -} diff --git a/src/Umbraco.Web/Install/UpgradeScripts/ContentPathFix.cs b/src/Umbraco.Web/Install/UpgradeScripts/ContentPathFix.cs deleted file mode 100644 index f52ae5078d..0000000000 --- a/src/Umbraco.Web/Install/UpgradeScripts/ContentPathFix.cs +++ /dev/null @@ -1,130 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Text; -using Umbraco.Core; -using Umbraco.Core.IO; -using umbraco.cms.businesslogic; -using umbraco.cms.businesslogic.web; - -namespace Umbraco.Web.Install.UpgradeScripts -{ - /// - /// An upgrade script to fix a moving issue in 4.10+ - /// http://issues.umbraco.org/issue/U4-1491 - /// - public class ContentPathFix : IUpgradeScript - { - private readonly StringBuilder _report = new StringBuilder(); - - public void Execute() - { - //return; - if (ApplicationContext.Current == null) return; - if (HasBeenFixed()) return; - Fix(); - WriteReport(); - } - - private void Fix() - { - AddReportLine("Starting fix paths script"); - - //fix content - AddReportLine("Fixing content"); - foreach (var d in Document.GetRootDocuments()) - { - FixPathsForChildren(d, content => ((Document)content).Children); - } - AddReportLine("Fixing content recycle bin"); - var contentRecycleBin = new RecycleBin(RecycleBin.RecycleBinType.Content); - foreach (var d in contentRecycleBin.Children) - { - FixPathsForChildren(new Document(d.Id), content => ((Document)content).Children); - } - - //fix media - AddReportLine("Fixing media"); - foreach (var d in global::umbraco.cms.businesslogic.media.Media.GetRootMedias()) - { - FixPathsForChildren(d, media => ((global::umbraco.cms.businesslogic.media.Media)media).Children); - } - AddReportLine("Fixing media recycle bin"); - var mediaRecycleBin = new RecycleBin(RecycleBin.RecycleBinType.Media); - foreach (var d in mediaRecycleBin.Children) - { - FixPathsForChildren(new global::umbraco.cms.businesslogic.media.Media(d.Id), media => ((global::umbraco.cms.businesslogic.media.Media)media).Children); - } - AddReportLine("Complete!"); - } - - /// - /// Returns true if this script has run based on a temp file written to - /// ~/App_Data/TEMP/FixPaths/report.txt - /// - /// - private bool HasBeenFixed() - { - return File.Exists(IOHelper.MapPath("~/App_Data/TEMP/FixPaths/report.txt")); - } - - /// - /// Creates the report - /// - private void WriteReport() - { - var filePath = IOHelper.MapPath("~/App_Data/TEMP/FixPaths/report.txt"); - Directory.CreateDirectory(Path.GetDirectoryName(filePath)); - using (var writer = File.CreateText(IOHelper.MapPath("~/App_Data/TEMP/FixPaths/report.txt"))) - { - writer.Write(_report.ToString()); - } - } - - /// - /// Recursively iterates over the children of the document and fixes the path - /// - /// - /// Callback to get the children of the conent item - /// - /// We cannot use GetDescendants() because that is based on the paths of documents and if they are invalid then - /// we cannot use that method. - /// - private void FixPathsForChildren(Content d, Func> getChildren) - { - AddReportLine("Fixing paths for children of " + d.Id); - foreach (var c in getChildren(d)) - { - FixPath(c); - if (c.HasChildren) - { - FixPathsForChildren(c, getChildren); - } - } - } - - /// - /// Check if the path is correct based on the document's parent if it is not correct, then fix it - /// - /// - private void FixPath(CMSNode d) - { - AddReportLine("Checking path for " + d.Id + ". Current = " + d.Path); - //check if the path is correct - var correctpath = d.Parent.Path + "," + d.Id.ToString(); - if (d.Path != correctpath) - { - AddReportLine(" INVALID PATH DETECTED. Path for " + d.Id + " changed to: " + d.Parent.Path + "," + d.Id.ToString()); - d.Path = correctpath; - d.Level = d.Parent.Level + 1; - } - } - - private void AddReportLine(string str) - { - _report.AppendLine(string.Format("{0} - " + str, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.fff"))); - } - - - } -} \ No newline at end of file diff --git a/src/Umbraco.Web/Install/UpgradeScripts/IUpgradeScript.cs b/src/Umbraco.Web/Install/UpgradeScripts/IUpgradeScript.cs deleted file mode 100644 index 339dbd4ac2..0000000000 --- a/src/Umbraco.Web/Install/UpgradeScripts/IUpgradeScript.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Umbraco.Web.Install.UpgradeScripts -{ - internal interface IUpgradeScript - { - void Execute(); - } -} \ No newline at end of file diff --git a/src/Umbraco.Web/Install/UpgradeScripts/UpgradeScriptManager.cs b/src/Umbraco.Web/Install/UpgradeScripts/UpgradeScriptManager.cs deleted file mode 100644 index 472415598d..0000000000 --- a/src/Umbraco.Web/Install/UpgradeScripts/UpgradeScriptManager.cs +++ /dev/null @@ -1,84 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Umbraco.Core.Configuration; -using umbraco.DataLayer.Utility.Installer; - -namespace Umbraco.Web.Install.UpgradeScripts -{ - /// - /// Class used to register and execute upgrade scripts during install if they are required. - /// - internal static class UpgradeScriptManager - { - /// - /// Returns true if there are scripts to execute for the version - /// - /// - /// - public static bool HasScriptsForVersion(Version version) - { - return Scripts.Any(x => x.Item2.InRange(version)); - } - - /// - /// Executes all of the scripts for a database version - /// - /// - /// - public static void ExecuteScriptsForVersion(Version version) - { - var types = Scripts.Where(x => x.Item2.InRange(version)).Select(x => x.Item1); - foreach (var instance in types.Select(x => x())) - { - instance.Execute(); - } - } - - public static void AddUpgradeScript(Func script, VersionRange version) - { - Scripts.Add(new Tuple, VersionRange>(script, version)); - } - - ///// - ///// Adds a script to execute for a database version - ///// - ///// - ///// - //public static void AddUpgradeScript(string assemblyQualifiedTypeName, VersionRange version) - //{ - // AddUpgradeScript(new Lazy(() => Type.GetType(assemblyQualifiedTypeName)), version); - //} - - ///// - ///// Adds a script to execute for a database version - ///// - ///// - ///// - //public static void AddUpgradeScript(VersionRange version) - //{ - // AddUpgradeScript(new Lazy(() => typeof(T)), version); - //} - - /// - /// Used for testing - /// - internal static void Clear() - { - Scripts.Clear(); - } - - ///// - ///// Adds a script to execute for a database version - ///// - ///// - ///// - //public static void AddUpgradeScript(Lazy type, VersionRange version) - //{ - // Scripts.Add(new Tuple, VersionRange>(type, version)); - //} - - private static readonly List, VersionRange>> Scripts = new List, VersionRange>>(); - //private static readonly List, VersionRange>> Scripts = new List, VersionRange>>(); - } -} \ No newline at end of file diff --git a/src/Umbraco.Web/Install/UpgradeScripts/UpgradeScriptRegistrar.cs b/src/Umbraco.Web/Install/UpgradeScripts/UpgradeScriptRegistrar.cs deleted file mode 100644 index 611703b7d8..0000000000 --- a/src/Umbraco.Web/Install/UpgradeScripts/UpgradeScriptRegistrar.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System; -using Umbraco.Core; - -namespace Umbraco.Web.Install.UpgradeScripts -{ - internal class UpgradeScriptRegistrar : IApplicationEventHandler - { - public void OnApplicationInitialized(UmbracoApplication httpApplication, ApplicationContext applicationContext) - { - //Add contnet path fixup for any version from 4.10 up to 4.11.4 - UpgradeScriptManager.AddUpgradeScript( - () => new ContentPathFix(), - new VersionRange( - new Version(4, 10), - new Version(4, 11, 4))); - } - - public void OnApplicationStarting(UmbracoApplication httpApplication, ApplicationContext applicationContext) - { - - } - - public void OnApplicationStarted(UmbracoApplication httpApplication, ApplicationContext applicationContext) - { - - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Web/Install/UpgradeScripts/VersionRange.cs b/src/Umbraco.Web/Install/UpgradeScripts/VersionRange.cs deleted file mode 100644 index adafd7691a..0000000000 --- a/src/Umbraco.Web/Install/UpgradeScripts/VersionRange.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; - -namespace Umbraco.Web.Install.UpgradeScripts -{ - internal class VersionRange - { - private readonly Version _specificVersion; - private readonly Version _startVersion; - private readonly Version _endVersion; - - public VersionRange(Version specificVersion) - { - _specificVersion = specificVersion; - } - - public VersionRange(Version startVersion, Version endVersion) - { - _startVersion = startVersion; - _endVersion = endVersion; - } - - /// - /// Checks if the versionCheck is in the range (in between) the start and end version - /// - /// - /// - /// - /// For example if our version range is 4.10 -> 4.11.4, we want to return true if the version being checked is: - /// greater than or equal to the start version but less than the end version. - /// - public bool InRange(Version versionCheck) - { - //if it is a specific version - if (_specificVersion != null) - return versionCheck == _specificVersion; - - return versionCheck >= _startVersion && versionCheck < _endVersion; - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 5c7a263b12..480b4eff6b 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -252,11 +252,6 @@ - - - - - @@ -334,7 +329,6 @@ ASPXCodeBehind - ASPXCodeBehind @@ -2028,7 +2022,9 @@ UserControl - + + ASPXCodeBehind + diff --git a/src/Umbraco.Web/WebBootManager.cs b/src/Umbraco.Web/WebBootManager.cs index 915144efcf..b4aed9339d 100644 --- a/src/Umbraco.Web/WebBootManager.cs +++ b/src/Umbraco.Web/WebBootManager.cs @@ -9,7 +9,6 @@ using Umbraco.Core.Dictionary; using Umbraco.Core.Dynamics; using Umbraco.Core.PropertyEditors; using Umbraco.Web.Dictionary; -using Umbraco.Web.Install.UpgradeScripts; using Umbraco.Web.Media; using Umbraco.Web.Media.ThumbnailProviders; using Umbraco.Web.Models; @@ -91,7 +90,6 @@ namespace Umbraco.Web //add the internal types since we don't want to mark these public ApplicationEventsResolver.Current.AddType(); ApplicationEventsResolver.Current.AddType(); - ApplicationEventsResolver.Current.AddType(); //now we need to call the initialize methods ApplicationEventsResolver.Current.ApplicationEventHandlers diff --git a/src/Umbraco.Web/umbraco.presentation/install/default.aspx.cs b/src/Umbraco.Web/umbraco.presentation/install/default.aspx.cs index 16ceb1195f..479cb474c6 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/default.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/install/default.aspx.cs @@ -136,7 +136,6 @@ namespace umbraco.presentation.install ics.Add(new install.steps.Definitions.Welcome()); ics.Add(new install.steps.Definitions.License()); ics.Add(new install.steps.Definitions.FilePermissions()); - ics.Add(new install.steps.Definitions.UpgradeScripts()); ics.Add(new install.steps.Definitions.Database()); ics.Add(new install.steps.Definitions.DefaultUser()); ics.Add(new install.steps.Definitions.Skinning()); diff --git a/src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/UpgradeScripts.cs b/src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/UpgradeScripts.cs deleted file mode 100644 index 57d4cf9d9b..0000000000 --- a/src/Umbraco.Web/umbraco.presentation/install/steps/Definitions/UpgradeScripts.cs +++ /dev/null @@ -1,78 +0,0 @@ -using System; -using Umbraco.Core; -using Umbraco.Core.IO; -using Umbraco.Web.Install.UpgradeScripts; -using umbraco.DataLayer.Utility.Installer; -using umbraco.cms.businesslogic.installer; - -namespace umbraco.presentation.install.steps.Definitions -{ - internal class UpgradeScripts : InstallerStep - { - - - - public override string Alias - { - get { return "upgradeScripts"; } - } - - public override bool HideFromNavigation - { - get { return true; } - } - - /// - /// If there are no scripts for this version the skip - /// - /// - public override bool Completed() - { - var canConnect = CanConnectToDb(); - //if we cannot connect to the db, then we cannot run the script and most likely the database doesn't exist yet anyways. - if (!canConnect) return true; //skip - - //if the version is empty then it's probably a new installation, we cannot run scripts - if (GlobalSettings.CurrentVersion.IsNullOrWhiteSpace()) return true; //skip - var currentUmbVersion = Umbraco.Core.Configuration.GlobalSettings.GetConfigurationVersion(); - if (currentUmbVersion == null) - return true; //skip, could not get a version - - //check if we have upgrade script to run for this version - var hasScripts = UpgradeScriptManager.HasScriptsForVersion(currentUmbVersion); - return !hasScripts; - } - - public override string Name - { - get { return "Upgrade scripts"; } - } - - public override string UserControl - { - get { return SystemDirectories.Install + "/steps/UpgradeScripts.ascx"; } - } - - public override bool MoveToNextStepAutomaticly - { - get - { - return true; - } - } - - private bool CanConnectToDb() - { - try - { - var installer = BusinessLogic.Application.SqlHelper.Utility.CreateInstaller(); - var latest = installer.IsLatestVersion; - return true; //if we got this far, we can connect. - } - catch - { - return false; - } - } - } -} \ No newline at end of file diff --git a/src/Umbraco.Web/umbraco.presentation/install/utills/p.aspx.cs b/src/Umbraco.Web/umbraco.presentation/install/utills/p.aspx.cs index 8576f12366..d7c99e7f47 100644 --- a/src/Umbraco.Web/umbraco.presentation/install/utills/p.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/install/utills/p.aspx.cs @@ -4,7 +4,6 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; -using Umbraco.Web.Install.UpgradeScripts; using umbraco.DataLayer.Utility.Installer; using umbraco.DataLayer;