Updated 3.5 details

[mono.git] / mcs / class / System.Web.Extensions / Assembly / AssemblyInfo.cs

diff --git a/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
index 5885f286a1fe41cf6df1325143074b7ed6563065..ddabcb0da85e95d9ca08eb4c0fc5081a01ae7415 100644 (file)
--- a/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
@@ -36,16 +36,23 @@ using System.Web.UI;
 using System.Security;
 
 // General Information about the System.Web.Extensions assembly
-
+#if !NET_3_5 || TARGET_JVM || TARGET_DOTNET
 [assembly: AssemblyVersion ("1.0.61025.0")]
+[assembly: AssemblyInformationalVersion ("0.0.0.1")]
+[assembly: AssemblyTrademark ("")]
+[assembly: AssemblyConfiguration ("Development version")]
+#else
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: AssemblyVersion(Consts.FxVersion)]
+[assembly: SatelliteContractVersion (Consts.FxVersion)]
+[assembly: AssemblyInformationalVersionAttribute (Consts.FxVersion)]
+#endif
 
 [assembly: AssemblyTitle ("System.Web.Extensions.dll")]
 [assembly: AssemblyDescription ("System.Web.Extensions.dll")]
-[assembly: AssemblyConfiguration ("Development version")]
 [assembly: AssemblyCompany ("MONO development team")]
 [assembly: AssemblyProduct ("MONO CLI")]
 [assembly: AssemblyCopyright ("(c) 2007 Various Authors")]
-[assembly: AssemblyTrademark ("")]
 #if TARGET_JVM
 [assembly: CLSCompliant(false)]
 #else
@@ -53,7 +60,6 @@ using System.Security;
 #endif
 [assembly: ComVisible (false)]
 [assembly: AssemblyDefaultAlias ("System.Web.Extensions.dll")]
-[assembly: AssemblyInformationalVersion ("0.0.0.1")]
 [assembly: NeutralResourcesLanguage ("en-US")]
 
 [assembly: AllowPartiallyTrustedCallers ()]
@@ -65,9 +71,12 @@ using System.Security;
 [assembly: WebResource ("MicrosoftAjaxWebForms.debug.js", "application/x-javascript")]
 [assembly: WebResource ("MicrosoftAjaxTimer.js", "application/x-javascript")]
 [assembly: WebResource ("MicrosoftAjaxTimer.debug.js", "application/x-javascript")]
+#if TARGET_J2EE
+[assembly: WebResource ("MicrosoftAjaxExtension.js", "application/x-javascript")]
+[assembly: WebResource ("MicrosoftAjaxWebFormsExtension.js", "application/x-javascript")]
+#endif
 
-//
-// This is needed only in the 3.5 profile, which we do not build in mcs yet
-//
-//[assembly: AssemblyDelaySign (true)]
-//[assembly: AssemblyKeyFile ("../winfx.pub")]
+#if !(TARGET_JVM || TARGET_DOTNET)
+[assembly: AssemblyDelaySign (true)]
+[assembly: AssemblyKeyFile ("../winfx.pub")]
+#endif