Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -15,6 +15,7 @@ TEST_RESX_RESOURCES = Test/Microsoft.Build.Utilities/Strings.resources
TEST_LIB_REFS = $(XBUILD_ENGINE) $(XBUILD_FRAMEWORK) $(PARENT_PROFILE)System $(PARENT_PROFILE)System.Core
TEST_MCS_FLAGS = $(TEST_RESX_RESOURCES:%=-resource:%)
TEST_NUNITLITE_APP_CONFIG_RUNTIME=Test/test-config-file-$(PROFILE)
include $(XBUILD_DIR)/xbuild_test.make
include ../../build/library.make

View File

@@ -50,10 +50,11 @@ namespace Microsoft.Build.Utilities
#if XBUILD_14
Version46,
Version461,
Version462,
#endif
#if XBUILD_14
VersionLatest = Version461
VersionLatest = Version462
#elif XBUILD_12
VersionLatest = Version451
#else

View File

@@ -74,6 +74,7 @@ namespace Microsoft.Build.Utilities
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
Path.Combine (lib_mono_dir, "net_4_x"), // Version462
};
} else if (runningOnDotNet) {
mono_dir = new string [] {
@@ -86,6 +87,7 @@ namespace Microsoft.Build.Utilities
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
Path.Combine (lib_mono_dir, "v4.0.30319"), // Version462
};
} else {
mono_dir = new string [] {
@@ -99,6 +101,7 @@ namespace Microsoft.Build.Utilities
Path.Combine (lib_mono_dir, "4.5"), // Version451
Path.Combine (lib_mono_dir, "4.5"), // Version46
Path.Combine (lib_mono_dir, "4.5"), // Version461
Path.Combine (lib_mono_dir, "4.5"), // Version462
};
}