Fix bug #615420.

* xbuild/Microsoft.CSharp.targets: Choose the compiler
based on TargetFrameworkVersion instead of ToolsVersion.

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

diff --git a/mcs/tools/xbuild/ChangeLog b/mcs/tools/xbuild/ChangeLog
index acb79d418c39326d413770700097821c9e5062ca..7991ef59bcd37be84e2cb2a47716a71de30013bf 100644 (file)
--- a/mcs/tools/xbuild/ChangeLog
+++ b/mcs/tools/xbuild/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-18  Ankit Jain  <jankit@novell.com>
+
+       Fix bug #615420.
+       * xbuild/Microsoft.CSharp.targets: Choose the compiler
+       based on TargetFrameworkVersion instead of ToolsVersion.
+
 2010-06-16  Ankit Jain  <jankit@novell.com>
 
        * SolutionParser.cs (ParseSolution): Use ProjectReference's

diff --git a/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets b/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets
index 96bd128f2292428df65588a50a3c545fc7ae3277..a71e9cbacf86f5b6c37fdf5a965994468767a956 100644 (file)
--- a/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets
+++ b/mcs/tools/xbuild/xbuild/Microsoft.CSharp.targets
@@ -13,6 +13,9 @@
        <PropertyGroup>
                <CreateManifestResourceNamesDependsOn></CreateManifestResourceNamesDependsOn>
                <CoreCompileDependsOn></CoreCompileDependsOn>
+
+               <CscToolExe Condition="'$(CscToolExe)' == '' and '$(TargetFrameworkVersion)' != 'v4.0'">gmcs</CscToolExe>
+               <CscToolExe Condition="'$(CscToolExe)' == '' and '$(TargetFrameworkVersion)' == 'v4.0'">dmcs</CscToolExe>
        </PropertyGroup>
 
        <ItemGroup>