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 62b2f845edf06e91b3d347acee69f1014476963c..e87df2644960e8f7936db75e6259af933a9d076a 100644 (file)
--- a/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Runtime.Remoting/Assembly/AssemblyInfo.cs
@@ -38,7 +38,6 @@ using System.Runtime.InteropServices;
 
 // General Information about the System.Runtime.Remoting assembly
 
-#if NET_2_0
        [assembly: AssemblyTitle ("System.Runtime.Remoting.dll")]
        [assembly: AssemblyDescription ("System.Runtime.Remoting.dll")]
        [assembly: AssemblyDefaultAlias ("System.Runtime.Remoting.dll")]
@@ -46,31 +45,20 @@ using System.Runtime.InteropServices;
        [assembly: AssemblyCompany (Consts.MonoCompany)]
        [assembly: AssemblyProduct (Consts.MonoProduct)]
        [assembly: AssemblyCopyright (Consts.MonoCopyright)]
-#endif
+
+       [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
+
 [assembly: AssemblyVersion (Consts.FxVersion)]
 [assembly: SatelliteContractVersion (Consts.FxVersion)]
 
-#if NET_2_0
-       [assembly: NeutralResourcesLanguage ("en-US")]
-       [assembly: ComCompatibleVersion (1, 0, 3300, 0)]
-#endif
+[assembly: NeutralResourcesLanguage ("en-US")]
+[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
 
-[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
-[assembly: ComVisible (false)]
-
-#if !TARGET_JVM
        [assembly: AssemblyDelaySign (true)]
        [assembly: AssemblyKeyFile("../ecma.pub")]
-#endif
 
-#if NET_2_0
-       [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
-       [assembly: CLSCompliant (false)]
-       [assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
-       [assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
-       [assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
-#elif NET_1_1
-       [assembly: TypeLibVersion (1, 10)]
-#elif NET_1_0
-       [assembly: TypeLibVersion (1, 10)]
-#endif
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: CLSCompliant (false)]
+[assembly: ComVisible (false)]
+[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+[assembly: TypeLibVersion (2, 0)]