[BCL] Fix xammac_4_5 build of the Facades.

diff --git a/mcs/class/Facades/Makefile b/mcs/class/Facades/Makefile
index fb97a983392efc4aee1798fd10c62aa04316d663..5917c651483231ab0f5a7a1296e458e6044eca4b 100644 (file)
--- a/mcs/class/Facades/Makefile
+++ b/mcs/class/Facades/Makefile
@@ -16,7 +16,7 @@ monotouch_SUBDIRS = System.Collections.Concurrent System.Collections System.Comp
        System.Diagnostics.Process System.Diagnostics.TextWriterTraceListener System.Diagnostics.TraceEvent System.Diagnostics.TraceSource System.Globalization.Calendars \
        System.IO.Compression System.IO.Compression.ZipFile System.IO.FileSystem System.IO.FileSystem.DriveInfo System.IO.FileSystem.Primitives \
        System.IO.IsolatedStorage System.IO.MemoryMappedFiles System.IO.UnmanagedMemoryStream System.Net.AuthenticationManager System.Net.Cache \
-       System.Net.Http.WebRequestHandler System.Net.HttpListener System.Net.Mail System.Net.NameResolution System.Net.Security System.Net.ServicePoint System.Net.Sockets \
+       System.Net.HttpListener System.Net.Mail System.Net.NameResolution System.Net.Security System.Net.ServicePoint System.Net.Sockets \
        System.Net.Utilities System.Net.WebHeaderCollection System.Net.WebSockets System.Net.WebSockets.Client System.Resources.ReaderWriter System.Runtime.CompilerServices.VisualC \
        System.Security.AccessControl System.Security.Claims System.Security.Cryptography.DeriveBytes System.Security.Cryptography.Encoding System.Security.Cryptography.Encryption \
        System.Security.Cryptography.Encryption.Aes System.Security.Cryptography.Encryption.ECDiffieHellman System.Security.Cryptography.Encryption.ECDsa System.Security.Cryptography.Hashing \
@@ -31,7 +31,7 @@ reflection_SUBDIRS = System.Reflection.Emit.ILGeneration System.Reflection.Emit.
 mobile_static_SUBDIRS = $(monotouch_SUBDIRS)
 
 net_4_5_SUBDIRS = $(monotouch_SUBDIRS) $(reflection_SUBDIRS) System.Diagnostics.PerformanceCounter \
-       System.IO.FileSystem.Watcher System.IO.Pipes System.Security.Cryptography.ProtectedData System.ServiceProcess.ServiceController 
+       System.IO.FileSystem.Watcher System.IO.Pipes System.Security.Cryptography.ProtectedData System.ServiceProcess.ServiceController System.Net.Http.WebRequestHandler
 
 monodroid_SUBDIRS = $(monotouch_SUBDIRS) $(reflection_SUBDIRS)
 

diff --git a/mcs/class/Facades/System.ServiceModel.Duplex/TypeForwarders.cs b/mcs/class/Facades/System.ServiceModel.Duplex/TypeForwarders.cs
index 3b1a3929a8421c7b216ba575c672b559f4363bb1..89df05537785702076e7b0b9a3cf1831880c4e92 100644 (file)
--- a/mcs/class/Facades/System.ServiceModel.Duplex/TypeForwarders.cs
+++ b/mcs/class/Facades/System.ServiceModel.Duplex/TypeForwarders.cs
@@ -20,7 +20,7 @@
 // THE SOFTWARE.
 // 
 
-#if !MOBILE
+#if !MOBILE && !XAMMAC_4_5
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.CallbackBehaviorAttribute))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.DuplexChannelFactory<>))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.DuplexClientBase<>))]

diff --git a/mcs/class/Facades/System.ServiceModel.NetTcp/TypeForwarders.cs b/mcs/class/Facades/System.ServiceModel.NetTcp/TypeForwarders.cs
index 41b9ff38adac1c052d90f694460a8ac9bc47fd8a..a80d1c6fd126c5c9ffc8e0b8923fd9805bb0910e 100644 (file)
--- a/mcs/class/Facades/System.ServiceModel.NetTcp/TypeForwarders.cs
+++ b/mcs/class/Facades/System.ServiceModel.NetTcp/TypeForwarders.cs
@@ -20,7 +20,7 @@
 // THE SOFTWARE.
 // 
 
-#if !MOBILE
+#if !MOBILE && !XAMMAC_4_5
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.ConnectionOrientedTransportBindingElement))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.SslStreamSecurityBindingElement))]
 [assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.ServiceModel.Channels.TcpConnectionPoolSettings))]