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

Imported Upstream version 4.8.0.309

Browse Source 
Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mcs/class/System.ServiceModel.Web/System.ServiceModel.Channels/WebMessageEncoder.cs
View File

@ -47,7 +47,7 @@ namespace System.ServiceModel.Channels
}
public override string ContentType {
#if NET_2_1
#if MOBILE
get { return MediaType; }
#else
get { return MediaType + "; charset=" + source.WriteEncoding.HeaderName; }
@ -114,7 +114,7 @@ namespace System.ServiceModel.Channels
break;
case WebContentFormat.Json:
// FIXME: is it safe/unsafe/required to keep XmlReader open?
#if NET_2_1
#if MOBILE
msg = Message.CreateMessage (MessageVersion.None, null, JsonReaderWriterFactory.CreateJsonReader (stream, source.ReaderQuotas));
#else
msg = Message.CreateMessage (MessageVersion.None, null, JsonReaderWriterFactory.CreateJsonReader (stream, enc, source.ReaderQuotas, null));
@ -174,7 +174,7 @@ namespace System.ServiceModel.Channels
switch (GetContentFormat (message)) {
case WebContentFormat.Xml:
#if NET_2_1
#if MOBILE
using (XmlWriter w = XmlDictionaryWriter.CreateDictionaryWriter (XmlWriter.Create (new StreamWriter (stream, source.WriteEncoding))))
message.WriteMessage (w);
#else

6
mcs/class/System.ServiceModel.Web/System.ServiceModel.Channels/WebMessageEncodingBindingElement.cs
View File

@ -34,7 +34,7 @@ using System.Xml;
namespace System.ServiceModel.Channels
{
public sealed class WebMessageEncodingBindingElement
#if NET_2_1
#if MOBILE
: MessageEncodingBindingElement
#else
: MessageEncodingBindingElement, IWsdlExportExtension
@ -109,7 +109,7 @@ namespace System.ServiceModel.Channels
return base.BuildChannelFactory<TChannel> (context);
}
#if !NET_2_1
#if !MOBILE
[MonoTODO ("Why is it overriden?")]
public override bool CanBuildChannelListener<TChannel> (BindingContext context)
{
@ -146,7 +146,7 @@ namespace System.ServiceModel.Channels
return context.GetInnerProperty<T> ();
}
#if !NET_2_1 && !XAMMAC_4_5
#if !MOBILE && !XAMMAC_4_5
[MonoTODO]
void IWsdlExportExtension.ExportContract (WsdlExporter exporter, WsdlContractConversionContext context)
{