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:
authorSebastien Pouliot <sebastien@ximian.com>2009-05-02 02:24:03 +0400
committerSebastien Pouliot <sebastien@ximian.com>2009-05-02 02:24:03 +0400
commit53d4863cd5d6647b747a500c1d9be328b96d6111 (patch)
treec3a85279ac51747ae8278000f2525bfdd3dc4346 /mcs/class/System.ServiceModel/Assembly
parent7bd0a7c7f857a2613876c09b061c8fac5ccb5da1 (diff)
2009-05-01 Sebastien Pouliot <sebastien@ximian.com>
* AssemblyInfo.cs: Don't include extra stuff into Moonlight (NET_2_1) svn path=/trunk/mcs/; revision=133298
Diffstat (limited to 'mcs/class/System.ServiceModel/Assembly')
-rw-r--r--mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs8
-rw-r--r--mcs/class/System.ServiceModel/Assembly/ChangeLog4
2 files changed, 8 insertions, 4 deletions
diff --git a/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs b/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs
index f4558707e6b..681c6e963ca 100644
--- a/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs
@@ -59,16 +59,16 @@ using System.Runtime.InteropServices;
[assembly: AssemblyKeyFile ("../winfx.pub")]
#else
[assembly: AssemblyKeyFile ("../ecma.pub")]
+[assembly: AllowPartiallyTrustedCallers]
+[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
+[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
+[assembly: SecurityCritical (SecurityCriticalScope.Explicit)]
#endif
[assembly: ComVisible (false)]
-[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
-[assembly: AllowPartiallyTrustedCallers]
[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
[assembly: SecurityPermission (SecurityAction.RequestMinimum, SkipVerification = true)]
-[assembly: SecurityCritical (SecurityCriticalScope.Explicit)]
[assembly: InternalsVisibleTo ("System.ServiceModel.Web, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
diff --git a/mcs/class/System.ServiceModel/Assembly/ChangeLog b/mcs/class/System.ServiceModel/Assembly/ChangeLog
index c65e3943597..9c673c936e9 100644
--- a/mcs/class/System.ServiceModel/Assembly/ChangeLog
+++ b/mcs/class/System.ServiceModel/Assembly/ChangeLog
@@ -1,3 +1,7 @@
+2009-05-01 Sebastien Pouliot <sebastien@ximian.com>
+
+ * AssemblyInfo.cs: Don't include extra stuff into Moonlight (NET_2_1)
+
2008-11-20 Jb Evain <jbevain@novell.com>
* AssemblyInfo.cs: sign using winfx.pub on NET_2_1.