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

@@ -28,12 +28,14 @@ else
KEYFILE = ../winfx.pub
endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES = $(RESOURCE_FILES) \
TEST_RESOURCE_FILES = \
Test/config/webHttpBinding \
Test/config/webHttpBinding.config
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) $(foreach r, $(TEST_RESOURCE_FILES), -resource:$(r),$(r))
EXTRA_DISTFILES = $(RESOURCE_FILES) $(TEST_RESOURCE_FILES)
VALID_PROFILE := $(filter 2 4, $(FRAMEWORK_VERSION_MAJOR))
ifndef VALID_PROFILE
LIBRARY_NAME = dummy-System.ServiceModel.Web.dll

View File

@@ -1,4 +1,5 @@
../../test-helpers/NetworkHelpers.cs
../../test-helpers/TestResourceHelper.cs
System.ServiceModel.Activation/WebScriptServiceHostFactoryTest.cs
System.ServiceModel.Channels/WebBodyFormatMessagePropertyTest.cs
System.ServiceModel.Channels/WebMessageEncodingBindingElementTest.cs

View File

@@ -6,6 +6,8 @@ using System.ServiceModel;
using System.Text;
using System.Configuration;
using MonoTests.Helpers;
namespace MonoTests.System.ServiceModel.Configuration
{
[TestFixture]
@@ -53,7 +55,7 @@ namespace MonoTests.System.ServiceModel.Configuration
private WebHttpBinding CreateBindingFromConfig ()
{
ServiceModelSectionGroup config = (ServiceModelSectionGroup) ConfigurationManager.OpenExeConfiguration ("Test/config/webHttpBinding").GetSectionGroup ("system.serviceModel");
ServiceModelSectionGroup config = (ServiceModelSectionGroup) ConfigurationManager.OpenExeConfiguration (TestResourceHelper.GetFullPathOfResource ("Test/config/webHttpBinding")).GetSectionGroup ("system.serviceModel");
WebHttpBindingCollectionElement collectionElement = (WebHttpBindingCollectionElement) config.Bindings ["webHttpBinding"];
WebHttpBindingElement el = collectionElement.Bindings ["WebHttpBinding1_Service"];