Skip to content

Commit dace483

Browse files
authored
Merge pull request dotnet/corefx#31063 from AfsanehR/GithubIssue30720
Added missing #ifnetcoreapp for PoolBlockingPeriod property. Commit migrated from dotnet/corefx@6b7572f
2 parents ff4dc4b + 799fe7f commit dace483

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

src/libraries/System.Data.SqlClient/src/System/Data/Common/DbConnectionStringCommon.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,9 @@ internal static partial class DbConnectionStringKeywords
306306
internal const string MaxPoolSize = "Max Pool Size";
307307
internal const string Pooling = "Pooling";
308308
internal const string MinPoolSize = "Min Pool Size";
309+
#if netcoreapp
309310
internal const string PoolBlockingPeriod = "PoolBlockingPeriod";
311+
#endif
310312
}
311313

312314
internal static class DbConnectionStringSynonyms

src/libraries/System.Data.SqlClient/src/System/Data/SqlClient/SqlConnectionString.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,9 @@ internal static class KEY
5656
internal const string Application_Name = "application name";
5757
internal const string AsynchronousProcessing = "asynchronous processing";
5858
internal const string AttachDBFilename = "attachdbfilename";
59+
#if netcoreapp
5960
internal const string PoolBlockingPeriod = "poolblockingperiod";
61+
#endif
6062
internal const string Connect_Timeout = "connect timeout";
6163
internal const string Connection_Reset = "connection reset";
6264
internal const string Context_Connection = "context connection";
@@ -501,7 +503,9 @@ internal static Dictionary<string, string> GetParseSynonyms()
501503
{ KEY.Application_Name, KEY.Application_Name },
502504
{ KEY.AsynchronousProcessing, KEY.AsynchronousProcessing },
503505
{ KEY.AttachDBFilename, KEY.AttachDBFilename },
506+
#if netcoreapp
504507
{ KEY.PoolBlockingPeriod, KEY.PoolBlockingPeriod},
508+
#endif
505509
{ KEY.Connect_Timeout, KEY.Connect_Timeout },
506510
{ KEY.Connection_Reset, KEY.Connection_Reset },
507511
{ KEY.Context_Connection, KEY.Context_Connection },

src/libraries/System.Data.SqlClient/src/System/Data/SqlClient/SqlConnectionStringBuilder.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ private enum Keywords
3030
Pooling,
3131
MinPoolSize,
3232
MaxPoolSize,
33+
#if netcoreapp
3334
PoolBlockingPeriod,
35+
#endif
3436

3537
MultipleActiveResultSets,
3638
Replication,
@@ -107,7 +109,9 @@ private static string[] CreateValidKeywords()
107109
validKeywords[(int)Keywords.ApplicationIntent] = DbConnectionStringKeywords.ApplicationIntent;
108110
validKeywords[(int)Keywords.ApplicationName] = DbConnectionStringKeywords.ApplicationName;
109111
validKeywords[(int)Keywords.AttachDBFilename] = DbConnectionStringKeywords.AttachDBFilename;
112+
#if netcoreapp
110113
validKeywords[(int)Keywords.PoolBlockingPeriod] = DbConnectionStringKeywords.PoolBlockingPeriod;
114+
#endif
111115
validKeywords[(int)Keywords.ConnectTimeout] = DbConnectionStringKeywords.ConnectTimeout;
112116
validKeywords[(int)Keywords.CurrentLanguage] = DbConnectionStringKeywords.CurrentLanguage;
113117
validKeywords[(int)Keywords.DataSource] = DbConnectionStringKeywords.DataSource;
@@ -144,7 +148,9 @@ private static Dictionary<string, Keywords> CreateKeywordsDictionary()
144148
hash.Add(DbConnectionStringKeywords.ApplicationIntent, Keywords.ApplicationIntent);
145149
hash.Add(DbConnectionStringKeywords.ApplicationName, Keywords.ApplicationName);
146150
hash.Add(DbConnectionStringKeywords.AttachDBFilename, Keywords.AttachDBFilename);
151+
#if netcoreapp
147152
hash.Add(DbConnectionStringKeywords.PoolBlockingPeriod, Keywords.PoolBlockingPeriod);
153+
#endif
148154
hash.Add(DbConnectionStringKeywords.ConnectTimeout, Keywords.ConnectTimeout);
149155
hash.Add(DbConnectionStringKeywords.CurrentLanguage, Keywords.CurrentLanguage);
150156
hash.Add(DbConnectionStringKeywords.DataSource, Keywords.DataSource);

0 commit comments

Comments
 (0)