Merge branch 'upstream'
Former-commit-id: c53b28aa770a639d7fa0f615e32edc20c3dfedc1
This commit is contained in:
commit
6d3ce64f68
@ -1 +1 @@
|
|||||||
30a0ef008eb1e277b4b01067d9a59c3a1b95562d
|
e886f52a12041f216837188d2c25257084578671
|
@ -1 +1 @@
|
|||||||
53c884028bfc2d03fa552a9154e0568c70afec20
|
a7850d85dfce721f1d9b19f626a4fb1833943306
|
@ -34,11 +34,11 @@ static class Consts
|
|||||||
// Use these assembly version constants to make code more maintainable.
|
// Use these assembly version constants to make code more maintainable.
|
||||||
//
|
//
|
||||||
|
|
||||||
public const string MonoVersion = "5.10.0.79";
|
public const string MonoVersion = "5.10.0.83";
|
||||||
public const string MonoCompany = "Mono development team";
|
public const string MonoCompany = "Mono development team";
|
||||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||||
public const string MonoCopyright = "(c) Various Mono authors";
|
public const string MonoCopyright = "(c) Various Mono authors";
|
||||||
public const int MonoCorlibVersion = 1051000001;
|
public const int MonoCorlibVersion = 1051000002;
|
||||||
|
|
||||||
#if MOBILE
|
#if MOBILE
|
||||||
// Versions of .NET Framework for Silverlight 4.0
|
// Versions of .NET Framework for Silverlight 4.0
|
||||||
|
@ -134,9 +134,10 @@ namespace MonoTests.System.IO.Compression.FileSystem
|
|||||||
{
|
{
|
||||||
var entry = archive.GetEntry (file);
|
var entry = archive.GetEntry (file);
|
||||||
Assert.IsNotNull (entry);
|
Assert.IsNotNull (entry);
|
||||||
Assert.AreEqual(entry.LastWriteTime.Year, date.Year);
|
var lastWriteTimeUtc = entry.LastWriteTime.ToUniversalTime ();
|
||||||
Assert.AreEqual(entry.LastWriteTime.Month, date.Month);
|
Assert.AreEqual (date.Year, lastWriteTimeUtc.Year);
|
||||||
Assert.AreEqual(entry.LastWriteTime.Day, date.Day);
|
Assert.AreEqual (date.Month, lastWriteTimeUtc.Month);
|
||||||
|
Assert.AreEqual (date.Day, lastWriteTimeUtc.Day);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -442,6 +442,7 @@ namespace MonoTests.System.Net
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
|
[Category ("MobileNotWorking")]
|
||||||
public void OpenReadTaskAsyncOnFile ()
|
public void OpenReadTaskAsyncOnFile ()
|
||||||
{
|
{
|
||||||
var tmp = Path.GetTempFileName ();
|
var tmp = Path.GetTempFileName ();
|
||||||
@ -449,6 +450,7 @@ namespace MonoTests.System.Net
|
|||||||
|
|
||||||
var client = new WebClient ();
|
var client = new WebClient ();
|
||||||
var task = client.OpenReadTaskAsync (url);
|
var task = client.OpenReadTaskAsync (url);
|
||||||
|
|
||||||
Assert.IsTrue (task.Wait (2000));
|
Assert.IsTrue (task.Wait (2000));
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1431,7 +1433,7 @@ namespace MonoTests.System.Net
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
[Category ("AndroidNotWorking")] // Fails when ran as part of the entire BCL test suite. Works when only this fixture is ran
|
[Category ("MobileNotWorking")] // Fails when ran as part of the entire BCL test suite. Works when only this fixture is ran
|
||||||
#if FEATURE_NO_BSD_SOCKETS
|
#if FEATURE_NO_BSD_SOCKETS
|
||||||
[ExpectedException (typeof (PlatformNotSupportedException))]
|
[ExpectedException (typeof (PlatformNotSupportedException))]
|
||||||
#endif
|
#endif
|
||||||
@ -1805,7 +1807,7 @@ namespace MonoTests.System.Net
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
[Category ("AndroidNotWorking")] // Fails when ran as part of the entire BCL test suite. Works when only this fixture is ran
|
[Category ("MobileNotWorking")] // Fails when ran as part of the entire BCL test suite. Works when only this fixture is ran
|
||||||
#if FEATURE_NO_BSD_SOCKETS
|
#if FEATURE_NO_BSD_SOCKETS
|
||||||
[ExpectedException (typeof (PlatformNotSupportedException))]
|
[ExpectedException (typeof (PlatformNotSupportedException))]
|
||||||
#endif
|
#endif
|
||||||
@ -1825,7 +1827,7 @@ namespace MonoTests.System.Net
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
[Category ("AndroidNotWorking")] // Fails when ran as part of the entire BCL test suite. Works when only this fixture is ran
|
[Category ("MobileNotWorking")] // Fails when ran as part of the entire BCL test suite. Works when only this fixture is ran
|
||||||
#if FEATURE_NO_BSD_SOCKETS
|
#if FEATURE_NO_BSD_SOCKETS
|
||||||
[ExpectedException (typeof (PlatformNotSupportedException))]
|
[ExpectedException (typeof (PlatformNotSupportedException))]
|
||||||
#endif
|
#endif
|
||||||
@ -1844,7 +1846,7 @@ namespace MonoTests.System.Net
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
[Category ("AndroidNotWorking")] // Fails when ran as part of the entire BCL test suite. Works when only this fixture is ran
|
[Category ("MobileNotWorking")] // Fails when ran as part of the entire BCL test suite. Works when only this fixture is ran
|
||||||
#if FEATURE_NO_BSD_SOCKETS
|
#if FEATURE_NO_BSD_SOCKETS
|
||||||
[ExpectedException (typeof (PlatformNotSupportedException))]
|
[ExpectedException (typeof (PlatformNotSupportedException))]
|
||||||
#endif
|
#endif
|
||||||
@ -1863,7 +1865,7 @@ namespace MonoTests.System.Net
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
[Category ("AndroidNotWorking")] // Fails when ran as part of the entire BCL test suite. Works when only this fixture is ran
|
[Category ("MobileNotWorking")] // Fails when ran as part of the entire BCL test suite. Works when only this fixture is ran
|
||||||
#if FEATURE_NO_BSD_SOCKETS
|
#if FEATURE_NO_BSD_SOCKETS
|
||||||
[ExpectedException (typeof (PlatformNotSupportedException))]
|
[ExpectedException (typeof (PlatformNotSupportedException))]
|
||||||
#endif
|
#endif
|
||||||
@ -1885,7 +1887,7 @@ namespace MonoTests.System.Net
|
|||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
[Category ("AndroidNotWorking")] // Test suite hangs if the tests runs as part of the entire BCL suite. Works when only this fixture is ran
|
[Category ("MobileNotWorking")] // Test suite hangs if the tests runs as part of the entire BCL suite. Works when only this fixture is ran
|
||||||
#if FEATURE_NO_BSD_SOCKETS
|
#if FEATURE_NO_BSD_SOCKETS
|
||||||
[ExpectedException (typeof (PlatformNotSupportedException))]
|
[ExpectedException (typeof (PlatformNotSupportedException))]
|
||||||
#endif
|
#endif
|
||||||
|
@ -1 +0,0 @@
|
|||||||
d17978c398c3cb7b18fe232f5789dbba9aab7e88
|
|
@ -1 +0,0 @@
|
|||||||
ef8ed4e5f0ba56170c0a405445543af8667357e3
|
|
@ -1 +0,0 @@
|
|||||||
26f3818d695357bee806703dbc52b981eee2184c
|
|
@ -1 +0,0 @@
|
|||||||
476e6a2fe432b03c8e4bfed18c63d560e1f412a0
|
|
@ -1 +0,0 @@
|
|||||||
e994933a4d60d3e4bf067bfd47467e851012724c
|
|
@ -1 +0,0 @@
|
|||||||
409725b4072d6f8f1bfa5d13a223102e9f10f044
|
|
@ -1 +0,0 @@
|
|||||||
738e3a725932359bf8f7132534ff51379cd11e1b
|
|
@ -0,0 +1 @@
|
|||||||
|
50e48a0a5c2d98e4d786321ed1d9d416d31190cb
|
@ -0,0 +1 @@
|
|||||||
|
1a014325a38fda404cc88831d3bc5a315f7178ad
|
@ -0,0 +1 @@
|
|||||||
|
bb17d47aa2372108b18993567a839d9c2bf41e6b
|
@ -0,0 +1 @@
|
|||||||
|
b47a0a8e619c5e7078d41295c5ca19e51b9bfb90
|
@ -0,0 +1 @@
|
|||||||
|
0c69026deebbb2caef0928290165c38c87008284
|
@ -0,0 +1 @@
|
|||||||
|
2b5abd33a20ead8837e499cd0935f4acd7b63ae7
|
@ -0,0 +1 @@
|
|||||||
|
b1ea276d5680d8d29c92d4f37047c74a69dc58ed
|
@ -1 +0,0 @@
|
|||||||
d17978c398c3cb7b18fe232f5789dbba9aab7e88
|
|
@ -1 +0,0 @@
|
|||||||
ef8ed4e5f0ba56170c0a405445543af8667357e3
|
|
@ -1 +0,0 @@
|
|||||||
26f3818d695357bee806703dbc52b981eee2184c
|
|
@ -1 +0,0 @@
|
|||||||
476e6a2fe432b03c8e4bfed18c63d560e1f412a0
|
|
@ -1 +0,0 @@
|
|||||||
e994933a4d60d3e4bf067bfd47467e851012724c
|
|
@ -1 +0,0 @@
|
|||||||
409725b4072d6f8f1bfa5d13a223102e9f10f044
|
|
@ -1 +0,0 @@
|
|||||||
738e3a725932359bf8f7132534ff51379cd11e1b
|
|
@ -0,0 +1 @@
|
|||||||
|
50e48a0a5c2d98e4d786321ed1d9d416d31190cb
|
@ -0,0 +1 @@
|
|||||||
|
1a014325a38fda404cc88831d3bc5a315f7178ad
|
@ -0,0 +1 @@
|
|||||||
|
bb17d47aa2372108b18993567a839d9c2bf41e6b
|
@ -0,0 +1 @@
|
|||||||
|
b47a0a8e619c5e7078d41295c5ca19e51b9bfb90
|
@ -0,0 +1 @@
|
|||||||
|
0c69026deebbb2caef0928290165c38c87008284
|
@ -0,0 +1 @@
|
|||||||
|
2b5abd33a20ead8837e499cd0935f4acd7b63ae7
|
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