yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move assemblyversion to UmbracoVersion, where it belongs

Browse Source
This commit is contained in:
Sebastiaan Janssen
2013-01-02 08:57:40 -01:00
parent f391029a2a
commit a47f566fb0
2 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Core/Configuration/UmbracoVersion.cs
View File

@@ -1,10 +1,11 @@
using System;
using System.Reflection;
namespace Umbraco.Core.Configuration
{
public class UmbracoVersion
{
private static readonly Version Version = new Version(6,0,0);
private static readonly Version Version = new Version(6, 0, 0);
/// <summary>
/// Gets the current version of Umbraco.
@@ -23,5 +24,9 @@ namespace Umbraco.Core.Configuration
/// </summary>
/// <value>The version comment.</value>
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
public static string AssemblyVersion { get { return new AssemblyName(typeof(ActionsResolver).Assembly.FullName).Version.ToString(); } }
}
}

25
src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/about.aspx.cs
View File

@@ -1,17 +1,6 @@
using System;
using System.Collections;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Web;
using System.Web.SessionState;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Web.UI.HtmlControls;
using System.Reflection;
using System.Diagnostics;
using System.Globalization;
using Umbraco.Core.Configuration;
using umbraco.IO;
namespace umbraco.dialogs
{
@@ -21,17 +10,11 @@ namespace umbraco.dialogs
public partial class about : BasePages.UmbracoEnsuredPage
{
protected void Page_Load(object sender, System.EventArgs e)
protected void Page_Load(object sender, EventArgs e)
{
// Put user code to initialize the page here
version.Text = UmbracoVersion.Current.ToString(3);
thisYear.Text = DateTime.Now.Year.ToString();
// 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
var versionNumber = new AssemblyName(typeof(Umbraco.Web.ApplicationContextExtensions).Assembly.FullName).Version.ToString();
version.Text += string.Format(" (Assembly version: {0})", versionNumber);
thisYear.Text = DateTime.Now.Year.ToString(CultureInfo.InvariantCulture);
version.Text = string.Format("{0} (Assembly version: {1})", UmbracoVersion.Current.ToString(3), UmbracoVersion.AssemblyVersion);
}
#region Web Form Designer generated code