diff options
| author | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-11-24 19:49:29 +0300 |
|---|---|---|
| committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2015-11-24 19:58:58 +0300 |
| commit | 92d00136b1fcd241938fcad69d931a0b355110dd (patch) | |
| tree | 384114b5d78a25ce4d89c7e137aa11524dd38bd5 /mcs/class/Microsoft.Build.Utilities | |
| parent | 2b1d785ca4cc5758f6beeb92fcbeb0a6da4a21b3 (diff) | |
[xbuild] Add net_4.6.xml/net_4.6.1.xml and wire through xbuild
Commented the entries in ToolLocationHelper, they could be misunderstood since the 4.0/4.5/4.6 entries are all the same.
Diffstat (limited to 'mcs/class/Microsoft.Build.Utilities')
2 files changed, 31 insertions, 27 deletions
diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs index df09e1c8ec3..5a050e1a4aa 100644 --- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs +++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs @@ -48,11 +48,12 @@ namespace Microsoft.Build.Utilities Version451, #endif #if XBUILD_14 - Version453, + Version46, + Version461, #endif #if XBUILD_14 - VersionLatest = Version453 + VersionLatest = Version461 #elif XBUILD_12 VersionLatest = Version451 #else diff --git a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs index 64ed0757a90..8806c73e72d 100644 --- a/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs +++ b/mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs @@ -61,41 +61,44 @@ namespace Microsoft.Build.Utilities runningOnDotNet = !string.IsNullOrEmpty (windowsPath) && lib_mono_dir.StartsWith (windowsPath); if (Environment.GetEnvironmentVariable ("TESTING_MONO") != null) { - mono_dir = new string [] { - Path.Combine (lib_mono_dir, "net_1_0"), - Path.Combine (lib_mono_dir, "net_2_0"), - Path.Combine (lib_mono_dir, "net_2_0"), - Path.Combine (lib_mono_dir, "net_3_5"), + mono_dir = new string [] { // TargetDotNetFrameworkVersion: + Path.Combine (lib_mono_dir, "net_1_0"), // Version11 + Path.Combine (lib_mono_dir, "net_2_0"), // Version20 + Path.Combine (lib_mono_dir, "net_2_0"), // Version30 + Path.Combine (lib_mono_dir, "net_3_5"), // Version35 // mono's 4.0 is not an actual framework directory with all tools etc // it's simply reference assemblies. So like .NET we consider 4.5 to // be a complete replacement for 4.0. - Path.Combine (lib_mono_dir, "net_4_x"), - Path.Combine (lib_mono_dir, "net_4_x"), - Path.Combine (lib_mono_dir, "net_4_x"), - Path.Combine (lib_mono_dir, "net_4_x") + Path.Combine (lib_mono_dir, "net_4_x"), // Version40 + Path.Combine (lib_mono_dir, "net_4_x"), // Version45 + Path.Combine (lib_mono_dir, "net_4_x"), // Version451 + Path.Combine (lib_mono_dir, "net_4_x"), // Version46 + Path.Combine (lib_mono_dir, "net_4_x"), // Version461 }; } else if (runningOnDotNet) { mono_dir = new string [] { - Path.Combine (lib_mono_dir, "v1.0.3705"), - Path.Combine (lib_mono_dir, "v2.0.50727"), - Path.Combine (lib_mono_dir, "v2.0.50727"), - Path.Combine (lib_mono_dir, "v3.5"), - Path.Combine (lib_mono_dir, "v4.0.30319"), - Path.Combine (lib_mono_dir, "v4.0.30319"), - Path.Combine (lib_mono_dir, "v4.0.30319"), - Path.Combine (lib_mono_dir, "v4.0.30319") + Path.Combine (lib_mono_dir, "v1.0.3705"), // Version11 + Path.Combine (lib_mono_dir, "v2.0.50727"), // Version20 + Path.Combine (lib_mono_dir, "v2.0.50727"), // Version30 + Path.Combine (lib_mono_dir, "v3.5"), // Version35 + Path.Combine (lib_mono_dir, "v4.0.30319"), // Version40 + Path.Combine (lib_mono_dir, "v4.0.30319"), // Version45 + Path.Combine (lib_mono_dir, "v4.0.30319"), // Version451 + Path.Combine (lib_mono_dir, "v4.0.30319"), // Version46 + Path.Combine (lib_mono_dir, "v4.0.30319"), // Version461 }; } else { mono_dir = new string [] { - Path.Combine (lib_mono_dir, "1.0"), - Path.Combine (lib_mono_dir, "2.0"), - Path.Combine (lib_mono_dir, "2.0"), - Path.Combine (lib_mono_dir, "3.5"), + Path.Combine (lib_mono_dir, "1.0"), // Version11 + Path.Combine (lib_mono_dir, "2.0"), // Version20 + Path.Combine (lib_mono_dir, "2.0"), // Version30 + Path.Combine (lib_mono_dir, "3.5"), // Version35 // see comment above regarding 4.0/4.5 - Path.Combine (lib_mono_dir, "4.5"), - Path.Combine (lib_mono_dir, "4.5"), - Path.Combine (lib_mono_dir, "4.5"), - Path.Combine (lib_mono_dir, "4.5") + Path.Combine (lib_mono_dir, "4.5"), // Version40 + Path.Combine (lib_mono_dir, "4.5"), // Version45 + Path.Combine (lib_mono_dir, "4.5"), // Version451 + Path.Combine (lib_mono_dir, "4.5"), // Version46 + Path.Combine (lib_mono_dir, "4.5"), // Version461 }; } |