projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e78b5e7)
[bcl] Remove wrong IVT attributes
authorMarek Safar <marek.safar@gmail.com>
Wed, 16 Mar 2016 17:34:05 +0000 (18:34 +0100)
committerMarek Safar <marek.safar@gmail.com>
Wed, 16 Mar 2016 17:36:33 +0000 (18:36 +0100)
13 files changed:
mcs/build/common/AssemblyRef.cs [new file with mode: 0644] patch | blob
mcs/build/common/SR.cs patch | blob | history
mcs/class/SMDiagnostics/Assembly/AssemblyInfo.cs patch | blob | history
mcs/class/System.Data.Entity/System.Data.Entity.dll.sources patch | blob | history
mcs/class/System.Data/mobile_System.Data.dll.sources patch | blob | history
mcs/class/System.Data/net_4_x_System.Data.dll.sources patch | blob | history
mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals.dll.sources patch | blob | history
mcs/class/System.ServiceModel.Internals/mobile_System.ServiceModel.Internals.dll.sources patch | blob | history
mcs/class/System.XML/Assembly/AssemblyInfo.cs patch | blob | history
mcs/class/System.XML/System.Xml.dll.sources patch | blob | history
mcs/class/System.XML/mobile_System.Xml.dll.sources patch | blob | history
mcs/class/corlib/Assembly/AssemblyInfo.cs patch | blob | history
mcs/class/corlib/corlib.dll.sources patch | blob | history

diff --git a/mcs/build/common/AssemblyRef.cs b/mcs/build/common/AssemblyRef.cs
new file mode 100644 (file)
index 0000000..a38d371
--- /dev/null
+++ b/mcs/build/common/AssemblyRef.cs
@@ -0,0 +1,25 @@
+static class AssemblyRef
+{
+       // FIXME
+       internal const string SystemConfiguration = "System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
+       internal const string System = "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
+
+       public const string EcmaPublicKey = "b77a5c561934e089";
+#if NET_2_1
+       public const string FrameworkPublicKeyFull = "0024000004800000940000000602000000240000525341310004000001000100B5FC90E7027F67871E773A8FDE8938C81DD402BA65B9201D60593E96C492651E889CC13F1415EBB53FAC1131AE0BD333C5EE6021672D9718EA31A8AEBD0DA0072F25D87DBA6FC90FFD598ED4DA35E44C398C454307E8E33B8426143DAEC9F596836F97C8F74750E5975C64E2189F45DEF46B2A2B1247ADC3652BF5C308055DA9";
+       public const string FrameworkPublicKeyFull2 = "00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB";
+#else
+       public const string FrameworkPublicKeyFull = "00000000000000000400000000000000";
+       public const string FrameworkPublicKeyFull2 = "00000000000000000400000000000000";
+#endif
+       public const string MicrosoftPublicKey = "b03f5f7f11d50a3a";
+ 
+       public const string MicrosoftJScript = Consts.AssemblyMicrosoft_JScript;
+       public const string MicrosoftVSDesigner = Consts.AssemblyMicrosoft_VSDesigner;
+       public const string SystemData = Consts.AssemblySystem_Data;
+       public const string SystemDesign = Consts.AssemblySystem_Design;
+       public const string SystemDrawing = Consts.AssemblySystem_Drawing;
+       public const string SystemWeb = Consts.AssemblySystem_Web;
+       public const string SystemWebExtensions =  "System.Web.Extensions, Version=" + Consts.FxVersion + ", Culture=neutral, PublicKeyToken=31bf3856ad364e35";
+       public const string SystemWindowsForms = Consts.AssemblySystem_Windows_Forms;
+}
\ No newline at end of file
diff --git a/mcs/build/common/SR.cs b/mcs/build/common/SR.cs
index 836910f2ecf21ac2833f2f601287dd061b5e12ca..0685edb53bca0127edb3c2ef8f5847a7dfc2498f 100644 (file)
--- a/mcs/build/common/SR.cs
+++ b/mcs/build/common/SR.cs
@@ -1,31 +1,5 @@
 using System.Globalization;
 
-static class AssemblyRef
-{
-       // FIXME
-       internal const string SystemConfiguration = "System.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a";
-       internal const string System = "System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35";
-
-       public const string EcmaPublicKey = "b77a5c561934e089";
-#if NET_2_1
-       public const string FrameworkPublicKeyFull = "0024000004800000940000000602000000240000525341310004000001000100B5FC90E7027F67871E773A8FDE8938C81DD402BA65B9201D60593E96C492651E889CC13F1415EBB53FAC1131AE0BD333C5EE6021672D9718EA31A8AEBD0DA0072F25D87DBA6FC90FFD598ED4DA35E44C398C454307E8E33B8426143DAEC9F596836F97C8F74750E5975C64E2189F45DEF46B2A2B1247ADC3652BF5C308055DA9";
-       public const string FrameworkPublicKeyFull2 = "00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB";
-#else
-       public const string FrameworkPublicKeyFull = "00000000000000000400000000000000";
-       public const string FrameworkPublicKeyFull2 = "00000000000000000400000000000000";
-#endif
-       public const string MicrosoftPublicKey = "b03f5f7f11d50a3a";
- 
-       public const string MicrosoftJScript = Consts.AssemblyMicrosoft_JScript;
-       public const string MicrosoftVSDesigner = Consts.AssemblyMicrosoft_VSDesigner;
-       public const string SystemData = Consts.AssemblySystem_Data;
-       public const string SystemDesign = Consts.AssemblySystem_Design;
-       public const string SystemDrawing = Consts.AssemblySystem_Drawing;
-       public const string SystemWeb = Consts.AssemblySystem_Web;
-       public const string SystemWebExtensions =  "System.Web.Extensions, Version=" + Consts.FxVersion + ", Culture=neutral, PublicKeyToken=31bf3856ad364e35";
-       public const string SystemWindowsForms = Consts.AssemblySystem_Windows_Forms;
-}
-
 static partial class SR
 {
        internal static string GetString(string name, params object[] args)
diff --git a/mcs/class/SMDiagnostics/Assembly/AssemblyInfo.cs b/mcs/class/SMDiagnostics/Assembly/AssemblyInfo.cs
index e83ceb3e1d1990375796bb3cb5ab9a33141ae120..561d2fef4b2a656d5dde288fab45d8d9ca8cdd83 100644 (file)
--- a/mcs/class/SMDiagnostics/Assembly/AssemblyInfo.cs
+++ b/mcs/class/SMDiagnostics/Assembly/AssemblyInfo.cs
@@ -48,7 +48,6 @@ using System.Runtime.InteropServices;
 [assembly: ComCompatibleVersion (1, 0, 3300, 0)]
 [assembly: SecurityCritical (SecurityCriticalScope.Explicit)]
 #endif
-[assembly: InternalsVisibleTo ("System.Runtime.Serialization, PublicKey=" + AssemblyRef.FrameworkPublicKeyFull)]
 [assembly: InternalsVisibleTo ("System.IdentityModel, PublicKey=" + AssemblyRef.FrameworkPublicKeyFull)]
 [assembly: InternalsVisibleTo ("System.IdentityModel.Selectors, PublicKey=" + AssemblyRef.FrameworkPublicKeyFull)]
 [assembly: InternalsVisibleTo ("System.ServiceModel, PublicKey=" + AssemblyRef.FrameworkPublicKeyFull)]
diff --git a/mcs/class/System.Data.Entity/System.Data.Entity.dll.sources b/mcs/class/System.Data.Entity/System.Data.Entity.dll.sources
index 13ab7daa6d13d3dc3347053fdb639b28ce4f1539..59a7f8b139e5d1501eabf69f48924799d275e4d0 100644 (file)
--- a/mcs/class/System.Data.Entity/System.Data.Entity.dll.sources
+++ b/mcs/class/System.Data.Entity/System.Data.Entity.dll.sources
@@ -1,6 +1,7 @@
 Assembly/AssemblyInfo.cs
 ../../build/common/Consts.cs
 ../../build/common/SR.cs
+../../build/common/AssemblyRef.cs
 EntityRes.cs
 EntityResCategoryAttribute.cs
 EntityResDescriptionAttribute.cs
diff --git a/mcs/class/System.Data/mobile_System.Data.dll.sources b/mcs/class/System.Data/mobile_System.Data.dll.sources
index 1315e15e184338ef0f5639d41128c7e35cf9a53b..a5b2a2f1492a695f255fbb5c8aaf165e5c297848 100644 (file)
--- a/mcs/class/System.Data/mobile_System.Data.dll.sources
+++ b/mcs/class/System.Data/mobile_System.Data.dll.sources
@@ -3,6 +3,7 @@ Assembly/AssemblyInfo.cs
 ../../build/common/Locale.cs
 ../../build/common/SR.cs
 ../../build/common/MonoTODOAttribute.cs
+../../build/common/AssemblyRef.cs
 
 ReferenceSources/NativeOledbWrapper.cs
 ReferenceSources/Res.cs
diff --git a/mcs/class/System.Data/net_4_x_System.Data.dll.sources b/mcs/class/System.Data/net_4_x_System.Data.dll.sources
index 9622fcee668d3525c1dc49fa7a44053d20c8a983..76b642b8849fda23403711d3dbc810bb48a6171a 100644 (file)
--- a/mcs/class/System.Data/net_4_x_System.Data.dll.sources
+++ b/mcs/class/System.Data/net_4_x_System.Data.dll.sources
@@ -3,6 +3,7 @@ Assembly/AssemblyInfo.cs
 ../../build/common/Locale.cs
 ../../build/common/SR.cs
 ../../build/common/MonoTODOAttribute.cs
+../../build/common/AssemblyRef.cs
 
 ReferenceSources/NativeOledbWrapper.cs
 ReferenceSources/Res.cs
diff --git a/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals.dll.sources b/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals.dll.sources
index 99b323b2ab87b039f8e4d4c379c55ff66dd9fb4d..c9371adcc7403240c954b4a66007148ccf1aeb6c 100644 (file)
--- a/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals.dll.sources
+++ b/mcs/class/System.ServiceModel.Internals/System.ServiceModel.Internals.dll.sources
@@ -1,5 +1,6 @@
 ../../build/common/Consts.cs
 ../../build/common/SR.cs
+../../build/common/AssemblyRef.cs
 EventLogEntryType.cs
 InternalSR.cs
 Assembly/AssemblyInfo.cs
diff --git a/mcs/class/System.ServiceModel.Internals/mobile_System.ServiceModel.Internals.dll.sources b/mcs/class/System.ServiceModel.Internals/mobile_System.ServiceModel.Internals.dll.sources
index a2290a9efeaf3b0ae14f737112d1aebd49cb4be0..d788a69db7c339cf3c567efc9aec7dceb8fd62f1 100644 (file)
--- a/mcs/class/System.ServiceModel.Internals/mobile_System.ServiceModel.Internals.dll.sources
+++ b/mcs/class/System.ServiceModel.Internals/mobile_System.ServiceModel.Internals.dll.sources
@@ -1,5 +1,6 @@
 ../../build/common/Consts.cs
 ../../build/common/SR.cs
+../../build/common/AssemblyRef.cs
 EventLogEntryType.cs
 InternalSR.cs
 MobileStubs.cs
diff --git a/mcs/class/System.XML/Assembly/AssemblyInfo.cs b/mcs/class/System.XML/Assembly/AssemblyInfo.cs
index 355a3941c49773033d6a5496df503c5a8a417a99..3b61fe6384ad5cb0384fd7b329d1f7ac1133b281 100644 (file)
--- a/mcs/class/System.XML/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.XML/Assembly/AssemblyInfo.cs
@@ -63,12 +63,9 @@ using System.Runtime.InteropServices;
 
 #if NET_2_1
        [assembly: InternalsVisibleTo ("System.ServiceModel.Web, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
-       // System.Xml.Serialization (from Microsoft Silverlight 2.0 SDK) requires access to System.Xml internals
-       [assembly: InternalsVisibleTo ("System.Xml.Serialization, PublicKey=" + AssemblyRef.FrameworkPublicKeyFull)]
 #else
        [assembly: AllowPartiallyTrustedCallers]
 #endif
-       [assembly: InternalsVisibleTo ("System.Runtime.Serialization, PublicKey=" + AssemblyRef.FrameworkPublicKeyFull, AllInternalsVisible = false)]
        [assembly: InternalsVisibleTo ("System.Xml.Linq, PublicKey=" + AssemblyRef.FrameworkPublicKeyFull, AllInternalsVisible = false)]
 
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
diff --git a/mcs/class/System.XML/System.Xml.dll.sources b/mcs/class/System.XML/System.Xml.dll.sources
index 267719b871e93571b74c4c277a04a15e98a32845..be7f6099f6c4f6eeaa005c179dd27b8e738ba2d8 100644 (file)
--- a/mcs/class/System.XML/System.Xml.dll.sources
+++ b/mcs/class/System.XML/System.Xml.dll.sources
@@ -1,6 +1,7 @@
 Assembly/AssemblyInfo.cs
 ../../build/common/Consts.cs
 ../../build/common/SR.cs
+../../build/common/AssemblyRef.cs
 ReferenceSources/Res.cs
 ReferenceSources/LocalAppContextSwitches.cs
 ReferenceSources/ThisAssembly.cs
diff --git a/mcs/class/System.XML/mobile_System.Xml.dll.sources b/mcs/class/System.XML/mobile_System.Xml.dll.sources
index 9306044810f02c3f1491fa556fd8b522c9813452..253beb6470688707f66711f03749fc80fb4cb3ea 100644 (file)
--- a/mcs/class/System.XML/mobile_System.Xml.dll.sources
+++ b/mcs/class/System.XML/mobile_System.Xml.dll.sources
@@ -2,6 +2,7 @@ Assembly/AssemblyInfo.cs
 ../../build/common/Consts.cs
 ../../build/common/MonoTODOAttribute.cs
 ../../build/common/SR.cs
+../../build/common/AssemblyRef.cs
 ReferenceSources/Res.cs
 ReferenceSources/LocalAppContextSwitches.cs
 ReferenceSources/ThisAssembly.cs
diff --git a/mcs/class/corlib/Assembly/AssemblyInfo.cs b/mcs/class/corlib/Assembly/AssemblyInfo.cs
index b3284ea78796be7b38531510d7a79ffb72f7b7b2..cf95aee80ea0e92aa4eec92c3b2ce8c4a6bf8ccd 100644 (file)
--- a/mcs/class/corlib/Assembly/AssemblyInfo.cs
+++ b/mcs/class/corlib/Assembly/AssemblyInfo.cs
@@ -73,13 +73,9 @@ using System.Runtime.InteropServices;
 [assembly: DefaultDependency (LoadHint.Always)]
 [assembly: StringFreezing]
 
-#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: InternalsVisibleTo ("System, PublicKey=" + AssemblyRef.FrameworkPublicKeyFull2)]
+[assembly: InternalsVisibleTo ("System.Core, PublicKey=" + AssemblyRef.FrameworkPublicKeyFull2)]
+
 [assembly: InternalsVisibleTo ("System.Numerics, PublicKey=00000000000000000400000000000000")]
 
 #if MONOTOUCH
diff --git a/mcs/class/corlib/corlib.dll.sources b/mcs/class/corlib/corlib.dll.sources
index 464ac076432cab4506909b77961da47cf926fde9..35ed33617c26884fa55a28c2d058cfb533a30179 100644 (file)
--- a/mcs/class/corlib/corlib.dll.sources
+++ b/mcs/class/corlib/corlib.dll.sources
@@ -1,6 +1,7 @@
 Assembly/AssemblyInfo.cs
 ../../build/common/Consts.cs
 ../../build/common/Locale.cs
+../../build/common/AssemblyRef.cs
 Microsoft.Win32/IRegistryApi.cs
 Microsoft.Win32/RegistryKey.cs
 Microsoft.Win32/RegistryKeyPermissionCheck.cs
my mono mirror. check out Moved to http://github.com/mono/mono