merge commit

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");

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);
         }

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";

WebsitePanel/build.xml

@@ -5,7 +5,7 @@
 		<Version>2.0.0</Version>
 		<FileVersion>$(BUILD_NUMBER)</FileVersion>
 		<VersionLabel>$(BUILD_NUMBER)</VersionLabel>
-		<ReleaseDate>2012-09-09</ReleaseDate>
+		<ReleaseDate>2012-09-23</ReleaseDate>
 		<BuildConfiguration></BuildConfiguration>
 		<RootFolder>..</RootFolder>
 		<TrunkFolder>$(RootFolder)\WebsitePanel</TrunkFolder>