2009-03-04 Atsushi Enomoto <atsushi@ximian.com>

	* CrossDomainAccessManager.cs : 2.1 WebRequest misses some
 	  members used here.

	* Makefile : add /r:System.Core in 2.1 build.

svn path=/trunk/mcs/; revision=128579

diff --git a/mcs/class/System.ServiceModel/ChangeLog b/mcs/class/System.ServiceModel/ChangeLog
index aa02aba4d38a1a9f3ab4e8b6710e9df0ec538ba2..0e0225103e755d17dfd1e1bd4eb8261995b66651 100755 (executable)
--- a/mcs/class/System.ServiceModel/ChangeLog
+++ b/mcs/class/System.ServiceModel/ChangeLog
@@ -1,3 +1,7 @@
+2009-03-04  Astushi Enomoto  <atsushi@ximian.com>
+
+       * Makefile : add /r:System.Core in 2.1 build.
+
 2009-03-04  Astushi Enomoto  <atsushi@ximian.com>
 
        * net_2_1_raw_System.ServiceModel.dll.sources :

diff --git a/mcs/class/System.ServiceModel/Makefile b/mcs/class/System.ServiceModel/Makefile
index ca6a746deee90400edaf19a9bef5d9c1bca64f41..edba0317eeb2d7c976d665affe07c2ec477cbc6a 100755 (executable)
--- a/mcs/class/System.ServiceModel/Makefile
+++ b/mcs/class/System.ServiceModel/Makefile
@@ -30,7 +30,7 @@ LIB_MCS_FLAGS += /d:NET_3_0   \
 endif
 
 ifeq (2.1, $(FRAMEWORK_VERSION))
-LIB_MCS_FLAGS += /r:System.Net
+LIB_MCS_FLAGS += /r:System.Net /r:System.Core
 endif
 
 TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
index e2d2b1c8f9178b3b0ff3900e5dd5434214137248..643049fbf397e39d424f00131eb1ba13d498b80c 100755 (executable)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-04  Atsushi Enomoto  <atsushi@ximian.com>
+
+       * CrossDomainAccessManager.cs : 2.1 WebRequest misses some
+         members used here.
+
 2009-03-04  Atsushi Enomoto  <atsushi@ximian.com>
 
        * CrossDomainAccessManager.cs, ClientAccessPolicy.cs,

diff --git a/mcs/class/System.ServiceModel/System.ServiceModel/CrossDomainAccessManager.cs b/mcs/class/System.ServiceModel/System.ServiceModel/CrossDomainAccessManager.cs
index 607fb76f4a1fa4f34a841a8394800585c2ae54b6..1eb0b97313f443eeed458a72c2909528dc85e153 100644 (file)
--- a/mcs/class/System.ServiceModel/System.ServiceModel/CrossDomainAccessManager.cs
+++ b/mcs/class/System.ServiceModel/System.ServiceModel/CrossDomainAccessManager.cs
@@ -81,8 +81,8 @@ namespace System.ServiceModel
                {
                        var m = new CrossDomainAccessManager (applicationUri);
 
-                       var wreq = WebRequest.Create (new Uri (applicationUri, "/clientaccesspolicy.xml"));
-                       var wres = (HttpWebResponse) wreq.GetResponse ();
+                       var wreq = (HttpWebRequest) WebRequest.Create (new Uri (applicationUri, "/clientaccesspolicy.xml"));
+                       var wres = (HttpWebResponse) wreq.EndGetResponse (wreq.BeginGetResponse (null, null));
                        if ((int) wres.StatusCode >= 400)
                                try {
                                        using (var xr = XmlReader.Create (wres.GetResponseStream ()))
@@ -95,8 +95,8 @@ namespace System.ServiceModel
                        if (m.Client != null)
                                return m;
 
-                       wreq = WebRequest.Create (new Uri (applicationUri, "/crossdomain.xml"));
-                       wres = (HttpWebResponse) wreq.GetResponse ();
+                       wreq = (HttpWebRequest) WebRequest.Create (new Uri (applicationUri, "/crossdomain.xml"));
+                       wres = (HttpWebResponse) wreq.EndGetResponse (wreq.BeginGetResponse (null, null));
                        if ((int) wres.StatusCode >= 400)
                                try {
                                        using (var xr = XmlReader.Create (wres.GetResponseStream ()))