Merge branch 'upstream'

Former-commit-id: eb69929b331e86cab19bec7f90f0cb14557bdf80
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-08-04 08:21:11 +00:00
commit 7f6861457f
35 changed files with 32 additions and 32 deletions

View File

@ -1 +1 @@
e05fbc81da3b2dde80b415f79934421e796b0a98
c92971f6e89bc3394876a540d68dc9dc1ca02f20

View File

@ -1 +1 @@
19965dbc247d5f43db6a851fde8f79bfe4e72b14
0f61be4caba74251aaffb252e3a1ad805758b642

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.176";
public const string MonoVersion = "5.14.0.177";
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

@ -804,7 +804,7 @@ namespace Mono.Data.Sqlite
int enc;
IntPtr p = UnsafeNativeMethods.sqlite3_context_collseq(context, out type, out enc, out len);
if (p != null) seq.Name = UTF8ToString(p, len);
if (p != IntPtr.Zero) seq.Name = UTF8ToString(p, len);
seq.Type = (CollationTypeEnum)type;
seq._func = func;
seq.Encoding = (CollationEncodingEnum)enc;

View File

@ -1 +1 @@
94d72be41d76452237b19ae2b8562dbfb2c12f91
8318ef9a4baf064d6db18089cc92c1edae5d7765

View File

@ -1 +1 @@
15a15c6fab694449c0b8ee773248593820eb1e56
2c16d182050bd99dffe0d80bd5a2e6317c793d2c

View File

@ -1 +1 @@
9902042a2af7c9d47b9b87a1f4cc36dac32def40
b0f02ad0e702b6d56d4539fcab0ad15c36fba7ee

View File

@ -1 +1 @@
7b6159eb9944b4471542142901c1c961a09f7c94
3d2c1aa7c74c35f58f2f243709ecd6c9538932de

View File

@ -1 +1 @@
9ac1124b39b1d98c2fb3b36d9d3eca5ed3546216
faf39fa30b619890a4630225b4b1fdfdfe7298ad

View File

@ -1 +1 @@
c07070a3683ecd702db88c0e2c216ce3e6456646
5daea542af494d606f9d502a960985ab1b8eea90

View File

@ -1 +1 @@
018ca23093b6608f5d17737d294edf02a5e7bca3
e5da752cc313f2c7e098b0ffad2854d1ce3424b7

View File

@ -1 +1 @@
94d72be41d76452237b19ae2b8562dbfb2c12f91
8318ef9a4baf064d6db18089cc92c1edae5d7765

View File

@ -1 +1 @@
15a15c6fab694449c0b8ee773248593820eb1e56
2c16d182050bd99dffe0d80bd5a2e6317c793d2c

View File

@ -1 +1 @@
9902042a2af7c9d47b9b87a1f4cc36dac32def40
b0f02ad0e702b6d56d4539fcab0ad15c36fba7ee

View File

@ -1 +1 @@
7b6159eb9944b4471542142901c1c961a09f7c94
3d2c1aa7c74c35f58f2f243709ecd6c9538932de

View File

@ -1 +1 @@
9ac1124b39b1d98c2fb3b36d9d3eca5ed3546216
faf39fa30b619890a4630225b4b1fdfdfe7298ad

View File

@ -1 +1 @@
c07070a3683ecd702db88c0e2c216ce3e6456646
5daea542af494d606f9d502a960985ab1b8eea90

View File

@ -1 +1 @@
018ca23093b6608f5d17737d294edf02a5e7bca3
e5da752cc313f2c7e098b0ffad2854d1ce3424b7

View File

@ -1 +1 @@
94d72be41d76452237b19ae2b8562dbfb2c12f91
8318ef9a4baf064d6db18089cc92c1edae5d7765

View File

@ -1 +1 @@
15a15c6fab694449c0b8ee773248593820eb1e56
2c16d182050bd99dffe0d80bd5a2e6317c793d2c

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