diff options
author | Jonathan Pryor <jonpryor@vt.edu> | 2010-11-23 01:30:15 +0300 |
---|---|---|
committer | Jonathan Pryor <jonpryor@vt.edu> | 2010-11-23 01:30:15 +0300 |
commit | 5f90f7a8e49fa73714816b912450b061c0c855c0 (patch) | |
tree | 19295ad6d429ce219d1daf534a513f39da65bd24 | |
parent | a3ba2ab7a091b96c9e8917aab9bd9ad042a5d639 (diff) |
Remove IVT from System.ServiceModel on MonoDroid, MonoTouch profiles.
This is ~identical to commit a3ba2ab7a091b96c9e8917aab9bd9ad042a5d639,
just applied to the MonoDroid and MonoTouch profiles.
Furthermore, without this patch the MonoDroid & MonoTouch profiles fail to
build, as current versions of mcs (nicely) attempt to verify that the output
assembly name matches the IVT of a referenced assembly, which isn't possible
when System.Xml.dll has an IVT entry for System.ServiceModel.Web.dll which
differs from System.ServiceModel.dll's IVT entry for
System.ServiceModel.Web.dll.
-rw-r--r-- | mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs b/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs index 5a2618fc21c..de6e3ab5f9d 100644 --- a/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs +++ b/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs @@ -71,7 +71,7 @@ using System.Runtime.InteropServices; [assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)] [assembly: SecurityPermission (SecurityAction.RequestMinimum, SkipVerification = true)] -#if !MOONLIGHT +#if !MOONLIGHT && !NET_2_1 [assembly: InternalsVisibleTo ("System.ServiceModel.Web, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] [assembly: InternalsVisibleTo ("System.ServiceModel.Routing, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] [assembly: InternalsVisibleTo ("System.ServiceModel.Discovery, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] // AnnouncementChannelEndpointElementCollection requires it. |