diff options
| author | Marek Safar <marek.safar@gmail.com> | 2017-04-27 10:45:26 +0300 |
|---|---|---|
| committer | Marek Safar <marek.safar@gmail.com> | 2017-04-28 00:38:57 +0300 |
| commit | 414e74bb4c9a7142dfefe021a46141ff4843e07f (patch) | |
| tree | 64736775db854a55dbc32b33062d3c116015f9ca /mcs/class/referencesource | |
| parent | 618f75ffe74bd432a76d9e1934f63014cb497b03 (diff) | |
Bump corefx
Diffstat (limited to 'mcs/class/referencesource')
| -rw-r--r-- | mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs | 5 | ||||
| -rw-r--r-- | mcs/class/referencesource/System.Data/System/Data/Sql/SqlDataSourceEnumerator.cs | 2 |
2 files changed, 7 insertions, 0 deletions
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<bool> s_falseTask = Task.FromResult<bool>(false); +#if MONO + static internal Task<bool> TrueTask => s_trueTask; + static internal Task<bool> 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() { |