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

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

@@ -50,7 +50,7 @@ namespace System.ServiceModel
{
}
#if !NET_2_1 && !XAMMAC_4_5
#if !MOBILE && !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 || XAMMAC_4_5
#if MOBILE || 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 || XAMMAC_4_5
#if MOBILE || 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 && !XAMMAC_4_5
#if !MOBILE && !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 || XAMMAC_4_5
#if MOBILE || XAMMAC_4_5
throw new NotImplementedException ();
#else
return new MtomMessageEncodingBindingElement (

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

@@ -50,7 +50,7 @@ namespace System.ServiceModel
{
}
#if !NET_2_1 && !XAMMAC_4_5
#if !MOBILE && !XAMMAC_4_5
public BasicHttpsBinding (string configurationName)
: this ()
{
@@ -102,7 +102,7 @@ namespace System.ServiceModel
SecurityBindingElement element;
switch (Security.Mode) {
case BasicHttpsSecurityMode.TransportWithMessageCredential:
#if NET_2_1 || XAMMAC_4_5
#if MOBILE || XAMMAC_4_5
throw new NotImplementedException ();
#else
@@ -117,7 +117,7 @@ namespace System.ServiceModel
return null;
}
#if !NET_2_1 && !XAMMAC_4_5
#if !MOBILE && !XAMMAC_4_5
element.SetKeyDerivation (false);
element.SecurityHeaderLayout = SecurityHeaderLayout.Lax;
#endif
@@ -132,7 +132,7 @@ namespace System.ServiceModel
ReaderQuotas.CopyTo (tm.ReaderQuotas);
return tm;
} else {
#if NET_2_1 || XAMMAC_4_5
#if MOBILE || XAMMAC_4_5
throw new NotImplementedException ();
#else
return new MtomMessageEncodingBindingElement (

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

@@ -90,7 +90,7 @@ namespace System.ServiceModel
if (configurationName == null)
return;
#if NET_2_1 || XAMMAC_4_5
#if MOBILE || 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 && !XAMMAC_4_5
#if !MOBILE && !XAMMAC_4_5
private void ApplyBehavior (string behaviorConfig)
{
BehaviorsSection behaviorsSection = ConfigUtil.BehaviorsSection;
@@ -260,7 +260,7 @@ namespace System.ServiceModel
new BindingParameterCollection ();
ContractDescription cd = Endpoint.Contract;
#if !NET_2_1
#if !MOBILE
pl.Add (ChannelProtectionRequirements.CreateFromContract (cd));
#endif

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

@@ -79,7 +79,7 @@ namespace System.ServiceModel
string modname = "dummy";
Type crtype =
#if !NET_2_1
#if !MOBILE
duplex ? typeof (DuplexClientRuntimeChannel) :
#endif
typeof (ClientRuntimeChannel);
@@ -131,7 +131,7 @@ namespace System.ServiceModel
BindingFlags bf = BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance;
foreach (OperationDescription od in cd.Operations) {
// FIXME: handle properties and events.
#if !NET_2_1
#if !MOBILE
if (od.SyncMethod != null)
GenerateMethodImpl (c, crtype.GetMethod ("Process", bf), od.Name, od.SyncMethod);
#endif

2
mcs/class/System.ServiceModel/System.ServiceModel/ClientRealProxy.cs
View File

@@ -71,7 +71,7 @@ namespace System.ServiceModel
{
if (CanCastTo<IClientChannel> (t))
return true;
#if !NET_2_1
#if !MOBILE
if (isDuplex && CanCastTo<IDuplexContextChannel> (t))
return true;
#endif

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

@@ -192,10 +192,6 @@ namespace System.ServiceModel.MonoInternal
} catch (Exception ex) {
// FIXME: log it.
Console.WriteLine (ex);
} finally {
// unless it is closed by session/call manager, move it back to the loop to receive the next message.
if (loop && input.State != CommunicationState.Closed)
ProcessRequestOrInput (input);
}
}

12
mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddress.cs
View File

@@ -37,7 +37,7 @@ using System.Xml.Schema;
using System.Xml.Serialization;
using System.ServiceModel.Channels;
using System.ServiceModel.Description;
#if !NET_2_1
#if !MOBILE
using System.Security.Cryptography.Xml;
#endif
@@ -116,7 +116,7 @@ namespace System.ServiceModel
get { return address; }
}
#if !NET_2_1
#if !MOBILE
internal static XmlSchema Schema {
get {
if (schema == null) {
@@ -187,7 +187,7 @@ namespace System.ServiceModel
return ! (address1 == address2);
}
//#if !NET_2_1
//#if !MOBILE
public static EndpointAddress ReadFrom (
XmlDictionaryReader reader)
{
@@ -296,7 +296,7 @@ namespace System.ServiceModel
addressingVersion.Namespace, reader.LocalName, reader.NamespaceURI));
reader.MoveToContent ();
#if !NET_2_1
#if !MOBILE
MetadataSet metadata = null;
if (reader.LocalName == "Metadata" &&
reader.NamespaceURI == addressingVersion.Namespace &&
@@ -317,7 +317,7 @@ namespace System.ServiceModel
if (addressingVersion == AddressingVersion.WSAddressing10 && uri == w3c_anonymous)
uri = anonymous_role;
#if NET_2_1
#if MOBILE
return new EndpointAddress (uri, identity);
#else
if (metadata == null)
@@ -338,7 +338,7 @@ namespace System.ServiceModel
{
if (writer == null)
throw new ArgumentNullException ("writer");
#if NET_2_1
#if MOBILE
if (addressingVersion == AddressingVersion.None) {
writer.WriteString (Uri.AbsoluteUri);
} else {

2
mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddress10.cs
View File

@@ -42,7 +42,7 @@ namespace System.ServiceModel
{
[XmlSchemaProvider ("GetSchema")]
[XmlRoot ("EndpointReference", Namespace = "http://www.w3.org/2005/08/addressing")]
#if NET_2_1
#if MOBILE
internal class EndpointAddress10 : IXmlSerializable
#else
public class EndpointAddress10 : IXmlSerializable

2
mcs/class/System.ServiceModel/System.ServiceModel/EndpointAddressBuilder.cs
View File

@@ -67,7 +67,7 @@ namespace System.ServiceModel
set { identity = value; }
}
#if !NET_2_1
#if !MOBILE
public XmlDictionaryReader GetReaderAtExtensions ()
{
if (extension == null)

16
mcs/class/System.ServiceModel/System.ServiceModel/Logger.cs
View File

@@ -50,7 +50,7 @@ namespace System.ServiceModel
internal static class Logger
{
#if NET_2_1
#if MOBILE
enum TraceEventType // dummy
{
Critical,
@@ -71,7 +71,7 @@ namespace System.ServiceModel
static int event_id;
static TextWriter log_writer;
static XmlWriter xml_writer;
#if !NET_2_1
#if !MOBILE
static readonly TraceSource source = new TraceSource ("System.ServiceModel");
static readonly TraceSource message_source = new TraceSource ("System.ServiceModel.MessageLogging");
#endif
@@ -89,7 +89,7 @@ namespace System.ServiceModel
case "stderr":
log_writer = Console.Error;
break;
#if !NET_2_1
#if !MOBILE
default:
try {
if (!String.IsNullOrEmpty (env))
@@ -104,7 +104,7 @@ namespace System.ServiceModel
if (log_writer != null)
xml_writer = XmlWriter.Create (log_writer, new XmlWriterSettings () { OmitXmlDeclaration = true });
#if !NET_2_1
#if !MOBILE
message_source.Switch.Level = SourceLevels.Information;
#endif
}
@@ -143,7 +143,7 @@ namespace System.ServiceModel
if (log_writer != null) {
lock (log_writer){
event_id++;
#if NET_2_1
#if MOBILE
log_writer.Write ("[{0}] ", event_id);
#endif
TraceCore (TraceEventType.Information, event_id,
@@ -151,7 +151,7 @@ namespace System.ServiceModel
message, args);
log_writer.WriteLine (message, args);
log_writer.Flush ();
#if !NET_2_1
#if !MOBILE
source.TraceEvent (eventType, event_id, message, args);
#endif
}
@@ -179,7 +179,7 @@ namespace System.ServiceModel
{
if (log_writer != null) {
var sw = new StringWriter ();
#if NET_2_1
#if MOBILE
var xw = XmlWriter.Create (sw, xws);
#else
var doc = new XmlDocument ();
@@ -199,7 +199,7 @@ namespace System.ServiceModel
event_id++;
lock (log_writer){
#if NET_2_1
#if MOBILE
log_writer.Write ("[{0}] ", event_id);
TraceCore (TraceEventType.Information, event_id, /*FIXME*/false, /*FIXME*/Guid.Empty, sw);

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

@@ -45,7 +45,7 @@ namespace System.ServiceModel
}
Message incoming_message;
#if !NET_2_1 && !XAMMAC_4_5
#if !MOBILE && !XAMMAC_4_5
EndpointDispatcher dispatcher;
#endif
IContextChannel channel;
@@ -83,7 +83,7 @@ namespace System.ServiceModel
}
#if !NET_2_1 && !XAMMAC_4_5
#if !MOBILE && !XAMMAC_4_5
public EndpointDispatcher EndpointDispatcher {
get { return dispatcher; }
set { dispatcher = value; }
@@ -146,7 +146,7 @@ namespace System.ServiceModel
get { return Channel.SessionId; }
}
#if !NET_2_1
#if !MOBILE
public ServiceSecurityContext ServiceSecurityContext {
get { return IncomingMessageProperties != null ? IncomingMessageProperties.Security.ServiceSecurityContext : null; }
}

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

@@ -25,7 +25,7 @@
// 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 || XAMMAC_4_5
#if MOBILE || XAMMAC_4_5
using System;
using System.Collections.Generic;