From 5e46750cc447c69ef06c376366cc88dbf731c781 Mon Sep 17 00:00:00 2001 From: Shannon Date: Thu, 11 Feb 2016 16:34:15 +0100 Subject: [PATCH] nuspec and version --- build/NuSpecs/UmbracoCms.nuspec | 2 +- build/UmbracoVersion.txt | 3 +-- src/SolutionInfo.cs | 2 +- src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build/NuSpecs/UmbracoCms.nuspec b/build/NuSpecs/UmbracoCms.nuspec index 14df9c00af..46703a0c39 100644 --- a/build/NuSpecs/UmbracoCms.nuspec +++ b/build/NuSpecs/UmbracoCms.nuspec @@ -17,7 +17,7 @@ - + diff --git a/build/UmbracoVersion.txt b/build/UmbracoVersion.txt index 8cc23a423e..36ca25b17a 100644 --- a/build/UmbracoVersion.txt +++ b/build/UmbracoVersion.txt @@ -1,3 +1,2 @@ # Usage: on line 2 put the release version, on line 3 put the version comment (example: beta) -7.4.0 -RC1 \ No newline at end of file +7.4.0 \ No newline at end of file diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index f51970c7c9..b0d13e9bad 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -12,4 +12,4 @@ using System.Resources; [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyFileVersion("7.4.0")] -[assembly: AssemblyInformationalVersion("7.4.0-RC1")] \ No newline at end of file +[assembly: AssemblyInformationalVersion("7.4.0")] \ No newline at end of file diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs index 02a9a64893..658e8498e9 100644 --- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs +++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs @@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration /// Gets the version comment (like beta or RC). /// /// The version comment. - public static string CurrentComment { get { return "RC1"; } } + public static string CurrentComment { get { return ""; } } // Get the version of the umbraco.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