Merge branch 'upstream'

Former-commit-id: 3cd69d10c0f3f31de129db2cf38c5afefc7ecf64
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-10-21 08:30:30 +00:00
commit b8717c1816
47 changed files with 40 additions and 40 deletions

View File

@ -1 +1 @@
0c8487a4478d80685fdce261c1ee2f30c58acaf3
94ed6d6aa3a39f0a2d844de937d6d5672e204248

View File

@ -1 +1 @@
392e8eb22c994a04b08648a75045e5ae11cf8ac7
046bdfaafd8d462c64dee0ce538b63baed899c0b

View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.18.0.167";
public const string MonoVersion = "5.18.0.169";
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

@ -41,7 +41,7 @@ class X
Version min_mono_version;
#if __MonoCS__
min_mono_version = new Version (5, 16);
min_mono_version = new Version (5, 18);
#else
min_mono_version = new Version (5, 10);
#endif

View File

@ -1 +1 @@
d5ab56797108ee5fd7c93acbbe05eb09ad163728
540d114a92a41cc7ac3ed228b3bb6aedad59e801

View File

@ -1 +1 @@
e1f1ba24412ca1f24fdfe401edf5228e75bebbe2
ed2882ad95de0cc502243aa733b10de59dcf969e

View File

@ -1 +1 @@
c338253c34aa6e057427ee3f6085fdd4ff5b35c9
a7e54246e1aa9a8a3dd148e587410706fc3e85c7

View File

@ -1 +1 @@
6409ea01b4ed66a85bc41f83c569b4f41509b143
2467a38e74764a85a81a0f405dd69eba69285306

View File

@ -1 +1 @@
195c68d1031ca0246416077f4019351943293362
a34769007b43b981e9663f6a7bca50247adfb246

View File

@ -1 +1 @@
b1374518cd1b58bb3aaa9d7d45e050f3cb5e2460
771a0a31fff0ceb4e0b58f5e4e590f2e6a1483da

View File

@ -1 +1 @@
0b554efd62e0f4ce4a9685df4d2cf7be64e6bafc
043eb2b709e4118eb66a505b08f90a9d34316822

View File

@ -1 +1 @@
d5ab56797108ee5fd7c93acbbe05eb09ad163728
540d114a92a41cc7ac3ed228b3bb6aedad59e801

View File

@ -1 +1 @@
e1f1ba24412ca1f24fdfe401edf5228e75bebbe2
ed2882ad95de0cc502243aa733b10de59dcf969e

View File

@ -1 +1 @@
c338253c34aa6e057427ee3f6085fdd4ff5b35c9
a7e54246e1aa9a8a3dd148e587410706fc3e85c7

View File

@ -1 +1 @@
6409ea01b4ed66a85bc41f83c569b4f41509b143
2467a38e74764a85a81a0f405dd69eba69285306

View File

@ -1 +1 @@
195c68d1031ca0246416077f4019351943293362
a34769007b43b981e9663f6a7bca50247adfb246

View File

@ -1 +1 @@
b1374518cd1b58bb3aaa9d7d45e050f3cb5e2460
771a0a31fff0ceb4e0b58f5e4e590f2e6a1483da

View File

@ -1 +1 @@
0b554efd62e0f4ce4a9685df4d2cf7be64e6bafc
043eb2b709e4118eb66a505b08f90a9d34316822

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