From 4891bbf9a431c2fce8a765b52e8435c723142ca9 Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 12 May 2016 14:18:34 +0200 Subject: [PATCH] Update UmbracoVersion --- build/Build.proj | 692 +++++++++--------- .../Configuration/UmbracoVersion.cs | 17 +- 2 files changed, 354 insertions(+), 355 deletions(-) diff --git a/build/Build.proj b/build/Build.proj index 9413b49d15..64a0ec3548 100644 --- a/build/Build.proj +++ b/build/Build.proj @@ -1,347 +1,347 @@ - - - - - - ..\MSBuildCommunityTasks - ..\UmbracoMSBuildTasks - - - - - - - - - - - - - - - - b.ToString("x2")))); - } - } - } - } - } - ]]> - - - - - - - - - - .$(BUILD_NUMBER) - - - .$(BUILD_RELEASE) - - - .$(BUILD_RELEASE)-$(BUILD_COMMENT) - - - .$(BUILD_RELEASE)-$(BUILD_NIGHTLY) - - - .$(BUILD_RELEASE)-$(BUILD_COMMENT)-$(BUILD_NIGHTLY) - - - - Release - _BuildOutput\ - UmbracoCms$(DECIMAL_BUILD_NUMBER).zip - UmbracoCms.AllBinaries$(DECIMAL_BUILD_NUMBER).zip - UmbracoCms.WebPI$(DECIMAL_BUILD_NUMBER).zip - False - ..\..\build\$(BuildFolder) - $(MSBuildProjectDirectory)\$(BuildFolder) - $(BuildFolder)bin\ - $(BuildFolder)WebApp\ - $(BuildFolder)WebPi\ - $(BuildFolder)Configs\ - $(BuildFolderRelativeToProjects)bin\ - $(BuildFolderAbsolutePath)bin\ - $(BuildFolderRelativeToProjects)WebApp\ - $(BuildFolderAbsolutePath)WebApp\ - $(BuildFolderRelativeToProjects)WebPi\ - $(BuildFolderAbsolutePath)WebPi\ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(BUILD_RELEASE) - $(BUILD_RELEASE)-$(BUILD_COMMENT) - $(BUILD_RELEASE)-$(BUILD_NIGHTLY) - $(BUILD_RELEASE)-$(BUILD_COMMENT)-$(BUILD_NIGHTLY) - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + ..\MSBuildCommunityTasks + ..\UmbracoMSBuildTasks + + + + + + + + + + + + + + + + b.ToString("x2")))); + } + } + } + } + } + ]]> + + + + + + + + + + .$(BUILD_NUMBER) + + + .$(BUILD_RELEASE) + + + .$(BUILD_RELEASE)-$(BUILD_COMMENT) + + + .$(BUILD_RELEASE)-$(BUILD_NIGHTLY) + + + .$(BUILD_RELEASE)-$(BUILD_COMMENT)-$(BUILD_NIGHTLY) + + + + Release + _BuildOutput\ + UmbracoCms$(DECIMAL_BUILD_NUMBER).zip + UmbracoCms.AllBinaries$(DECIMAL_BUILD_NUMBER).zip + UmbracoCms.WebPI$(DECIMAL_BUILD_NUMBER).zip + False + ..\..\build\$(BuildFolder) + $(MSBuildProjectDirectory)\$(BuildFolder) + $(BuildFolder)bin\ + $(BuildFolder)WebApp\ + $(BuildFolder)WebPi\ + $(BuildFolder)Configs\ + $(BuildFolderRelativeToProjects)bin\ + $(BuildFolderAbsolutePath)bin\ + $(BuildFolderRelativeToProjects)WebApp\ + $(BuildFolderAbsolutePath)WebApp\ + $(BuildFolderRelativeToProjects)WebPi\ + $(BuildFolderAbsolutePath)WebPi\ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(BUILD_RELEASE) + $(BUILD_RELEASE)-$(BUILD_COMMENT) + $(BUILD_RELEASE)-$(BUILD_NIGHTLY) + $(BUILD_RELEASE)-$(BUILD_COMMENT)-$(BUILD_NIGHTLY) + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs index 07f107d203..07a3307a77 100644 --- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs +++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs @@ -6,7 +6,9 @@ namespace Umbraco.Core.Configuration { public class UmbracoVersion { - private static readonly Version Version = new Version("8.0.0"); + // BEWARE! + // This class is parsed and updated by the build scripts. + // Do NOT modify it unless you understand what you are doing. /// /// Gets the current version of Umbraco. @@ -15,27 +17,24 @@ namespace Umbraco.Core.Configuration /// /// CURRENT UMBRACO VERSION ID. /// - public static Version Current - { - get { return Version; } - } + public static Version Current { get; } = new Version("8.0.0"); /// /// Gets the version comment (like beta or RC). /// /// The version comment. - public static string CurrentComment { get { return "beta"; } } + public static string CurrentComment => "alpha0001"; // Get the version of the Umbraco.Core.dll by looking at a class in that dll // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx - public static string AssemblyVersion { get { return new AssemblyName(typeof(UmbracoVersion).Assembly.FullName).Version.ToString(); } } + public static string AssemblyVersion => new AssemblyName(typeof(UmbracoVersion).Assembly.FullName).Version.ToString(); public static SemVersion GetSemanticVersion() { return new SemVersion( - Current.Major, + Current.Major, Current.Minor, - Current.Build, + Current.Build, CurrentComment.IsNullOrWhiteSpace() ? null : CurrentComment, Current.Revision > 0 ? Current.Revision.ToInvariantString() : null); }