* WindowsBase/Assembly/AssemblyInfo.cs: AssemblyFileVersion now uses

  Consts.FxFileVersion, which is "3.0.4506.648".

* WindowsBase/Makefile: Define NET_3_0 so that Consts will have the
  correct values for this assembly.

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

diff --git a/mcs/class/WindowsBase/Assembly/AssemblyInfo.cs b/mcs/class/WindowsBase/Assembly/AssemblyInfo.cs
index 0087914925c942f938bb9d3a233c676a9edbe8d7..3eb44746da704b66a176c5a45aece87eec09c523 100644 (file)
--- a/mcs/class/WindowsBase/Assembly/AssemblyInfo.cs
+++ b/mcs/class/WindowsBase/Assembly/AssemblyInfo.cs
@@ -45,7 +45,7 @@ using System.Windows.Markup;
 [assembly: AssemblyProduct (Consts.MonoProduct)]
 [assembly: AssemblyCopyright (Consts.MonoCopyright)]
 [assembly: AssemblyVersion (Consts.FxVersion)]
-[assembly: AssemblyFileVersion ("6.0.6001.17014")]
+[assembly: AssemblyFileVersion (Consts.FxFileVersion)]
 
 [assembly: NeutralResourcesLanguage ("en")]
 [assembly: CLSCompliant (true)]

diff --git a/mcs/class/WindowsBase/ChangeLog b/mcs/class/WindowsBase/ChangeLog
index c75e078fe0a21279114d08c438a8b4060e8a3ed5..48b2e78712e677bd9587998bebac86dd9568afc3 100644 (file)
--- a/mcs/class/WindowsBase/ChangeLog
+++ b/mcs/class/WindowsBase/ChangeLog
@@ -1,3 +1,11 @@
+2008-11-06  Sandy Armstrong  <sanfordarmstrong@gmail.com>
+
+       * Assembly/AssemblyInfo.cs: AssemblyFileVersion now uses
+       Consts.FxFileVersion, which is "3.0.4506.648".
+
+       * Makefile: Define NET_3_0 so that Consts will have the correct values
+       for this assembly.
+
 2008-11-06  Alan McGovern  <amcgovern@novell.com>
 
        

diff --git a/mcs/class/WindowsBase/Makefile b/mcs/class/WindowsBase/Makefile
index 1970823d763ea15e3a1d1b3d8dcf4ae35523e5bb..83b73153a4e540c3e764fe61769d941da78bc672 100644 (file)
--- a/mcs/class/WindowsBase/Makefile
+++ b/mcs/class/WindowsBase/Makefile
@@ -6,4 +6,8 @@ LIBRARY = WindowsBase.dll
 LIB_MCS_FLAGS = -unsafe -r:System -r:System.Xml
 TEST_MCS_FLAGS = -unsafe -r:WindowsBase.dll
 
+ifeq (2.0, $(FRAMEWORK_VERSION))
+LIB_MCS_FLAGS += -d:NET_3_0
+endif
+
 include ../../build/library.make