Author: miguel
Date: 2008-02-11 00:35:09 -0500 (Mon, 11 Feb 2008)
New Revision: 95413
Modified:
trunk/mcs/build/common/ChangeLog
trunk/mcs/build/common/Consts.cs.in
trunk/mcs/class/System.Core/Assembly/AssemblyInfo.cs
trunk/mcs/class/System.Core/Assembly/ChangeLog
trunk/mcs/class/System.Xml.Linq/Assembly/AssemblyInfo.cs
trunk/mcs/class/System.Xml.Linq/Assembly/ChangeLog
Log:
Revert, this patch does not look correct
Modified: trunk/mcs/build/common/ChangeLog
===================================================================
--- trunk/mcs/build/common/ChangeLog 2008-02-11 02:28:00 UTC (rev 95412)
+++ trunk/mcs/build/common/ChangeLog 2008-02-11 05:35:09 UTC (rev 95413)
@@ -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.
Modified: trunk/mcs/build/common/Consts.cs.in
===================================================================
--- trunk/mcs/build/common/Consts.cs.in 2008-02-11 02:28:00 UTC (rev 95412)
+++ trunk/mcs/build/common/Consts.cs.in 2008-02-11 05:35:09 UTC (rev 95413)
@@ -48,12 +48,13 @@
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:
Modified: trunk/mcs/class/System.Core/Assembly/AssemblyInfo.cs
===================================================================
--- trunk/mcs/class/System.Core/Assembly/AssemblyInfo.cs 2008-02-11
02:28:00 UTC (rev 95412)
+++ trunk/mcs/class/System.Core/Assembly/AssemblyInfo.cs 2008-02-11
05:35:09 UTC (rev 95413)
@@ -39,16 +39,16 @@
[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")]
Modified: trunk/mcs/class/System.Core/Assembly/ChangeLog
===================================================================
--- trunk/mcs/class/System.Core/Assembly/ChangeLog 2008-02-11 02:28:00 UTC
(rev 95412)
+++ trunk/mcs/class/System.Core/Assembly/ChangeLog 2008-02-11 05:35:09 UTC
(rev 95413)
@@ -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.
Modified: trunk/mcs/class/System.Xml.Linq/Assembly/AssemblyInfo.cs
===================================================================
--- trunk/mcs/class/System.Xml.Linq/Assembly/AssemblyInfo.cs 2008-02-11
02:28:00 UTC (rev 95412)
+++ trunk/mcs/class/System.Xml.Linq/Assembly/AssemblyInfo.cs 2008-02-11
05:35:09 UTC (rev 95413)
@@ -37,9 +37,9 @@
// 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")]
Modified: trunk/mcs/class/System.Xml.Linq/Assembly/ChangeLog
===================================================================
--- trunk/mcs/class/System.Xml.Linq/Assembly/ChangeLog 2008-02-11 02:28:00 UTC
(rev 95412)
+++ trunk/mcs/class/System.Xml.Linq/Assembly/ChangeLog 2008-02-11 05:35:09 UTC
(rev 95413)
@@ -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
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
