From b0ccb040a16a4065cf39c1c1b4fb878f8850f8ce Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Tue, 7 Jul 2015 10:12:34 +0200 Subject: [PATCH] Makes sure we can have nightlies for non-pre-releases as well --- .gitignore | 1 + src/Umbraco.Core/ApplicationContext.cs | 4 ++-- src/Umbraco.Core/Configuration/GlobalSettings.cs | 4 ++-- src/Umbraco.Core/CoreBootManager.cs | 2 +- src/Umbraco.Core/SemVersionExtensions.cs | 12 ++++++++++++ src/Umbraco.Core/Umbraco.Core.csproj | 1 + src/Umbraco.Tests/ApplicationContextTests.cs | 4 ++-- src/Umbraco.Tests/Routing/UmbracoModuleTests.cs | 2 +- .../TestHelpers/BaseDatabaseFactoryTest.cs | 2 +- src/Umbraco.Web/Editors/BackOfficeController.cs | 2 +- .../Install/InstallSteps/SetUmbracoVersionStep.cs | 2 +- .../umbraco/dialogs/about.aspx.cs | 3 ++- 12 files changed, 27 insertions(+), 12 deletions(-) create mode 100644 src/Umbraco.Core/SemVersionExtensions.cs diff --git a/.gitignore b/.gitignore index 0073675d82..ebee9f6ae9 100644 --- a/.gitignore +++ b/.gitignore @@ -129,3 +129,4 @@ src/*.boltdata/ /src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.front.js src/umbraco.sln.ide/* build/UmbracoCms.*/ +src/.vs/ diff --git a/src/Umbraco.Core/ApplicationContext.cs b/src/Umbraco.Core/ApplicationContext.cs index 7b9a6a6b2b..b48d4eb5e9 100644 --- a/src/Umbraco.Core/ApplicationContext.cs +++ b/src/Umbraco.Core/ApplicationContext.cs @@ -286,14 +286,14 @@ namespace Umbraco.Core { //we haven't executed this migration in this environment, so even though the config versions match, // this db has not been updated. - ProfilingLogger.Logger.Debug("The migration for version: '" + currentVersion + " has not been executed, there is no record in the database"); + ProfilingLogger.Logger.Debug(string.Format("The migration for version: '{0} has not been executed, there is no record in the database", currentVersion.ToSemanticString())); ok = false; } } } else { - ProfilingLogger.Logger.Debug("CurrentVersion different from configStatus: '" + currentVersion + "','" + configStatus + "'"); + ProfilingLogger.Logger.Debug(string.Format("CurrentVersion different from configStatus: '{0}','{1}'", currentVersion.ToSemanticString(), configStatus)); } return ok; diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs index 329fa598c1..2c3855727b 100644 --- a/src/Umbraco.Core/Configuration/GlobalSettings.cs +++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs @@ -429,7 +429,7 @@ namespace Umbraco.Core.Configuration try { string configStatus = ConfigurationStatus; - string currentVersion = UmbracoVersion.GetSemanticVersion().ToString(); + string currentVersion = UmbracoVersion.GetSemanticVersion().ToSemanticString(); if (currentVersion != configStatus) @@ -596,7 +596,7 @@ namespace Umbraco.Core.Configuration [Obsolete("Use Umbraco.Core.Configuration.UmbracoVersion.Current instead", false)] public static string CurrentVersion { - get { return UmbracoVersion.GetSemanticVersion().ToString(); } + get { return UmbracoVersion.GetSemanticVersion().ToSemanticString(); } } /// diff --git a/src/Umbraco.Core/CoreBootManager.cs b/src/Umbraco.Core/CoreBootManager.cs index b188bf2232..998bda32f2 100644 --- a/src/Umbraco.Core/CoreBootManager.cs +++ b/src/Umbraco.Core/CoreBootManager.cs @@ -77,7 +77,7 @@ namespace Umbraco.Core _profilingLogger = new ProfilingLogger(LoggerResolver.Current.Logger, ProfilerResolver.Current.Profiler); _timer = _profilingLogger.TraceDuration( - "Umbraco application (" + UmbracoVersion.GetSemanticVersion() + ") starting", + string.Format("Umbraco application ({0}) starting", UmbracoVersion.GetSemanticVersion().ToSemanticString()), "Umbraco application startup complete"); CreateApplicationCache(); diff --git a/src/Umbraco.Core/SemVersionExtensions.cs b/src/Umbraco.Core/SemVersionExtensions.cs new file mode 100644 index 0000000000..f45aacdfc2 --- /dev/null +++ b/src/Umbraco.Core/SemVersionExtensions.cs @@ -0,0 +1,12 @@ +using Semver; + +namespace Umbraco.Core +{ + public static class SemVersionExtensions + { + public static string ToSemanticString(this SemVersion semVersion) + { + return semVersion.ToString().Replace("--", "-").Replace("-+", "+"); + } + } +} \ No newline at end of file diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 4058970401..e73ff5bd15 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -435,6 +435,7 @@ + diff --git a/src/Umbraco.Tests/ApplicationContextTests.cs b/src/Umbraco.Tests/ApplicationContextTests.cs index 60eecce81d..61dabf6e3b 100644 --- a/src/Umbraco.Tests/ApplicationContextTests.cs +++ b/src/Umbraco.Tests/ApplicationContextTests.cs @@ -20,7 +20,7 @@ namespace Umbraco.Tests [Test] public void Is_Configured() { - ConfigurationManager.AppSettings.Set("umbracoConfigurationStatus", UmbracoVersion.GetSemanticVersion().ToString()); + ConfigurationManager.AppSettings.Set("umbracoConfigurationStatus", UmbracoVersion.GetSemanticVersion().ToSemanticString()); var migrationEntryService = new Mock(); migrationEntryService.Setup(x => x.FindEntry(It.IsAny(), It.IsAny())) @@ -42,7 +42,7 @@ namespace Umbraco.Tests [Test] public void Is_Not_Configured_By_Migration_Not_Found() { - ConfigurationManager.AppSettings.Set("umbracoConfigurationStatus", UmbracoVersion.GetSemanticVersion().ToString()); + ConfigurationManager.AppSettings.Set("umbracoConfigurationStatus", UmbracoVersion.GetSemanticVersion().ToSemanticString()); var migrationEntryService = new Mock(); migrationEntryService.Setup(x => x.FindEntry(It.IsAny(), It.IsAny())) diff --git a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs index 2eb59aba64..3c3686aded 100644 --- a/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs +++ b/src/Umbraco.Tests/Routing/UmbracoModuleTests.cs @@ -28,7 +28,7 @@ namespace Umbraco.Tests.Routing //create the module _module = new UmbracoModule(); - SettingsForTests.ConfigurationStatus = UmbracoVersion.GetSemanticVersion().ToString(); + SettingsForTests.ConfigurationStatus = UmbracoVersion.GetSemanticVersion().ToSemanticString(); //SettingsForTests.ReservedPaths = "~/umbraco,~/install/"; //SettingsForTests.ReservedUrls = "~/config/splashes/booting.aspx,~/install/default.aspx,~/config/splashes/noNodes.aspx,~/VSEnterpriseHelper.axd"; diff --git a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs index 4c64c5eaf2..621837ee36 100644 --- a/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs +++ b/src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs @@ -97,7 +97,7 @@ namespace Umbraco.Tests.TestHelpers InitializeDatabase(); //ensure the configuration matches the current version for tests - SettingsForTests.ConfigurationStatus = UmbracoVersion.GetSemanticVersion().ToString(); + SettingsForTests.ConfigurationStatus = UmbracoVersion.GetSemanticVersion().ToSemanticString(); } } diff --git a/src/Umbraco.Web/Editors/BackOfficeController.cs b/src/Umbraco.Web/Editors/BackOfficeController.cs index 46dc4df910..0be884f5b4 100644 --- a/src/Umbraco.Web/Editors/BackOfficeController.cs +++ b/src/Umbraco.Web/Editors/BackOfficeController.cs @@ -617,7 +617,7 @@ namespace Umbraco.Web.Editors {"assemblyVersion", UmbracoVersion.AssemblyVersion} }; - var version = UmbracoVersion.GetSemanticVersion().ToString(); + var version = UmbracoVersion.GetSemanticVersion().ToSemanticString(); app.Add("version", version); app.Add("cdf", ClientDependency.Core.Config.ClientDependencySettings.Instance.Version); diff --git a/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs b/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs index d52579772c..b8be5b7a22 100644 --- a/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs +++ b/src/Umbraco.Web/Install/InstallSteps/SetUmbracoVersionStep.cs @@ -34,7 +34,7 @@ namespace Umbraco.Web.Install.InstallSteps DistributedCache.Instance.RefreshAllPageCache(); // Update configurationStatus - GlobalSettings.ConfigurationStatus = UmbracoVersion.GetSemanticVersion().ToString(); + GlobalSettings.ConfigurationStatus = UmbracoVersion.GetSemanticVersion().ToSemanticString(); // Update ClientDependency version var clientDependencyConfig = new ClientDependencyConfiguration(_applicationContext.ProfilingLogger.Logger); diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/about.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/about.aspx.cs index 37e1f6eca9..a30cb1eb7b 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/about.aspx.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/about.aspx.cs @@ -1,5 +1,6 @@ using System; using System.Globalization; +using Umbraco.Core; using Umbraco.Core.Configuration; namespace umbraco.dialogs @@ -14,7 +15,7 @@ namespace umbraco.dialogs { // Put user code to initialize the page here thisYear.Text = DateTime.Now.Year.ToString(CultureInfo.InvariantCulture); - version.Text = UmbracoVersion.GetSemanticVersion().ToString(); + version.Text = UmbracoVersion.GetSemanticVersion().ToSemanticString(); } #region Web Form Designer generated code