diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 9138b9ab8a..bea139836e 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -cfd298f0214dbe147b607ec867f5a0700ae52f03 \ No newline at end of file +e8e55390c7a19b75beced76b13cba26115783992 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index c97ac83989..d6f664fe20 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -f9f812ae034d2087f5a64846fa6446d74bc9f020 \ No newline at end of file +249f69974e9846cf3b2f1ea6d1abcb79faff896f \ No newline at end of file diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index c38c17ef48..6d3ff6159d 100644 --- a/mcs/build/common/Consts.cs +++ b/mcs/build/common/Consts.cs @@ -34,7 +34,7 @@ static class Consts // Use these assembly version constants to make code more maintainable. // - public const string MonoVersion = "4.6.1.0"; + public const string MonoVersion = "4.6.2.0"; public const string MonoCompany = "Mono development team"; public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoCopyright = "(c) Various Mono authors"; diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLiteConvert.cs b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLiteConvert.cs index 7f35914d24..45b2db1768 100644 --- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLiteConvert.cs +++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_2.0/SQLiteConvert.cs @@ -221,7 +221,7 @@ namespace Mono.Data.Sqlite case SQLiteDateFormats.UnixEpoch: return ((long)(dateValue.Subtract(UnixEpoch).Ticks / TimeSpan.TicksPerSecond)).ToString(); default: - return dateValue.ToString(_datetimeFormats[7], CultureInfo.InvariantCulture); + return dateValue.ToString(_datetimeFormats[5], CultureInfo.InvariantCulture); } } diff --git a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_test.dll.sources b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_test.dll.sources index 0a02896ef8..643c40a86d 100644 --- a/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_test.dll.sources +++ b/mcs/class/Mono.Data.Sqlite/Mono.Data.Sqlite_test.dll.sources @@ -6,4 +6,4 @@ SqliteExceptionUnitTests.cs SqliteParameterUnitTests.cs SqliteFunctionTests.cs Bug27864.cs - +SqliteTests.cs diff --git a/mcs/class/Mono.Data.Sqlite/Test/SqliteTests.cs b/mcs/class/Mono.Data.Sqlite/Test/SqliteTests.cs new file mode 100644 index 0000000000..15339454b8 --- /dev/null +++ b/mcs/class/Mono.Data.Sqlite/Test/SqliteTests.cs @@ -0,0 +1,102 @@ +// +// SqliteTests.cs +// +// Authors: +// Marek Safar +// +// Copyright (C) 2016 Xamarin Inc (http://www.xamarin.com) +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the +// "Software"), to deal in the Software without restriction, including +// without limitation the rights to use, copy, modify, merge, publish, +// distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to +// the following conditions: +// +// The above copyright notice and this permission notice shall be +// included in all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// + +using System; +using System.Data; +using System.IO; +using System.Text; +using Mono.Data.Sqlite; +using NUnit.Framework; + +namespace MonoTests.Mono.Data.Sqlite +{ + [TestFixture] + public class SqliteTests + { + string _databasePath; + + [SetUp] + public void Setup () + { + var dataFolder = Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.Personal), "SqlTest"); + + _databasePath = Path.Combine (dataFolder, "database.db"); + + if (!Directory.Exists (dataFolder)) { + Directory.CreateDirectory (dataFolder); + } + + File.Delete (_databasePath); + } + + [TearDown] + public void TearDown () + { + try { + File.Delete (_databasePath); + } catch { + } + } + + [Test] + public void DateTimeConvert () + { + var dateTime = new DateTime (2016, 9, 15, 12, 1, 53); + var guid = Guid.NewGuid (); + + using (var connection = new SqliteConnection ("Data Source=" + _databasePath)) { + connection.Open (); + + var sqlCreate = "CREATE TABLE TestTable (ID uniqueidentifier PRIMARY KEY, Modified datetime)"; + using (var cmd = new SqliteCommand (sqlCreate, connection)) { + cmd.ExecuteNonQuery (); + } + + var sqlInsert = "INSERT INTO TestTable (ID, Modified) VALUES (@id, @mod)"; + using (var cmd = new SqliteCommand (sqlInsert, connection)) { + cmd.Parameters.Add (new SqliteParameter ("@id", guid)); + cmd.Parameters.Add (new SqliteParameter ("@mod", dateTime)); + cmd.ExecuteNonQuery (); + } + } + + using (var connection = new SqliteConnection ("Data Source=" + _databasePath)) { + connection.Open (); + + var sqlSelect = "SELECT * from TestTable"; + using (var cmd = new SqliteCommand (sqlSelect, connection)) + using (var reader = cmd.ExecuteReader ()) { + while (reader.Read ()) { + Assert.AreEqual (guid, reader.GetGuid (0), "#1"); + Assert.AreEqual (dateTime, reader.GetDateTime (1), "#2"); + } + } + } + } + } +} diff --git a/mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs b/mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs index 98622cb981..8a768b0d57 100644 --- a/mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs +++ b/mcs/class/System/System.Net.Sockets/SocketAsyncEventArgs.cs @@ -179,13 +179,6 @@ namespace System.Net.Sockets if (disposing && in_progress != 0) return; - - AcceptSocket = null; - Buffer = null; - BufferList = null; - RemoteEndPoint = null; - UserToken = null; - SendPacketsElements = null; } public void Dispose () diff --git a/mcs/class/System/Test/System.Net.Sockets/SocketAsyncEventArgsTest.cs b/mcs/class/System/Test/System.Net.Sockets/SocketAsyncEventArgsTest.cs index f0c29764ae..935aa77bcd 100644 --- a/mcs/class/System/Test/System.Net.Sockets/SocketAsyncEventArgsTest.cs +++ b/mcs/class/System/Test/System.Net.Sockets/SocketAsyncEventArgsTest.cs @@ -247,6 +247,25 @@ namespace MonoTests.System.Net.Sockets { SocketAsyncEventArgsPoker saea = new SocketAsyncEventArgsPoker (); saea.OnCompleted_ (null); } + + [Test] + public void TransparentDispose () + { + var buffer = new byte[5]; + var elements = new SendPacketsElement[2]; + var utoken = new object(); + + var saea = new SocketAsyncEventArgs(); + saea.SetBuffer(buffer, 0, 3); + saea.SendPacketsElements = elements; + saea.UserToken = utoken; + + saea.Dispose(); + + Assert.AreEqual (buffer, saea.Buffer); + Assert.AreEqual (elements, saea.SendPacketsElements); + Assert.AreEqual (utoken, saea.UserToken); + } } } diff --git a/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id index 51606540a9..7b5a39c753 100644 --- a/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -c083b93e7b6150b680d32a820f3b88c682ddf789 \ No newline at end of file +00b036beeecec41027d32261f93ef4afcded2671 \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id index bb080995a3..802174ee41 100644 --- a/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -08ca578f5d7e96ee914dfbdbf084f73f3e8909b0 \ No newline at end of file +bcbe83f41aabb1ad3e9a1b1d2db8b1a232d1a926 \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id index bda85a8024..714009bd29 100644 --- a/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -619913794ad60026c6830bab6dbfd0527c03dcb3 \ No newline at end of file +3750501024a83aeecb9eae17568c1ce449e4a5ee \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id index e97055478a..cf68b6611c 100644 --- a/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -931b6d3637a95ae8cd8c492c6fa7126cffa90444 \ No newline at end of file +902c79a57b8ba29447b9a30239452ab2187b2890 \ No newline at end of file diff --git a/mcs/class/lib/monolite/System.dll.REMOVED.git-id b/mcs/class/lib/monolite/System.dll.REMOVED.git-id index 16ee9aeb5f..e98a025474 100644 --- a/mcs/class/lib/monolite/System.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/System.dll.REMOVED.git-id @@ -1 +1 @@ -6bbc3c03d2cb117b010f43a89db6683af9ceb8f6 \ No newline at end of file +5356d88f5d4b5d16d5017ef1fa1c4716dc7a2c99 \ No newline at end of file diff --git a/mcs/class/lib/monolite/basic.exe.REMOVED.git-id b/mcs/class/lib/monolite/basic.exe.REMOVED.git-id index b5ce8df2be..8c2dab7ae7 100644 --- a/mcs/class/lib/monolite/basic.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite/basic.exe.REMOVED.git-id @@ -1 +1 @@ -9b7e5806ba59d76556574f901304d48e15f9520f \ No newline at end of file +957872a1e4c1a244c061e75175fedabe66254f81 \ No newline at end of file diff --git a/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id index b30f801159..5d925f7c90 100644 --- a/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -48c23282983ab1e14ac9a68999ba56373af61c8d \ No newline at end of file +9494bf7798aee9c87600048b7a9fef4caf09d396 \ No newline at end of file diff --git a/mono/metadata/domain-internals.h b/mono/metadata/domain-internals.h index a3989ab74a..d4d20ab25a 100644 --- a/mono/metadata/domain-internals.h +++ b/mono/metadata/domain-internals.h @@ -380,9 +380,6 @@ struct _MonoDomain { GHashTable *method_rgctx_hash; GHashTable *generic_virtual_cases; - MonoThunkFreeList **thunk_free_lists; - - GHashTable *generic_virtual_thunks; /* Information maintained by the JIT engine */ gpointer runtime_info; diff --git a/mono/metadata/domain.c b/mono/metadata/domain.c index a3ba4a76e0..f18f9b0d0d 100644 --- a/mono/metadata/domain.c +++ b/mono/metadata/domain.c @@ -1239,10 +1239,6 @@ mono_domain_free (MonoDomain *domain, gboolean force) g_hash_table_destroy (domain->generic_virtual_cases); domain->generic_virtual_cases = NULL; } - if (domain->generic_virtual_thunks) { - g_hash_table_destroy (domain->generic_virtual_thunks); - domain->generic_virtual_thunks = NULL; - } if (domain->ftnptrs_hash) { g_hash_table_destroy (domain->ftnptrs_hash); domain->ftnptrs_hash = NULL; diff --git a/mono/metadata/object.c.REMOVED.git-id b/mono/metadata/object.c.REMOVED.git-id index ef9cbb3c0f..ce6c50526e 100644 --- a/mono/metadata/object.c.REMOVED.git-id +++ b/mono/metadata/object.c.REMOVED.git-id @@ -1 +1 @@ -f827cb16009ae47f3c9018b424c91bac7bf1214e \ No newline at end of file +d5b8dd5db52f5b2af9fca12c6c39209d7f1e8cfc \ No newline at end of file diff --git a/mono/mini/Makefile.am b/mono/mini/Makefile.am index f5bfa89bc8..3630a0de74 100644 --- a/mono/mini/Makefile.am +++ b/mono/mini/Makefile.am @@ -824,7 +824,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.6.1.5/ef43c15\"" > version.h + echo "#define FULL_VERSION \"Stable 4.6.2.6/db69866\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.am.in b/mono/mini/Makefile.am.in index f5bfa89bc8..3630a0de74 100755 --- a/mono/mini/Makefile.am.in +++ b/mono/mini/Makefile.am.in @@ -824,7 +824,7 @@ EXTRA_DIST = TestDriver.cs \ Makefile.am.in version.h: Makefile - echo "#define FULL_VERSION \"Stable 4.6.1.5/ef43c15\"" > version.h + echo "#define FULL_VERSION \"Stable 4.6.2.6/db69866\"" > version.h # Utility target for patching libtool to speed up linking patch-libtool: diff --git a/mono/mini/Makefile.in.REMOVED.git-id b/mono/mini/Makefile.in.REMOVED.git-id index 28dc16e462..db459cdb8e 100644 --- a/mono/mini/Makefile.in.REMOVED.git-id +++ b/mono/mini/Makefile.in.REMOVED.git-id @@ -1 +1 @@ -af57916ed7a1e484a212d0ac404d689861bcb022 \ No newline at end of file +f219af2692be7d8f8ddc330d4241f4fa99446213 \ No newline at end of file diff --git a/mono/mini/aot-runtime.c.REMOVED.git-id b/mono/mini/aot-runtime.c.REMOVED.git-id index 079ea243cc..bbaf8b64a7 100644 --- a/mono/mini/aot-runtime.c.REMOVED.git-id +++ b/mono/mini/aot-runtime.c.REMOVED.git-id @@ -1 +1 @@ -013d44207d4a363ed79bb112074971361023c73e \ No newline at end of file +f1499dd86dfa96b2daff903a17b06f8d4f099923 \ No newline at end of file diff --git a/mono/mini/method-to-ir.c.REMOVED.git-id b/mono/mini/method-to-ir.c.REMOVED.git-id index c21985b8ef..c5d05ee3f1 100644 --- a/mono/mini/method-to-ir.c.REMOVED.git-id +++ b/mono/mini/method-to-ir.c.REMOVED.git-id @@ -1 +1 @@ -a907decc82e6ebd6fbd2f02741729d50fcfe07b4 \ No newline at end of file +c997ed5af31cb98c0f5784fe9ae8fd20edb74fc5 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 04f9e95621..595d0c00b8 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "Stable 4.6.1.5/ef43c15" +#define FULL_VERSION "Stable 4.6.2.6/db69866" diff --git a/mono/profiler/proflog.c.REMOVED.git-id b/mono/profiler/proflog.c.REMOVED.git-id index dfe3506712..af753270d8 100644 --- a/mono/profiler/proflog.c.REMOVED.git-id +++ b/mono/profiler/proflog.c.REMOVED.git-id @@ -1 +1 @@ -40e4187280464b96aac6aa5ea5d1f8539689ea02 \ No newline at end of file +874d8ba620ea8fa42ef506799e1dde438a2ecd10 \ No newline at end of file diff --git a/mono/utils/mono-threads.c b/mono/utils/mono-threads.c index 244df6a887..4eb18256b7 100644 --- a/mono/utils/mono-threads.c +++ b/mono/utils/mono-threads.c @@ -1190,7 +1190,7 @@ sleep_interruptable (guint32 ms, gboolean *alerted) *alerted = FALSE; if (ms != INFINITE) - end = mono_100ns_ticks () + (ms * 1000 * 10); + end = mono_msec_ticks() + ms; mono_lazy_initialize (&sleep_init, sleep_initialize); @@ -1198,8 +1198,8 @@ sleep_interruptable (guint32 ms, gboolean *alerted) for (;;) { if (ms != INFINITE) { - now = mono_100ns_ticks (); - if (now > end) + now = mono_msec_ticks(); + if (now >= end) break; } @@ -1210,7 +1210,7 @@ sleep_interruptable (guint32 ms, gboolean *alerted) } if (ms != INFINITE) - mono_coop_cond_timedwait (&sleep_cond, &sleep_mutex, (end - now) / 10 / 1000); + mono_coop_cond_timedwait (&sleep_cond, &sleep_mutex, end - now); else mono_coop_cond_wait (&sleep_cond, &sleep_mutex); diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 19959698a8..ec3f8e748d 100644 Binary files a/po/mcs/de.gmo and b/po/mcs/de.gmo differ diff --git a/po/mcs/de.po.REMOVED.git-id b/po/mcs/de.po.REMOVED.git-id index d60deed8a9..a4d55d39d0 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -5e4e19f077ff0b739d21c49cb7d12f01406323f0 \ No newline at end of file +fee7aafe68936fe6e60112c7aee544d951a9e8ba \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 3d7265122b..f080f60107 100644 Binary files a/po/mcs/es.gmo and b/po/mcs/es.gmo differ diff --git a/po/mcs/es.po.REMOVED.git-id b/po/mcs/es.po.REMOVED.git-id index 2d1725981d..b98d1f015b 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -bc163f403dc4484be068e049bd90467d235957fd \ No newline at end of file +cb117604bb38e5972606741b5f2e06b1b17885d5 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index 8ae7486bd3..2927c7e4fd 100644 Binary files a/po/mcs/ja.gmo and b/po/mcs/ja.gmo differ diff --git a/po/mcs/ja.po.REMOVED.git-id b/po/mcs/ja.po.REMOVED.git-id index 327e4358aa..bf1023fe9c 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -180d9e14490b61253133b79b59798a3bda578368 \ No newline at end of file +cd8f7f08a55a6b8b1540dc1471ed6207c8bfae03 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 9c8e79964b..2f47ef37f4 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 4.6.1\n" +"Project-Id-Version: mono 4.6.2\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2016-10-11 13:11+0000\n" +"POT-Creation-Date: 2016-11-02 14:17+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/po/mcs/pt_BR.gmo b/po/mcs/pt_BR.gmo index 8a8d8c0594..1526a1fc07 100644 Binary files a/po/mcs/pt_BR.gmo and b/po/mcs/pt_BR.gmo differ diff --git a/po/mcs/pt_BR.po.REMOVED.git-id b/po/mcs/pt_BR.po.REMOVED.git-id index b224d69edb..eea3d3f8db 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -faaa44720891d4d758b7b091b9b95ccf4243e9db \ No newline at end of file +cf53000475e62765019bb7c49d2f7842dee456b2 \ No newline at end of file