Revert, this patch does not look correct

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

mcs/build/common/ChangeLog

@@ -1,8 +1,3 @@
-2008-02-10  Atsushi Enomoto  <[email protected]>
-
-	* Consts.cs.in : now that we removed 3.5 profile, those versions are
-	  needed independently.
-
 2007-12-31  Gert Driesen  <[email protected]>
 
 	* Consts.cs.in: Add corlib assembly name.

mcs/build/common/Consts.cs.in

@@ -48,12 +48,13 @@ internal
 
 	public const string MonoVersion = "@MONO_VERSION@";
 
+#if NET_3_5
 	// Versions of .NET Framework 3.5 RTM
-	public const string Fx35Version = "3.5.0.0";
-	public const string Fx35FileVersion = "3.5.21022.8";
+	public const string FxVersion = "3.5.0.0";
+	public const string FxFileVersion = "3.5.21022.8";
 	
-	public const string Vs35Version = "0.0.0.0"; // Useless ?
-#if NET_2_1
+	public const string VsVersion = "0.0.0.0"; // Useless ?
+#elif NET_2_1
 	// Versions of .NET Framework 2.1 (SilverLight)
 	public const string FxVersion = "2.1.0.0";
 	public const string VsVersion = "9.0.0.0"; // TODO:

mcs/class/System.Core/Assembly/AssemblyInfo.cs

@@ -39,16 +39,16 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyProduct("System.Core")]
 [assembly: AssemblyCopyright("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyFileVersion (Consts.Fx35FileVersion)]
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 [assembly: AssemblyDefaultAlias ("System.Core.dll")]
 [assembly: NeutralResourcesLanguage ("en-US")]
 
 [assembly: CLSCompliant(true)]
 [assembly: ComVisible (false)]
 
-[assembly: AssemblyVersion(Consts.Fx35Version)]
-[assembly: SatelliteContractVersion (Consts.Fx35Version)]
-[assembly: AssemblyInformationalVersionAttribute (Consts.Fx35Version)]
+[assembly: AssemblyVersion(Consts.FxVersion)]
+[assembly: SatelliteContractVersion (Consts.FxVersion)]
+[assembly: AssemblyInformationalVersionAttribute (Consts.FxVersion)]
 
 [assembly: AssemblyDelaySign (true)]
 [assembly: AssemblyKeyFile ("../ecma.pub")]

mcs/class/System.Core/Assembly/ChangeLog

@@ -1,7 +1,3 @@
-2008-02-10  Atsushi Enomoto  <[email protected]>
-
-	* AssemblyInfo.cs: use 3.5 version strings.
-
 2007-08-20  Marek Safar <[email protected]>
 
 	* AssemblyInfo.cs: Add a few more attributes.

mcs/class/System.Xml.Linq/Assembly/AssemblyInfo.cs

@@ -37,9 +37,9 @@ using System.Runtime.InteropServices;
 
 // General Information about the System.Xml.Linq assembly
 
-[assembly: AssemblyVersion (Consts.Fx35Version)]
-[assembly: SatelliteContractVersion (Consts.Fx35Version)]
-[assembly: AssemblyFileVersion (Consts.Fx35FileVersion)]
+[assembly: AssemblyVersion (Consts.FxVersion)]
+[assembly: SatelliteContractVersion (Consts.FxVersion)]
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 
 [assembly: AssemblyTitle ("System.Xml.Linq.dll")]
 [assembly: AssemblyDescription ("System.Xml.Linq.dll")]

mcs/class/System.Xml.Linq/Assembly/ChangeLog

@@ -1,7 +1,3 @@
-2008-02-10  Atsushi Enomoto  <[email protected]>
-
-	* AssemblyInfo.cs: use 3.5 version strings.
-
 2007-08-24  Marek Safar  <[email protected]>
 
 	* AssemblyInfo.cs: Updated to Beta 2