From a47f566fb017cbb578e704536216e01c519366cd Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 2 Jan 2013 08:57:40 -0100
Subject: [PATCH] Move assemblyversion to UmbracoVersion, where it belongs

---
 .../Configuration/UmbracoVersion.cs           |  7 +++++-
 .../umbraco/dialogs/about.aspx.cs             | 25 +++----------------
 2 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index e6b1d5c2a6..9e721820c2 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -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(); } }
     }
 }
\ No newline at end of file
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 e1661c7db4..051756a942 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/about.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/about.aspx.cs
@@ -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