diff options
| author | Atsushi Eno <atsushieno@gmail.com> | 2010-03-10 13:17:24 +0300 |
|---|---|---|
| committer | Atsushi Eno <atsushieno@gmail.com> | 2010-03-10 13:17:24 +0300 |
| commit | 286c255027f3a2c957b134014a858b4fce89ecaf (patch) | |
| tree | 5ca2e75ec457cec0d2e9c6d5b997e286ab167147 /mcs/class/System.ServiceModel.Web/Assembly/AssemblyInfo.cs | |
| parent | fb01abdaa2a003388359d72fb2f1025b3a3d4ff7 (diff) | |
2010-03-10 Atsushi Enomoto <atsushi@ximian.com>
in System.ServiceModel.Web:
* JavaScriptObjectDeserializer.cs : new internal file, which is
used by System.Json (for moonlight compatibility).
* net_2_0_System.ServiceModel.Web.dll.sources,
net_2_1_raw_System.ServiceModel.Web.dll.sources :
add JavaScriptObjectDeserializer.cs and JsonReader in Sys.Json
(which is to be moved later).
* AssemblyInfo.cs: added InternalVisibleTo(System.Json). Also added
dummy 2.0 for easy testing.
in System.Json:
* JsonValue.cs : use Sys.SM.Web.dll's JavaScriptObjectDeserializer
for silverlight sdk / moonlight compatibility.
* JsonReader.cs : renamed to JavaScriptReader (for disambiguation in
Sys.SM.Web.dll). Now it is native-type based and used by the above
deserializer.
* Makefile : reference System.Xml and System.ServiceModel.Web (for
moonlight compatibility).
* AssemblyInfo.cs : use the same pub key in 2.0 (dummy), to ease
testing locally.
svn path=/trunk/mcs/; revision=153392
Diffstat (limited to 'mcs/class/System.ServiceModel.Web/Assembly/AssemblyInfo.cs')
| -rw-r--r-- | mcs/class/System.ServiceModel.Web/Assembly/AssemblyInfo.cs | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mcs/class/System.ServiceModel.Web/Assembly/AssemblyInfo.cs b/mcs/class/System.ServiceModel.Web/Assembly/AssemblyInfo.cs index 435052c7da8..982ff7fc40b 100644 --- a/mcs/class/System.ServiceModel.Web/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.ServiceModel.Web/Assembly/AssemblyInfo.cs @@ -59,3 +59,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyInformationalVersion ("3.5.594.0")] [assembly: AssemblyKeyFile("../winfx.pub")] #endif + +#if NET_2_1 +[assembly: InternalsVisibleTo ("System.Json, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")] +#else +[assembly: InternalsVisibleTo ("dummy-System.Json, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")] +#endif |