Skip to content

Move HttpUtility to System in unityjit. #1420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 6, 2021
Merged

Move HttpUtility to System in unityjit. #1420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mcs/class/System.Web/Assembly/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions mcs/class/System.Web/System.Web.Compilation/BaseCompiler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions mcs/class/System.Web/System.Web.Compilation/BuildManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions mcs/class/System.Web/System.Web.Util/HttpEncoder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion mcs/class/System.Web/System.Web/HttpUtility.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ();
Expand Down
3 changes: 3 additions & 0 deletions mcs/class/System.Web/unityjit_System.Web.dll.exclude.sources
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
System.Web/HttpUtility.cs
System.Web.Util/Helpers.cs
System.Web.Util/HttpEncoder.cs
1 change: 1 addition & 0 deletions mcs/class/System.Web/unityjit_System.Web.dll.sources
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include System.Web.dll.sources
6 changes: 5 additions & 1 deletion mcs/class/System/Assembly/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions mcs/class/System/unityjit_System.dll.sources
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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