Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRodrigo Kumpera <kumpera@gmail.com>2013-01-05 03:41:56 +0400
committerRodrigo Kumpera <kumpera@gmail.com>2013-01-05 03:41:56 +0400
commitf46a51a006e4d044893e2a73bcf974b6e9fb61e8 (patch)
treecfb656526640215aca9a48ddcbd3f3faf8f76320
parentd831b702700d9092106bd294a44dd9abb68839fb (diff)
[bcl] Add System.Net.Http to the mobile build.
* AssemblyInfo.cs: System.Net.Http.dll needs internal visibility into System.dll so grant it on all targets but dying silverlight.
-rw-r--r--mcs/class/Makefile6
-rw-r--r--mcs/class/System/Assembly/AssemblyInfo.cs2
2 files changed, 5 insertions, 3 deletions
diff --git a/mcs/class/Makefile b/mcs/class/Makefile
index 59e8d219c28..509c4fc414e 100644
--- a/mcs/class/Makefile
+++ b/mcs/class/Makefile
@@ -166,7 +166,8 @@ mobile_dirs := \
System.Reactive.Linq \
System.Reactive.PlatformServices \
System.Reactive.Experimental \
- System.Reactive.Debugger
+ System.Reactive.Debugger \
+ System.Net.Http
monodroid_dirs := \
Mono.CompilerServices.SymbolWriter \
@@ -201,7 +202,8 @@ monotouch_runtime_dirs := \
System.Web \
Mono.Web \
System.Web.Services \
- System.Web
+ System.Web \
+ System.Net.Http
net_3_5_only_dirs := \
Microsoft.Build.Framework \
diff --git a/mcs/class/System/Assembly/AssemblyInfo.cs b/mcs/class/System/Assembly/AssemblyInfo.cs
index a565b594ac3..bdaba29fd48 100644
--- a/mcs/class/System/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System/Assembly/AssemblyInfo.cs
@@ -69,7 +69,7 @@ using System.Runtime.InteropServices;
#endif
#endif
-#if NET_2_1
+#if NET_2_1 && !MOBILE
[assembly: InternalsVisibleTo ("System.Net, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")]
#else
[assembly: InternalsVisibleTo ("System.ComponentModel.DataAnnotations, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]