diff options
| author | Ankit Jain <radical@corewars.org> | 2010-07-08 23:27:14 +0400 |
|---|---|---|
| committer | Ankit Jain <radical@corewars.org> | 2010-07-08 23:27:14 +0400 |
| commit | 4ae701cad00a152bc0bf289cfd24bf7efa078a40 (patch) | |
| tree | 72692d8ec332562ed67a962e4929558d4e55dd0b /mcs/class | |
| parent | 24d0a7b0b52a6ccd0a47722bc63d9496af6440d8 (diff) | |
* Engine.cs: Define 4.0 toolset for non-NET_4_0 profiles also,
but fallback to 3.5 toolset there. This is required for the mono-2-6
branch, which doesn't lacks NET_4_0 .
svn path=/branches/mono-2-6/mcs/; revision=160080
Diffstat (limited to 'mcs/class')
| -rw-r--r-- | mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog | 6 | ||||
| -rw-r--r-- | mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog index b0c3c37b508..577d438d5ab 100644 --- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog +++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/ChangeLog @@ -1,3 +1,9 @@ +2010-07-09 Ankit Jain <jankit@novell.com> + + * Engine.cs: Define 4.0 toolset for non-NET_4_0 profiles also, + but fallback to 3.5 toolset there. This is required for the mono-2-6 + branch, which doesn't lacks NET_4_0 . + 2010-06-04 Ankit Jain <jankit@novell.com> * Import.cs (EvaluateProjectPath): Add a hack to support multiple diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs index e211551f9c7..1a113a26240 100644 --- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs +++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Engine.cs @@ -119,6 +119,9 @@ namespace Microsoft.Build.BuildEngine { #if NET_4_0 Toolsets.Add (new Toolset ("4.0", ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version40))); +#else + Toolsets.Add (new Toolset ("4.0", + ToolLocationHelper.GetPathToDotNetFramework (TargetDotNetFrameworkVersion.Version35))); #endif } |