There's no need for those special NET_2_1 cases (not using NameValueCollection like...

diff --git a/mcs/class/System.ServiceModel.Web/System/UriTemplate.cs b/mcs/class/System.ServiceModel.Web/System/UriTemplate.cs
index f8ca883f83275ec1f704e2e3992c03801148b59e..875acb2117ec61a67808e9e4c99958795ec84a7f 100644 (file)
--- 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 fca94d761cad0701f02b9f952947ef486cbefedd..b437f43d5d2b7e5c22a5c5ff20c3b152562bfa5e 100644 (file)
--- 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