mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.0.0~alpha1

Browse Source 
Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9
This commit is contained in:
Jo Shields
2015-04-07 09:35:12 +01:00
parent 283343f570
commit 3c1f479b9d
22469 changed files with 2931443 additions and 869343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mcs/tools/xbuild/SolutionParser.cs
View File

@ -121,7 +121,9 @@ namespace Mono.XBuild.CommandLine {
string slnVersion = GetSlnFileVersion (reader);
if (slnVersion == "12.00")
#if XBUILD_12
#if XBUILD_14
p.DefaultToolsVersion = "14.0";
#elif XBUILD_12
p.DefaultToolsVersion = "12.0";
#else
p.DefaultToolsVersion = "4.0";
@ -351,11 +353,9 @@ namespace Mono.XBuild.CommandLine {
void EmitBeforeImports (Project p, string file)
{
#if NET_4_0
p.AddNewImport ("$(MSBuildExtensionsPath)\\$(MSBuildToolsVersion)\\SolutionFile\\ImportBefore\\*",
"'$(ImportByWildcardBeforeSolution)' != 'false' and " +
"Exists('$(MSBuildExtensionsPath)\\$(MSBuildToolsVersion)\\SolutionFile\\ImportBefore')");
#endif
string before_filename = Path.Combine (Path.GetDirectoryName (file), "before." + Path.GetFileName (file) + ".targets");
p.AddNewImport (before_filename, String.Format ("Exists ('{0}')", before_filename));
@ -363,11 +363,9 @@ namespace Mono.XBuild.CommandLine {
void EmitAfterImports (Project p, string file)
{
#if NET_4_0
p.AddNewImport ("$(MSBuildExtensionsPath)\\$(MSBuildToolsVersion)\\SolutionFile\\ImportAfter\\*",
"'$(ImportByWildcardAfterSolution)' != 'false' and " +
"Exists('$(MSBuildExtensionsPath)\\$(MSBuildToolsVersion)\\SolutionFile\\ImportAfter')");
#endif
string after_filename = Path.Combine (Path.GetDirectoryName (file), "after." + Path.GetFileName (file) + ".targets");
p.AddNewImport (after_filename, String.Format ("Exists ('{0}')", after_filename));