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 ae1105f89be92ab8ae5e4d9f5bbc2547f4d37517..5a6cf4150e3a126af4dd7dcfe90ab689a09b820f 100644 (file)
--- a/mcs/class/corlib/Assembly/AssemblyInfo.cs
+++ b/mcs/class/corlib/Assembly/AssemblyInfo.cs
@@ -41,17 +41,15 @@ using System.Runtime.InteropServices;
 
 // General Information about the mscorlib assembly
 
-#if NET_2_0
-       [assembly: AssemblyTitle ("mscorlib.dll")]
-       [assembly: AssemblyDescription ("mscorlib.dll")]
-       [assembly: AssemblyDefaultAlias ("mscorlib.dll")]
+[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: AssemblyCompany (Consts.MonoCompany)]
+[assembly: AssemblyProduct (Consts.MonoProduct)]
+[assembly: AssemblyCopyright (Consts.MonoCopyright)]
 
-       [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
-#endif
+[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
 
 [assembly: AssemblyVersion (Consts.FxVersion)]
 [assembly: SatelliteContractVersion (Consts.FxVersion)]
@@ -59,35 +57,30 @@ using System.Runtime.InteropServices;
 [assembly: NeutralResourcesLanguage ("en-US")]
 
 [assembly: CLSCompliant (true)]
-[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
-[assembly: Guid ("BED7F4EA-1A96-11D2-8F08-00A0C9A6186D")]
-[assembly: AllowPartiallyTrustedCallers]
 
-#if !BOOTSTRAP_WITH_OLDLIB
-       [assembly: SecurityPermission (SecurityAction.RequestMinimum, SkipVerification = true)]
-       [assembly: AssemblyDelaySign (true)]
+[assembly: AssemblyDelaySign (true)]
 #if NET_2_1
        [assembly: AssemblyKeyFile ("../silverlight.pub")]
 #else
        [assembly: AssemblyKeyFile ("../ecma.pub")]
-#endif
+       [assembly: ComCompatibleVersion (1, 0, 3300, 0)]
+       [assembly: AllowPartiallyTrustedCallers]
 #endif
 
-#if NET_2_0
-       [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-       [assembly: ComVisible (false)]
-       [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-       [assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
-       [assembly: TypeLibVersion (2, 0)]
-       [assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
-       [assembly: DefaultDependency (LoadHint.Always)]
-       [assembly: StringFreezing]
-#elif NET_1_1 || NET_1_0
-       [assembly: AssemblyDescription("Common Language Runtime Library")]
-       [assembly: TypeLibVersion (1, 10)]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: ComVisible (false)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: TypeLibVersion (2, 4)]
+[assembly: DefaultDependency (LoadHint.Always)]
+[assembly: StringFreezing]
 
 #if NET_2_1
-       [assembly: InternalsVisibleTo ("System.Windows, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
-       [assembly: InternalsVisibleTo ("System.Net, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
+[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")]
+