Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiguel de Icaza <miguel@gnome.org>2012-06-02 00:50:48 +0400
committerMiguel de Icaza <miguel@gnome.org>2012-06-02 00:50:55 +0400
commit8d3b80d4fb899d1892a2942b85a70c6b99e05e2b (patch)
treeb499826d351d8c17a946d4e680e9664686ea6ca3 /mcs/class/CustomMarshalers
parentdb3d5cbc534abf0ee57d02250e7e78d410a437a9 (diff)
[net_1_0] Finally all of NET_1_0 is gone from the source files
Diffstat (limited to 'mcs/class/CustomMarshalers')
-rw-r--r--mcs/class/CustomMarshalers/Assembly/AssemblyInfo.cs28
1 files changed, 12 insertions, 16 deletions
diff --git a/mcs/class/CustomMarshalers/Assembly/AssemblyInfo.cs b/mcs/class/CustomMarshalers/Assembly/AssemblyInfo.cs
index e9261c44aa4..0f297530ca6 100644
--- a/mcs/class/CustomMarshalers/Assembly/AssemblyInfo.cs
+++ b/mcs/class/CustomMarshalers/Assembly/AssemblyInfo.cs
@@ -41,19 +41,15 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDelaySign (true)]
[assembly: AssemblyKeyFile ("../msfinal.pub")]
-#if NET_2_0
- [assembly: AssemblyTitle ("CustomMarshalers.dll")]
- [assembly: AssemblyDescription ("CustomMarshalers.dll")]
- [assembly: AssemblyDefaultAlias ("CustomMarshalers.dll")]
-
- [assembly: AssemblyCompany (Consts.MonoCompany)]
- [assembly: AssemblyProduct (Consts.MonoProduct)]
- [assembly: AssemblyCopyright (Consts.MonoCopyright)]
- [assembly: AssemblyFileVersion (Consts.FxFileVersion)]
- [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
-
- [assembly: CLSCompliant (true)]
- [assembly: ComVisible (false)]
-#elif NET_1_1
-#elif NET_1_0
-#endif
+[assembly: AssemblyTitle ("CustomMarshalers.dll")]
+[assembly: AssemblyDescription ("CustomMarshalers.dll")]
+[assembly: AssemblyDefaultAlias ("CustomMarshalers.dll")]
+
+[assembly: AssemblyCompany (Consts.MonoCompany)]
+[assembly: AssemblyProduct (Consts.MonoProduct)]
+[assembly: AssemblyCopyright (Consts.MonoCopyright)]
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+[assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
+
+[assembly: CLSCompliant (true)]
+[assembly: ComVisible (false)]