From 0f4b1752e0885eeac24cfbdd002e2fe8aba4144d Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 21 Jun 2013 15:25:46 +0200 Subject: [PATCH 01/24] U4-2416 Missing colon in file ListChildPagesOrderedByProperty causes Web site not to run --- .../templates/cshtml/ListChildPagesOrderedByProperty.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByProperty.cshtml b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByProperty.cshtml index 2f5ebb543b..8383d9077e 100644 --- a/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByProperty.cshtml +++ b/src/Umbraco.Web.UI/umbraco/scripting/templates/cshtml/ListChildPagesOrderedByProperty.cshtml @@ -10,7 +10,7 @@ @* Get the property alias we want to filter on from the macro parameter *@ var propertyAlias = Parameter.propertyAlias; - var selection = Model.Children.Where("Visible").OrderBy(propertyAlias) + var selection = Model.Children.Where("Visible").OrderBy(propertyAlias); } From 96cec0b407a35392cadbc9d3ae109b7d21d64a30 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 21 Jun 2013 16:30:44 +0200 Subject: [PATCH 02/24] U4-2410 EditRelationType.aspx missing virtual path - 6.0.6 --- .../umbraco/developer/RelationTypes/EditRelationType.aspx | 2 +- .../umbraco/developer/RelationTypes/NewRelationType.aspx | 2 +- .../umbraco/developer/RelationTypes/EditRelationType.aspx | 2 +- .../umbraco/developer/RelationTypes/NewRelationType.aspx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx index ea6de5b968..2b8e9e16b0 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx +++ b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/EditRelationType.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="/umbraco/masterpages/umbracoPage.Master" %> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="../../masterpages/umbracoPage.Master" %> <%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %> diff --git a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx index fd16f91b03..d2c72fef2a 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx +++ b/src/Umbraco.Web.UI/umbraco/developer/RelationTypes/NewRelationType.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="/umbraco/masterpages/umbracoPage.Master"%> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="../../masterpages/umbracoPage.Master"%> <%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %> diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx index ea6de5b968..2b8e9e16b0 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="/umbraco/masterpages/umbracoPage.Master" %> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="EditRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.EditRelationType" MasterPageFile="../../masterpages/umbracoPage.Master" %> <%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %> diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx index fd16f91b03..d2c72fef2a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/NewRelationType.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="/umbraco/masterpages/umbracoPage.Master"%> +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="NewRelationType.aspx.cs" Inherits="umbraco.cms.presentation.developer.RelationTypes.NewRelationType" MasterPageFile="../../masterpages/umbracoPage.Master"%> <%@ Register TagPrefix="umb" Namespace="umbraco.uicontrols" Assembly="controls" %> From 23ec07276a4cd1cd353f7a1a8287771f1dab02a1 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 21 Jun 2013 16:56:59 +0200 Subject: [PATCH 03/24] U4-2369 Wrong path for Umbraco/Config/Lang/xx.xml for publish notification mail --- src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 4 ++-- src/Umbraco.Web.UI/umbraco/config/lang/de.xml | 14 +++++++------- src/Umbraco.Web.UI/umbraco/config/lang/fr.xml | 14 +++++++------- src/Umbraco.Web.UI/umbraco/config/lang/nl.xml | 12 ++++++------ src/Umbraco.Web.UI/umbraco/config/lang/no.xml | 14 +++++++------- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index e3aa533783..d800f72a6b 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -432,13 +432,13 @@ Dette er en automatisk mail for at fortælle at handlingen '%1%' er blevet udført på siden '%2%' af brugeren '%3%' -Gå til http://%4%/umbraco/default.aspx?section=content&id=%5% for at redigere. +Gå til http://%4%/default.aspx?section=content&id=%5% for at redigere. Ha' en dejlig dag! Mange hilsner fra umbraco robotten ]]> - Hej %0%

Dette er en automatisk mail for at informere dig om at opgaven '%1%' er blevet udførtpå siden '%2%' af brugeren '%3%'

Opdateringssammendrag:

%6%

Hav en fortsat god dag!

De bedste hilsner fra umbraco robotten

]]> + Hej %0%

Dette er en automatisk mail for at informere dig om at opgaven '%1%' er blevet udførtpå siden '%2%' af brugeren '%3%'

Opdateringssammendrag:

%6%

Hav en fortsat god dag!

De bedste hilsner fra umbraco robotten

]]> [%0%] Notificering om %1% udført på %2% Notificeringer diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml index 707648950f..c721c7e227 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml @@ -463,7 +463,7 @@ Hallo %0%, die Aufgabe '%1%' (von Benutzer '%3%') an der Seite '%2%' wurde ausgeführt. -Zum Bearbeiten verwenden Sie bitte diesen Link: http://%4%/umbraco/actions/editContent.aspx?id=%5% +Zum Bearbeiten verwenden Sie bitte diesen Link: http://%4%/actions/editContent.aspx?id=%5% Einen schönen Tag wünscht Ihr freundlicher Umbraco-Robot @@ -474,9 +474,9 @@ Ihr freundlicher Umbraco-Robot

die Aufgabe '%1%' (von Benutzer '%3%') an der Seite '%2%' wurde ausgeführt.

@@ -487,9 +487,9 @@ Ihr freundlicher Umbraco-Robot

Einen schönen Tag wünscht
Ihr freundlicher Umbraco-Robot

diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml index 58396680cd..0e646278f8 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml @@ -534,7 +534,7 @@ Pour gerer votre site, accéder simplement au back office et commencez à contri Ceci est un email automatique pour vous informer que la tâche '%1%' a été activée sur la page '%2%' par l'utilisateur '%3%' - Allez à http://%4%/umbraco/actions/editContent.aspx?id=%5% pour éditer. + Allez à http://%4%/actions/editContent.aspx?id=%5% pour éditer. Bonne journée! @@ -550,9 +550,9 @@ Pour gerer votre site, accéder simplement au back office et commencez à contri


-   PUBLIER     -      EDITER        -     SUPPRIMER     +   PUBLIER     +      EDITER        +     SUPPRIMER    

@@ -564,9 +564,9 @@ Pour gerer votre site, accéder simplement au back office et commencez à contri


-   PUBLIER     -      EDITER        -     SUPPRIMER     +   PUBLIER     +      EDITER        +     SUPPRIMER    
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml index 729883cf4e..7e8fbd8e3a 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml @@ -452,9 +452,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je


-   PUBLISH     -      EDIT        -     DELETE     +   PUBLISH     +      EDIT        +     DELETE    

@@ -466,9 +466,9 @@ Echter, Runway biedt een gemakkelijke basis om je snel op weg te helpen. Als je


-   PUBLISH     -      EDIT        -     DELETE     +   PUBLISH     +      EDIT        +     DELETE    
diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/no.xml b/src/Umbraco.Web.UI/umbraco/config/lang/no.xml index 8dcc4dcdb7..ce5d23a286 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/no.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/no.xml @@ -433,7 +433,7 @@ Dette er en automatisk mail for å informere om at handlingen '%1%' er utført på siden '%2%' av brukeren '%3%' -Gå til http://%4%/umbraco/default.aspx?section=content&id=%5% for å redigere. +Gå til http://%4%/default.aspx?section=content&id=%5% for å redigere. Ha en fin dag! @@ -447,9 +447,9 @@ Vennlig hilsen umbraco roboten

@@ -461,9 +461,9 @@ Vennlig hilsen umbraco roboten

From a2da27121e053eddf24da3771d8abc74aacc7272 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 21 Jun 2013 17:00:40 +0200 Subject: [PATCH 04/24] U4-2335 [Regression] YSOD when editing stylesheet property on 6.0.6 --- .../stylesheet/property/EditStyleSheetProperty.aspx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx index c554ab88b9..1d0166285d 100644 --- a/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx +++ b/src/Umbraco.Web.UI/umbraco/settings/stylesheet/property/EditStyleSheetProperty.aspx @@ -10,25 +10,25 @@
- <%=umbraco.ui.Text("name", UmbracoUser)%>: + <%=umbraco.ui.Text("name", base.getUser())%>:
- <%=umbraco.ui.Text("stylesheet", "nameHelp", UmbracoUser)%> + <%=umbraco.ui.Text("stylesheet", "nameHelp", base.getUser())%>
- <%=umbraco.ui.Text("alias", UmbracoUser)%>: + <%=umbraco.ui.Text("alias", base.getUser())%>:
- <%=umbraco.ui.Text("stylesheet", "aliasHelp", UmbracoUser)%> + <%=umbraco.ui.Text("stylesheet", "aliasHelp", base.getUser())%>
- <%=umbraco.ui.Text("styles", UmbracoUser)%>: + <%=umbraco.ui.Text("styles", base.getUser())%>: @@ -38,7 +38,7 @@
- <%=umbraco.ui.Text("preview", UmbracoUser)%>: + <%=umbraco.ui.Text("preview", base.getUser())%>:
From 7fad8ca98b20081a2a9040a84ddcbc0142d95098 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 21 Jun 2013 17:15:42 +0200 Subject: [PATCH 05/24] U4-2378 Mono port to do: TypeFinder needs exclusions for Monodevelop Nunit --- src/Umbraco.Tests/TypeFinderTests.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Tests/TypeFinderTests.cs b/src/Umbraco.Tests/TypeFinderTests.cs index 7d052d7cbc..ca3f80936d 100644 --- a/src/Umbraco.Tests/TypeFinderTests.cs +++ b/src/Umbraco.Tests/TypeFinderTests.cs @@ -447,7 +447,9 @@ namespace Umbraco.Tests "HtmlAgilityPack.", "TidyNet.", "ICSharpCode.", - "CookComputing." + "CookComputing.", + /* Mono */ + "MonoDevelop.NUnit" }; public static IEnumerable FindClassesOfTypeWithAttribute() From 35c0eb3b0c441e4ba30078771a64d95351b01e32 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 21 Jun 2013 17:22:13 +0200 Subject: [PATCH 06/24] U4-2377 Mono port to do: Universal currency character does not work as split character unless given in unicode. --- .../umbraco.presentation/umbraco/create/ScriptTasks.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs index 46ee8f3f80..5e3f16ca0c 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs @@ -42,7 +42,7 @@ namespace umbraco public bool Save() { - string[] scriptFileAr = _alias.Split('¤'); + string[] scriptFileAr = _alias.Split('\u00A4'); From 76358e3e133a502692412929d99ba71292abb26a Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Fri, 21 Jun 2013 17:29:55 +0200 Subject: [PATCH 07/24] U4-2374 Mono port to do: dealing with empty string --- .../umbraco/controls/GenericProperties/GenericProperty.ascx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs index fba88a0d67..2eac5b2f41 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/controls/GenericProperties/GenericProperty.ascx.cs @@ -223,7 +223,7 @@ namespace umbraco.controls.GenericProperties checkMandatory.Checked = true; // validation - if (_pt != null && _pt.ValidationRegExp != "") + if (_pt != null && string.IsNullOrEmpty(_pt.ValidationRegExp) == false) tbValidation.Text = _pt.ValidationRegExp; // description From 033f98171871bbcdee1925136fd4c22eeea067d4 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sat, 22 Jun 2013 14:19:22 +0200 Subject: [PATCH 08/24] Fix unit test --- src/Umbraco.Tests/ContentStores/PublishContentStoreTests.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Tests/ContentStores/PublishContentStoreTests.cs b/src/Umbraco.Tests/ContentStores/PublishContentStoreTests.cs index bbbcff3c00..51d0479460 100644 --- a/src/Umbraco.Tests/ContentStores/PublishContentStoreTests.cs +++ b/src/Umbraco.Tests/ContentStores/PublishContentStoreTests.cs @@ -3,6 +3,7 @@ using System.Xml; using NUnit.Framework; using Umbraco.Core; using Umbraco.Core.Configuration; +using Umbraco.Tests.PublishedContent; using Umbraco.Tests.TestHelpers; using Umbraco.Web; using Umbraco.Web.Routing; @@ -11,7 +12,7 @@ using umbraco.BusinessLogic; namespace Umbraco.Tests.ContentStores { [TestFixture] - public class PublishContentStoreTests + public class PublishContentStoreTests { private FakeHttpContextFactory _httpContextFactory; private UmbracoContext _umbracoContext; @@ -74,6 +75,8 @@ namespace Umbraco.Tests.ContentStores _umbracoContext = new UmbracoContext(_httpContextFactory.HttpContext, new ApplicationContext(), new DefaultRoutesCache(false)); + + UmbracoSettings.UseLegacyXmlSchema = false; _umbracoContext.GetXmlDelegate = () => { From df1940a01c04a3129bdd93be12a6ca24cf6b74d7 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sat, 22 Jun 2013 15:07:40 +0200 Subject: [PATCH 09/24] Fix unit test by ensuring config file is copied if it doesn't exist --- .../CodeFirst/StronglyTypedMapperTest.cs | 27 +++++++++++++++- .../LegacyShortStringHelperTests.cs | 27 ++++++++++++++++ src/Umbraco.Tests/LibraryTests.cs | 27 +++++++++++----- .../PublishedContent/DynamicNodeTests.cs | 27 +++++++++++----- .../Routing/NiceUrlProviderTests.cs | 31 ++++++++++++++----- 5 files changed, 117 insertions(+), 22 deletions(-) diff --git a/src/Umbraco.Tests/CodeFirst/StronglyTypedMapperTest.cs b/src/Umbraco.Tests/CodeFirst/StronglyTypedMapperTest.cs index 62fb7cc18e..de2c109af4 100644 --- a/src/Umbraco.Tests/CodeFirst/StronglyTypedMapperTest.cs +++ b/src/Umbraco.Tests/CodeFirst/StronglyTypedMapperTest.cs @@ -1,4 +1,5 @@ -using System.Linq; +using System.IO; +using System.Linq; using System.Text.RegularExpressions; using NUnit.Framework; using Umbraco.Core.Models; @@ -57,11 +58,35 @@ namespace Umbraco.Tests.CodeFirst #region Test setup public override void Initialize() { + var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory); + + var configPath = Path.Combine(currDir.Parent.Parent.FullName, "config"); + if (Directory.Exists(configPath) == false) + Directory.CreateDirectory(configPath); + + var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); + if (System.IO.File.Exists(umbracoSettingsFile) == false) + System.IO.File.Copy( + currDir.Parent.Parent.Parent.GetDirectories("Umbraco.Web.UI") + .First() + .GetDirectories("config").First() + .GetFiles("umbracoSettings.Release.config").First().FullName, + Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"), + true); + + Core.Configuration.UmbracoSettings.SettingsFilePath = Core.IO.IOHelper.MapPath(Core.IO.SystemDirectories.Config + Path.DirectorySeparatorChar, false); + base.Initialize(); } public override void TearDown() { + var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory); + + var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); + if (System.IO.File.Exists(umbracoSettingsFile)) + System.IO.File.Delete(umbracoSettingsFile); + base.TearDown(); } diff --git a/src/Umbraco.Tests/CoreStrings/LegacyShortStringHelperTests.cs b/src/Umbraco.Tests/CoreStrings/LegacyShortStringHelperTests.cs index 20a3ac0c86..fbdd242fe7 100644 --- a/src/Umbraco.Tests/CoreStrings/LegacyShortStringHelperTests.cs +++ b/src/Umbraco.Tests/CoreStrings/LegacyShortStringHelperTests.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.IO; using System.Linq; using System.Text; using NUnit.Framework; @@ -17,8 +18,34 @@ namespace Umbraco.Tests.CoreStrings public void Setup() { _helper = new LegacyShortStringHelper(); + var currDir = new DirectoryInfo(TestHelpers.TestHelper.CurrentAssemblyDirectory); + Directory.CreateDirectory(Path.Combine(currDir.Parent.Parent.FullName, "config")); + File.Copy( + currDir.Parent.Parent.Parent.GetDirectories("Umbraco.Web.UI") + .First() + .GetDirectories("config").First() + .GetFiles("umbracoSettings.Release.config").First().FullName, + Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"), + true); + + Core.Configuration.UmbracoSettings.SettingsFilePath = Core.IO.IOHelper.MapPath(Core.IO.SystemDirectories.Config + Path.DirectorySeparatorChar, false); } + [TearDown] + public void TearDown() + { + var currDir = new DirectoryInfo(TestHelpers.TestHelper.CurrentAssemblyDirectory); + + var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); + if (File.Exists(umbracoSettingsFile)) + File.Delete(umbracoSettingsFile); + + var configPath = Path.Combine(currDir.Parent.Parent.FullName, "config"); + if (Directory.Exists(configPath)) + Directory.Delete(configPath); + } + + #region Cases [TestCase("foo", "foo")] [TestCase(" foo ", "Foo")] diff --git a/src/Umbraco.Tests/LibraryTests.cs b/src/Umbraco.Tests/LibraryTests.cs index 77fe2afe96..d04dd9bf0d 100644 --- a/src/Umbraco.Tests/LibraryTests.cs +++ b/src/Umbraco.Tests/LibraryTests.cs @@ -27,19 +27,32 @@ namespace Umbraco.Tests UmbracoContext.Current = routingContext.UmbracoContext; var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory); - File.Copy( - currDir.Parent.Parent.Parent.GetDirectories("Umbraco.Web.UI") - .First() - .GetDirectories("config").First() - .GetFiles("umbracoSettings.Release.config").First().FullName, - Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"), - true); + + var configPath = Path.Combine(currDir.Parent.Parent.FullName, "config"); + if (Directory.Exists(configPath) == false) + Directory.CreateDirectory(configPath); + + var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); + if (File.Exists(umbracoSettingsFile) == false) + File.Copy( + currDir.Parent.Parent.Parent.GetDirectories("Umbraco.Web.UI") + .First() + .GetDirectories("config").First() + .GetFiles("umbracoSettings.Release.config").First().FullName, + Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"), + true); Core.Configuration.UmbracoSettings.SettingsFilePath = Core.IO.IOHelper.MapPath(Core.IO.SystemDirectories.Config + Path.DirectorySeparatorChar, false); } public override void TearDown() { + var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory); + + var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); + if (File.Exists(umbracoSettingsFile)) + File.Delete(umbracoSettingsFile); + base.TearDown(); UmbracoContext.Current = null; } diff --git a/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs b/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs index 011ed05d0a..37a0301f53 100644 --- a/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs +++ b/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs @@ -30,13 +30,20 @@ namespace Umbraco.Tests.PublishedContent base.Initialize(); //copy the umbraco settings file over var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory); - File.Copy( - currDir.Parent.Parent.Parent.GetDirectories("Umbraco.Web.UI") - .First() - .GetDirectories("config").First() - .GetFiles("umbracoSettings.Release.config").First().FullName, - Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"), - true); + + var configPath = Path.Combine(currDir.Parent.Parent.FullName, "config"); + if (Directory.Exists(configPath) == false) + Directory.CreateDirectory(configPath); + + var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); + if (File.Exists(umbracoSettingsFile) == false) + File.Copy( + currDir.Parent.Parent.Parent.GetDirectories("Umbraco.Web.UI") + .First() + .GetDirectories("config").First() + .GetFiles("umbracoSettings.Release.config").First().FullName, + Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"), + true); UmbracoSettings.SettingsFilePath = IOHelper.MapPath(SystemDirectories.Config + Path.DirectorySeparatorChar, false); @@ -76,6 +83,12 @@ namespace Umbraco.Tests.PublishedContent public override void TearDown() { + var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory); + + var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); + if (File.Exists(umbracoSettingsFile)) + File.Delete(umbracoSettingsFile); + base.TearDown(); } diff --git a/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs b/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs index a64de740af..838a6177db 100644 --- a/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs +++ b/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs @@ -18,17 +18,34 @@ namespace Umbraco.Tests.Routing base.Initialize(); var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory); - File.Copy( - currDir.Parent.Parent.Parent.GetDirectories("Umbraco.Web.UI") - .First() - .GetDirectories("config").First() - .GetFiles("umbracoSettings.Release.config").First().FullName, - Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"), - true); + + var configPath = Path.Combine(currDir.Parent.Parent.FullName, "config"); + if (Directory.Exists(configPath) == false) + Directory.CreateDirectory(configPath); + + var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); + if (File.Exists(umbracoSettingsFile) == false) + File.Copy( + currDir.Parent.Parent.Parent.GetDirectories("Umbraco.Web.UI") + .First() + .GetDirectories("config").First() + .GetFiles("umbracoSettings.Release.config").First().FullName, + Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"), + true); SettingsForTests.SettingsFilePath = Core.IO.IOHelper.MapPath(Core.IO.SystemDirectories.Config + Path.DirectorySeparatorChar, false); } + + public void TearDown() + { + var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory); + + var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); + if (File.Exists(umbracoSettingsFile)) + File.Delete(umbracoSettingsFile); + } + protected override void FreezeResolution() { SiteDomainHelperResolver.Current = new SiteDomainHelperResolver(new SiteDomainHelper()); From 7139e302962c6f963dd4e13ee308e875131b5b51 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sat, 22 Jun 2013 15:53:10 +0200 Subject: [PATCH 10/24] Don't delete the config file directory, it can't sometimes For now, don't delete umbracoSettings.config either, it makes a lot of tests fail --- .../CoreStrings/LegacyShortStringHelperTests.cs | 14 ++++++-------- src/Umbraco.Tests/LibraryTests.cs | 10 ++++++---- .../PublishedContent/DynamicNodeTests.cs | 8 ++++---- src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs | 10 ++++++---- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/Umbraco.Tests/CoreStrings/LegacyShortStringHelperTests.cs b/src/Umbraco.Tests/CoreStrings/LegacyShortStringHelperTests.cs index fbdd242fe7..ba88bf447b 100644 --- a/src/Umbraco.Tests/CoreStrings/LegacyShortStringHelperTests.cs +++ b/src/Umbraco.Tests/CoreStrings/LegacyShortStringHelperTests.cs @@ -34,15 +34,13 @@ namespace Umbraco.Tests.CoreStrings [TearDown] public void TearDown() { - var currDir = new DirectoryInfo(TestHelpers.TestHelper.CurrentAssemblyDirectory); - - var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); - if (File.Exists(umbracoSettingsFile)) - File.Delete(umbracoSettingsFile); + //TODO: Deleting the umbracoSettings.config file makes a lot of tests fail - var configPath = Path.Combine(currDir.Parent.Parent.FullName, "config"); - if (Directory.Exists(configPath)) - Directory.Delete(configPath); + //var currDir = new DirectoryInfo(TestHelpers.TestHelper.CurrentAssemblyDirectory); + + //var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); + //if (File.Exists(umbracoSettingsFile)) + // File.Delete(umbracoSettingsFile); } diff --git a/src/Umbraco.Tests/LibraryTests.cs b/src/Umbraco.Tests/LibraryTests.cs index d04dd9bf0d..fa365e8b0b 100644 --- a/src/Umbraco.Tests/LibraryTests.cs +++ b/src/Umbraco.Tests/LibraryTests.cs @@ -47,11 +47,13 @@ namespace Umbraco.Tests public override void TearDown() { - var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory); + //TODO: Deleting the umbracoSettings.config file makes a lot of tests fail - var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); - if (File.Exists(umbracoSettingsFile)) - File.Delete(umbracoSettingsFile); + //var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory); + + //var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); + //if (File.Exists(umbracoSettingsFile)) + // File.Delete(umbracoSettingsFile); base.TearDown(); UmbracoContext.Current = null; diff --git a/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs b/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs index 37a0301f53..be51860e3f 100644 --- a/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs +++ b/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs @@ -83,11 +83,11 @@ namespace Umbraco.Tests.PublishedContent public override void TearDown() { - var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory); + //var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory); - var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); - if (File.Exists(umbracoSettingsFile)) - File.Delete(umbracoSettingsFile); + //var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); + //if (File.Exists(umbracoSettingsFile)) + // File.Delete(umbracoSettingsFile); base.TearDown(); } diff --git a/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs b/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs index 838a6177db..8d58c386b2 100644 --- a/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs +++ b/src/Umbraco.Tests/Routing/NiceUrlProviderTests.cs @@ -39,11 +39,13 @@ namespace Umbraco.Tests.Routing public void TearDown() { - var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory); + //TODO: Deleting the umbracoSettings.config file makes a lot of tests fail - var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); - if (File.Exists(umbracoSettingsFile)) - File.Delete(umbracoSettingsFile); + //var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory); + + //var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); + //if (File.Exists(umbracoSettingsFile)) + // File.Delete(umbracoSettingsFile); } protected override void FreezeResolution() From e93c910347c6321594bc852f7c4a1b2f6c9b319c Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sat, 22 Jun 2013 17:32:22 +0200 Subject: [PATCH 11/24] Fix more unit tests --- .../PublishedContent/DynamicNodeTests.cs | 2 ++ .../DynamicPublishedContentTests.cs | 23 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs b/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs index be51860e3f..a8db72ad5e 100644 --- a/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs +++ b/src/Umbraco.Tests/PublishedContent/DynamicNodeTests.cs @@ -83,6 +83,8 @@ namespace Umbraco.Tests.PublishedContent public override void TearDown() { + //TODO: Deleting the umbracoSettings.config file makes a lot of tests fail + //var currDir = new DirectoryInfo(TestHelper.CurrentAssemblyDirectory); //var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); diff --git a/src/Umbraco.Tests/PublishedContent/DynamicPublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/DynamicPublishedContentTests.cs index fdf097472d..0bf8784ab0 100644 --- a/src/Umbraco.Tests/PublishedContent/DynamicPublishedContentTests.cs +++ b/src/Umbraco.Tests/PublishedContent/DynamicPublishedContentTests.cs @@ -1,3 +1,4 @@ +using System.IO; using System.Linq; using NUnit.Framework; using Umbraco.Core; @@ -6,6 +7,7 @@ using Umbraco.Web; using Umbraco.Web.Models; using Umbraco.Web.PublishedCache; using Umbraco.Web.PublishedCache.XmlPublishedCache; +using File = Umbraco.Core.Models.File; namespace Umbraco.Tests.PublishedContent { @@ -13,9 +15,26 @@ namespace Umbraco.Tests.PublishedContent public class DynamicPublishedContentTests : DynamicDocumentTestsBase { public override void Initialize() - { - base.Initialize(); + { + var currDir = new DirectoryInfo(TestHelpers.TestHelper.CurrentAssemblyDirectory); + var configPath = Path.Combine(currDir.Parent.Parent.FullName, "config"); + if (Directory.Exists(configPath) == false) + Directory.CreateDirectory(configPath); + + var umbracoSettingsFile = Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"); + if (System.IO.File.Exists(umbracoSettingsFile) == false) + System.IO.File.Copy( + currDir.Parent.Parent.Parent.GetDirectories("Umbraco.Web.UI") + .First() + .GetDirectories("config").First() + .GetFiles("umbracoSettings.Release.config").First().FullName, + Path.Combine(currDir.Parent.Parent.FullName, "config", "umbracoSettings.config"), + true); + + Core.Configuration.UmbracoSettings.SettingsFilePath = Core.IO.IOHelper.MapPath(Core.IO.SystemDirectories.Config + Path.DirectorySeparatorChar, false); + + base.Initialize(); } public override void TearDown() From 3daf936623c6353cb9b336fe43119302e0a399d5 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sun, 23 Jun 2013 14:52:45 +0200 Subject: [PATCH 12/24] Remove hgignore files --- .hgignore | 70 ------------------------------------------------------- .hgtags | 34 --------------------------- 2 files changed, 104 deletions(-) delete mode 100644 .hgignore delete mode 100644 .hgtags diff --git a/.hgignore b/.hgignore deleted file mode 100644 index fb3237c506..0000000000 --- a/.hgignore +++ /dev/null @@ -1,70 +0,0 @@ -syntax: regexp -^src/packages/(?!repositories.config$) -web.Template.[a-zA-Z0-9]*.Debug.config - -syntax: glob -*.obj -*.pdb -*.user -*.aps -*.pch -*.vspscc -[Bb]in -[Db]ebug*/ -obj/ -[Rr]elease*/ -_ReSharper*/ -_NCrunch_*/ -*.ncrunchsolution -*.ncrunchsolution.user -*.ncrunchproject -*.crunchsolution.cache -[Tt]est[Rr]esult* -[Bb]uild[Ll]og.* -*.[Pp]ublish.xml -*.suo -[sS]ource -[sS]andbox -umbraco.config -*.vs10x -App_Data\TEMP\* -umbraco\presentation\umbraco\plugins\* -umbraco\presentation\usercontrols\* -umbraco\presentation\scripts\* -umbraco\presentation\fonts\* -umbraco\presentation\css\* - -src\Umbraco.Web.UI\[Cc]ss\* -src\Umbraco.Web.UI\App_Code\* -src\Umbraco.Web.UI\App_Data\* -src\Umbraco.Tests\App_Data\* -src\Umbraco.Web.UI\[Mm]edia\* -src\Umbraco.Web.UI\[Mm]aster[Pp]ages\* -src\Umbraco.Web.UI\[Mm]acro[Ss]cripts\* -src\Umbraco.Web.UI\[Xx]slt\* -src\Umbraco.Web.UI\[Ii]mages\* -src\Umbraco.Web.UI\[Ss]cripts\* -src\Umbraco.Web.UI\Web.*.config.transformed - -umbraco\presentation\umbraco\plugins\uComponents\uComponentsInstaller.ascx -umbraco\presentation\packages\uComponents\MultiNodePicker\CustomTreeService.asmx -_BuildOutput/* -*.ncrunchsolution -build/UmbracoCms.AllBinaries*zip -build/UmbracoCms.WebPI*zip -build/UmbracoCms*zip -build/*.nupkg -src/Umbraco.Tests/config/applications.config -src/Umbraco.Tests/config/trees.config -src/Umbraco.Web.UI/web.config -*.orig -src/Umbraco.Tests/config/404handlers.config -src/Umbraco.Web.UI/Views/*.cshtml -src/Umbraco.Web.UI/Views/*.vbhtml -src/Umbraco.Tests/config/umbracoSettings.config -src/Umbraco.Web.UI/App_Plugins/* -src/Umbraco.Web.UI/Views/* -src/packages/ - -src\Umbraco.Web.UI\[W]eb.config -*.transformed \ No newline at end of file diff --git a/.hgtags b/.hgtags deleted file mode 100644 index 4bd4dc34e0..0000000000 --- a/.hgtags +++ /dev/null @@ -1,34 +0,0 @@ -d0aba247db91d1b70c39c6397b965ca370a67497 Sprint-Juno-A -0b8f67be2ca8faf008151d87f232c698de69e735 Release-4.5.0 -5960c073250926d202861a09472f5f334da6e283 Sprint-Juno-B -f15d4ff81a8368e9d42788f7e0ae726f7a70a3b1 Release-4.0.3 -283065df4d3c27245267709dd2644a479c4f62a5 Release-4.0.4.2 -ffc34b23e1a03785e4098afa4290d8c03cf10115 Release-4.5.2 -d03fcffb8834a9583a56813bb44b6abbd9f042cc Release-4.6.0 -1809f7b2593270c192cd47bdcfdb392100686f79 4.7.2 -488779dec0ceb1d2874bcef906241b919325c904 4.8.0-beta -096f20bb0575d6199f20fcb3147b63554e765a74 Release-4.8.0 -8f8a203857886b373148af29edd57460a42940be Release-4.8.1 -de73e687ddf6086ed52b6554676c1632865d07f2 Release-4.9.0 -8d7d8609e2e4b971da99cd97f72132ce85ce3333 Release-4.9.1 -f6da531fbb4c251ff61d314e2a7effb13c71e74a Release-4.10.0 -20e4dff821d8ac2527a5353618fa1a23ea1d8b34 Release-4.11.0 -7f827760cb49d749616859f528d19dde64807947 Release-4.11.1 -7f827760cb49d749616859f528d19dde64807947 Release-4.11.1 -6eb5f2fb5a88aa29ea544499df9160a1b31b5638 Release-4.11.1 -73711b806a4044dbf0d7d7c095ddfdda23b09932 4.11.2 -73711b806a4044dbf0d7d7c095ddfdda23b09932 4.11.2 -0000000000000000000000000000000000000000 4.11.2 -73711b806a4044dbf0d7d7c095ddfdda23b09932 Release-4.11.2 -77db220b89e166b3c0736ed321ecfd6416cddbcd Release-4.11.2.1 -54cde33b809dcb3a1f7e7ae0d5375f6dd0d89c8d Release-4.11.2.2 -ff3bb24ea0c915878396a6ae27f1ff164e8ac150 Release-6.0.0-beta -56015ac26f5ab60e3c61b1d09075297b660afa07 Release-6.0.0-RC -1719fbd857f28b376639ac2aa0abada0ef2e7560 Release-6.0.0 -e02f5aebb87e3f07d27376647756caa9762931d8 Release-4.11.4 -14338b0ab1738fbd8987677ecdb9a73d79fc229d release-4.11.6 -ce47176bc6b9298741783e20f1fe2672c811f744 release-4.11.7 -b247b35d821144849f551e02da8ba719f91d5fb0 Release-6.0.2 -aed55cba29009ad3db48880a7cfb66407ce9805f release-6.0.3 -0dee9964687ea51ea797984cf7cce3655d6a6558 release-6.0.4 -953c466faf8fcfd6e85e06ccd04c2346bbdb88a8 release-6.0.6 From 507c6c23b99e811bba2c278d48ca06248f3eac12 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Sun, 23 Jun 2013 14:57:53 +0200 Subject: [PATCH 13/24] If you never had VS2010 installed, the build now works, checking if the Publishing Tasks dll exists now --- src/umbraco.presentation.targets | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/umbraco.presentation.targets b/src/umbraco.presentation.targets index 6bceb13987..79eb7c494d 100644 --- a/src/umbraco.presentation.targets +++ b/src/umbraco.presentation.targets @@ -39,17 +39,22 @@ + + + $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\Web\Microsoft.Web.Publishing.Tasks.dll + + + + $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v11.0\Web\Microsoft.Web.Publishing.Tasks.dll + - - + +