Merge pull request #910 from akoeplinger/cleanup-test-ignores

[mono.git] / mcs / class / corlib / Assembly / AssemblyInfo.cs

diff --git a/mcs/class/corlib/Assembly/AssemblyInfo.cs b/mcs/class/corlib/Assembly/AssemblyInfo.cs
index f9b7e875cfa378ed0420746ad9af7af2ad5d775d..5a6cf4150e3a126af4dd7dcfe90ab689a09b820f 100644 (file)
--- a/mcs/class/corlib/Assembly/AssemblyInfo.cs
+++ b/mcs/class/corlib/Assembly/AssemblyInfo.cs
@@ -34,37 +34,53 @@ using System;
 using System.Reflection;
 using System.Resources;
 using System.Security;
+using System.Diagnostics;
 using System.Security.Permissions;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about the system assembly
+// General Information about the mscorlib assembly
+
+[assembly: AssemblyTitle ("mscorlib.dll")]
+[assembly: AssemblyDescription ("mscorlib.dll")]
+[assembly: AssemblyDefaultAlias ("mscorlib.dll")]
+
+[assembly: AssemblyCompany (Consts.MonoCompany)]
+[assembly: AssemblyProduct (Consts.MonoProduct)]
+[assembly: AssemblyCopyright (Consts.MonoCopyright)]
+
+[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
 
 [assembly: AssemblyVersion (Consts.FxVersion)]
 [assembly: SatelliteContractVersion (Consts.FxVersion)]
 
-#if (ONLY_1_1)
-[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
-[assembly: TypeLibVersion (1, 10)]
-#endif
+[assembly: NeutralResourcesLanguage ("en-US")]
 
-//[assembly: AssemblyTitle("mscorlib.dll")]
-[assembly: AssemblyDescription("Common Language Runtime Library")]
-//[assembly: AssemblyConfiguration("Development version")]
-//[assembly: AssemblyCompany("MONO development team")]
-//[assembly: AssemblyProduct("MONO CLI")]
-//[assembly: AssemblyCopyright("(c) 2003 Various Authors")]
+[assembly: CLSCompliant (true)]
 
-[assembly: CLSCompliant(true)]
-//[assembly: AssemblyDefaultAlias("mscorlib.dll")]
-//[assembly: AssemblyInformationalVersion("0.0.0.1")]
-[assembly: NeutralResourcesLanguage("en-US")]
+[assembly: AssemblyDelaySign (true)]
+#if NET_2_1
+       [assembly: AssemblyKeyFile ("../silverlight.pub")]
+#else
+       [assembly: AssemblyKeyFile ("../ecma.pub")]
+       [assembly: ComCompatibleVersion (1, 0, 3300, 0)]
+       [assembly: AllowPartiallyTrustedCallers]
+#endif
 
-[assembly: AllowPartiallyTrustedCallers]
-[assembly: Guid("BED7F4EA-1A96-11D2-8F08-00A0C9A6186D")]
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: ComVisible (false)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: TypeLibVersion (2, 4)]
+[assembly: DefaultDependency (LoadHint.Always)]
+[assembly: StringFreezing]
 
-#if ! BOOTSTRAP_WITH_OLDLIB
-[assembly: SecurityPermission (SecurityAction.RequestMinimum, SkipVerification=true)]
-[assembly: AssemblyDelaySign(true)]
-[assembly: AssemblyKeyFile("../ecma.pub")]
+#if NET_2_1
+[assembly: InternalsVisibleTo ("System, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
+[assembly: InternalsVisibleTo ("System.Core, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
+#else
+[assembly: InternalsVisibleTo ("System, PublicKey=00000000000000000400000000000000")]
+[assembly: InternalsVisibleTo ("System.Core, PublicKey=00000000000000000400000000000000")]
 #endif
+
+[assembly: Guid ("BED7F4EA-1A96-11D2-8F08-00A0C9A6186D")]
+