From 414e74bb4c9a7142dfefe021a46141ff4843e07f Mon Sep 17 00:00:00 2001 From: Marek Safar Date: Thu, 27 Apr 2017 09:45:26 +0200 Subject: [PATCH] Bump corefx --- external/corefx | 2 +- .../System.Data/System/Data/Common/AdapterUtil.cs | 5 +++++ .../System.Data/System/Data/Sql/SqlDataSourceEnumerator.cs | 2 ++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/external/corefx b/external/corefx index 2f070ea5c26..76767209e09 160000 --- a/external/corefx +++ b/external/corefx @@ -1 +1 @@ -Subproject commit 2f070ea5c26c4093b1bcdf5fbdc6fbfdb688d419 +Subproject commit 76767209e09be647a5c7e0d272c3f22b87adfd6b diff --git a/mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs b/mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs index 4801e47b5a5..6f8b649c6fe 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs @@ -83,6 +83,11 @@ namespace System.Data.Common { static internal Task s_falseTask = Task.FromResult(false); +#if MONO + static internal Task TrueTask => s_trueTask; + static internal Task FalseTask => s_falseTask; +#endif + [BidMethod] // this method accepts BID format as an argument, this attribute allows FXCopBid rule to validate calls to it static private void TraceException( string trace, diff --git a/mcs/class/referencesource/System.Data/System/Data/Sql/SqlDataSourceEnumerator.cs b/mcs/class/referencesource/System.Data/System/Data/Sql/SqlDataSourceEnumerator.cs index 657bed3dc7a..908dec7ecbc 100644 --- a/mcs/class/referencesource/System.Data/System/Data/Sql/SqlDataSourceEnumerator.cs +++ b/mcs/class/referencesource/System.Data/System/Data/Sql/SqlDataSourceEnumerator.cs @@ -26,7 +26,9 @@ namespace System.Data.Sql { internal const string InstanceName = "InstanceName"; internal const string IsClustered = "IsClustered"; internal const string Version = "Version"; +#if !MONO private const int timeoutSeconds = ADP.DefaultCommandTimeout; +#endif private long timeoutTime; // variable used for timeout computations, holds the value of the hi-res performance counter at which this request should expire private SqlDataSourceEnumerator() : base() { -- 2.25.1