Merge pull request #1971 from angeloc/master

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

diff --git a/mcs/class/System.Data/Assembly/AssemblyInfo.cs b/mcs/class/System.Data/Assembly/AssemblyInfo.cs
index e83b5de2d95fa8ce8b6dc5e638cd90a9d11561b1..55252a3c447e72929a69a6ec485f9675554d4d8a 100644 (file)
--- a/mcs/class/System.Data/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Data/Assembly/AssemblyInfo.cs
@@ -34,38 +34,36 @@ using System;
 using System.Reflection;
 using System.Resources;
 using System.Security;
+using System.Security.Permissions;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about the system assembly
+// General Information about the System.Data assembly
 
+[assembly: AssemblyTitle ("System.Data.dll")]
+[assembly: AssemblyDescription ("System.Data.dll")]
+[assembly: AssemblyDefaultAlias ("System.Data.dll")]
+
+[assembly: AssemblyCompany (Consts.MonoCompany)]
+[assembly: AssemblyProduct (Consts.MonoProduct)]
+[assembly: AssemblyCopyright (Consts.MonoCopyright)]
 [assembly: AssemblyVersion (Consts.FxVersion)]
 [assembly: SatelliteContractVersion (Consts.FxVersion)]
+[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
 
-#if (ONLY_1_1)
-[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
-[assembly: TypeLibVersion (1, 10)]
-#endif
+       [assembly: CLSCompliant (true)]
+[assembly: NeutralResourcesLanguage ("en-US")]
 
-[assembly: AssemblyTitle("System.Data.dll")]
-[assembly: AssemblyDescription("System.Data.dll")]
-[assembly: AssemblyConfiguration("Development version")]
-[assembly: AssemblyCompany("MONO development team")]
-[assembly: AssemblyProduct("MONO CLI")]
-[assembly: AssemblyCopyright("(c) 2003 Various Authors")]
-[assembly: AssemblyTrademark("")]
+[assembly: ComVisible (false)]
+[assembly: AllowPartiallyTrustedCallers]
 
-#if !TARGET_JVM
-[assembly: CLSCompliant(true)]
-#endif
-[assembly: AssemblyDefaultAlias("System.Data.dll")]
-[assembly: AssemblyInformationalVersion("0.0.0.1")]
-[assembly: NeutralResourcesLanguage("en-US")]
+[assembly: AssemblyDelaySign (true)]
+       [assembly: AssemblyKeyFile("../ecma.pub")]
 
-[assembly: ComVisible(false)]
-[assembly: AllowPartiallyTrustedCallers]
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: InternalsVisibleTo ("System.Data.DataSetExtensions, PublicKey=" + AssemblyRef.FrameworkPublicKeyFull)]
+[assembly: InternalsVisibleTo ("System.Design, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+[assembly: InternalsVisibleTo ("System.Web, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 
-[assembly: AssemblyDelaySign(true)]
-#if !TARGET_JVM
-[assembly: AssemblyKeyFile("../ecma.pub")]
-#endif
+//     [assembly: InternalsVisibleTo ("System.Data.Entity, PublicKey=00000000000000000400000000000000")]
+//     [assembly: InternalsVisibleTo ("System.Data.DataSetExtensions, PublicKey=00000000000000000400000000000000")]