Moved assembly version and assembly reference constants to a common Consts.cs file. Updated 2.0.3600.0 assembly versions to 2.0.0.0. Updated some old beta version numbers to recent ones. Fixed hard coded assembly references to use constants with the appropriate version number.

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

2 files changed, 6 insertions, 89 deletions

diff --git a/mcs/class/System.Configuration.Install/Assembly/AssemblyInfo.cs b/mcs/class/System.Configuration.Install/Assembly/AssemblyInfo.cs
index fbfd16692af..b916c5516f0 100644
--- a/mcs/class/System.Configuration.Install/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Configuration.Install/Assembly/AssemblyInfo.cs
@@ -37,17 +37,12 @@ using System.Runtime.InteropServices;
 
 // General Information about the System.Configuration.Install assembly
 
-#if (NET_1_0)
-	[assembly: AssemblyVersion ("1.0.3300.0")]
-	[assembly: SatelliteContractVersion ("1.0.3300.0")]
-#elif (NET_2_0)
-        [assembly: AssemblyVersion("2.0.3600.0")]
-	[assembly: SatelliteContractVersion("2.0.3600.0")]
-#elif (NET_1_1)
-	[assembly: AssemblyVersion ("1.0.5000.0")]
-	[assembly: SatelliteContractVersion ("1.0.5000.0")]
-	[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
-	[assembly: TypeLibVersion (1, 10)]
+[assembly: AssemblyVersion (Consts.FxVersion)]
+[assembly: SatelliteContractVersion (Consts.FxVersion)]
+
+#if (ONLY_1_1)
+[assembly: ComCompatibleVersion (1, 0, 3300, 0)]
+[assembly: TypeLibVersion (1, 10)]
 #endif
 
 [assembly: AssemblyTitle ("System.Configuration.Install.dll")]
diff --git a/mcs/class/System.Configuration.Install/Assembly/Consts.cs b/mcs/class/System.Configuration.Install/Assembly/Consts.cs
deleted file mode 100644
index 8321482cd26..00000000000
--- a/mcs/class/System.Configuration.Install/Assembly/Consts.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-//
-// Consts.cs
-//
-// Author:
-//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
-//
-// (C) 2003 Andreas Nahr
-//
-// NOTE:
-//	Ensure that every constant is defined for every version symbol!
-//
-
-//
-// 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.
-//
-
-// This class contains constants that are dependent on the defined symbols
-// Use it to shorten and make code more maintainable in situations like:
-//
-//#if (NET_1_0)
-//	[Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))]
-//#endif
-//#if (NET_1_1)
-//    	[Designer ("System.Diagnostics.Design.ProcessDesigner, System.Design, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a", typeof (IDesigner))]
-//#endif
-//
-// by changing them into:
-//
-// [Designer ("System.Diagnostics.Design.ProcessDesigner, " + Consts.AssemblySystem_Design, typeof (IDesigner))]
-//
-
-internal sealed class Consts
-{
-	
-	private 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";
-
-#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 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
-
-}