2009-07-11 Michael Barker <mike@middlesoft.co.uk>

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

diff --git a/mcs/class/System.Web/Assembly/AssemblyInfo.cs b/mcs/class/System.Web/Assembly/AssemblyInfo.cs
index 5da7b13b752a8759157f5452058cb55bfa0f1351..b1e6f1ecf66b41067d58ade1dbcce7488efb580e 100644 (file)
--- a/mcs/class/System.Web/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web/Assembly/AssemblyInfo.cs
@@ -38,16 +38,8 @@ using System.Web.UI;
 
 // General Information about the System.Web assembly
 
-#if (NET_1_0)
-       [assembly: AssemblyVersion("1.0.3300.0")]
-       [assembly: SatelliteContractVersion("1.0.3300.0")]
-#elif (NET_2_0)
-       [assembly: AssemblyVersion ("2.0.3600.0")]
-       [assembly: SatelliteContractVersion ("2.0.3600.0")]
-#elif (NET_1_1)
-       [assembly: AssemblyVersion("1.0.5000.0")]
-       [assembly: SatelliteContractVersion("1.0.5000.0")]
-#endif
+[assembly: AssemblyVersion (Consts.FxVersion)]
+[assembly: SatelliteContractVersion (Consts.FxVersion)]
 
 [assembly: AssemblyTitle("System.Web.dll")]
 [assembly: AssemblyDescription("System.Web.dll")]
@@ -56,8 +48,11 @@ using System.Web.UI;
 [assembly: AssemblyProduct("MONO CLI")]
 [assembly: AssemblyCopyright("(c) 2003 Various Authors")]
 [assembly: AssemblyTrademark("")]
-
+#if TARGET_JVM
+[assembly: CLSCompliant(false)]
+#else
 [assembly: CLSCompliant(true)]
+#endif
 [assembly: ComVisible(false)]
 [assembly: AssemblyDefaultAlias("System.Web.dll")]
 [assembly: AssemblyInformationalVersion("0.0.0.1")]
@@ -65,10 +60,18 @@ using System.Web.UI;
 
 [assembly: AllowPartiallyTrustedCallers()]
 [assembly: TagPrefix("System.Web.UI.WebControls", "asp")]
-
+#if !(TARGET_JVM || TARGET_DOTNET)
 [assembly: AssemblyDelaySign(true)]
 [assembly: AssemblyKeyFile("../msfinal.pub")]
 
+#if NET_2_0
+[assembly: InternalsVisibleTo ("System.Web.Extensions, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
+[assembly: InternalsVisibleTo ("System.Web.DynamicData, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
+
+[assembly: InternalsVisibleTo ("SystemWebTestShim, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
+#endif
+#endif
+
 // Resources
 
 #if NET_2_0
@@ -107,9 +110,19 @@ using System.Web.UI;
 [assembly: WebResource ("warning.gif", "image/gif")]
 [assembly: WebResource ("arrow_up.gif", "image/gif")]
 [assembly: WebResource ("arrow_down.gif", "image/gif")]
+[assembly: WebResource ("transparent.gif", "image/gif")]
+[assembly: WebResource ("file.gif", "image/gif")]
+[assembly: WebResource ("folder.gif", "image/gif")]
+[assembly: WebResource ("computer.gif", "image/gif")]
 
 [assembly: WebResource ("TreeView.js", "text/javascript")]
 [assembly: WebResource ("Menu.js", "text/javascript")]
-[assembly: WebResource ("callback.js", "text/javascript")]
+[assembly: WebResource ("GridView.js", "text/javascript")]
+[assembly: WebResource ("webform.js", "text/javascript")]
+#endif
 
+#if NET_2_0
+[assembly: WebResource ("WebUIValidation_2.0.js", "text/javascript")]
+#else
+[assembly: WebResource ("WebUIValidation.js", "text/javascript")]
 #endif