Imported Upstream version 5.20.0.180

Former-commit-id: ff953ca879339fe1e1211f7220f563e1342e66cb
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-02-04 20:11:37 +00:00
parent 0e2d47d1c8
commit 0510252385
3360 changed files with 83827 additions and 39243 deletions

View File

@ -177,39 +177,34 @@ namespace System.ServiceModel
// introduced for silverlight sdk compatibility
internal interface IDuplexHelper { }
[FriendAccessAllowed ()]
internal class DiagnosticUtility
internal static class DiagnosticUtility
{
[FriendAccessAllowed ()]
internal class ExceptionUtility
internal static class ExceptionUtility
{
public static Exception ThrowHelperArgument (string message) { throw new NotImplementedException (); }
public static Exception ThrowHelperArgument (string paramName, string message) { throw new NotImplementedException (); }
public static Exception ThrowHelperArgumentNull (string arg)
internal static ArgumentException ThrowHelperArgument (string message)
{
return new ArgumentNullException (arg);
return (ArgumentException)ThrowHelperError (new ArgumentException (message));
}
[FriendAccessAllowed]
internal static Exception ThrowHelperCallback (Exception e) { throw new NotImplementedException (); }
[FriendAccessAllowed]
internal static Exception ThrowHelperCallback (string message, Exception innerException) { throw new NotImplementedException (); }
public static Exception ThrowHelperError (Exception error)
internal static ArgumentException ThrowHelperArgument (string paramName, string message)
{
return error;
return (ArgumentException)ThrowHelperError (new ArgumentException (message, paramName));
}
internal static ArgumentNullException ThrowHelperArgumentNull (string paramName)
{
return (ArgumentNullException)ThrowHelperError (new ArgumentNullException (paramName));
}
internal static Exception ThrowHelperError (Exception exception)
{
return exception;
}
internal static Exception ThrowHelperWarning (Exception exception)
{
return exception;
}
[FriendAccessAllowed]
internal static Exception ThrowHelperFatal (string message, Exception innerException) { throw new NotImplementedException (); }
[FriendAccessAllowed]
internal static Exception ThrowHelperInternal (bool fatal) { throw new NotImplementedException (); }
public static Exception ThrowHelperWarning (Exception e) { throw new NotImplementedException (); }
}
}
}

View File

@ -149,4 +149,38 @@ namespace System.ServiceModel.Description
namespace System.ServiceModel.Channels
{
public interface ITransportTokenAssertionProvider {}
}
namespace System.ServiceModel
{
internal static class DiagnosticUtility
{
internal static class ExceptionUtility
{
internal static ArgumentException ThrowHelperArgument (string message)
{
return (ArgumentException)ThrowHelperError (new ArgumentException (message));
}
internal static ArgumentException ThrowHelperArgument (string paramName, string message)
{
return (ArgumentException)ThrowHelperError (new ArgumentException (message, paramName));
}
internal static ArgumentNullException ThrowHelperArgumentNull (string paramName)
{
return (ArgumentNullException)ThrowHelperError (new ArgumentNullException (paramName));
}
internal static Exception ThrowHelperError (Exception exception)
{
return exception;
}
internal static Exception ThrowHelperWarning (Exception exception)
{
return exception;
}
}
}
}

View File

@ -47,17 +47,14 @@ endif # (2.1, $(FRAMEWORK_VERSION))
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
TEST_EXTRA_FILES = \
System.ServiceModel_test_net_3_0.dll.config \
Test/config/* \
Test/Resources/* \
Test/XmlFiles/* \
Test/System.ServiceModel.Channels/soap-fault*.xml \
Test/System.ServiceModel.Channels/binary-message.raw \
Test/System.ServiceModel.Description/dump.xml \
Test/MetadataTests/Resources/*
TEST_RESOURCE_FILES = \
$(wildcard Test/config/*) \
$(wildcard Test/Resources/*) \
$(wildcard Test/MetadataTests/Resources/*)
EXTRA_DISTFILES = $(RESOURCE_FILES) $(TEST_EXTRA_FILES)
TEST_MCS_FLAGS += $(foreach r, $(TEST_RESOURCE_FILES), -resource:$(r),$(r))
EXTRA_DISTFILES = $(RESOURCE_FILES) $(TEST_RESOURCE_FILES)
# Useful for debugging under Visual Studio 2005
# NO_SIGN_ASSEMBLY = yes

View File

@ -0,0 +1,12 @@
partial class SR
{
public const string CannotAddTwoItemsWithTheSameKeyToSynchronizedKeyedCollection0 = "Cannot add two items with the same key to SynchronizedKeyedCollection.";
public const string DuplicateBehavior1 = "The value could not be added to the collection, as the collection already contains an item of the same type: '{0}'. This collection only supports one instance of each type.";
public const string ItemDoesNotExistInSynchronizedKeyedCollection0 = "Item does not exist in SynchronizedKeyedCollection.";
public const string SFxCollectionReadOnly = "This operation is not supported because the collection is read-only.";
public const string SFxCollectionWrongType2 = "The collection of type {0} does not support values of type {1}.";
public const string SFxCopyToRequiresICollection = "SynchronizedReadOnlyCollection's CopyTo only works if the underlying list implements ICollection.";
public const string SynchronizedCollectionWrongType1 = "A value of type '{0}' cannot be added to the generic collection, because the collection has been parameterized with a different type.";
public const string SynchronizedCollectionWrongTypeNull = "A null value cannot be added to the generic collection, because the collection has been parameterized with a value type.";
public const string ValueMustBeInRange = "The value of this argument must fall within the range {0} to {1}.";
}

View File

@ -1,93 +0,0 @@
//
// KeyedByTypeCollection.cs
//
// Author:
// Atsushi Enomoto <atsushi@ximian.com>
//
// Copyright (C) 2005 Novell, Inc. http://www.novell.com
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.Collections.ObjectModel;
namespace System.Collections.Generic
{
public class KeyedByTypeCollection<TItem>
: KeyedCollection<Type, TItem>
{
public KeyedByTypeCollection ()
{
}
public KeyedByTypeCollection (IEnumerable<TItem> items)
{
foreach (TItem item in items)
Add (item);
}
protected override Type GetKeyForItem (TItem item)
{
return item.GetType ();
}
public T Find<T> ()
{
foreach (TItem k in this)
if (k is T)
return (T) (object) k;
return default (T);
}
public Collection<T> FindAll<T> ()
{
Collection<T> list = new Collection<T> ();
foreach (TItem k in this)
if (k is T)
list.Add ((T) (object) k);
return list;
}
protected override void InsertItem (int index, TItem item)
{
base.InsertItem (index, item);
}
protected override void SetItem (int index, TItem item)
{
base.SetItem (index, item);
}
public T Remove<T> ()
{
foreach (TItem k in this)
if (k is T) {
Remove (k);
return (T) (object) k;
}
return default (T);
}
public Collection<T> RemoveAll<T> ()
{
return RemoveAll<T> ();
}
}
}

View File

@ -1,261 +0,0 @@
//
// SynchronizedCollection.cs
//
// Author:
// Atsushi Enomoto <atsushi@ximian.com>
//
// Copyright (C) 2005 Novell, Inc. http://www.novell.com
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Runtime.InteropServices;
namespace System.Collections.Generic
{
[ComVisibleAttribute (false)]
public class SynchronizedCollection<T> : IList<T>, ICollection<T>,
IEnumerable<T>, IList, ICollection, IEnumerable
{
object root;
List<T> list;
public SynchronizedCollection ()
: this (new object (), null, false)
{
}
public SynchronizedCollection (object syncRoot)
: this (syncRoot, null, false)
{
}
public SynchronizedCollection (object syncRoot,
IEnumerable<T> list)
: this (syncRoot, new List<T> (list), false)
{
}
public SynchronizedCollection (object syncRoot,
params T [] list)
: this (syncRoot, new List<T> (list), false)
{
}
public SynchronizedCollection (object syncRoot,
List<T> list, bool makeCopy)
{
if (syncRoot == null)
syncRoot = new object ();
root = syncRoot;
if (list == null)
this.list = new List<T> ();
else if (makeCopy)
this.list = new List<T> (list);
else
this.list = list;
}
public int Count {
get {
lock (root) {
return list.Count;
}
}
}
public T this [int index] {
get {
lock (root) {
return list [index];
}
}
set {
SetItem (index, value);
}
}
public object SyncRoot {
get { return root; }
}
protected List<T> Items {
get { return list; }
}
public void Add (T item)
{
InsertItem (list.Count, item);
}
public void Clear ()
{
ClearItems ();
}
public bool Contains (T item)
{
lock (root) {
return list.Contains (item);
}
}
public void CopyTo (T [] array, int index)
{
lock (root) {
list.CopyTo (array, index);
}
}
[MonoTODO ("Should be synchronized enumerator?")]
public IEnumerator<T> GetEnumerator ()
{
lock (root) {
return list.GetEnumerator ();
}
}
public int IndexOf (T item)
{
lock (root) {
return list.IndexOf (item);
}
}
public void Insert (int index, T item)
{
InsertItem (index, item);
}
public bool Remove (T item)
{
lock (root) {
int index = IndexOf (item);
if (index < 0)
return false;
RemoveAt (index);
return true;
}
}
public void RemoveAt (int index)
{
RemoveItem (index);
}
protected virtual void ClearItems ()
{
lock (root) {
list.Clear ();
}
}
protected virtual void InsertItem (int index, T item)
{
lock (root) {
list.Insert (index, item);
}
}
protected virtual void RemoveItem (int index)
{
lock (root) {
list.RemoveAt (index);
}
}
protected virtual void SetItem (int index, T item)
{
lock (root) {
list [index] = item;
}
}
#region Explicit interface implementations
void ICollection.CopyTo (Array array, int index)
{
CopyTo ((T []) array, index);
}
IEnumerator IEnumerable.GetEnumerator ()
{
return GetEnumerator ();
}
int IList.Add (object value)
{
lock (root) {
Add ((T) value);
return list.Count - 1;
}
}
bool IList.Contains (object value)
{
return Contains ((T) value);
}
int IList.IndexOf (object value)
{
return IndexOf ((T) value);
}
void IList.Insert (int index, object value)
{
Insert (index, (T) value);
}
void IList.Remove (object value)
{
Remove ((T) value);
}
bool ICollection<T>.IsReadOnly {
get { return false; }
}
bool ICollection.IsSynchronized {
get { return true; }
}
object ICollection.SyncRoot {
get { return root; }
}
bool IList.IsFixedSize {
get { return false; }
}
bool IList.IsReadOnly {
get { return false; }
}
object IList.this [int index] {
get { return this [index]; }
set { this [index] = (T) value; }
}
#endregion
}
}

View File

@ -1,142 +0,0 @@
//
// SynchronizedKeyedCollection.cs
//
// Author:
// Atsushi Enomoto <atsushi@ximian.com>
//
// Copyright (C) 2005 Novell, Inc. http://www.novell.com
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.ServiceModel.Channels;
namespace System.Collections.Generic
{
[ComVisibleAttribute (false)]
public abstract class SynchronizedKeyedCollection<K, T>
: SynchronizedCollection<T>
{
Dictionary<K, T> dict;
protected SynchronizedKeyedCollection ()
: this (new object ())
{
}
protected SynchronizedKeyedCollection (object syncRoot)
: base (syncRoot)
{
dict = new Dictionary<K, T> ();
}
protected SynchronizedKeyedCollection (object syncRoot,
IEqualityComparer<K> comparer)
: base (syncRoot)
{
dict = new Dictionary<K, T> (comparer);
}
protected SynchronizedKeyedCollection (object syncRoot,
IEqualityComparer<K> comparer, int dictionaryCreationThreshold)
: base (syncRoot)
{
dict = new Dictionary<K, T> (dictionaryCreationThreshold, comparer);
}
// see bug #76417
/*
public T this [int index] {
get { return base [index]; }
set { base [index] = value; }
}
*/
public T this [K key] {
get {
lock (SyncRoot) {
return dict [key];
}
}
}
protected IDictionary<K, T> Dictionary {
get { return dict; }
}
public bool Contains (K key)
{
lock (SyncRoot) {
return dict.ContainsKey (key);
}
}
public bool Remove (K key)
{
lock (SyncRoot) {
return dict.Remove (key);
}
}
protected void ChangeItemKey (T item, K newKey)
{
lock (SyncRoot) {
K old = GetKeyForItem (item);
dict [old] = default (T);
dict [newKey] = item;
}
}
[MonoTODO ("This lock is not an atomic.")]
protected override void ClearItems ()
{
base.ClearItems ();
lock (SyncRoot) {
dict.Clear ();
}
}
protected abstract K GetKeyForItem (T item);
[MonoTODO ("This lock is not an atomic.")]
protected override void InsertItem (int index, T item)
{
base.InsertItem (index, item);
dict.Add (GetKeyForItem (item), item);
}
[MonoTODO ("This lock is not an atomic.")]
protected override void RemoveItem (int index)
{
K key = GetKeyForItem (base [index]);
base.RemoveItem (index);
dict.Remove (key);
}
[MonoTODO ("This lock is not an atomic.")]
protected override void SetItem (int index, T item)
{
base.SetItem (index, item);
dict [GetKeyForItem (item)] = item;
}
}
}

View File

@ -1,223 +0,0 @@
//
// System.ServiceModel.SynchronizedReadOnlyCollection.cs
//
// Author: Duncan Mak (duncan@novell.com)
//
// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.Collections;
using System.Runtime.InteropServices;
namespace System.Collections.Generic
{
[ComVisible (false)]
public class SynchronizedReadOnlyCollection<T>
: IList<T>, ICollection<T>, IEnumerable<T>, IList, ICollection, IEnumerable
{
List<T> l;
object sync_root;
public SynchronizedReadOnlyCollection ()
: this (new object ())
{
}
public SynchronizedReadOnlyCollection (object syncRoot)
: this (syncRoot, new List<T> ())
{
}
public SynchronizedReadOnlyCollection (object syncRoot, IEnumerable<T> list)
{
if (syncRoot == null)
throw new ArgumentNullException ("syncRoot");
if (list == null)
throw new ArgumentNullException ("list");
this.sync_root = syncRoot;
this.l = new List<T> (list);
}
public SynchronizedReadOnlyCollection (object syncRoot, params T [] list)
: this (syncRoot, (IEnumerable<T>) list)
{
}
public SynchronizedReadOnlyCollection (object sync_root, List<T> list, bool make_copy)
: this (sync_root,
list == null ? null : make_copy ? new List<T> (list) : list)
{
}
public bool Contains (T value)
{
bool retval;
lock (sync_root) {
retval = l.Contains (value);
}
return retval;
}
public void CopyTo (T [] array, int index)
{
lock (sync_root) {
l.CopyTo (array, index);
}
}
public IEnumerator<T> GetEnumerator ()
{
IEnumerator<T> retval;
lock (sync_root) {
retval = l.GetEnumerator ();
}
return retval;
}
public int IndexOf (T value)
{
int retval;
lock (sync_root) {
retval = l.IndexOf (value);
}
return retval;
}
void ICollection<T>.Add (T value) { throw new NotSupportedException (); }
void ICollection<T>.Clear () { throw new NotSupportedException (); }
bool ICollection<T>.Remove (T value) { throw new NotSupportedException (); }
void IList<T>.Insert (int index, T value) { throw new NotSupportedException (); }
void IList<T>.RemoveAt (int index) { throw new NotSupportedException (); }
void ICollection.CopyTo (Array array, int index)
{
ICollection<T> a = array as ICollection<T>;
if (a == null)
throw new ArgumentException ("The array type is not compatible.");
lock (sync_root) {
((ICollection) l).CopyTo (array, index);
}
}
IEnumerator IEnumerable.GetEnumerator ()
{
return GetEnumerator ();
}
int IList.Add (object value) { throw new NotSupportedException (); }
void IList.Clear () { throw new NotSupportedException (); }
bool IList.Contains (object value)
{
if (typeof (T).IsValueType)
throw new ArgumentException ("This is a collection of ValueTypes.");
// null always gets thru
if (value is T == false && value != null)
throw new ArgumentException ("value is not of the same type as this collection.");
bool retval;
T val = (T) value;
lock (sync_root) {
retval = l.Contains (val);
}
return retval;
}
int IList.IndexOf (object value)
{
if (typeof (T).IsValueType)
throw new ArgumentException ("This is a collection of ValueTypes.");
if (value is T == false)
throw new ArgumentException ("value is not of the same type as this collection.");
int retval;
T val = (T) value;
lock (sync_root) {
retval = l.IndexOf (val);
}
return retval;
}
void IList.Insert (int index, object value) { throw new NotSupportedException (); }
void IList.Remove (object value) { throw new NotSupportedException (); }
void IList.RemoveAt (int index) { throw new NotSupportedException (); }
public int Count {
get {
int retval;
lock (sync_root) {
retval = l.Count;
}
return retval;
}
}
public T this [int index] {
get {
T retval;
lock (sync_root) {
retval = l [index];
}
return retval;
}
}
protected IList<T> Items {
get { return l; }
}
bool ICollection<T>.IsReadOnly { get { return true; }}
bool ICollection.IsSynchronized { get { return true; }}
object ICollection.SyncRoot { get { return sync_root; }}
bool IList.IsFixedSize { get { return true; }}
bool IList.IsReadOnly { get { return true; }}
T IList<T>.this [int index] {
get { return this [index]; }
set { throw new NotSupportedException (); }
}
object IList.this [int index] {
get { return this [index]; }
set { throw new NotSupportedException (); }
}
}
}

View File

@ -1,41 +0,0 @@
using System;
using System.IO;
using System.Runtime.Serialization;
using System.ServiceModel.Channels;
namespace System.IO
{
public class PipeException : IOException
{
public PipeException ()
{
}
public PipeException (string message): base (message)
{
}
protected PipeException (SerializationInfo info, StreamingContext context)
: base (info, context)
{
}
public PipeException (string message, Exception inner)
: base (message, inner)
{
}
public PipeException (string message, int errorCode)
: base (message, errorCode)
{
}
public virtual int ErrorCode {
get {
// we re-use the HResult for the error code here.
return HResult;
}
}
}
}

View File

@ -3,6 +3,7 @@
../../build/common/SR.cs
../../build/common/MonoTODOAttribute.cs
corefx/SR.cs
ReferenceSources/SR.cs
Assembly/AssemblyInfo.cs
Mono.CodeGeneration/CodeAdd.cs
Mono.CodeGeneration/CodeAnd.cs
@ -66,11 +67,11 @@ Mono.Xml.XPath/DTMXPathDocumentBuilder2.cs
Mono.Xml.XPath/DTMXPathDocumentWriter2.cs
Mono.Xml.XPath/DTMXPathNavigator2.cs
Mono.Xml.XPath/DTMXPathNode2.cs
System.Collections.Generic/KeyedByTypeCollection.cs
System.Collections.Generic/SynchronizedCollection.cs
System.Collections.Generic/SynchronizedKeyedCollection.cs
System.Collections.Generic/SynchronizedReadOnlyCollection.cs
System.IO/PipeException.cs
../referencesource/System.ServiceModel/System/ServiceModel/KeyedByTypeCollection.cs
../referencesource/System.ServiceModel/System/ServiceModel/SynchronizedCollection.cs
../referencesource/System.ServiceModel/System/ServiceModel/SynchronizedKeyedCollection.cs
../referencesource/System.ServiceModel/System/ServiceModel/SynchronizedReadOnlyCollection.cs
../referencesource/System.ServiceModel/System/ServiceModel/Channels/PipeException.cs
System.ServiceModel.Activation/AspNetIntegrationRequirementsAttribute.cs
System.ServiceModel.Activation/ServiceHostFactoryBase.cs
System.ServiceModel.Activation/VirtualPathExtension.cs

View File

@ -1,4 +1,5 @@
../../test-helpers/NunitHelpers.cs
../../test-helpers/TestResourceHelper.cs
NUnitMoonHelper.cs
FeatureBased/Features.Client/AsyncCallTesterProxy.cs
FeatureBased/Features.Client/AsyncPatternServer.cs
@ -198,6 +199,7 @@ System.ServiceModel/ServiceHostBaseTest.cs
System.ServiceModel/ServiceHostTest.cs
System.ServiceModel/ServiceKnownTypeAttributeTest.cs
System.ServiceModel/SynchronizedReadOnlyCollectionTest.cs
System.ServiceModel/SynchronizedCollectionTest.cs
System.ServiceModel/TransactionProtocolTest.cs
System.ServiceModel/UriSchemeKeyedCollectionTest.cs
System.ServiceModel/WSFederationHttpBindingTest.cs

View File

@ -1,41 +0,0 @@
<?xml version="1.0" encoding="utf-8"?><configuration>
<appSettings>
<add key="onlyClients" value="false" />
<add key="endpointBase" value="http://localhost:9999" />
</appSettings>
<system.serviceModel>
<behaviors>
<serviceBehaviors>
<behavior name="MetadataBehavior">
<serviceMetadata httpGetEnabled="true" />
</behavior>
</serviceBehaviors>
<endpointBehaviors>
<behavior name="behavior1">
<callbackDebug includeExceptionDetailInFaults="true" />
</behavior>
<behavior name="behavior2">
<callbackDebug includeExceptionDetailInFaults="false" />
</behavior>
</endpointBehaviors>
</behaviors>
<bindings>
<basicHttpBinding>
<binding name="basicHttp">
<security mode="None">
</security>
</binding>
</basicHttpBinding>
</bindings>
<client>
<endpoint address="http://test1_1" binding="basicHttpBinding" contract="MonoTests.System.ServiceModel.ICtorUseCase1" name="CtorUseCase1_1" />
<endpoint address="http://test2_1" binding="basicHttpBinding" contract="CtorUseCase2" name="CtorUseCase2_1" />
<endpoint address="http://test2_2" binding="basicHttpBinding" contract="CtorUseCase2" name="CtorUseCase2_2" behaviorConfiguration="behavior1" />
<endpoint address="http://test2_2" binding="basicHttpBinding" contract="CtorUseCase2" name="CtorUseCase2_3" behaviorConfiguration="behavior2" />
<endpoint name="" binding="basicHttpBinding" contract="test" />
</client>
<services>
</services>
</system.serviceModel>
</configuration>

View File

@ -39,6 +39,8 @@ using System.ServiceModel.Description;
using SysConfig = System.Configuration.Configuration;
using MonoTests.Helpers;
namespace MonoTests.System.ServiceModel.MetadataTests {
public abstract class TestContext {
@ -111,20 +113,12 @@ namespace MonoTests.System.ServiceModel.MetadataTests {
public static MetadataSet LoadMetadata (string name)
{
#if USE_EMBEDDED_METADATA
return LoadMetadataFromResource (name);
#else
return LoadMetadataFromFile (name);
#endif
}
public static XmlDocument LoadConfiguration (string name)
{
#if USE_EMBEDDED_METADATA
return LoadConfigurationFromResource (name);
#else
return LoadConfigurationFromFile (name);
#endif
}
public static void SaveMetadata (string name, MetadataSet metadata)
@ -137,32 +131,9 @@ namespace MonoTests.System.ServiceModel.MetadataTests {
var asm = Assembly.GetExecutingAssembly ();
if (!name.EndsWith (".xml"))
name = name + ".xml";
var uri = new Uri (asm.CodeBase);
// Run from mcs/class/lib/<profile>
var path = Path.GetDirectoryName (uri.AbsolutePath);
path = Directory.GetParent (path).Parent.Parent.FullName;
path = Path.Combine (path, "System.ServiceModel");
path = Path.Combine (path, "Test");
path = Path.Combine (path, "MetadataTests");
path = Path.Combine (path, "Resources");
var filename = Path.Combine (path, name);
using (var stream = new StreamReader (filename)) {
var reader = new XmlTextReader (stream);
return MetadataSet.ReadFrom (reader);
}
}
public static MetadataSet LoadMetadataFromResource (string name)
{
var asm = Assembly.GetExecutingAssembly ();
if (!name.EndsWith (".xml"))
name = name + ".xml";
var resname = "MetadataTests.Resources." + name;
using (var stream = asm.GetManifestResourceStream (resname)) {
if (stream == null)
throw new InvalidOperationException (
"No such resource: " + name);
var filename = TestResourceHelper.GetFullPathOfResource ("Test/MetadataTests/Resources/" + name);
using (var stream = new StreamReader (filename)) {
var reader = new XmlTextReader (stream);
return MetadataSet.ReadFrom (reader);
}
@ -173,32 +144,9 @@ namespace MonoTests.System.ServiceModel.MetadataTests {
var asm = Assembly.GetExecutingAssembly ();
if (!name.EndsWith (".config"))
name = name + ".config";
var uri = new Uri (asm.CodeBase);
var path = Path.GetDirectoryName (uri.AbsolutePath);
path = Directory.GetParent (path).Parent.Parent.FullName;
path = Path.Combine (path, "System.ServiceModel");
path = Path.Combine (path, "Test");
path = Path.Combine (path, "MetadataTests");
path = Path.Combine (path, "Resources");
var filename = Path.Combine (path, name);
using (var stream = new StreamReader (filename)) {
var xml = new XmlDocument ();
xml.Load (stream);
return xml;
}
}
public static XmlDocument LoadConfigurationFromResource (string name)
{
var asm = Assembly.GetExecutingAssembly ();
if (!name.EndsWith (".config"))
name = name + ".config";
var resname = "MetadataTests.Resources." + name;
using (var stream = asm.GetManifestResourceStream (resname)) {
if (stream == null)
throw new InvalidOperationException (
"No such resource: " + name);
var filename = TestResourceHelper.GetFullPathOfResource ("Test/MetadataTests/Resources/" + name);
using (var stream = new StreamReader (filename)) {
var xml = new XmlDocument ();
xml.Load (stream);
return xml;

Some files were not shown because too many files have changed in this diff Show More