Imported Upstream version 5.8.0.22

Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions

View File

@@ -53,13 +53,7 @@ using System.Runtime.InteropServices;
[assembly: ComVisible (false)]
[assembly: AssemblyDelaySign (true)]
#if MOBILE
[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
[assembly: AssemblyKeyFile ("../silverlight.pub")]
#else
[assembly: AssemblyInformationalVersion ("3.5.594.0")]
[assembly: AssemblyKeyFile("../winfx.pub")]
#endif
#if MOBILE
[assembly: InternalsVisibleTo ("System.Json, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

View File

@@ -22,6 +22,12 @@ LIB_REFS += System.ServiceModel.Activation
endif
endif
ifdef MOBILE_PROFILE
KEYFILE = ../silverlight.pub
else
KEYFILE = ../winfx.pub
endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES = $(RESOURCE_FILES) \

View File

@@ -649,6 +649,7 @@ namespace System.ServiceModel.Syndication
string [] rfc822formats = new string [] {
"ddd, dd MMM yyyy HH:mm:ss 'Z'",
"ddd, dd MMM yyyy HH:mm:ss 'GMT'",
"ddd, dd MMM yyyy HH:mm:ss zzz",
"ddd, dd MMM yyyy HH:mm:ss"};

View File

@@ -7,6 +7,8 @@ using System.ServiceModel.Channels;
using System.ServiceModel.Web;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.ServiceModel.Activation
{
class MyHostFactory : WebScriptServiceHostFactory
@@ -23,8 +25,9 @@ namespace MonoTests.System.ServiceModel.Activation
[Test]
public void CreateServiceHost ()
{
var port = NetworkHelpers.FindFreePort ();
var f = new MyHostFactory ();
var host = f.DoCreateServiceHost (typeof (TestService), new Uri [] {new Uri ("http://localhost:37564")});
var host = f.DoCreateServiceHost (typeof (TestService), new Uri [] {new Uri ($"http://localhost:{port}")});
Assert.IsFalse (host is WebServiceHost, "#1");
host.Open ();
host.Close ();
@@ -34,8 +37,9 @@ namespace MonoTests.System.ServiceModel.Activation
[ExpectedException (typeof (NotSupportedException))]
public void ResponseWrappedIsInvalid ()
{
var port = NetworkHelpers.FindFreePort ();
var f = new MyHostFactory ();
var host = f.DoCreateServiceHost (typeof (TestService2), new Uri [] {new Uri ("http://localhost:37564")});
var host = f.DoCreateServiceHost (typeof (TestService2), new Uri [] {new Uri ($"http://localhost:{port}")});
host.Open (); // should raise an error here.
}
@@ -43,8 +47,9 @@ namespace MonoTests.System.ServiceModel.Activation
[ExpectedException (typeof (InvalidOperationException))]
public void MultipleContract ()
{
var port = NetworkHelpers.FindFreePort ();
var f = new MyHostFactory ();
var host = f.DoCreateServiceHost (typeof (TestServiceMultiple), new Uri [] {new Uri ("http://localhost:37564")});
var host = f.DoCreateServiceHost (typeof (TestServiceMultiple), new Uri [] {new Uri ($"http://localhost:{port}")});
host.Open ();
}

View File

@@ -0,0 +1 @@
#include mobile_System.ServiceModel.Web.dll.sources