Merge pull request #1421 from Unity-Technologies/unity-master-new-unitychanges-remove-netstandard-dep-system-web

Move HttpUtility to System in unityjit.

Author: joncham

mcs/class/System.Web/Assembly/AssemblyInfo.cs

@@ -140,7 +140,7 @@
 [assembly: WebResource ("WebUIValidation_2.0.js", "text/javascript")]
 #endif
 
-#if UNITY_AOT && FULL_AOT_RUNTIME
+#if (UNITY_AOT && FULL_AOT_RUNTIME) || UNITY_JIT
 [assembly: TypeForwardedTo (typeof (System.Web.HttpUtility))]
 [assembly: TypeForwardedTo (typeof (System.Web.Util.HttpEncoder))]
 #endif

mcs/class/System.Web/System.Web.Compilation/BaseCompiler.cs

@@ -39,6 +39,10 @@
 using System.Web.Configuration;
 using System.IO;
 
+#if UNITY_JIT
+using Compiler=System.Web.Configuration.Compiler;
+#endif
+
 namespace System.Web.Compilation
 {
 	abstract class BaseCompiler

mcs/class/System.Web/System.Web.Compilation/BuildManager.cs

@@ -49,6 +49,10 @@
 using System.Web.Util;
 using System.Runtime.Versioning;
 
+#if UNITY_JIT
+using Compiler=System.Web.Configuration.Compiler;
+#endif
+
 namespace System.Web.Compilation
 {
 	public sealed class BuildManager

mcs/class/System.Web/System.Web.Util/HttpEncoder.cs

@@ -35,7 +35,7 @@
 using System.Configuration;
 using System.IO;
 using System.Text;
-#if !NO_SYSTEM_WEB_DEPENDENCY && !MOBILE
+#if !NO_SYSTEM_WEB_DEPENDENCY && !MOBILE && !UNITY_JIT
 using System.Web.Configuration;
 #endif
 
@@ -163,7 +163,7 @@ protected internal virtual byte[] UrlEncode (byte[] bytes, int offset, int count
 
 		static HttpEncoder GetCustomEncoderFromConfig ()
 		{
-#if MOBILE || NO_SYSTEM_WEB_DEPENDENCY
+#if MOBILE || NO_SYSTEM_WEB_DEPENDENCY || UNITY_JIT
 			return defaultEncoder.Value;
 #else
 			var cfg = HttpRuntime.Section;

mcs/class/System.Web/System.Web/HttpUtility.cs

@@ -511,7 +511,7 @@ public static string HtmlEncode (object value)
 			if (value == null)
 				return null;
 
-#if !(MOBILE || NO_SYSTEM_WEB_DEPENDENCY)
+#if !(MOBILE || NO_SYSTEM_WEB_DEPENDENCY || UNITY_JIT)
 			IHtmlString htmlString = value as IHtmlString;
 			if (htmlString != null)
 				return htmlString.ToHtmlString ();

mcs/class/System.Web/unityjit_System.Web.dll.exclude.sources

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

mcs/class/System.Web/unityjit_System.Web.dll.sources

@@ -0,0 +1 @@
+#include System.Web.dll.sources

mcs/class/System/Assembly/AssemblyInfo.cs

@@ -98,3 +98,8 @@
 [assembly: TypeForwardedTo (typeof (System.Collections.Generic.Queue<>))]
 [assembly: TypeForwardedTo (typeof (System.IO.Enumeration.FileSystemName))]
 [assembly: TypeForwardedTo (typeof (System.Security.Cryptography.CryptographicOperations))]
+
+#if UNITY_JIT
+[assembly: InternalsVisibleTo ("System.Web, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+#endif
+

mcs/class/System/linux_unityjit_System.dll.sources

@@ -1 +1,4 @@
 #include linux_net_4_x_System.dll.sources
+../System.Web/System.Web/HttpUtility.cs
+../System.Web/System.Web.Util/Helpers.cs
+../System.Web/System.Web.Util/HttpEncoder.cs

mcs/class/System/macos_unityjit_System.dll.sources

@@ -1 +1,4 @@
 #include macos_net_4_x_System.dll.sources
+../System.Web/System.Web/HttpUtility.cs
+../System.Web/System.Web.Util/Helpers.cs
+../System.Web/System.Web.Util/HttpEncoder.cs