Makes sure we can have nightlies for non-pre-releases as well

.gitignore

@@ -129,3 +129,4 @@ src/*.boltdata/
 /src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.front.js
 src/umbraco.sln.ide/*
 build/UmbracoCms.*/
+src/.vs/

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<ApplicationContext>("The migration for version: '" + currentVersion + " has not been executed, there is no record in the database");
+                                ProfilingLogger.Logger.Debug<ApplicationContext>(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<ApplicationContext>("CurrentVersion different from configStatus: '" + currentVersion + "','" + configStatus + "'");
+                        ProfilingLogger.Logger.Debug<ApplicationContext>(string.Format("CurrentVersion different from configStatus: '{0}','{1}'", currentVersion.ToSemanticString(), configStatus));
                     }
 
                     return ok;

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(); }
         }
 
         /// <summary>

src/Umbraco.Core/CoreBootManager.cs

@@ -77,7 +77,7 @@ namespace Umbraco.Core
             _profilingLogger = new ProfilingLogger(LoggerResolver.Current.Logger, ProfilerResolver.Current.Profiler);
 
             _timer = _profilingLogger.TraceDuration<CoreBootManager>(
-                "Umbraco application (" + UmbracoVersion.GetSemanticVersion() + ") starting",
+                string.Format("Umbraco application ({0}) starting", UmbracoVersion.GetSemanticVersion().ToSemanticString()),
                 "Umbraco application startup complete");
 
             CreateApplicationCache();

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("-+", "+");
+        }
+    }
+}

src/Umbraco.Core/Umbraco.Core.csproj

@@ -435,6 +435,7 @@
     <Compile Include="Security\BackOfficeUserManager.cs" />
     <Compile Include="Security\BackOfficeUserStore.cs" />
     <Compile Include="Security\MembershipPasswordHasher.cs" />
+    <Compile Include="SemVersionExtensions.cs" />
     <Compile Include="ServiceProviderExtensions.cs" />
     <Compile Include="IO\ResizedImage.cs" />
     <Compile Include="IO\UmbracoMediaFile.cs" />

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<IMigrationEntryService>();
             migrationEntryService.Setup(x => x.FindEntry(It.IsAny<string>(), It.IsAny<SemVersion>()))
@@ -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<IMigrationEntryService>();
             migrationEntryService.Setup(x => x.FindEntry(It.IsAny<string>(), It.IsAny<SemVersion>()))

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";
 

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();
             }
         }
 

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);

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);

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