New test.

[mono.git] / mcs / class / System.Design / Assembly / AssemblyInfo.cs

diff --git a/mcs/class/System.Design/Assembly/AssemblyInfo.cs b/mcs/class/System.Design/Assembly/AssemblyInfo.cs
index 234c8d9faf2307d67e4ee0cbcbddb4888919f891..8cd78b96c988e76829ad190f33ce0345ad780a62 100644 (file)
--- a/mcs/class/System.Design/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Design/Assembly/AssemblyInfo.cs
@@ -7,6 +7,27 @@
 // (C) 2003 Ximian, Inc.  http://www.ximian.com
 //
 
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
 using System.Reflection;
 using System.Resources;
@@ -16,15 +37,12 @@ using System.Runtime.InteropServices;
 
 // General Information about the System.Design assembly
 
-#if (NET_1_0)
-       [assembly: AssemblyVersion ("1.0.3300.0")]
-       [assembly: SatelliteContractVersion ("1.0.3300.0")]
-#endif
-#if (NET_1_1)
-       [assembly: AssemblyVersion ("1.0.5000.0")]
-       [assembly: SatelliteContractVersion ("1.0.5000.0")]
-       [assembly: ComCompatibleVersion (1, 0, 3300, 0)]
-       [assembly: TypeLibVersion (1, 10)]
+[assembly: AssemblyVersion (Consts.FxVersion)]
+[assembly: SatelliteContractVersion (Consts.FxVersion)]
+
+#if (ONLY_1_1)
+[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
+[assembly: TypeLibVersion (1, 10)]
 #endif
 
 [assembly: AssemblyTitle ("System.Design.dll")]
@@ -35,8 +53,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright ("(c) 2003 Various Authors")]
 [assembly: AssemblyTrademark ("")]
 
-// FIXME: add once CLS compliance is reached (CLS compliance requests that Accessibility needs to be referenced - doesn't on mcs, probably a mcs bug)
-//[assembly: CLSCompliant (true)]
+[assembly: CLSCompliant (true)]
 [assembly: AssemblyDefaultAlias ("System.Design.dll")]
 [assembly: AssemblyInformationalVersion ("0.0.0.1")]
 [assembly: NeutralResourcesLanguage ("en-US")]
@@ -44,4 +61,5 @@ using System.Runtime.InteropServices;
 [assembly: ComVisible (false)]
 
 [assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../ecma.pub")]
+[assembly: AssemblyKeyFile("../msfinal.pub")]
+