From 04de3ac14d88913b24f45851091e050c995a5aa9 Mon Sep 17 00:00:00 2001 From: Gert Driesen Date: Fri, 11 Jun 2004 06:37:41 +0000 Subject: * Consts.cs: Replaced by Consts.cs from System.Messaging svn path=/trunk/mcs/; revision=29271 --- .../Assembly/ChangeLog | 6 ++++- .../Assembly/Consts.cs | 27 ++++++++++++++-------- 2 files changed, 23 insertions(+), 10 deletions(-) (limited to 'mcs/class/System.Configuration.Install') diff --git a/mcs/class/System.Configuration.Install/Assembly/ChangeLog b/mcs/class/System.Configuration.Install/Assembly/ChangeLog index eda95009db4..2fe1eab99c1 100644 --- a/mcs/class/System.Configuration.Install/Assembly/ChangeLog +++ b/mcs/class/System.Configuration.Install/Assembly/ChangeLog @@ -1,4 +1,8 @@ -2004-05-15 Gert Driesen (drieseng@users.sourceforge.net) +2004-06-11 Gert Driesen + + * Consts.cs: Replaced by Consts.cs from System.Messaging + +2004-05-15 Gert Driesen * Consts.cs: Added diff --git a/mcs/class/System.Configuration.Install/Assembly/Consts.cs b/mcs/class/System.Configuration.Install/Assembly/Consts.cs index 19a13d1db9e..dbe3150e650 100644 --- a/mcs/class/System.Configuration.Install/Assembly/Consts.cs +++ b/mcs/class/System.Configuration.Install/Assembly/Consts.cs @@ -1,14 +1,13 @@ // // Consts.cs // -// Authors: -// Umadevi S (sumadevi@novell.com) +// Author: // Andreas Nahr (ClassDevelopment@A-SoftTech.com) -// +// +// (C) 2003 Andreas Nahr // // NOTE: // Ensure that every constant is defined for every version symbol! -// This class is similar to the Consts.cs class at System.Web/Assembly by Andreas Nhar // // This class contains constants that are dependent on the defined symbols @@ -35,14 +34,24 @@ internal sealed class Consts #if (NET_1_0) + public const string AssemblySystem_Design = "System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + public const string AssemblySystem_Drawing = "System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblySystem = "System, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; -//#elif (NET_1_1) +#elif (NET_2_0) + + public const string AssemblySystem_Design = "System.Design, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + public const string AssemblySystem_Drawing = "System.Drawing, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=2.0.3600.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + #else // NET_1_1 is seen as default if somebody 'forgets' to specify any of the symbols - // to ensure we are not breaking the build in this case - public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; - public const string AssemblySystem = "System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"; + // to ensure we are not breaking the build in this case + + public const string AssemblySystem_Design = "System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + public const string AssemblySystem_Drawing = "System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + public const string AssemblyMicrosoft_VisualStudio = "Microsoft.VisualStudio, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"; + #endif + } -- cgit v1.2.3