Merge pull request #1397 from Unity-Technologies/unityprofile-urlencode-2

Move HttpUtility from System.Web.Services to System.Web

Author: bholmes

mcs/class/System.Web.Services/System.Web.Services.Protocols/UrlEncodedParameterWriter.cs

@@ -70,20 +70,27 @@ protected void Encode (TextWriter writer, object[] values)
 		}
 
 		protected void Encode (TextWriter writer, string name, object value)
+		{
+			writer.Write (UrlEncode (name));
+			writer.Write ("=");
+			writer.Write (UrlEncode (ObjToString (value)));
+		}
+
+		private string UrlEncode (string value)
 		{
 			if (requestEncoding != null)
 			{
-				writer.Write (HttpUtility.UrlEncode (name, requestEncoding));
-				writer.Write ("=");
-				writer.Write (HttpUtility.UrlEncode (ObjToString (value), requestEncoding));
-			}
-			else
-			{
-				writer.Write (HttpUtility.UrlEncode (name));
-				writer.Write ("=");
-				writer.Write (HttpUtility.UrlEncode (ObjToString (value)));
+#if UNITY_AOT && FULL_AOT_RUNTIME
+				return UrlEncoder.UrlEscapeString (value, requestEncoding);
+#else
+				return HttpUtility.UrlEncode (value, requestEncoding);
+#endif
 			}
-				
+#if UNITY_AOT && FULL_AOT_RUNTIME
+				return UrlEncoder.UrlEscapeStringUnicode (value);
+#else
+				return HttpUtility.UrlEncode (value);
+#endif
 		}
 
 		public override object GetInitializer (LogicalMethodInfo methodInfo)

mcs/class/System.Web.Services/unityaot_System.Web.Services.dll.exclude.sources

@@ -0,0 +1,3 @@
+../System.Web/System.Web.Util/Helpers.cs
+../System.Web/System.Web.Util/HttpEncoder.cs
+../System.Web/System.Web/HttpUtility.cs

mcs/class/System.Web.Services/unityaot_System.Web.Services.dll.sources

@@ -1 +1,3 @@
 #include mobile_System.Web.Services.dll.sources
+ReferenceSources/Res.cs
+../referencesource/System.Web.Services/System/Web/Services/Protocols/Scalars.cs