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

Imported Upstream version 4.3.2.467

Browse Source 
Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d
This commit is contained in:
Xamarin Public Jenkins
2016-02-22 11:00:01 -05:00
parent f302175246
commit f3e3aab35a
4097 changed files with 122406 additions and 82300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/TargetDotNetFrameworkVersion.cs
View File

@@ -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

50
mcs/class/Microsoft.Build.Utilities/Microsoft.Build.Utilities/ToolLocationHelper.cs
View File

@@ -61,38 +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_5"),
Path.Combine (lib_mono_dir, "net_4_5"),
Path.Combine (lib_mono_dir, "net_4_5")
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, "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"), // 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
};
}

3
mcs/class/Microsoft.Build.Utilities/Test/Microsoft.Build.Utilities/ToolLocationHelperTest.cs
View File

@@ -1,4 +1,4 @@
#if NET_4_0

using System;
using NUnit.Framework;
using Microsoft.Build.Utilities;
@@ -18,4 +18,3 @@ namespace MonoTests.Microsoft.Build.Utilities
}
}
#endif