Merge branch 'upstream'
Former-commit-id: d5e17d5fa19eb57eb51f24dc236587c02b15e3f6
This commit is contained in:
commit
cd897f1930
@ -1 +1 @@
|
||||
5a71458baca48b9afee5435d6a116632b3b1c2cd
|
||||
d4b39c76d234855c13b7e72356ba16af95038fd2
|
@ -1 +1 @@
|
||||
8af8ff011e5451fed36d2a3fef4da686e7400bca
|
||||
42e4417c14b2befb25de75a219226beb30a507ef
|
@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.4.0.152";
|
||||
public const string MonoVersion = "6.4.0.154";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -111,7 +111,7 @@ namespace System.IO.Compression
|
||||
if (disposing)
|
||||
GC.SuppressFinalize (this);
|
||||
|
||||
native.Dispose (disposing);
|
||||
native?.Dispose (disposing);
|
||||
|
||||
if (disposing && !disposed) {
|
||||
disposed = true;
|
||||
@ -392,11 +392,11 @@ namespace System.IO.Compression
|
||||
|
||||
io_buffer = null;
|
||||
|
||||
if (z_stream != null) {
|
||||
if (z_stream != null && !z_stream.IsInvalid) {
|
||||
z_stream.Dispose();
|
||||
}
|
||||
|
||||
if (data.IsAllocated) {
|
||||
if (data != null && data.IsAllocated) {
|
||||
data.Free ();
|
||||
}
|
||||
}
|
||||
|
@ -182,9 +182,9 @@ public class TimeZoneTest {
|
||||
TST (t1);
|
||||
break;
|
||||
case "GMT":
|
||||
#if MONOTOUCH
|
||||
#if MOBILE
|
||||
if (string.IsNullOrEmpty (t1.DaylightName))
|
||||
Assert.Ignore ("This test may fail due to: http://www.openradar.me/38174449");
|
||||
Assert.Ignore ("This test may fail due to: http://www.openradar.me/38174449. This value is also empty on recent Android versions.");
|
||||
#endif
|
||||
GMT (t1);
|
||||
break;
|
||||
|
@ -1 +1 @@
|
||||
63167183234be324be0b84742a372e60bdd93cbc
|
||||
ed794b76e398827d7f12d03c2f9fab78c29b6f5e
|
@ -1 +1 @@
|
||||
32467bc1560d39e74fafe09be7d6c41a47073c5d
|
||||
0ca055f5bc4bd3afaaa88e4c60ca00387ec5ed00
|
@ -1 +1 @@
|
||||
a9d5b3e41d21ff652708eeaa10a9e003db94b15b
|
||||
c9483802dd8ba49044cb99f1b6b1633489cfb00f
|
@ -1 +1 @@
|
||||
9fc70ffa1af2c36797c4c514e737e91b5993ffe9
|
||||
c97b87efd9c3f40784510d56c77fc28b32a56875
|
@ -1 +1 @@
|
||||
04f4ba0053364f34ba7cef1584761de3c17bc650
|
||||
6e6088e387d47441a5e29df7a59cba15b4bdd829
|
@ -1 +1 @@
|
||||
687e38575b8386a0ae471dee67ffe3380cf465f0
|
||||
0d7de73d30827f93ef7f8aea1a648d5bb645aee3
|
@ -1 +1 @@
|
||||
1e213927c7eaa4acff458796dd7ba1442c1a6adf
|
||||
94048178ada4511b0832af2888f4141c560253e6
|
@ -1 +1 @@
|
||||
63a6d5f9321f4e72e6732bafb0c2ea3ed0b8326e
|
||||
b7d268b9027f5299ca5ea1b3d2d2d72c13dc83c0
|
@ -1 +1 @@
|
||||
63167183234be324be0b84742a372e60bdd93cbc
|
||||
ed794b76e398827d7f12d03c2f9fab78c29b6f5e
|
@ -1 +1 @@
|
||||
32467bc1560d39e74fafe09be7d6c41a47073c5d
|
||||
0ca055f5bc4bd3afaaa88e4c60ca00387ec5ed00
|
@ -1 +1 @@
|
||||
a9d5b3e41d21ff652708eeaa10a9e003db94b15b
|
||||
c9483802dd8ba49044cb99f1b6b1633489cfb00f
|
@ -1 +1 @@
|
||||
9fc70ffa1af2c36797c4c514e737e91b5993ffe9
|
||||
c97b87efd9c3f40784510d56c77fc28b32a56875
|
@ -1 +1 @@
|
||||
04f4ba0053364f34ba7cef1584761de3c17bc650
|
||||
6e6088e387d47441a5e29df7a59cba15b4bdd829
|
@ -1 +1 @@
|
||||
687e38575b8386a0ae471dee67ffe3380cf465f0
|
||||
0d7de73d30827f93ef7f8aea1a648d5bb645aee3
|
@ -1 +1 @@
|
||||
1e213927c7eaa4acff458796dd7ba1442c1a6adf
|
||||
94048178ada4511b0832af2888f4141c560253e6
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user