Merge pull request #1695 from gregoryyoung/master

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

diff --git a/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs b/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
index 09248a4d516873bf0f5c71bb2fe0e7ee7b06abd9..e87df2644960e8f7936db75e6259af933a9d076a 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
@@ -32,33 +32,33 @@ using System;
 using System.Reflection;
 using System.Resources;
 using System.Security;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about the System.Runtime.Remoting assembly
 
-#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")]
-#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
+       [assembly: AssemblyTitle ("System.Runtime.Remoting.dll")]
+       [assembly: AssemblyDescription ("System.Runtime.Remoting.dll")]
+       [assembly: AssemblyDefaultAlias ("System.Runtime.Remoting.dll")]
 
-//[assembly: AssemblyTitle("System.Runtime.Remoting.dll")]
-//[assembly: AssemblyDescription("System.Runtime.Remoting.dll")]
-//[assembly: AssemblyConfiguration("Development version")]
-//[assembly: AssemblyCompany("MONO development team")]
-//[assembly: AssemblyProduct("MONO CLI")]
-//[assembly: AssemblyCopyright("(c) 2003 Various Authors")]
-//[assembly: AssemblyTrademark("")]
+       [assembly: AssemblyCompany (Consts.MonoCompany)]
+       [assembly: AssemblyProduct (Consts.MonoProduct)]
+       [assembly: AssemblyCopyright (Consts.MonoCopyright)]
 
-[assembly: NeutralResourcesLanguage("en-US")]
+       [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
 
-[assembly: AssemblyDelaySign(true)]
-[assembly: AssemblyKeyFile("../ecma.pub")]
+[assembly: AssemblyVersion (Consts.FxVersion)]
+[assembly: SatelliteContractVersion (Consts.FxVersion)]
+
+[assembly: NeutralResourcesLanguage ("en-US")]
+[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
+
+       [assembly: AssemblyDelaySign (true)]
+       [assembly: AssemblyKeyFile("../ecma.pub")]
+
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CLSCompliant (false)]
+[assembly: ComVisible (false)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: TypeLibVersion (2, 0)]