From 89ae3bc143f816ceb9208e585b696e9d64695f0c Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Wed, 27 Feb 2013 13:51:58 -0100 Subject: [PATCH 1/2] Add RevertToCleanInstall.bat to 4.11.5 too, it's handy. --- build/RevertToCleanInstall.bat | 128 +++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 build/RevertToCleanInstall.bat diff --git a/build/RevertToCleanInstall.bat b/build/RevertToCleanInstall.bat new file mode 100644 index 0000000000..6c391386cd --- /dev/null +++ b/build/RevertToCleanInstall.bat @@ -0,0 +1,128 @@ +@ECHO OFF + +:choice +set /P c=WARNING! Are you sure you want to continue, this will remove all package files, view files, sqlce database, etc... Press 'Y' to auto-remove all files/folders, 'N' to cancel or 'C' to prompt for each folder removal? +if /I "%c%" EQU "C" goto :prompt +if /I "%c%" EQU "Y" goto :auto +if /I "%c%" EQU "N" goto :exit +goto :choice + + +:prompt + +echo Current folder: %CD% + +echo Removing sqlce database +del ..\src\Umbraco.Web.UI\App_Data\Umbraco.sdf + +echo Resetting installedPackages.config +echo ^^^ >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config + +echo Removing plugin cache files +del ..\src\Umbraco.Web.UI\App_Data\TEMP\PluginCache\*.* + +echo Removing cache files and examine index +del ..\src\Umbraco.Web.UI\App_Data\TEMP\*.* + +echo Removing log files +del ..\src\Umbraco.Web.UI\App_Data\Logs\*.* + +echo Removing packages +del ..\src\Umbraco.Web.UI\App_Data\packages\*.* + +echo Removing previews +del ..\src\Umbraco.Web.UI\App_Data\preview\*.* + +echo Removing app code files (typically added by starterkits) +del ..\src\Umbraco.Web.UI\App_Code\*.* + +echo Removing xslt files +del ..\src\Umbraco.Web.UI\xslt\*.* + +echo Removing user control files +del ..\src\Umbraco.Web.UI\UserControls\*.* + +echo Removing masterpage files +del ..\src\Umbraco.Web.UI\masterpages\*.* + +echo Removing view files +del ..\src\Umbraco.Web.UI\Views\*.* + +echo Removing razor files +del ..\src\Umbraco.Web.UI\macroScripts\*.* + +echo Removing media files +del ..\src\Umbraco.Web.UI\media\*.* + +echo Removing script files +del ..\src\Umbraco.Web.UI\scripts\*.* + +echo Removing css files +del ..\src\Umbraco.Web.UI\css\*.* + +echo "Umbraco install reverted to clean install" +pause +exit + + + +:auto + +echo Current folder: %CD% + +echo Removing sqlce database +del ..\src\Umbraco.Web.UI\App_Data\Umbraco.sdf + +echo Resetting installedPackages.config +echo ^^^ >..\src\Umbraco.Web.UI\App_Data\packages\installed\installedPackages.config + +echo Removing plugin cache files +FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\TEMP\PluginCache\*.*) DO DEL %%A + +echo Removing cache files and examine index +FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\TEMP\*.*) DO DEL %%A + +echo Removing log files +FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\Logs\*.*) DO DEL %%A + +echo Removing packages +FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\packages\*.*) DO DEL %%A + +echo Removing previews +FOR %%A IN (..\src\Umbraco.Web.UI\App_Data\preview\*.*) DO DEL %%A + +echo Removing app code files (typically added by starterkits) +FOR %%A IN (..\src\Umbraco.Web.UI\App_Code\*.*) DO DEL %%A + +echo Removing xslt files +FOR %%A IN (..\src\Umbraco.Web.UI\xslt\*.*) DO DEL %%A + +echo Removing masterpage files +FOR %%A IN (..\src\Umbraco.Web.UI\masterpages\*.*) DO DEL %%A + +echo Removing user control files +FOR %%A IN (..\src\Umbraco.Web.UI\usercontrols\*.*) DO DEL %%A + +echo Removing view files +FOR %%A IN (..\src\Umbraco.Web.UI\Views\*.*) DO DEL %%A + +echo Removing razor files +FOR %%A IN (..\src\Umbraco.Web.UI\macroScripts\*.*) DO DEL %%A + +echo Removing media files +FOR %%A IN (..\src\Umbraco.Web.UI\media\*.*) DO DEL %%A + +echo Removing script files +FOR %%A IN (..\src\Umbraco.Web.UI\scripts\*.*) DO DEL %%A + +echo Removing css files +FOR %%A IN (..\src\Umbraco.Web.UI\css\*.*) DO DEL %%A + +echo "Umbraco install reverted to clean install" +pause +exit + + + +:exit +exit \ No newline at end of file From 36c66e676a77177aa3b2d5372baf4e78f8a04648 Mon Sep 17 00:00:00 2001 From: Shannon Deminick Date: Wed, 27 Feb 2013 22:35:27 +0600 Subject: [PATCH 2/2] Fixed unit tests --- src/Umbraco.Core/Configuration/GlobalSettings.cs | 11 ++++++++++- src/Umbraco.Tests/GlobalSettingsTests.cs | 8 +++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs index 22e69e0100..e5a0f0928c 100644 --- a/src/Umbraco.Core/Configuration/GlobalSettings.cs +++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs @@ -38,6 +38,14 @@ namespace Umbraco.Core.Configuration #endregion + /// + /// used for unit tests + /// + internal static void ResetCache() + { + _reservedUrlsCache = null; + } + /// /// Gets the reserved urls from web.config. /// @@ -69,7 +77,8 @@ namespace Umbraco.Core.Configuration var staticReservedPaths = "~/app_plugins/,~/install/,"; //always add the umbraco path to the list - if (ConfigurationManager.AppSettings.ContainsKey("umbracoPath")) + if (ConfigurationManager.AppSettings.ContainsKey("umbracoPath") + && !ConfigurationManager.AppSettings["umbracoPath"].IsNullOrWhiteSpace()) { staticReservedPaths += ConfigurationManager.AppSettings["umbracoPath"].EnsureEndsWith(','); } diff --git a/src/Umbraco.Tests/GlobalSettingsTests.cs b/src/Umbraco.Tests/GlobalSettingsTests.cs index 5d57679b61..1298a5e719 100644 --- a/src/Umbraco.Tests/GlobalSettingsTests.cs +++ b/src/Umbraco.Tests/GlobalSettingsTests.cs @@ -23,10 +23,12 @@ namespace Umbraco.Tests public override void TearDown() { + //reset the app config + ConfigurationManager.AppSettings.Set("umbracoReservedPaths", ""); + ConfigurationManager.AppSettings.Set("umbracoReservedUrls", ""); + Umbraco.Core.Configuration.GlobalSettings.ResetCache(); base.TearDown(); - //reset the app config - ConfigurationManager.AppSettings.Set("umbracoReservedPaths", ""); - ConfigurationManager.AppSettings.Set("umbracoReservedUrls", ""); + } [TestCase("/umbraco/umbraco.aspx")]