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 bd93a4debbba02461fe4734cb1733d83edb0a8c2..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")]
@@ -48,7 +47,6 @@ using System.Runtime.InteropServices;
        [assembly: AssemblyCopyright (Consts.MonoCopyright)]
 
        [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
-#endif
 
 [assembly: AssemblyVersion (Consts.FxVersion)]
 [assembly: SatelliteContractVersion (Consts.FxVersion)]
@@ -56,10 +54,8 @@ using System.Runtime.InteropServices;
 [assembly: NeutralResourcesLanguage ("en-US")]
 [assembly: ComCompatibleVersion (1, 0, 3300, 0)]
 
-#if !TARGET_JVM
        [assembly: AssemblyDelaySign (true)]
        [assembly: AssemblyKeyFile("../ecma.pub")]
-#endif
 
 [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 [assembly: CLSCompliant (false)]