diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Default.aspx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Default.aspx.cs index 6b51871f..7c71d343 100644 --- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Default.aspx.cs +++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Default.aspx.cs @@ -49,9 +49,9 @@ namespace WebsitePanel.EnterpriseServer litUrl.Text = url.Substring(0, url.LastIndexOf("/")); // set version - object[] attrs = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), true); + object[] attrs = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true); if (attrs.Length > 0) - litVersion.Text = ((AssemblyInformationalVersionAttribute)attrs[0]).InformationalVersion; + litVersion.Text = ((AssemblyFileVersionAttribute)attrs[0]).Version; imgLogo.ImageUrl = Page.ClientScript.GetWebResourceUrl( typeof(DefaultPage), "WebsitePanel.EnterpriseServer.Images.logo.png"); diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Images/logo.png b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Images/logo.png index 45f7ad78..35a64dd8 100644 Binary files a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Images/logo.png and b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Images/logo.png differ diff --git a/WebsitePanel/Sources/WebsitePanel.Server/Code/AutoDiscoveryHelper.cs b/WebsitePanel/Sources/WebsitePanel.Server/Code/AutoDiscoveryHelper.cs index 0e804b46..57466138 100644 --- a/WebsitePanel/Sources/WebsitePanel.Server/Code/AutoDiscoveryHelper.cs +++ b/WebsitePanel/Sources/WebsitePanel.Server/Code/AutoDiscoveryHelper.cs @@ -86,9 +86,9 @@ namespace WebsitePanel.Server.Code public static string GetServerVersion() { - object[] attrs = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), true); + object[] attrs = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true); if (attrs.Length > 0) - return ((AssemblyInformationalVersionAttribute)attrs[0]).InformationalVersion; + return ((AssemblyFileVersionAttribute)attrs[0]).Version; else return typeof(AutoDiscoveryHelper).Assembly.GetName().Version.ToString(3); } diff --git a/WebsitePanel/Sources/WebsitePanel.Server/Default.aspx.cs b/WebsitePanel/Sources/WebsitePanel.Server/Default.aspx.cs index 5267c682..efb71b4e 100644 --- a/WebsitePanel/Sources/WebsitePanel.Server/Default.aspx.cs +++ b/WebsitePanel/Sources/WebsitePanel.Server/Default.aspx.cs @@ -49,9 +49,9 @@ namespace WebsitePanel.Server litUrl.Text = url.Substring(0, url.LastIndexOf("/")); // set version - object[] attrs = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), true); + object[] attrs = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true); if(attrs.Length > 0) - litVersion.Text = ((AssemblyInformationalVersionAttribute)attrs[0]).InformationalVersion; + litVersion.Text = ((AssemblyFileVersionAttribute)attrs[0]).Version; // asp.net mode litAspNetMode.Text = (IntPtr.Size == 8) ? "64-bit" : "32-bit"; diff --git a/WebsitePanel/Sources/WebsitePanel.Server/Images/logo.png b/WebsitePanel/Sources/WebsitePanel.Server/Images/logo.png index 45f7ad78..35a64dd8 100644 Binary files a/WebsitePanel/Sources/WebsitePanel.Server/Images/logo.png and b/WebsitePanel/Sources/WebsitePanel.Server/Images/logo.png differ diff --git a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/logo.png b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/logo.png index 45f7ad78..35a64dd8 100644 Binary files a/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/logo.png and b/WebsitePanel/Sources/WebsitePanel.WebPortal/App_Themes/Default/Images/logo.png differ diff --git a/WebsitePanel/build.xml b/WebsitePanel/build.xml index a5b571a3..b7232d9a 100644 --- a/WebsitePanel/build.xml +++ b/WebsitePanel/build.xml @@ -5,7 +5,7 @@ 2.0.0 $(BUILD_NUMBER) $(BUILD_NUMBER) - 2012-09-09 + 2012-09-23 .. $(RootFolder)\WebsitePanel