Merge pull request #2705 from kumpera/loader-error-cleanup7

[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 bbce7a972d57451b20fcf290b829d4e6a0bd5815..87b059215a3e1fb55e364dfe6971b42b950b9894 100644 (file)
--- a/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
@@ -32,34 +32,41 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Resources;
 using System;
+using System.Diagnostics;
 using System.Web.UI;
 using System.Security;
+using System.Security.Permissions;
 
 // General Information about the System.Web.Extensions assembly
-#if NET_3_5
-[assembly: AssemblyVersion ("3.5.0.0")]
-[assembly: AssemblyInformationalVersion ("3.5.0.0")]
-#else
-[assembly: AssemblyVersion ("1.0.61025.0")]
-[assembly: AssemblyInformationalVersion ("1.0.61025.0")]
-#endif
+// v3.5 Assembly
 
 [assembly: AssemblyTitle ("System.Web.Extensions.dll")]
 [assembly: AssemblyDescription ("System.Web.Extensions.dll")]
-[assembly: AssemblyCompany ("MONO development team")]
-[assembly: AssemblyProduct ("MONO CLI")]
-[assembly: AssemblyCopyright ("(c) 2007 Various Authors")]
-#if TARGET_JVM
-[assembly: CLSCompliant(false)]
-#else
-[assembly: CLSCompliant (true)]
-#endif
-[assembly: ComVisible (false)]
 [assembly: AssemblyDefaultAlias ("System.Web.Extensions.dll")]
+
+[assembly: AssemblyCompany (Consts.MonoCompany)]
+[assembly: AssemblyProduct (Consts.MonoProduct)]
+[assembly: AssemblyCopyright (Consts.MonoCopyright)]
+       [assembly: AssemblyVersion (Consts.FxVersion)]
+       [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
+[assembly: SatelliteContractVersion (Consts.FxVersion)]
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+
 [assembly: NeutralResourcesLanguage ("en-US")]
 
-[assembly: AllowPartiallyTrustedCallers ()]
+#if !(TARGET_DOTNET)
+       [assembly: CLSCompliant (true)]
+       [assembly: AssemblyDelaySign (true)]
+       [assembly: AssemblyKeyFile ("../winfx.pub")]
+
+#endif
+
+[assembly: ComVisible (false)]
+[assembly: AllowPartiallyTrustedCallers]
+
 [assembly: TagPrefix ("System.Web.UI", "asp")]
+[assembly: TagPrefix ("System.Web.UI.WebControls", "asp")]
+[assembly: Dependency ("System,", LoadHint.Always)]
 
 [assembly: WebResource ("MicrosoftAjax.js", "application/x-javascript")]
 [assembly: WebResource ("MicrosoftAjax.debug.js", "application/x-javascript")]
@@ -67,12 +74,16 @@ 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
 
-#if !(TARGET_JVM || TARGET_DOTNET)
-[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../winfx.pub")]
+// Those entries must not be enabled until the appropriate .resx files with translations for the client scripts are
+// created.
+// The default (English) strings are embedded in the scripts - maybe we should extract them on the build time and create
+// the .resx files on the fly.
+//
+// DO NOT ENABLE UNTIL THE .resx FILES ARE PRESENT - ENABLING CAUSES BUG #384144
+#if DO_NOT_ENABLE_UNLESS_RESX_FILES_ARE_PRESENT
+[assembly: ScriptResource ("MicrosoftAjax.js", "System.Web.Resources.ScriptLibrary.Res", "Sys.Res")]
+[assembly: ScriptResource ("MicrosoftAjax.debug.js", "System.Web.Resources.ScriptLibrary.Res.debug", "Sys.Res")]
+[assembly: ScriptResource ("MicrosoftAjaxWebForms.js", "System.Web.Resources.ScriptLibrary.WebForms.Res", "Sys.WebForms.Res")]
+[assembly: ScriptResource ("MicrosoftAjaxWebForms.debug.js", "System.Web.Resources.ScriptLibrary.WebForms.Res.debug", "Sys.WebForms.Res")]
 #endif