Merge pull request #3018 from ludovic-henry/coop-marshal-attach

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

diff --git a/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs b/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs
index 6d150bf34569d8f69ca6fbbad4b666dd1d0de84a..adfcac1097ba0158145f29ae235fc955ca6a3bd0 100644 (file)
--- a/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Drawing.Design/Assembly/AssemblyInfo.cs
@@ -7,37 +7,54 @@
 // (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;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Diagnostics;
 
 // General Information about the System.Drawing.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")]
-#endif
-
-[assembly: AssemblyTitle("System.Drawing.Design.dll")]
-[assembly: AssemblyDescription("System.Drawing.Design.dll")]
-[assembly: AssemblyConfiguration("Development version")]
-[assembly: AssemblyCompany("MONO development team")]
-[assembly: AssemblyProduct("MONO CLI")]
-[assembly: AssemblyCopyright("(c) 2003 Various Authors")]
-[assembly: AssemblyTrademark("")]
-
-[assembly: CLSCompliant(true)]
-[assembly: AssemblyDefaultAlias("System.Drawing.Design.dll")]
-[assembly: AssemblyInformationalVersion("0.0.0.1")]
-[assembly: NeutralResourcesLanguage("en-US")]
-
-[assembly: ComVisible(false)]
-
-[assembly: AssemblyDelaySign(true)]
-//[assembly: AssemblyKeyFile("..\\..\\MonoKey.snk")]
+[assembly: AssemblyTitle ("System.Drawing.Design.dll")]
+[assembly: AssemblyDescription ("System.Drawing.Design.dll")]
+[assembly: AssemblyDefaultAlias ("System.Drawing.Design.dll")]
+
+[assembly: AssemblyCompany (Consts.MonoCompany)]
+[assembly: AssemblyProduct (Consts.MonoProduct)]
+[assembly: AssemblyCopyright (Consts.MonoCopyright)]
+[assembly: AssemblyVersion (Consts.FxVersion)]
+[assembly: SatelliteContractVersion (Consts.FxVersion)]
+[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
+
+[assembly: NeutralResourcesLanguage ("en-US")]
+
+[assembly: ComVisible (false)]
+
+[assembly: CLSCompliant (true)]
+[assembly: AssemblyDelaySign (true)]
+[assembly: AssemblyKeyFile("../msfinal.pub")]
+
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]