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:
authorJb Evain <jbevain@gmail.com>2008-11-20 17:09:16 +0300
committerJb Evain <jbevain@gmail.com>2008-11-20 17:09:16 +0300
commitc3cbc503b920121ac7a73d94460ea8abc40a20dc (patch)
tree967613299ec1e843789ee64703aabda4e63fa14e /mcs/class/System.ServiceModel/Assembly
parent85e2d21ceb5ac555055702e525317d7806f88bdf (diff)
2008-11-20 Jb Evain <jbevain@novell.com>
* AssemblyInfo.cs: sign using winfx.pub on NET_2_1. svn path=/trunk/mcs/; revision=119440
Diffstat (limited to 'mcs/class/System.ServiceModel/Assembly')
-rw-r--r--mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs4
-rw-r--r--mcs/class/System.ServiceModel/Assembly/ChangeLog4
2 files changed, 8 insertions, 0 deletions
diff --git a/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs b/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs
index 061dcfcf406..f4558707e6b 100644
--- a/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.ServiceModel/Assembly/AssemblyInfo.cs
@@ -55,7 +55,11 @@ using System.Runtime.InteropServices;
[assembly: NeutralResourcesLanguage ("en-US")]
[assembly: CLSCompliant (true)]
[assembly: AssemblyDelaySign (true)]
+#if NET_2_1
+[assembly: AssemblyKeyFile ("../winfx.pub")]
+#else
[assembly: AssemblyKeyFile ("../ecma.pub")]
+#endif
[assembly: ComVisible (false)]
[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
diff --git a/mcs/class/System.ServiceModel/Assembly/ChangeLog b/mcs/class/System.ServiceModel/Assembly/ChangeLog
index 84fc6850279..c65e3943597 100644
--- a/mcs/class/System.ServiceModel/Assembly/ChangeLog
+++ b/mcs/class/System.ServiceModel/Assembly/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-20 Jb Evain <jbevain@novell.com>
+
+ * AssemblyInfo.cs: sign using winfx.pub on NET_2_1.
+
2008-04-25 Andreas Nahr <ClassDevelopment@A-SoftTech.com>
* AssemblyInfo.cs: Added missing attributes