X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Web.Extensions%2FAssembly%2FAssemblyInfo.cs;h=38d235697fe0dc5b06d44effb65fd54dcf278faf;hb=c04c40760d13b2b46c34ee61fe9e0de47eaf1fbd;hp=932ed2e7c5b8853f841aa10ebf5528e1a73d0a26;hpb=2133da790bac38774b69d2d3fff2dd9a5d52fa6e;p=mono.git

diff --git a/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
index 932ed2e7c5b..38d235697fe 100644
--- a/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
@@ -32,32 +32,52 @@ 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
-
-[assembly: AssemblyVersion ("1.0.61025.0")]
+// v3.5 Assembly
 
 [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)]
+[assembly: AssemblyDefaultAlias ("System.Web.Extensions.dll")]
+
+[assembly: AssemblyCompany (Consts.MonoCompany)]
+[assembly: AssemblyProduct (Consts.MonoProduct)]
+[assembly: AssemblyCopyright (Consts.MonoCopyright)]
+#if NET_3_5
+	[assembly: AssemblyVersion (Consts.FxVersion)]
+	[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
 #else
-[assembly: CLSCompliant (true)]
+	[assembly: AssemblyVersion ("1.0.61025.0")]
+	[assembly: AssemblyInformationalVersion ("1.0.61025.0")]
 #endif
-[assembly: ComVisible (false)]
-[assembly: AssemblyDefaultAlias ("System.Web.Extensions.dll")]
-[assembly: AssemblyInformationalVersion ("0.0.0.1")]
+[assembly: SatelliteContractVersion (Consts.FxVersion)]
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+
 [assembly: NeutralResourcesLanguage ("en-US")]
 
-[assembly: AllowPartiallyTrustedCallers ()]
+#if !(TARGET_JVM || 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: SecurityPermission (SecurityAction.RequestMinimum, Execution = true)]
+[assembly: SecurityPermission (SecurityAction.RequestMinimum, SkipVerification = true)]
+
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
+[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
 
 [assembly: WebResource ("MicrosoftAjax.js", "application/x-javascript")]
 [assembly: WebResource ("MicrosoftAjax.debug.js", "application/x-javascript")]
@@ -65,8 +85,20 @@ 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
-[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../winfx.pub")]
-#endif
\ No newline at end of file
+// 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