diff options
author | Rolf Bjarne Kvinge <rolf@xamarin.com> | 2017-05-10 11:41:44 +0300 |
---|---|---|
committer | Marek Safar <marek.safar@gmail.com> | 2017-05-11 10:09:34 +0300 |
commit | 4960d5d2a28a08476ee4239e1746f04afce41c13 (patch) | |
tree | d337f098022e7cb20f3a211dd5f0394b86f89f55 /mcs | |
parent | 56e2eba4c26c5ce18b75c1b44eaef6e80186b024 (diff) |
[System] Use 'ObjCRuntimeInternal' as the namespace instead of 'ObjCRuntime'.
Use 'ObjCRuntimeInternal' as the namespace instead of 'ObjCRuntime' to avoid
these compiler-warnings when building xamarin-macios assemblies (which defines
the same types in the ObjCRuntime namespace, and to whom System.dll has an
InternalsVisibleTo attribute):
> xamarin-macios/src/build/watch/watch/Foundation/NSExtensionRequestHandling.g.cs(28,49): warning CS0436: The type `ObjCRuntime.INativeObject' conflicts with the imported type of same name'. Ignoring the imported type definition
> xamarin-macios/src/ObjCRuntime/INativeObject.cs(6,19): (Location of the symbol related to previous warning)
> xamarin-macios/_ios-build/Library/Frameworks/Xamarin.iOS.framework/Versions/git/lib/mono/Xamarin.WatchOS/repl/System.dll (Location of the symbol related to previous warning)
Diffstat (limited to 'mcs')
-rw-r--r-- | mcs/class/System/Mono.AppleTls/AppleTlsContext.cs | 2 | ||||
-rw-r--r-- | mcs/class/System/Mono.AppleTls/Certificate.cs | 2 | ||||
-rw-r--r-- | mcs/class/System/Mono.AppleTls/Enums.cs | 2 | ||||
-rw-r--r-- | mcs/class/System/Mono.AppleTls/INativeObject.cs | 2 | ||||
-rw-r--r-- | mcs/class/System/Mono.AppleTls/ImportExport.cs | 2 | ||||
-rw-r--r-- | mcs/class/System/Mono.AppleTls/Items.cs | 2 | ||||
-rw-r--r-- | mcs/class/System/Mono.AppleTls/Policy.cs | 2 | ||||
-rw-r--r-- | mcs/class/System/Mono.AppleTls/Trust.cs | 2 | ||||
-rw-r--r-- | mcs/class/System/System.Net/MacProxy.cs | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/mcs/class/System/Mono.AppleTls/AppleTlsContext.cs b/mcs/class/System/Mono.AppleTls/AppleTlsContext.cs index 2f2fd6b8b3c..c378ba67d90 100644 --- a/mcs/class/System/Mono.AppleTls/AppleTlsContext.cs +++ b/mcs/class/System/Mono.AppleTls/AppleTlsContext.cs @@ -35,7 +35,7 @@ using Mono.Net; using Mono.Net.Security; using Mono.Util; -using ObjCRuntime; +using ObjCRuntimeInternal; namespace Mono.AppleTls { diff --git a/mcs/class/System/Mono.AppleTls/Certificate.cs b/mcs/class/System/Mono.AppleTls/Certificate.cs index 1bcf1b2937c..7463ef1aa3a 100644 --- a/mcs/class/System/Mono.AppleTls/Certificate.cs +++ b/mcs/class/System/Mono.AppleTls/Certificate.cs @@ -36,7 +36,7 @@ using System.Runtime.InteropServices; using System.Security.Cryptography.X509Certificates; using Mono.Net; -using ObjCRuntime; +using ObjCRuntimeInternal; namespace Mono.AppleTls { diff --git a/mcs/class/System/Mono.AppleTls/Enums.cs b/mcs/class/System/Mono.AppleTls/Enums.cs index e71e94ff144..99c952f1713 100644 --- a/mcs/class/System/Mono.AppleTls/Enums.cs +++ b/mcs/class/System/Mono.AppleTls/Enums.cs @@ -1,7 +1,7 @@ #if MONO_FEATURE_APPLETLS // Copyright 2011-2015 Xamarin Inc. All rights reserved. -using ObjCRuntime; +using ObjCRuntimeInternal; namespace Mono.AppleTls { diff --git a/mcs/class/System/Mono.AppleTls/INativeObject.cs b/mcs/class/System/Mono.AppleTls/INativeObject.cs index 81c8003ee26..52d17755451 100644 --- a/mcs/class/System/Mono.AppleTls/INativeObject.cs +++ b/mcs/class/System/Mono.AppleTls/INativeObject.cs @@ -1,6 +1,6 @@ using System; -namespace ObjCRuntime { +namespace ObjCRuntimeInternal { internal interface INativeObject { IntPtr Handle { diff --git a/mcs/class/System/Mono.AppleTls/ImportExport.cs b/mcs/class/System/Mono.AppleTls/ImportExport.cs index 390dc381382..dae101bc6b4 100644 --- a/mcs/class/System/Mono.AppleTls/ImportExport.cs +++ b/mcs/class/System/Mono.AppleTls/ImportExport.cs @@ -31,7 +31,7 @@ using System; using System.Runtime.InteropServices; using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; -using ObjCRuntime; +using ObjCRuntimeInternal; using Mono.Net; #if MONO_FEATURE_BTLS diff --git a/mcs/class/System/Mono.AppleTls/Items.cs b/mcs/class/System/Mono.AppleTls/Items.cs index cb37e48e07e..7d28e64a220 100644 --- a/mcs/class/System/Mono.AppleTls/Items.cs +++ b/mcs/class/System/Mono.AppleTls/Items.cs @@ -34,7 +34,7 @@ using System; using System.Collections; using System.Runtime.InteropServices; -using ObjCRuntime; +using ObjCRuntimeInternal; using Mono.Net; namespace Mono.AppleTls { diff --git a/mcs/class/System/Mono.AppleTls/Policy.cs b/mcs/class/System/Mono.AppleTls/Policy.cs index b91f7132c07..4c14f891b76 100644 --- a/mcs/class/System/Mono.AppleTls/Policy.cs +++ b/mcs/class/System/Mono.AppleTls/Policy.cs @@ -30,7 +30,7 @@ // using System; using System.Runtime.InteropServices; -using ObjCRuntime; +using ObjCRuntimeInternal; using Mono.Net; namespace Mono.AppleTls { diff --git a/mcs/class/System/Mono.AppleTls/Trust.cs b/mcs/class/System/Mono.AppleTls/Trust.cs index 99c2cd8906d..722bc8faa21 100644 --- a/mcs/class/System/Mono.AppleTls/Trust.cs +++ b/mcs/class/System/Mono.AppleTls/Trust.cs @@ -32,7 +32,7 @@ using System; using System.Runtime.InteropServices; using System.Security; using System.Security.Cryptography.X509Certificates; -using ObjCRuntime; +using ObjCRuntimeInternal; using Mono.Net; namespace Mono.AppleTls { diff --git a/mcs/class/System/System.Net/MacProxy.cs b/mcs/class/System/System.Net/MacProxy.cs index 7dbb8957158..0ccf34bd53f 100644 --- a/mcs/class/System/System.Net/MacProxy.cs +++ b/mcs/class/System/System.Net/MacProxy.cs @@ -29,7 +29,7 @@ using System.Net; using System.Collections.Generic; using System.Runtime.InteropServices; using System.Threading; -using ObjCRuntime; +using ObjCRuntimeInternal; namespace Mono.Net { |