mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.3.13

Browse Source 
Former-commit-id: 4f1f69b42e04def9a697c2550b23b9cae645ef29
This commit is contained in:
Xamarin Public Jenkins
2015-07-20 03:39:00 -04:00
parent 4cee7df5e0
commit 2c051c3d51
138 changed files with 3829 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mcs/class/System.ServiceModel/System.ServiceModel/BasicHttpBinding_4_5.cs
View File

@ -50,7 +50,7 @@ namespace System.ServiceModel
{
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
public BasicHttpBinding (string configurationName)
: this ()
{
@ -110,7 +110,7 @@ namespace System.ServiceModel
SecurityBindingElement element;
switch (Security.Mode) {
case BasicHttpSecurityMode.Message:
#if NET_2_1
#if NET_2_1 || XAMMAC_4_5
throw new NotImplementedException ();
#else
if (Security.Message.ClientCredentialType != BasicHttpMessageCredentialType.Certificate)
@ -121,7 +121,7 @@ namespace System.ServiceModel
#endif
case BasicHttpSecurityMode.TransportWithMessageCredential:
#if NET_2_1
#if NET_2_1 || XAMMAC_4_5
throw new NotImplementedException ();
#else
if (Security.Message.ClientCredentialType != BasicHttpMessageCredentialType.Certificate)
@ -135,7 +135,7 @@ namespace System.ServiceModel
return null;
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
element.SetKeyDerivation (false);
element.SecurityHeaderLayout = SecurityHeaderLayout.Lax;
#endif
@ -150,7 +150,7 @@ namespace System.ServiceModel
ReaderQuotas.CopyTo (tm.ReaderQuotas);
return tm;
} else {
#if NET_2_1
#if NET_2_1 || XAMMAC_4_5
throw new NotImplementedException ();
#else
return new MtomMessageEncodingBindingElement (

9
mcs/class/System.ServiceModel/System.ServiceModel/BasicHttpsBinding.cs
View File

@ -50,7 +50,7 @@ namespace System.ServiceModel
{
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
public BasicHttpsBinding (string configurationName)
: this ()
{
@ -101,7 +101,8 @@ namespace System.ServiceModel
SecurityBindingElement element;
switch (Security.Mode) {
case BasicHttpsSecurityMode.TransportWithMessageCredential:
#if NET_2_1
#if NET_2_1 || XAMMAC_4_5
throw new NotImplementedException ();
#else
if (Security.Message.ClientCredentialType != BasicHttpMessageCredentialType.Certificate)
@ -115,7 +116,7 @@ namespace System.ServiceModel
return null;
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
element.SetKeyDerivation (false);
element.SecurityHeaderLayout = SecurityHeaderLayout.Lax;
#endif
@ -130,7 +131,7 @@ namespace System.ServiceModel
ReaderQuotas.CopyTo (tm.ReaderQuotas);
return tm;
} else {
#if NET_2_1
#if NET_2_1 || XAMMAC_4_5
throw new NotImplementedException ();
#else
return new MtomMessageEncodingBindingElement (

4
mcs/class/System.ServiceModel/System.ServiceModel/ChannelFactory.cs
View File

@ -90,7 +90,7 @@ namespace System.ServiceModel
if (endpointConfig == null)
return;
#if NET_2_1
#if NET_2_1 || XAMMAC_4_5
try {
// It should automatically use XmlXapResolver
var cfg = new SilverlightClientConfigLoader ().Load (XmlReader.Create ("ServiceReferences.ClientConfig"));
@ -160,7 +160,7 @@ namespace System.ServiceModel
#endif
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
private void ApplyBehavior (string behaviorConfig)
{
BehaviorsSection behaviorsSection = ConfigUtil.BehaviorsSection;

4
mcs/class/System.ServiceModel/System.ServiceModel/OperationContext.cs
View File

@ -45,7 +45,7 @@ namespace System.ServiceModel
}
Message incoming_message;
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
EndpointDispatcher dispatcher;
#endif
IContextChannel channel;
@ -83,7 +83,7 @@ namespace System.ServiceModel
}
#if !NET_2_1
#if !NET_2_1 && !XAMMAC_4_5
public EndpointDispatcher EndpointDispatcher {
get { return dispatcher; }
set { dispatcher = value; }

3
mcs/class/System.ServiceModel/System.ServiceModel/SilverlightClientConfigLoader.cs
View File

@ -25,7 +25,8 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
#if NET_2_1
#if NET_2_1 || XAMMAC_4_5
using System;
using System.Collections.Generic;
using System.ServiceModel.Channels;