From d522ca9fdd560d1dedb79bfda2dd42fa927fa910 Mon Sep 17 00:00:00 2001
From: Morten Christensen <unknown@kiln.example.com>
Date: Mon, 26 Nov 2012 10:00:47 -0100
Subject: [PATCH] Refactoring usages of VersionMajor, VersionMinor and
 VersionPatch in umbraco.GlobalSettings. Its now using
 Umbraco.Core.Configuration.GlobalSettings.Version instead. Fixes U4-1160

---
 .../developer/Packages/BrowseRepository.aspx.cs      | 12 +++++++++++-
 .../umbraco/webservices/CheckForUpgrade.asmx.cs      |  5 ++++-
 src/umbraco.businesslogic/GlobalSettings.cs          |  8 ++++----
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs
index 49c3375a66..c1ed3cb6eb 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs
@@ -41,7 +41,17 @@ namespace umbraco.presentation.developer.packages {
             if (!string.IsNullOrEmpty(category))
                 category = "&category=" + category;
 
-            iframeGen.Text = string.Format("<iframe id=\"repoFrame\" frameborder=\"1\" style=\"border: none; display: block\" src=\"{0}?repoGuid={1}{2}&callback={3}:{4}{5}/developer/packages/proxy.htm?/{6}/developer/packages/installer.aspx?repoGuid={7}&version=v45&fullVersion={8}.{9}.{10}&useLegacySchema={11}&dotnetVersion={12}&trustLevel={13}\"></iframe>", url, repoGuid, category, Request.ServerVariables["SERVER_NAME"], Request.ServerVariables["SERVER_PORT"], IOHelper.ResolveUrl( SystemDirectories.Umbraco ), IOHelper.ResolveUrl(SystemDirectories.Umbraco).Trim('/'), repoGuid, GlobalSettings.VersionMajor, GlobalSettings.VersionMinor, GlobalSettings.VersionPatch, UmbracoSettings.UseLegacyXmlSchema.ToString(), Environment.Version, Umbraco.Core.SystemUtilities.GetCurrentTrustLevel() );
+            iframeGen.Text =
+                string.Format(
+                    "<iframe id=\"repoFrame\" frameborder=\"1\" style=\"border: none; display: block\" src=\"{0}?repoGuid={1}{2}&callback={3}:{4}{5}/developer/packages/proxy.htm?/{6}/developer/packages/installer.aspx?repoGuid={7}&version=v45&fullVersion={8}.{9}.{10}&useLegacySchema={11}&dotnetVersion={12}&trustLevel={13}\"></iframe>",
+                    url, repoGuid, category, Request.ServerVariables["SERVER_NAME"],
+                    Request.ServerVariables["SERVER_PORT"], IOHelper.ResolveUrl(SystemDirectories.Umbraco),
+                    IOHelper.ResolveUrl(SystemDirectories.Umbraco).Trim('/'), repoGuid,
+                    Umbraco.Core.Configuration.GlobalSettings.Version.Major,
+                    Umbraco.Core.Configuration.GlobalSettings.Version.Minor,
+                    Umbraco.Core.Configuration.GlobalSettings.Version.Build,
+                    UmbracoSettings.UseLegacyXmlSchema.ToString(), Environment.Version,
+                    Umbraco.Core.SystemUtilities.GetCurrentTrustLevel());
         }
 
         #region Web Form Designer generated code
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs
index d4ef1f0edb..1d2c5b0902 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs
@@ -24,7 +24,10 @@ namespace umbraco.presentation.webservices
             legacyAjaxCalls.Authorize();
 
             org.umbraco.update.CheckForUpgrade check = new global::umbraco.presentation.org.umbraco.update.CheckForUpgrade();
-            org.umbraco.update.UpgradeResult result = check.CheckUpgrade(GlobalSettings.VersionMajor, GlobalSettings.VersionMinor, GlobalSettings.VersionPatch, GlobalSettings.VersionComment);
+            org.umbraco.update.UpgradeResult result = check.CheckUpgrade(Umbraco.Core.Configuration.GlobalSettings.Version.Major,
+                                                                         Umbraco.Core.Configuration.GlobalSettings.Version.Minor,
+                                                                         Umbraco.Core.Configuration.GlobalSettings.Version.Build,
+                                                                         Umbraco.Core.Configuration.GlobalSettings.VersionComment);
             return new UpgradeResult(result.UpgradeType.ToString(), result.Comment, result.UpgradeUrl);
         }
 
diff --git a/src/umbraco.businesslogic/GlobalSettings.cs b/src/umbraco.businesslogic/GlobalSettings.cs
index 6f3895965e..f31968a295 100644
--- a/src/umbraco.businesslogic/GlobalSettings.cs
+++ b/src/umbraco.businesslogic/GlobalSettings.cs
@@ -296,7 +296,7 @@ namespace umbraco
         [Obsolete("Use Umbraco.Core.Configuration.GlobalSettings.Version instead", false)]
         public static string CurrentVersion
         {
-			get { return Umbraco.Core.Configuration.GlobalSettings.CurrentVersion; }
+			get { return Umbraco.Core.Configuration.GlobalSettings.Version.ToString(3); }
         }
 
         /// <summary>
@@ -306,7 +306,7 @@ namespace umbraco
         [Obsolete("Use Umbraco.Core.Configuration.GlobalSettings.Version instead", false)]
         public static int VersionMajor
         {
-			get { return Umbraco.Core.Configuration.GlobalSettings.VersionMajor; }
+			get { return Umbraco.Core.Configuration.GlobalSettings.Version.Major; }
         }
 
         /// <summary>
@@ -316,7 +316,7 @@ namespace umbraco
         [Obsolete("Use Umbraco.Core.Configuration.GlobalSettings.Version instead", false)]
         public static int VersionMinor
         {
-			get { return Umbraco.Core.Configuration.GlobalSettings.VersionMinor; }
+			get { return Umbraco.Core.Configuration.GlobalSettings.Version.Minor; }
         }
 
         /// <summary>
@@ -326,7 +326,7 @@ namespace umbraco
         [Obsolete("Use Umbraco.Core.Configuration.GlobalSettings.Version instead", false)]
         public static int VersionPatch
         {
-			get { return Umbraco.Core.Configuration.GlobalSettings.VersionPatch; }
+			get { return Umbraco.Core.Configuration.GlobalSettings.Version.Build; }
         }
 
         /// <summary>