Merge branch 'upstream'

Former-commit-id: ade9792789faeb619432e04ddb93853ce9e88caa
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-05-15 09:04:35 +00:00
commit ae11c37b37
35 changed files with 37 additions and 31 deletions

View File

@ -1 +1 @@
bad7f5194ee248b1996a79e4d3c06f0d93073535
9ff6063dc10c3a86e9906912d420f8547b64b71b

View File

@ -1 +1 @@
a2bfb06bdd6b174954323519b35119f067fab088
29c799e5f85353ded9628d88add0ef0df3500006

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.14.0.81";
public const string MonoVersion = "5.14.0.83";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@ -19,6 +19,12 @@ endif
TEST_MCS_FLAGS =
TEST_LIB_REFS = System.Core
ifndef NO_PROCESS_START
REFERENCE_SOURCES_FLAGS += -d:MONO_FEATURE_PROCESS_START
TEST_MCS_FLAGS += -d:MONO_FEATURE_PROCESS_START
endif
LIB_MCS_FLAGS += $(REFERENCE_SOURCES_FLAGS)
BUILT_SOURCES = $(PROFILE)-parser.cs

View File

@ -1 +1 @@
6f3f71c1cf5112b1d51747ba1c7d88485e63de8f
55c94cc46f44e890909e1a1237b9d55741a80176

View File

@ -1 +1 @@
e74715fee1c1237cded6c578d6e96811514e10c3
604cebbdda77e512fc380aec7cea894cc3e6da9b

View File

@ -1 +1 @@
2218f66703fe03ed897ab3a05be5f123230e8476
c2513545611e5b10c41fda45508d1bb39eab33c5

View File

@ -1 +1 @@
cee3d766b3432842682b9abf35f15abaca42bb0e
5af118d177d5fde31ecf9f4e276a89370e91907b

View File

@ -1 +1 @@
c4fbdb7f2811f0459626d5d5e26e4980060a5db9
86e43db36a6a6c3b63aac0960035b180c0a1df09

View File

@ -1 +1 @@
0d5f79705325be831a61476b8bf583be14422134
cc7d1e4073fd991d75c5b30b8e7179febba5f5ae

View File

@ -1 +1 @@
8145e0b3651e4a04733818078ac7afc4b147efac
11a855bf7b4a86a5f4de47eaf9a0bbf5c482828f

View File

@ -1 +1 @@
6f3f71c1cf5112b1d51747ba1c7d88485e63de8f
55c94cc46f44e890909e1a1237b9d55741a80176

View File

@ -1 +1 @@
e74715fee1c1237cded6c578d6e96811514e10c3
604cebbdda77e512fc380aec7cea894cc3e6da9b

View File

@ -1 +1 @@
2218f66703fe03ed897ab3a05be5f123230e8476
c2513545611e5b10c41fda45508d1bb39eab33c5

View File

@ -1 +1 @@
cee3d766b3432842682b9abf35f15abaca42bb0e
5af118d177d5fde31ecf9f4e276a89370e91907b

View File

@ -1 +1 @@
c4fbdb7f2811f0459626d5d5e26e4980060a5db9
86e43db36a6a6c3b63aac0960035b180c0a1df09

View File

@ -1 +1 @@
0d5f79705325be831a61476b8bf583be14422134
cc7d1e4073fd991d75c5b30b8e7179febba5f5ae

View File

@ -1 +1 @@
8145e0b3651e4a04733818078ac7afc4b147efac
11a855bf7b4a86a5f4de47eaf9a0bbf5c482828f

View File

@ -1 +1 @@
6f3f71c1cf5112b1d51747ba1c7d88485e63de8f
55c94cc46f44e890909e1a1237b9d55741a80176

View File

@ -1 +1 @@
e74715fee1c1237cded6c578d6e96811514e10c3
604cebbdda77e512fc380aec7cea894cc3e6da9b

Some files were not shown because too many files have changed in this diff Show More