Imported Upstream version 4.2.0.179

Former-commit-id: 0a113cb3a6feb7873f632839b1307cc6033cd595
This commit is contained in:
Xamarin Public Jenkins
2015-08-26 07:17:56 -04:00
committed by Jo Shields
parent 183bba2c9a
commit 6992685b86
7507 changed files with 90259 additions and 657307 deletions

View File

@ -46,12 +46,12 @@ namespace System.ServiceModel.Channels
public static class UrlUtility {
public static string UrlEncode (string s, Encoding e)
{
return System.Net.WebUtility.UrlEncode (s);
return System.Runtime.UrlUtility.UrlEncode (s, e);
}
public static string UrlDecode (string s, Encoding e)
{
return System.Net.WebUtility.UrlDecode (s);
return System.Runtime.UrlUtility.UrlDecode (s, e);
}
}
}
@ -66,4 +66,4 @@ namespace System.ServiceModel.Description
namespace System.ServiceModel.Channels
{
public interface ITransportTokenAssertionProvider {}
}
}