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("", 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(
+ "",
+ 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); }
}
///
@@ -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; }
}
///
@@ -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; }
}
///
@@ -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; }
}
///