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

Refactoring usages of VersionMajor, VersionMinor and VersionPatch in umbraco.GlobalSettings.

Browse Source 
Its now using Umbraco.Core.Configuration.GlobalSettings.Version instead.
Fixes U4-1160
This commit is contained in:
Morten Christensen
2012-11-26 10:00:47 -01:00
parent 3fe1975514
commit d522ca9fdd
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/BrowseRepository.aspx.cs
View File

@@ -41,7 +41,17 @@ namespace umbraco.presentation.developer.packages {
if (!string.IsNullOrEmpty(category)) if (!string.IsNullOrEmpty(category))
category = "&category=" + 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 #region Web Form Designer generated code

5
src/Umbraco.Web/umbraco.presentation/umbraco/webservices/CheckForUpgrade.asmx.cs
View File

@@ -24,7 +24,10 @@ namespace umbraco.presentation.webservices
legacyAjaxCalls.Authorize(); legacyAjaxCalls.Authorize();
org.umbraco.update.CheckForUpgrade check = new global::umbraco.presentation.org.umbraco.update.CheckForUpgrade(); 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); return new UpgradeResult(result.UpgradeType.ToString(), result.Comment, result.UpgradeUrl);
} }

8
src/umbraco.businesslogic/GlobalSettings.cs
View File

@@ -296,7 +296,7 @@ namespace umbraco
[Obsolete("Use Umbraco.Core.Configuration.GlobalSettings.Version instead", false)] [Obsolete("Use Umbraco.Core.Configuration.GlobalSettings.Version instead", false)]
public static string CurrentVersion public static string CurrentVersion
{ {
get { return Umbraco.Core.Configuration.GlobalSettings.CurrentVersion; } get { return Umbraco.Core.Configuration.GlobalSettings.Version.ToString(3); }
} }
/// <summary> /// <summary>
@@ -306,7 +306,7 @@ namespace umbraco
[Obsolete("Use Umbraco.Core.Configuration.GlobalSettings.Version instead", false)] [Obsolete("Use Umbraco.Core.Configuration.GlobalSettings.Version instead", false)]
public static int VersionMajor public static int VersionMajor
{ {
get { return Umbraco.Core.Configuration.GlobalSettings.VersionMajor; } get { return Umbraco.Core.Configuration.GlobalSettings.Version.Major; }
} }
/// <summary> /// <summary>
@@ -316,7 +316,7 @@ namespace umbraco
[Obsolete("Use Umbraco.Core.Configuration.GlobalSettings.Version instead", false)] [Obsolete("Use Umbraco.Core.Configuration.GlobalSettings.Version instead", false)]
public static int VersionMinor public static int VersionMinor
{ {
get { return Umbraco.Core.Configuration.GlobalSettings.VersionMinor; } get { return Umbraco.Core.Configuration.GlobalSettings.Version.Minor; }
} }
/// <summary> /// <summary>
@@ -326,7 +326,7 @@ namespace umbraco
[Obsolete("Use Umbraco.Core.Configuration.GlobalSettings.Version instead", false)] [Obsolete("Use Umbraco.Core.Configuration.GlobalSettings.Version instead", false)]
public static int VersionPatch public static int VersionPatch
{ {
get { return Umbraco.Core.Configuration.GlobalSettings.VersionPatch; } get { return Umbraco.Core.Configuration.GlobalSettings.Version.Build; }
} }
/// <summary> /// <summary>