2009-01-11 Atsushi Enomoto <atsushi@ximian.com>

	* Makefile : remove wrong NET_3_5.

	* AssemblyInfo.cs : fix wrong key and versions.


svn path=/trunk/mcs/; revision=123009

4 files changed, 38 insertions, 35 deletions

diff --git a/mcs/class/System.DirectoryServices.Protocols/Assembly/AssemblyInfo.cs b/mcs/class/System.DirectoryServices.Protocols/Assembly/AssemblyInfo.cs
index c81ec1de438..0746e9b617c 100644
--- a/mcs/class/System.DirectoryServices.Protocols/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.DirectoryServices.Protocols/Assembly/AssemblyInfo.cs
@@ -2,32 +2,19 @@
 // AssemblyInfo.cs
 //
 // Author:
-//   Atsushi Enomoto  <atsushi@ximian.com>
-//   Marek Safar <marek.safar@gmail.com>
+//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
 //
-// Copyright (C) 2008 Novell, Inc.
+// (C) 2004 Ximian, Inc.  http://www.ximian.com
 //
 
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-// 
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
+using System;
+using System.Reflection;
+using System.Resources;
+using System.Security;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about the System.DirectoryServices.Protocols assembly
 
 using System;
 using System.Reflection;
@@ -37,8 +24,7 @@ using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about the System.DirectoryServices.Protocols assembly
-// v3.5 Assembly
+// General Information about the system assembly
 
 [assembly: AssemblyTitle ("System.DirectoryServices.Protocols.dll")]
 [assembly: AssemblyDescription ("System.DirectoryServices.Protocols.dll")]
@@ -50,13 +36,27 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyVersion (Consts.FxVersion)]
 [assembly: SatelliteContractVersion (Consts.FxVersion)]
 [assembly: AssemblyInformationalVersion (Consts.FxFileVersion)]
-[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 
 [assembly: NeutralResourcesLanguage ("en-US")]
-[assembly: CLSCompliant (true)]
-[assembly: AssemblyDelaySign (true)]
-[assembly: AssemblyKeyFile ("../ecma.pub")]
 
 [assembly: ComVisible (false)]
-[assembly: AllowPartiallyTrustedCallers]
 
+#if !TARGET_JVM
+	[assembly: CLSCompliant (true)]
+	[assembly: AssemblyDelaySign (true)]
+	[assembly: AssemblyKeyFile ("../msfinal.pub")]
+#endif
+
+#if NET_2_0
+	[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
+	[assembly: AllowPartiallyTrustedCallers]
+	[assembly: RuntimeCompatibility (WrapNonExceptionThrows = true)]
+	[assembly: CompilationRelaxations (CompilationRelaxations.NoStringInterning)]
+	[assembly: Debuggable (DebuggableAttribute.DebuggingModes.IgnoreSymbolStoreSequencePoints)]
+#elif NET_1_1
+	[assembly: AssemblyTrademark ("")]
+	[assembly: AssemblyConfiguration ("")]
+#elif NET_1_0
+	[assembly: AssemblyTrademark ("")]
+	[assembly: AssemblyConfiguration ("")]
+#endif
diff --git a/mcs/class/System.DirectoryServices.Protocols/Assembly/ChangeLog b/mcs/class/System.DirectoryServices.Protocols/Assembly/ChangeLog
index a4c849b7ba4..ad9f3adf64c 100644
--- a/mcs/class/System.DirectoryServices.Protocols/Assembly/ChangeLog
+++ b/mcs/class/System.DirectoryServices.Protocols/Assembly/ChangeLog
@@ -1,3 +1,7 @@
 2009-01-11  Atsushi Enomoto  <atsushi@ximian.com>
 
+	* AssemblyInfo.cs : fix wrong key and versions.
+
+2009-01-11  Atsushi Enomoto  <atsushi@ximian.com>
+
 	* AssemblyInfo.cs : initial checkin.
diff --git a/mcs/class/System.DirectoryServices.Protocols/ChangeLog b/mcs/class/System.DirectoryServices.Protocols/ChangeLog
index cbb035ac7b3..71bf11d63ca 100644
--- a/mcs/class/System.DirectoryServices.Protocols/ChangeLog
+++ b/mcs/class/System.DirectoryServices.Protocols/ChangeLog
@@ -1,4 +1,8 @@
 2009-01-11  Atsushi Enomoto  <atsushi@ximian.com>
 
+	* Makefile : remove wrong NET_3_5.
+
+2009-01-11  Atsushi Enomoto  <atsushi@ximian.com>
+
 	* Makefile, System.DirectoryServices.Protocols.dll.sources :
 	  initial checkin.
diff --git a/mcs/class/System.DirectoryServices.Protocols/Makefile b/mcs/class/System.DirectoryServices.Protocols/Makefile
index f375e40f518..9ffeafcdf3a 100644
--- a/mcs/class/System.DirectoryServices.Protocols/Makefile
+++ b/mcs/class/System.DirectoryServices.Protocols/Makefile
@@ -10,9 +10,4 @@ LIB_MCS_FLAGS = \
 
 NO_TEST = yes
 
-ifeq (2.0, $(FRAMEWORK_VERSION))
-# This is a .NET 3.5 only assembly, but built during the 2.0 build
-LIB_MCS_FLAGS += -d:NET_3_5
-endif
-
 include ../../build/library.make