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 d0f02cd9026f9a613babe79e8ecf85e706425633..fa68aa7a7eb3cb2eec8299af0d3dc9888712a5a9 100644 (file)
--- a/mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.EnterpriseServices/Assembly/AssemblyInfo.cs
@@ -31,40 +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;
 
-#if (NET_1_0)
-       [assembly: AssemblyVersion("1.0.3300.0")]
-       [assembly: SatelliteContractVersion("1.0.3300.0")]
-#elif (NET_2_0)
-       [assembly: AssemblyVersion("2.0.3600.0")]
-       [assembly: SatelliteContractVersion("2.0.3600.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("2.0.40301.9")]
-       [assembly: AssemblyFileVersion("2.0.40301.9")]
-#elif (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)]
-#endif
+// General Information about the System.EnterpriseServices assembly
 
-[assembly: CLSCompliant(true)]
-[assembly: NeutralResourcesLanguage("en-US")]
+       [assembly: AssemblyTitle ("System.EnterpriseServices.dll")]
+       [assembly: AssemblyDescription ("System.EnterpriseServices.dll")]
+       [assembly: AssemblyDefaultAlias ("System.EnterpriseServices.dll")]
 
-[assembly: ApplicationID("1e246775-2281-484f-8ad4-044c15b86eb7")]
-[assembly: ApplicationName(".NET Utilities")]
-[assembly: Guid("4fb2d46f-efc8-4643-bcd0-6e5bfa6a174c")]
+       [assembly: AssemblyCompany (Consts.MonoCompany)]
+       [assembly: AssemblyProduct (Consts.MonoProduct)]
+       [assembly: AssemblyCopyright (Consts.MonoCopyright)]
+[assembly: AssemblyVersion (Consts.FxVersion)]
+[assembly: SatelliteContractVersion (Consts.FxVersion)]
 
-[assembly: AssemblyDelaySign(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: CLSCompliant (true)]
+[assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile("../msfinal.pub")]
 
+[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: ComVisible (true)]