[corlib] Mobile build fixes

diff --git a/external/referencesource b/external/referencesource
index 4b90265461fb3cca3ba2381538693474b79ab08f..7612b6f65cec4620d83117511d38e47a5456b468 160000 (submodule)
--- a/external/referencesource
+++ b/external/referencesource
@@ -1 +1 @@
-Subproject commit 4b90265461fb3cca3ba2381538693474b79ab08f
+Subproject commit 7612b6f65cec4620d83117511d38e47a5456b468

diff --git a/mcs/class/System.Data/Assembly/AssemblyInfo.cs b/mcs/class/System.Data/Assembly/AssemblyInfo.cs
index 65930ef17203b2116140f052dc7cb0f761705d22..55252a3c447e72929a69a6ec485f9675554d4d8a 100644 (file)
--- a/mcs/class/System.Data/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Data/Assembly/AssemblyInfo.cs
@@ -61,7 +61,6 @@ using System.Runtime.InteropServices;
        [assembly: AssemblyKeyFile("../ecma.pub")]
 
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
 [assembly: InternalsVisibleTo ("System.Data.DataSetExtensions, PublicKey=" + AssemblyRef.FrameworkPublicKeyFull)]
 [assembly: InternalsVisibleTo ("System.Design, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
 [assembly: InternalsVisibleTo ("System.Web, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]

diff --git a/mcs/class/System.Transactions/Assembly/AssemblyInfo.cs b/mcs/class/System.Transactions/Assembly/AssemblyInfo.cs
index dc036a32be80f1bed036c92aeb7388b815a9bb98..4b130a9110a7bc42891c2168ba1144dc257d4f61 100644 (file)
--- a/mcs/class/System.Transactions/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Transactions/Assembly/AssemblyInfo.cs
@@ -52,7 +52,6 @@ using System.Security.Permissions;
 [assembly: NeutralResourcesLanguage ("en-US")]
 
 [assembly: ComVisible (false)]
-[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
 [assembly: AllowPartiallyTrustedCallers]
 
        [assembly: CLSCompliant (true)]

diff --git a/mcs/class/corlib/System.Reflection.Emit/CustomAttributeBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/CustomAttributeBuilder.cs
index 647736bf203d01d6e5cd6baea01790d950502700..f3302e02b9ce491b7e06f8c4dd78eb2f92f13896 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/CustomAttributeBuilder.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/CustomAttributeBuilder.cs
@@ -358,8 +358,10 @@ namespace System.Reflection.Emit {
                                        return UnmanagedMarshal.DefineLPArrayInternal (subtype, sizeConst, sizeParamIndex);
                                else
                                        return UnmanagedMarshal.DefineLPArray (subtype);
+#if FEATURE_COMINTEROP
                        case UnmanagedType.SafeArray:
                                return UnmanagedMarshal.DefineSafeArray (subtype);
+#endif
                        case UnmanagedType.ByValArray:
                                if (!is_field)
                                        throw new ArgumentException ("Specified unmanaged type is only valid on fields");
@@ -367,8 +369,10 @@ namespace System.Reflection.Emit {
                                return UnmanagedMarshal.DefineByValArray (sizeConst);
                        case UnmanagedType.ByValTStr:
                                return UnmanagedMarshal.DefineByValTStr (sizeConst);
+#if FEATURE_COMINTEROP
                        case UnmanagedType.CustomMarshaler:
                                return UnmanagedMarshal.DefineCustom (marshalTypeRef, marshalCookie, marshalTypeName, Guid.Empty);
+#endif
                        default:
                                return UnmanagedMarshal.DefineUnmanagedMarshal ((UnmanagedType)utype);
                        }

diff --git a/mcs/class/corlib/System.Reflection.Emit/UnmanagedMarshal.cs b/mcs/class/corlib/System.Reflection.Emit/UnmanagedMarshal.cs
index 7cf8c8a5717167a37f5c29d40678931067c77dfa..45b9a2caef31e8cfe4281e8147c7015b83a59ccf 100644 (file)
--- a/mcs/class/corlib/System.Reflection.Emit/UnmanagedMarshal.cs
+++ b/mcs/class/corlib/System.Reflection.Emit/UnmanagedMarshal.cs
@@ -68,8 +68,13 @@ namespace System.Reflection.Emit {
                
                public UnmanagedType BaseType {
                        get {
-                               if (t == UnmanagedType.LPArray || t == UnmanagedType.SafeArray)
+                               if (t == UnmanagedType.LPArray)
                                        throw new ArgumentException ();
+
+#if FEATURE_COMINTEROP
+                               if (t == UnmanagedType.SafeArray)
+                                       throw new ArgumentException ();
+#endif
                                return tbase;
                        }
                }
@@ -97,15 +102,15 @@ namespace System.Reflection.Emit {
                public static UnmanagedMarshal DefineLPArray( UnmanagedType elemType) {
                        return new UnmanagedMarshal (UnmanagedType.LPArray, elemType);
                }
-
+#if FEATURE_COMINTEROP
                public static UnmanagedMarshal DefineSafeArray( UnmanagedType elemType) {
                        return new UnmanagedMarshal (UnmanagedType.SafeArray, elemType);
                }
-
+#endif
                public static UnmanagedMarshal DefineUnmanagedMarshal( UnmanagedType unmanagedType) {
                        return new UnmanagedMarshal (unmanagedType, unmanagedType);
                }
-
+#if FEATURE_COMINTEROP
                internal static UnmanagedMarshal DefineCustom (Type typeref, string cookie, string mtype, Guid id) {
                        UnmanagedMarshal res = new UnmanagedMarshal (UnmanagedType.CustomMarshaler, UnmanagedType.CustomMarshaler);
                        res.mcookie = cookie;
@@ -117,7 +122,7 @@ namespace System.Reflection.Emit {
                                res.guid = id.ToString ();
                        return res;
                }
-               
+#endif         
                // sizeConst and sizeParamIndex can be -1 meaning they are not specified
                internal static UnmanagedMarshal DefineLPArrayInternal (UnmanagedType elemType, int sizeConst, int sizeParamIndex) {
                        UnmanagedMarshal res = new UnmanagedMarshal (UnmanagedType.LPArray, elemType);

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/EXCEPINFO.cs b/mcs/class/corlib/System.Runtime.InteropServices/EXCEPINFO.cs
index 0e61c36b7fd57029c7db92ec042e5a68b6a15426..c9ce2f0949f58cead92740654fb9180cc6593e16 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/EXCEPINFO.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/EXCEPINFO.cs
@@ -30,7 +30,7 @@
 
 using System;
 
-#if !FULL_AOT_RUNTIME
+#if !MOBILE
 namespace System.Runtime.InteropServices
 {
        [Obsolete]

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs b/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs
index 44c9ec8a72670db2e0354972d4c05aad60f47d88..1b650da569d25bda48ab02c01ab63dadb89c4d9e 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs
@@ -578,7 +578,7 @@ namespace System.Runtime.InteropServices
                        throw new NotImplementedException ();                   
                }
 
-#if !FULL_AOT_RUNTIME
+#if !MOBILE
                [Obsolete]
                [MonoTODO]
                public static string GetTypeInfoName (UCOMITypeInfo pTI)

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIConnectionPoint.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIConnectionPoint.cs
index cd0e84f3fc81d116272581d4771f4e5d0532543b..0e4a5d4592f0e15ffc21580de6833c0ca67b0620 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIConnectionPoint.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIConnectionPoint.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !FULL_AOT_RUNTIME
+#if !MOBILE
 namespace System.Runtime.InteropServices
 {
        [Obsolete]

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIConnectionPointContainer.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIConnectionPointContainer.cs
index 8011610ab7bcf250fc236fa0a56ef2ab359d0523..d652123058a73830f002b67d6e42898e9ba47b90 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIConnectionPointContainer.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIConnectionPointContainer.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !FULL_AOT_RUNTIME
+#if !MOBILE
 namespace System.Runtime.InteropServices
 {
        [Obsolete]

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumConnectionPoints.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumConnectionPoints.cs
index bb669b78e0d47ed47cdcf9dcd2befe3b6f13b757..02f4a456d4b1d1eeedb8954afc4aadc3c435e04a 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumConnectionPoints.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMIEnumConnectionPoints.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if !FULL_AOT_RUNTIME
+#if !MOBILE
 namespace System.Runtime.InteropServices
 {
        [Obsolete]

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeComp.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeComp.cs
index 12af145c4cd4ae22756c4f5cbc5eb7823fdc91d3..eb10fe08716812160c5daa133f4c5ce826f0c96a 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeComp.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeComp.cs
@@ -28,7 +28,7 @@
 //
 // (C) 2002 Ximian, Inc.
 
-#if !FULL_AOT_RUNTIME
+#if !MOBILE
 namespace System.Runtime.InteropServices
 {
        [Obsolete]

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeInfo.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeInfo.cs
index a8b4a1600b6429d838223683ed21783147f38dd3..5d374f12ea93616af855dcbcadf642eccbf05b90 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeInfo.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeInfo.cs
@@ -28,7 +28,7 @@
 //
 // (C) 2002 Ximian, Inc.
 
-#if !FULL_AOT_RUNTIME
+#if !MOBILE
 namespace System.Runtime.InteropServices
 {
        [Obsolete]

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeLib.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeLib.cs
index 2b9c1ccdc0da9ae69006d80cf71dc6e0b45217ec..46137121a6db1be7833f29f802bb59fbe4d425a3 100644 (file)
--- a/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeLib.cs
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMITypeLib.cs
@@ -28,7 +28,7 @@
 //
 // (C) 2002 Ximian, Inc.
 
-#if !FULL_AOT_RUNTIME
+#if !MOBILE
 namespace System.Runtime.InteropServices
 {
        [Obsolete]

diff --git a/mcs/class/corlib/System/Variant.cs b/mcs/class/corlib/System/Variant.cs
index c286abd3f98bc3a61139a9c9dc001212cd318233..e2b4380be7e54598cd3f30d5ec1b7fae35f732df 100644 (file)
--- a/mcs/class/corlib/System/Variant.cs
+++ b/mcs/class/corlib/System/Variant.cs
@@ -168,7 +168,7 @@ namespace System
                                vt = (short)VarEnum.VT_BSTR;
                                bstrVal = Marshal.StringToBSTR(((BStrWrapper)obj).WrappedObject);
                        }
-#if !FULL_AOT_RUNTIME
+#if FEATURE_COMINTEROP
                        else if (t == typeof (UnknownWrapper))
                        {
                                vt = (short)VarEnum.VT_UNKNOWN;
@@ -182,7 +182,7 @@ namespace System
 #endif
                        else
                        {
-#if FULL_AOT_RUNTIME
+#if !FEATURE_COMINTEROP
                                throw new NotImplementedException(string.Format("Variant couldn't handle object of type {0}", obj.GetType()));
 #else
                                try 
@@ -301,7 +301,7 @@ namespace System
                        case VarEnum.VT_BSTR:
                                obj = Marshal.PtrToStringBSTR(bstrVal);
                                break;
-#if !FULL_AOT_RUNTIME
+#if FEATURE_COMINTEROP
                        case VarEnum.VT_UNKNOWN:
                        case VarEnum.VT_DISPATCH:
                                if (pdispVal != IntPtr.Zero)