diff options
| author | Sebastien Pouliot <sebastien@xamarin.com> | 2014-01-14 19:11:21 +0400 |
|---|---|---|
| committer | Sebastien Pouliot <sebastien@xamarin.com> | 2014-01-14 19:11:21 +0400 |
| commit | b7c10a7c1d8c6d4d896b0147945c87dd465af2d6 (patch) | |
| tree | 8628145bb644550198e5741b9423936b989427f0 /mcs/class/System.ServiceModel.Web | |
| parent | 439b2917d9fa5992208e144b37e2e82e5b890a1e (diff) | |
There's no need for those special NET_2_1 cases (not using NameValueCollection like MS) anymore and it fixes 7 S.SM.W unit tests failures for XI (e.g. case sensitiveness)
Diffstat (limited to 'mcs/class/System.ServiceModel.Web')
| -rw-r--r-- | mcs/class/System.ServiceModel.Web/System/UriTemplate.cs | 9 | ||||
| -rw-r--r-- | mcs/class/System.ServiceModel.Web/System/UriTemplateMatch.cs | 4 |
2 files changed, 1 insertions, 12 deletions
diff --git a/mcs/class/System.ServiceModel.Web/System/UriTemplate.cs b/mcs/class/System.ServiceModel.Web/System/UriTemplate.cs index f8ca883f832..875acb2117e 100644 --- a/mcs/class/System.ServiceModel.Web/System/UriTemplate.cs +++ b/mcs/class/System.ServiceModel.Web/System/UriTemplate.cs @@ -33,10 +33,6 @@ using System.Collections.Specialized; using System.Globalization; using System.Text; -#if NET_2_1 -using NameValueCollection = System.Object; -#endif - namespace System { public class UriTemplate @@ -174,11 +170,8 @@ namespace System foreach (string name in names) { int s = template.IndexOf ('{', src); int e = template.IndexOf ('}', s + 1); -#if NET_2_1 - string value = null; -#else string value = nvc != null ? nvc [name] : null; -#endif + if (dic != null) dic.TryGetValue (name, out value); diff --git a/mcs/class/System.ServiceModel.Web/System/UriTemplateMatch.cs b/mcs/class/System.ServiceModel.Web/System/UriTemplateMatch.cs index fca94d761ca..b437f43d5d2 100644 --- a/mcs/class/System.ServiceModel.Web/System/UriTemplateMatch.cs +++ b/mcs/class/System.ServiceModel.Web/System/UriTemplateMatch.cs @@ -29,10 +29,6 @@ using System; using System.Collections.ObjectModel; using System.Collections.Specialized; -#if NET_2_1 -using NameValueCollection = System.Collections.Generic.Dictionary<string,string>; -#endif - namespace System { public class UriTemplateMatch |