Remove dependency on system.web

Costo · Costo · commit 6ebf51f9229e · 2014-12-09T18:31:42.000-05:00
diff --git a/Src/EngineIoClientDotNet.mono/EngineIoClientDotNet.mono.csproj b/Src/EngineIoClientDotNet.mono/EngineIoClientDotNet.mono.csproj
@@ -36,7 +36,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Web" />
     <Reference Include="WebSocket4Net, Version=0.7.0.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\References\WebSocket4Net.dll</HintPath>
diff --git a/Src/EngineIoClientDotNet.mono/Modules/Global.cs b/Src/EngineIoClientDotNet.mono/Modules/Global.cs
@@ -16,7 +16,7 @@ public static string EncodeURIComponent(string str)
 
         public static string DecodeURIComponent(string str)
         {
-            return HttpUtility.UrlDecode(str);
+			return Uri.UnescapeDataString(str);
         }
 
         public static string CallerName([CallerMemberName]string caller = "", [CallerLineNumber]int number = 0, [CallerFilePath]string path = "")
diff --git a/Src/EngineIoClientDotNet.mono/Modules/Global_net35.cs b/Src/EngineIoClientDotNet.mono/Modules/Global_net35.cs
@@ -16,7 +16,7 @@ public static string EncodeURIComponent(string str)
 
         public static string DecodeURIComponent(string str)
         {
-            return HttpUtility.UrlDecode(str);
+			return Uri.UnescapeDataString(str);
         }
 
         public static string CallerName(string caller = "", int number = 0, string path = "")
diff --git a/Src/EngineIoClientDotNet.mono/Modules/Global_netcore45.cs b/Src/EngineIoClientDotNet.mono/Modules/Global_netcore45.cs
@@ -19,7 +19,7 @@ public static string EncodeURIComponent(string str)
 
         public static string DecodeURIComponent(string str)
         {
-            return WebUtility.UrlDecode(str);
+			return Uri.UnescapeDataString(str);
         }
 
         public static string CallerName([CallerMemberName]string caller = "", [CallerLineNumber]int number = 0, [CallerFilePath]string path = "")
diff --git a/Src/EngineIoClientDotNet.mono/Modules/Global_windowsphone8.cs b/Src/EngineIoClientDotNet.mono/Modules/Global_windowsphone8.cs
@@ -17,7 +17,7 @@ public static string EncodeURIComponent(string str)
 
         public static string DecodeURIComponent(string str)
         {
-            return HttpUtility.UrlDecode(str);
+            return Uri.UnescapeDataString(str);
         }
 
         public static string CallerName([CallerMemberName]string caller = "", [CallerLineNumber]int number = 0, [CallerFilePath]string path = "")
diff --git a/Src/EngineIoClientDotNet.net35/EngineIoClientDotNet.net35.csproj b/Src/EngineIoClientDotNet.net35/EngineIoClientDotNet.net35.csproj
@@ -40,7 +40,6 @@
     <Reference Include="System.Threading.Tasks.NET35">
       <HintPath>packages\System.Threading.Tasks.3.0.1\lib\net35\System.Threading.Tasks.NET35.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
diff --git a/Src/EngineIoClientDotNet.net45/EngineIoClientDotNet.net45.csproj b/Src/EngineIoClientDotNet.net45/EngineIoClientDotNet.net45.csproj
@@ -36,7 +36,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Web" />
     <Reference Include="WebSocket4Net">
       <HintPath>packages\WebSocket4Net.0.10\lib\net45\WebSocket4Net.dll</HintPath>
     </Reference>

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public static string EncodeURIComponent(string str)`
`16`	`16`
`17`	`17`	`public static string DecodeURIComponent(string str)`
`18`	`18`	`{`
`19`		`- return HttpUtility.UrlDecode(str);`
	`19`	`+ return Uri.UnescapeDataString(str);`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public static string CallerName([CallerMemberName]string caller = "", [CallerLineNumber]int number = 0, [CallerFilePath]string path = "")`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public static string EncodeURIComponent(string str)`
`19`	`19`
`20`	`20`	`public static string DecodeURIComponent(string str)`
`21`	`21`	`{`
`22`		`- return WebUtility.UrlDecode(str);`
	`22`	`+ return Uri.UnescapeDataString(str);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`public static string CallerName([CallerMemberName]string caller = "", [CallerLineNumber]int number = 0, [CallerFilePath]string path = "")`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public static string EncodeURIComponent(string str)`
`17`	`17`
`18`	`18`	`public static string DecodeURIComponent(string str)`
`19`	`19`	`{`
`20`		`- return HttpUtility.UrlDecode(str);`
	`20`	`+ return Uri.UnescapeDataString(str);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`public static string CallerName([CallerMemberName]string caller = "", [CallerLineNumber]int number = 0, [CallerFilePath]string path = "")`