diff options
4 files changed, 12 insertions, 2 deletions
diff --git a/mcs/class/corlib/Assembly/AssemblyInfo.cs b/mcs/class/corlib/Assembly/AssemblyInfo.cs index bc52da976a9..3b68189f0bd 100644 --- a/mcs/class/corlib/Assembly/AssemblyInfo.cs +++ b/mcs/class/corlib/Assembly/AssemblyInfo.cs @@ -79,7 +79,7 @@ using System.Runtime.InteropServices; [assembly: DefaultDependency (LoadHint.Always)] [assembly: StringFreezing] -#if NET_2_1 && !MONOTOUCH +#if MOONLIGHT [assembly: InternalsVisibleTo ("System, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")] [assembly: InternalsVisibleTo ("System.Windows, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")] [assembly: InternalsVisibleTo ("System.Windows.Browser, PublicKey=00240000048000009400000006020000002400005253413100040000010001008D56C76F9E8649383049F383C44BE0EC204181822A6C31CF5EB7EF486944D032188EA1D3920763712CCB12D75FB77E9811149E6148E5D32FBAAB37611C1878DDC19E20EF135D0CB2CFF2BFEC3D115810C3D9069638FE4BE215DBF795861920E5AB6F7DB2E2CEEF136AC23D5DD2BF031700AEC232F6C6B1C785B4305C123B37AB")] diff --git a/mcs/class/corlib/Assembly/ChangeLog b/mcs/class/corlib/Assembly/ChangeLog index e35c3ac83f9..d1f7178414d 100644 --- a/mcs/class/corlib/Assembly/ChangeLog +++ b/mcs/class/corlib/Assembly/ChangeLog @@ -1,3 +1,8 @@ +2010-03-16 Jb Evain <jbevain@novell.com> + + * AssemblyInfo.cs: use MOONLIGHT symbol to disambiguate + MonoTouch and Moonlight code. + 2010-02-09 Sebastien Pouliot <sebastien@ximian.com> * AssemblyInfo.cs: Mono.CompilerServices.SymbolWriter does not diff --git a/mcs/class/corlib/System.Security.Permissions/ChangeLog b/mcs/class/corlib/System.Security.Permissions/ChangeLog index a2683cb943e..86d9705e696 100644 --- a/mcs/class/corlib/System.Security.Permissions/ChangeLog +++ b/mcs/class/corlib/System.Security.Permissions/ChangeLog @@ -1,3 +1,8 @@ +2010-03-16 Jb Evain <jbevain@novell.com> + + * PublisherIdentityPermissionAttribute.cs: use MOONLIGHT symbol to + disambiguate MonoTouch and Moonlight code. + 2009-09-22 Sebastien Pouliot <sebastien@ximian.com> * PermissionSetAttribute.cs: Don't create a pset for NET_2_1 diff --git a/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermissionAttribute.cs index 2740291d494..d5ae1319b1a 100644 --- a/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermissionAttribute.cs +++ b/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermissionAttribute.cs @@ -27,7 +27,7 @@ // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // -#if !NET_2_1 || MONOTOUCH +#if !MOONLIGHT using System.Runtime.InteropServices; using SSCX = System.Security.Cryptography.X509Certificates; |