Merge pull request #1420 from Unity-Technologies/unity-master-remove-…

…netstandard-dep-system-web Move HttpUtility to System in unityjit.
Unity-Technologies · Apr 6, 2021 · 6ec067a · 6ec067a
2 parents ea11507 + 08654df
commit 6ec067a
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 5 deletions.
diff --git a/mcs/class/System.Web/Assembly/AssemblyInfo.cs b/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
diff --git a/mcs/class/System.Web/System.Web.Compilation/BaseCompiler.cs b/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

diff --git a/mcs/class/System.Web/System.Web.Compilation/BuildManager.cs b/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

diff --git a/mcs/class/System.Web/System.Web.Util/HttpEncoder.cs b/mcs/class/System.Web/System.Web.Util/HttpEncoder.cs
@@ -30,12 +30,13 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
+
 using System;
 using System.Collections.Generic;
 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 +164,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;

diff --git a/mcs/class/System.Web/System.Web/HttpUtility.cs b/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 ();

diff --git a/mcs/class/System.Web/unityjit_System.Web.dll.exclude.sources b/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
diff --git a/mcs/class/System.Web/unityjit_System.Web.dll.sources b/mcs/class/System.Web/unityjit_System.Web.dll.sources
@@ -0,0 +1 @@
+#include System.Web.dll.sources
diff --git a/mcs/class/System/Assembly/AssemblyInfo.cs b/mcs/class/System/Assembly/AssemblyInfo.cs
@@ -81,4 +81,8 @@
 
 #if XAMMAC || XAMMAC_4_5
 [assembly: InternalsVisibleTo ("Xamarin.Mac, PublicKey=0024000004800000940000000602000000240000525341310004000011000000438ac2a5acfbf16cbd2b2b47a62762f273df9cb2795ceccdf77d10bf508e69e7a362ea7a45455bbf3ac955e1f2e2814f144e5d817efc4c6502cc012df310783348304e3ae38573c6d658c234025821fda87a0be8a0d504df564e2c93b2b878925f42503e9d54dfef9f9586d9e6f38a305769587b1de01f6c0410328b2c9733db")]
-#endif
+#endif
+
+#if UNITY_JIT
+[assembly: InternalsVisibleTo ("System.Web, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")]
+#endif
diff --git a/mcs/class/System/unityjit_System.dll.sources b/mcs/class/System/unityjit_System.dll.sources
@@ -1 +1,4 @@
 #include 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