diff --git a/configure.REMOVED.git-id b/configure.REMOVED.git-id index 36aa73c899..7513cc5833 100644 --- a/configure.REMOVED.git-id +++ b/configure.REMOVED.git-id @@ -1 +1 @@ -e886f52a12041f216837188d2c25257084578671 \ No newline at end of file +5c04f91573d0557a2c64610620433a17a53fc635 \ No newline at end of file diff --git a/configure.ac.REMOVED.git-id b/configure.ac.REMOVED.git-id index e1e789105a..50d2f7252d 100644 --- a/configure.ac.REMOVED.git-id +++ b/configure.ac.REMOVED.git-id @@ -1 +1 @@ -a7850d85dfce721f1d9b19f626a4fb1833943306 \ No newline at end of file +a544c273ddbf680c2fc1cfbf5a6d2e0a1c551fc9 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monodroid/System.Data.cs.REMOVED.git-id b/external/api-snapshot/profiles/monodroid/System.Data.cs.REMOVED.git-id index 7de0209462..ef18cbb5d1 100644 --- a/external/api-snapshot/profiles/monodroid/System.Data.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monodroid/System.Data.cs.REMOVED.git-id @@ -1 +1 @@ -b803f86ef29cfff6559c08f5186f8bdf441b8d4b \ No newline at end of file +8b04034feaab27d73164bdaa4db83c03b88c77b6 \ No newline at end of file diff --git a/external/api-snapshot/profiles/monotouch/System.Data.cs.REMOVED.git-id b/external/api-snapshot/profiles/monotouch/System.Data.cs.REMOVED.git-id index 7de0209462..ef18cbb5d1 100644 --- a/external/api-snapshot/profiles/monotouch/System.Data.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/monotouch/System.Data.cs.REMOVED.git-id @@ -1 +1 @@ -b803f86ef29cfff6559c08f5186f8bdf441b8d4b \ No newline at end of file +8b04034feaab27d73164bdaa4db83c03b88c77b6 \ No newline at end of file diff --git a/external/api-snapshot/profiles/net_4_x/System.Data.cs.REMOVED.git-id b/external/api-snapshot/profiles/net_4_x/System.Data.cs.REMOVED.git-id index b51c311406..af40f224f5 100644 --- a/external/api-snapshot/profiles/net_4_x/System.Data.cs.REMOVED.git-id +++ b/external/api-snapshot/profiles/net_4_x/System.Data.cs.REMOVED.git-id @@ -1 +1 @@ -1f8d4c968568f6efbbb436418f27bf2ed01bc649 \ No newline at end of file +abb67671d9d4ec35e02a5a80985f9f8f29fedd36 \ No newline at end of file diff --git a/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/TaskCanceledException.cs b/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/TaskCanceledException.cs index a6ec030452..556fd80f19 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/TaskCanceledException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/TaskCanceledException.cs @@ -20,7 +20,9 @@ namespace System.Threading.Tasks /// Represents an exception used to communicate task cancellation. /// [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class TaskCanceledException : OperationCanceledException { [NonSerialized] diff --git a/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/TaskSchedulerException.cs b/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/TaskSchedulerException.cs index 85ec497219..a133944b92 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/TaskSchedulerException.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/TaskSchedulerException.cs @@ -21,7 +21,9 @@ namespace System.Threading.Tasks /// . /// [Serializable] +#if !MONO [System.Runtime.CompilerServices.TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")] +#endif public class TaskSchedulerException : Exception { /// diff --git a/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/TaskToApm.cs b/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/TaskToApm.cs index add41f588e..192f7fff7f 100644 --- a/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/TaskToApm.cs +++ b/external/corefx/src/Common/src/CoreLib/System/Threading/Tasks/TaskToApm.cs @@ -16,7 +16,7 @@ // return TaskToApm.End(asyncResult); // } -using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Threading.Tasks { diff --git a/external/corefx/src/Common/src/System/Threading/Tasks/BeginEndAwaitableAdapter.cs b/external/corefx/src/Common/src/System/Threading/Tasks/BeginEndAwaitableAdapter.cs index ee54cd4c6a..962c0ec4f1 100644 --- a/external/corefx/src/Common/src/System/Threading/Tasks/BeginEndAwaitableAdapter.cs +++ b/external/corefx/src/Common/src/System/Threading/Tasks/BeginEndAwaitableAdapter.cs @@ -2,7 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. // See the LICENSE file in the project root for more information. -using System.Diagnostics; +using System.Diagnostics.Private; namespace System.Threading.Tasks { diff --git a/external/corefx/src/Common/src/System/Threading/Tasks/RendezvousAwaitable.cs b/external/corefx/src/Common/src/System/Threading/Tasks/RendezvousAwaitable.cs index 84134884f6..ddab8c338c 100644 --- a/external/corefx/src/Common/src/System/Threading/Tasks/RendezvousAwaitable.cs +++ b/external/corefx/src/Common/src/System/Threading/Tasks/RendezvousAwaitable.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.CompilerServices; using System.Runtime.ExceptionServices; diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs index 5f1be065a3..47613bf014 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs @@ -392,7 +392,7 @@ namespace System.Data.SqlClient.SNI /// public override void DisableSsl() { -#if !MONO || MONO_FEATURE_BTLS || MONO_FEATURE_APPLETLS +#if !MONO || MONO_FEATURE_BTLS || ONLY_APPLETLS // SSLStream.Dispose causes an unexpected behavior with legacy ssl implementation _sslStream.Dispose(); #endif diff --git a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlCommand.cs.REMOVED.git-id b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlCommand.cs.REMOVED.git-id index b72426d173..01729a6e39 100644 --- a/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlCommand.cs.REMOVED.git-id +++ b/external/corefx/src/System.Data.SqlClient/src/System/Data/SqlClient/SqlCommand.cs.REMOVED.git-id @@ -1 +1 @@ -38e0b56f769c5af73557977145de437792eed731 \ No newline at end of file +eb3ea56a8b8a9c2c2fab5ba555b0ac2aa412b00b \ No newline at end of file diff --git a/external/corefx/src/System.Threading.Tasks.Dataflow/src/Internal/ProducerConsumerQueues.cs b/external/corefx/src/System.Threading.Tasks.Dataflow/src/Internal/ProducerConsumerQueues.cs index 44b10b3dc8..e73ce8118e 100644 --- a/external/corefx/src/System.Threading.Tasks.Dataflow/src/Internal/ProducerConsumerQueues.cs +++ b/external/corefx/src/System.Threading.Tasks.Dataflow/src/Internal/ProducerConsumerQueues.cs @@ -31,6 +31,7 @@ using System.Collections.Concurrent; #endif using System.Collections.Generic; using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.InteropServices; namespace System.Threading.Tasks diff --git a/external/corefx/src/System.Threading.Tasks.Parallel/src/System/Threading/Tasks/Parallel.cs.REMOVED.git-id b/external/corefx/src/System.Threading.Tasks.Parallel/src/System/Threading/Tasks/Parallel.cs.REMOVED.git-id index c8cba02a3f..1ca0d5c141 100644 --- a/external/corefx/src/System.Threading.Tasks.Parallel/src/System/Threading/Tasks/Parallel.cs.REMOVED.git-id +++ b/external/corefx/src/System.Threading.Tasks.Parallel/src/System/Threading/Tasks/Parallel.cs.REMOVED.git-id @@ -1 +1 @@ -671122ad9b0b9cf5402090153b5999e24d96ea14 \ No newline at end of file +d38d3be91c131cc64ac5b985b3611c4307c4d453 \ No newline at end of file diff --git a/external/corefx/src/System.Threading.Tasks.Parallel/src/System/Threading/Tasks/ParallelLoopState.cs b/external/corefx/src/System.Threading.Tasks.Parallel/src/System/Threading/Tasks/ParallelLoopState.cs index d9d82953ad..43447f7e87 100644 --- a/external/corefx/src/System.Threading.Tasks.Parallel/src/System/Threading/Tasks/ParallelLoopState.cs +++ b/external/corefx/src/System.Threading.Tasks.Parallel/src/System/Threading/Tasks/ParallelLoopState.cs @@ -10,6 +10,7 @@ // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- using System.Diagnostics; +using System.Diagnostics.Private; // Prevents compiler warnings/errors regarding the use of ref params in Interlocked methods diff --git a/external/corefx/src/System.Threading.Tasks.Parallel/src/System/Threading/Tasks/ParallelRangeManager.cs b/external/corefx/src/System.Threading.Tasks.Parallel/src/System/Threading/Tasks/ParallelRangeManager.cs index 196ad01f9b..e83063f92f 100644 --- a/external/corefx/src/System.Threading.Tasks.Parallel/src/System/Threading/Tasks/ParallelRangeManager.cs +++ b/external/corefx/src/System.Threading.Tasks.Parallel/src/System/Threading/Tasks/ParallelRangeManager.cs @@ -8,7 +8,7 @@ // // =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -using System.Diagnostics; +using System.Diagnostics.Private; using System.Runtime.InteropServices; #pragma warning disable 0420 diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/vbc.exe b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/vbc.exe new file mode 100644 index 0000000000..7a74435709 Binary files /dev/null and b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/vbc.exe differ diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/vbc.exe.config b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/vbc.exe.config new file mode 100644 index 0000000000..a5de23dc75 --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/vbc.exe.config @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/vbc.rsp b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/vbc.rsp new file mode 100644 index 0000000000..c56b36c89b --- /dev/null +++ b/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/vbc.rsp @@ -0,0 +1,55 @@ +# Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +# This file contains command-line options that the VB +# command line compiler (VBC) will process as part +# of every compilation, unless the "/noconfig" option +# is specified. + +# Reference the common Framework libraries +/r:Accessibility.dll +/r:System.Configuration.dll +/r:System.Configuration.Install.dll +/r:System.Data.dll +/r:System.Data.OracleClient.dll +/r:System.Deployment.dll +/r:System.Design.dll +/r:System.DirectoryServices.dll +/r:System.dll +/r:System.Drawing.Design.dll +/r:System.Drawing.dll +/r:System.EnterpriseServices.dll +/r:System.Management.dll +/r:System.Messaging.dll +/r:System.Runtime.Remoting.dll +/r:System.Runtime.Serialization.Formatters.Soap.dll +/r:System.Security.dll +/r:System.ServiceProcess.dll +/r:System.Transactions.dll +/r:System.Web.dll +/r:System.Web.Mobile.dll +/r:System.Web.RegularExpressions.dll +/r:System.Web.Services.dll +/r:System.Windows.Forms.dll +/r:System.Xml.dll + +/r:System.Workflow.Activities.dll +/r:System.Workflow.ComponentModel.dll +/r:System.Workflow.Runtime.dll +/r:System.Runtime.Serialization.dll +/r:System.ServiceModel.dll + +/r:System.Core.dll +/r:System.Xml.Linq.dll +/r:System.Data.Linq.dll +/r:System.Data.DataSetExtensions.dll +/r:System.Web.Extensions.dll +/r:System.Web.Extensions.Design.dll +/r:System.ServiceModel.Web.dll + +# Import System and Microsoft.VisualBasic +/imports:System +/imports:Microsoft.VisualBasic +/imports:System.Linq +/imports:System.Xml.Linq + +/optioninfer+ diff --git a/mcs/build/common/Consts.cs b/mcs/build/common/Consts.cs index 0f44319abb..eb097a58e0 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 = "5.10.0.83"; + public const string MonoVersion = "5.10.0.91"; 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/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id index 7eb5b473b2..a801627912 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -50e48a0a5c2d98e4d786321ed1d9d416d31190cb \ No newline at end of file +af2124cfbb3fc8ad0adb58c7b36b4760b57c0c16 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id index fe62539ee0..375761bfef 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -1a014325a38fda404cc88831d3bc5a315f7178ad \ No newline at end of file +bf376e2ebb2d1f9ffc17868794d31c4901de43b0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id index 274069def0..3d5c6a8803 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -bb17d47aa2372108b18993567a839d9c2bf41e6b \ No newline at end of file +7319297a7d7dccc075bcc6de8bf3a09c4a85aebc \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id index fe7a34e0f3..74fc88b51c 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -b47a0a8e619c5e7078d41295c5ca19e51b9bfb90 \ No newline at end of file +52bdf6ac55dbbc3dbe83c65f4ed8680763bdf70c \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id index e7f903f37b..80eec0b17d 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -0c69026deebbb2caef0928290165c38c87008284 \ No newline at end of file +0bbfbbfd8573f69a64164fcba1da857e0e1e4159 \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id index 80db31955c..33c05059ec 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -2b5abd33a20ead8837e499cd0935f4acd7b63ae7 \ No newline at end of file +c77975dc0ecd88db8912d9bae7fabed8d1f1096d \ No newline at end of file diff --git a/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id index 6d19ccfcfa..a4228db4c5 100644 --- a/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-darwin/1051000002/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -b1ea276d5680d8d29c92d4f37047c74a69dc58ed \ No newline at end of file +43d9743098b81645a85431b5b3a042ab89e132fa \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id index 7eb5b473b2..a801627912 100644 --- a/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -50e48a0a5c2d98e4d786321ed1d9d416d31190cb \ No newline at end of file +af2124cfbb3fc8ad0adb58c7b36b4760b57c0c16 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id index fe62539ee0..375761bfef 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -1a014325a38fda404cc88831d3bc5a315f7178ad \ No newline at end of file +bf376e2ebb2d1f9ffc17868794d31c4901de43b0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id index 274069def0..3d5c6a8803 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -bb17d47aa2372108b18993567a839d9c2bf41e6b \ No newline at end of file +7319297a7d7dccc075bcc6de8bf3a09c4a85aebc \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id index fe7a34e0f3..74fc88b51c 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -b47a0a8e619c5e7078d41295c5ca19e51b9bfb90 \ No newline at end of file +52bdf6ac55dbbc3dbe83c65f4ed8680763bdf70c \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id index e7f903f37b..80eec0b17d 100644 --- a/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -0c69026deebbb2caef0928290165c38c87008284 \ No newline at end of file +0bbfbbfd8573f69a64164fcba1da857e0e1e4159 \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id index 80db31955c..33c05059ec 100644 --- a/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -2b5abd33a20ead8837e499cd0935f4acd7b63ae7 \ No newline at end of file +c77975dc0ecd88db8912d9bae7fabed8d1f1096d \ No newline at end of file diff --git a/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id index 6d19ccfcfa..a4228db4c5 100644 --- a/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-linux/1051000002/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -b1ea276d5680d8d29c92d4f37047c74a69dc58ed \ No newline at end of file +43d9743098b81645a85431b5b3a042ab89e132fa \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id index 7eb5b473b2..a801627912 100644 --- a/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/Mono.Security.dll.REMOVED.git-id @@ -1 +1 @@ -50e48a0a5c2d98e4d786321ed1d9d416d31190cb \ No newline at end of file +af2124cfbb3fc8ad0adb58c7b36b4760b57c0c16 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id index fe62539ee0..375761bfef 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Configuration.dll.REMOVED.git-id @@ -1 +1 @@ -1a014325a38fda404cc88831d3bc5a315f7178ad \ No newline at end of file +bf376e2ebb2d1f9ffc17868794d31c4901de43b0 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id index 274069def0..3d5c6a8803 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Numerics.dll.REMOVED.git-id @@ -1 +1 @@ -bb17d47aa2372108b18993567a839d9c2bf41e6b \ No newline at end of file +7319297a7d7dccc075bcc6de8bf3a09c4a85aebc \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id index fe7a34e0f3..74fc88b51c 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Security.dll.REMOVED.git-id @@ -1 +1 @@ -b47a0a8e619c5e7078d41295c5ca19e51b9bfb90 \ No newline at end of file +52bdf6ac55dbbc3dbe83c65f4ed8680763bdf70c \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id index e7f903f37b..80eec0b17d 100644 --- a/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/System.Xml.dll.REMOVED.git-id @@ -1 +1 @@ -0c69026deebbb2caef0928290165c38c87008284 \ No newline at end of file +0bbfbbfd8573f69a64164fcba1da857e0e1e4159 \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id index 80db31955c..33c05059ec 100644 --- a/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/mcs.exe.REMOVED.git-id @@ -1 +1 @@ -2b5abd33a20ead8837e499cd0935f4acd7b63ae7 \ No newline at end of file +c77975dc0ecd88db8912d9bae7fabed8d1f1096d \ No newline at end of file diff --git a/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id b/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id index 6d19ccfcfa..a4228db4c5 100644 --- a/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id +++ b/mcs/class/lib/monolite-win32/1051000002/mscorlib.dll.REMOVED.git-id @@ -1 +1 @@ -b1ea276d5680d8d29c92d4f37047c74a69dc58ed \ No newline at end of file +43d9743098b81645a85431b5b3a042ab89e132fa \ No newline at end of file diff --git a/mcs/packages/Makefile b/mcs/packages/Makefile index 696039fc38..8eb7c3a5e6 100644 --- a/mcs/packages/Makefile +++ b/mcs/packages/Makefile @@ -10,6 +10,9 @@ ROSLYN_FILES_FOR_MONO = \ $(ROSLYN_CSC_DIR)/csi.exe \ $(ROSLYN_CSC_DIR)/csi.exe.config \ $(ROSLYN_CSC_DIR)/csi.rsp \ + $(ROSLYN_CSC_DIR)/vbc.exe \ + $(ROSLYN_CSC_DIR)/vbc.exe.config \ + $(ROSLYN_CSC_DIR)/vbc.rsp \ $(ROSLYN_CSC_DIR)/Microsoft.CodeAnalysis.CSharp.dll \ $(ROSLYN_CSC_DIR)/Microsoft.CodeAnalysis.CSharp.Scripting.dll \ $(ROSLYN_CSC_DIR)/Microsoft.CodeAnalysis.VisualBasic.dll \ diff --git a/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/vbc.exe b/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/vbc.exe new file mode 100644 index 0000000000..7a74435709 Binary files /dev/null and b/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/vbc.exe differ diff --git a/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/vbc.exe.config b/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/vbc.exe.config new file mode 100644 index 0000000000..a5de23dc75 --- /dev/null +++ b/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/vbc.exe.config @@ -0,0 +1,149 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/vbc.rsp b/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/vbc.rsp new file mode 100644 index 0000000000..c56b36c89b --- /dev/null +++ b/mcs/packages/mnt/jenkins/workspace/release-tarball-mono/external/roslyn-binaries/Microsoft.Net.Compilers/Microsoft.Net.Compilers.2.6.0/tools/vbc.rsp @@ -0,0 +1,55 @@ +# Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +# This file contains command-line options that the VB +# command line compiler (VBC) will process as part +# of every compilation, unless the "/noconfig" option +# is specified. + +# Reference the common Framework libraries +/r:Accessibility.dll +/r:System.Configuration.dll +/r:System.Configuration.Install.dll +/r:System.Data.dll +/r:System.Data.OracleClient.dll +/r:System.Deployment.dll +/r:System.Design.dll +/r:System.DirectoryServices.dll +/r:System.dll +/r:System.Drawing.Design.dll +/r:System.Drawing.dll +/r:System.EnterpriseServices.dll +/r:System.Management.dll +/r:System.Messaging.dll +/r:System.Runtime.Remoting.dll +/r:System.Runtime.Serialization.Formatters.Soap.dll +/r:System.Security.dll +/r:System.ServiceProcess.dll +/r:System.Transactions.dll +/r:System.Web.dll +/r:System.Web.Mobile.dll +/r:System.Web.RegularExpressions.dll +/r:System.Web.Services.dll +/r:System.Windows.Forms.dll +/r:System.Xml.dll + +/r:System.Workflow.Activities.dll +/r:System.Workflow.ComponentModel.dll +/r:System.Workflow.Runtime.dll +/r:System.Runtime.Serialization.dll +/r:System.ServiceModel.dll + +/r:System.Core.dll +/r:System.Xml.Linq.dll +/r:System.Data.Linq.dll +/r:System.Data.DataSetExtensions.dll +/r:System.Web.Extensions.dll +/r:System.Web.Extensions.Design.dll +/r:System.ServiceModel.Web.dll + +# Import System and Microsoft.VisualBasic +/imports:System +/imports:Microsoft.VisualBasic +/imports:System.Linq +/imports:System.Xml.Linq + +/optioninfer+ diff --git a/mono/mini/generics.cs b/mono/mini/generics.cs index eafbd1c0e5..1047233582 100644 --- a/mono/mini/generics.cs +++ b/mono/mini/generics.cs @@ -1391,6 +1391,24 @@ class Tests return 0; } + + class LdobjStobj { + public int counter; + public LdobjStobj buffer1; + public LdobjStobj buffer2; + } + + [MethodImpl(MethodImplOptions.AggressiveInlining)] + private static void swap(ref T first, ref T second) { + second = first; + } + + public static int test_42_ldobj_stobj_ref () { + var obj = new LdobjStobj (); + obj.counter = 42; + swap (ref obj.buffer1, ref obj.buffer2); + return obj.counter; + } } #if !__MOBILE__ diff --git a/mono/mini/method-to-ir.c.REMOVED.git-id b/mono/mini/method-to-ir.c.REMOVED.git-id index bc69ae69cd..dc243ac2b4 100644 --- a/mono/mini/method-to-ir.c.REMOVED.git-id +++ b/mono/mini/method-to-ir.c.REMOVED.git-id @@ -1 +1 @@ -eea5e72ef9cbab5e5d8de0a261f23736a24d878c \ No newline at end of file +8397456fca14422578ee02395c3e5cb6be9c5a07 \ No newline at end of file diff --git a/mono/mini/version.h b/mono/mini/version.h index 13a80fc283..413a92fd25 100644 --- a/mono/mini/version.h +++ b/mono/mini/version.h @@ -1 +1 @@ -#define FULL_VERSION "explicit/bfc7397" +#define FULL_VERSION "explicit/fa7740e" diff --git a/po/mcs/de.gmo b/po/mcs/de.gmo index 06d45410e9..d9c03f9adf 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 446cd60303..a0c992ee4a 100644 --- a/po/mcs/de.po.REMOVED.git-id +++ b/po/mcs/de.po.REMOVED.git-id @@ -1 +1 @@ -722693e8c9971a494927f0e5879eb7ccd7e97bfe \ No newline at end of file +57751d630bde4168012986417017c5045f28ed74 \ No newline at end of file diff --git a/po/mcs/es.gmo b/po/mcs/es.gmo index 000f244bc5..13edcb4ba0 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 6634e5391e..f5984ca056 100644 --- a/po/mcs/es.po.REMOVED.git-id +++ b/po/mcs/es.po.REMOVED.git-id @@ -1 +1 @@ -9ab1dfa946ad506f2620cac1bda0f20833be239b \ No newline at end of file +2b87e62bf2d943d513f877cf2d1c5ef7d059c656 \ No newline at end of file diff --git a/po/mcs/ja.gmo b/po/mcs/ja.gmo index ec5be79e0e..91ba2f3b54 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 3359773d1e..8dd8b31609 100644 --- a/po/mcs/ja.po.REMOVED.git-id +++ b/po/mcs/ja.po.REMOVED.git-id @@ -1 +1 @@ -1c2efa4927cf770c88686b77bc121e73700c9514 \ No newline at end of file +789ac78ddd6eeedd86886366e1e52553647d1c71 \ No newline at end of file diff --git a/po/mcs/mcs.pot b/po/mcs/mcs.pot index 699ebe2148..97d4cc7324 100644 --- a/po/mcs/mcs.pot +++ b/po/mcs/mcs.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: mono 5.10.0.83\n" +"Project-Id-Version: mono 5.10.0.91\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" -"POT-Creation-Date: 2018-02-05 19:33+0000\n" +"POT-Creation-Date: 2018-02-06 18:52+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 fc644cc015..0d2e805a3a 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 f4e0449f6c..187517ddbe 100644 --- a/po/mcs/pt_BR.po.REMOVED.git-id +++ b/po/mcs/pt_BR.po.REMOVED.git-id @@ -1 +1 @@ -4f711b7f815b1dca7d92b875fb71e2b0b7b179b2 \ No newline at end of file +71c6a58881155d5d7342489cd27d148796ffc2d7 \ No newline at end of file diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 9f792fd136..c647615d9e 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -36,7 +36,8 @@ bin_SCRIPTS = \ mono-test-install \ peverify \ mcs \ - csc \ + csc \ + vbc \ csi \ mono-package-runtime \ mono-heapviz \ @@ -158,6 +159,7 @@ EXTRA_DIST = \ update_submodules.sh \ mcs.in \ csc.in \ + vbc.in \ dmcs.in \ csi.in \ mono-package-runtime \ @@ -208,6 +210,10 @@ csc: csc.in Makefile $(REWRITE_COMMON) $(srcdir)/csc.in > $@.tmp mv -f $@.tmp $@ +vbc: vbc.in Makefile + $(REWRITE_COMMON) $(srcdir)/vbc.in > $@.tmp + mv -f $@.tmp $@ + dmcs: dmcs.in Makefile $(REWRITE_COMMON) $(srcdir)/dmcs.in > $@.tmp mv -f $@.tmp $@ diff --git a/scripts/Makefile.in b/scripts/Makefile.in index ea5b3a9f45..ee8554071c 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -409,7 +409,7 @@ COMPAT_4_0_SUFFIX = 4$(SCRIPT_SUFFIX) bin_SCRIPTS = $(scripts_4_0_umask) $(scripts_defaults) $(scripts_2_0) \ $(scripts_service) $(scripts_nunit) $(scripts_rpmhelpers) \ $(MDOC_SUBCOMMANDS) $(MDOC_COMPAT) mono-test-install peverify \ - mcs csc csi mono-package-runtime mono-heapviz \ + mcs csc vbc csi mono-package-runtime mono-heapviz \ $(scripts_mono_configuration_crypto) $(am__append_1) scripts_4_0_umask = \ makecert$(SCRIPT_SUFFIX) \ @@ -520,6 +520,7 @@ EXTRA_DIST = \ update_submodules.sh \ mcs.in \ csc.in \ + vbc.in \ dmcs.in \ csi.in \ mono-package-runtime \ @@ -795,6 +796,10 @@ csc: csc.in Makefile $(REWRITE_COMMON) $(srcdir)/csc.in > $@.tmp mv -f $@.tmp $@ +vbc: vbc.in Makefile + $(REWRITE_COMMON) $(srcdir)/vbc.in > $@.tmp + mv -f $@.tmp $@ + dmcs: dmcs.in Makefile $(REWRITE_COMMON) $(srcdir)/dmcs.in > $@.tmp mv -f $@.tmp $@ diff --git a/scripts/vbc.in b/scripts/vbc.in new file mode 100644 index 0000000000..7bdd70ecb4 --- /dev/null +++ b/scripts/vbc.in @@ -0,0 +1,2 @@ +#!/bin/sh +exec @bindir@/mono --gc-params=nursery-size=64m $MONO_OPTIONS @mono_instdir@/4.5/vbc.exe "$@" diff --git a/support/sys-xattr.c b/support/sys-xattr.c index f10f9671ef..4b7f55e086 100644 --- a/support/sys-xattr.c +++ b/support/sys-xattr.c @@ -12,7 +12,7 @@ #include //If we're compiling to API level < 16 this won't be available -#if __ANDROID_API__ < 16 +#if defined (HOST_ANDROID) && __ANDROID_API__ < 16 #define ANDROID_NO_XATTR #endif