Merge pull request #3548 from cmp-/fix-sgen-resume-thread-win32

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

diff --git a/mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs b/mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs
index 8d1ff3311a304f37744264b67da0f70c8857abbb..fa68aa7a7eb3cb2eec8299af0d3dc9888712a5a9 100644 (file)
--- a/mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs
@@ -31,36 +31,36 @@ using System;
 using System.Reflection;
 using System.Resources;
 using System.Security;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.EnterpriseServices;
 
+// General Information about the System.EnterpriseServices assembly
+
+       [assembly: AssemblyTitle ("System.EnterpriseServices.dll")]
+       [assembly: AssemblyDescription ("System.EnterpriseServices.dll")]
+       [assembly: AssemblyDefaultAlias ("System.EnterpriseServices.dll")]
+
+       [assembly: AssemblyCompany (Consts.MonoCompany)]
+       [assembly: AssemblyProduct (Consts.MonoProduct)]
+       [assembly: AssemblyCopyright (Consts.MonoCopyright)]
 [assembly: AssemblyVersion (Consts.FxVersion)]
 [assembly: SatelliteContractVersion (Consts.FxVersion)]
 
-#if (ONLY_1_1)
-[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
-[assembly: TypeLibVersion (1, 10)]
-#elif (NET_2_0)
-[assembly: ComVisible(true)]
-[assembly: AssemblyTitle("System.EnterpriseServices.dll")]
-[assembly: AssemblyDescription("System.EnterpriseServices.dll")]
-[assembly: AssemblyConfiguration("Development version")]
-[assembly: AssemblyCompany("MONO development team")]
-[assembly: AssemblyProduct("MONO CLI")]
-[assembly: AssemblyCopyright("(c) 2004 Various Authors")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyInformationalVersion(Consts.FxFileVersion)]
-[assembly: AssemblyFileVersion(Consts.FxFileVersion)]
-#endif
+[assembly: NeutralResourcesLanguage ("en-US")]
 
-[assembly: CLSCompliant(true)]
-[assembly: NeutralResourcesLanguage("en-US")]
+[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
 
-[assembly: ApplicationID("1e246775-2281-484f-8ad4-044c15b86eb7")]
-[assembly: ApplicationName(".NET Utilities")]
-[assembly: Guid("4fb2d46f-efc8-4643-bcd0-6e5bfa6a174c")]
+[assembly: ApplicationID ("1e246775-2281-484f-8ad4-044c15b86eb7")]
+[assembly: ApplicationName (".NET Utilities")]
+[assembly: Guid ("4fb2d46f-efc8-4643-bcd0-6e5bfa6a174c")]
 
-[assembly: AssemblyDelaySign(true)]
+[assembly: CLSCompliant (true)]
+[assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile("../msfinal.pub")]
 
+[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: ComVisible (true)]