Fixes for HttpUtility.UrlEncode for Unity aot and jit profiles

Reverting HttpUtility.UrlEncode back to the System.dll to keep
netstandard profiles smaller, especially on Android. In Unity
integration testing we found that adding System.Web to netstandard
profile brings in 4 dlls to Android APKs that were not there before.

This attempt is to leave HttpUtility in System.dll and use a type
forward in System.Web to satisfy .net 4 profile references.

Author: bholmes

mcs/class/Facades/netstandard/Makefile

@@ -26,9 +26,7 @@ LIB_REFS += System.Transactions System.Runtime.Serialization System.Data System.
 else ifeq ($(PROFILE),xammac_net_4_5)
 LIB_REFS += System.Web.Services System.Transactions System.Runtime.Serialization System.Data System.Data.DataSetExtensions
 else ifeq (2.1, $(FRAMEWORK_VERSION))
-ifeq ($(PROFILE),unityaot)
-LIB_REFS += System.Web
-else
+ifneq ($(PROFILE),unityaot)
 LIB_REFS += System.Web.Services System.Transactions System.Runtime.Serialization System.Data System.Data.DataSetExtensions
 endif
 LIB_REFS += System.Transactions System.Runtime.Serialization System.Data System.Data.DataSetExtensions

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

@@ -138,4 +138,9 @@
 [assembly: WebResource ("GridView.js", "text/javascript")]
 [assembly: WebResource ("webform.js", "text/javascript")]
 [assembly: WebResource ("WebUIValidation_2.0.js", "text/javascript")]
+#endif
+
+#if UNITY_AOT && FULL_AOT_RUNTIME
+[assembly: TypeForwardedTo (typeof (System.Web.HttpUtility))]
+[assembly: TypeForwardedTo (typeof (System.Web.Util.HttpEncoder))]
 #endif

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

@@ -2,8 +2,4 @@ Assembly/AssemblyInfo.cs
 ../../build/common/Consts.cs
 ../../build/common/Locale.cs
 ../../build/common/MonoTODOAttribute.cs
-../System/System/MonoToolsLocator.cs
-
-System.Web/HttpUtility.cs
-System.Web.Util/Helpers.cs
-System.Web.Util/HttpEncoder.cs
+../System/System/MonoToolsLocator.cs

mcs/class/System/linux_unityaot_System.dll.sources

@@ -1,4 +1,6 @@
 #include mobile_System.dll.sources
-
+../System.Web/System.Web/HttpUtility.cs
+../System.Web/System.Web.Util/Helpers.cs
+../System.Web/System.Web.Util/HttpEncoder.cs
 System.CodeDom/CodeCompileUnit.cs
 System.CodeDom/CodeTypeDeclaration.cs

mcs/class/System/macos_unityaot_System.dll.sources

@@ -1,4 +1,6 @@
 #include mobile_System.dll.sources
-
+../System.Web/System.Web/HttpUtility.cs
+../System.Web/System.Web.Util/Helpers.cs
+../System.Web/System.Web.Util/HttpEncoder.cs
 System.CodeDom/CodeCompileUnit.cs
 System.CodeDom/CodeTypeDeclaration.cs

mcs/class/System/win32_unityaot_System.dll.sources

@@ -1,5 +1,8 @@
 #include mobile_System.dll.sources
 #include corefx.windows.sources
+../System.Web/System.Web/HttpUtility.cs
+../System.Web/System.Web.Util/Helpers.cs
+../System.Web/System.Web.Util/HttpEncoder.cs
 
 System.Net.NetworkInformation/Win32UnixFactoryPal.cs