Skip to content

Commit 7611570

Browse files
Fix merge conflict damage in LocalAppContextSwitches
The 'accept both' merge dropped the opening /// <summary> line on three UseOverallConnectTimeoutForPoolWait XML doc comments (const string, cached SwitchValue field, and public property), leaving them malformed.
1 parent 80da656 commit 7611570

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/LocalAppContextSwitches.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ internal static class LocalAppContextSwitches
131131
/// </summary>
132132
private const string UseLegacyIdleTimeoutBehaviorString =
133133
"Switch.Microsoft.Data.SqlClient.UseLegacyIdleTimeoutBehavior";
134+
135+
/// <summary>
134136
/// The name of the app context switch that controls whether pool operations
135137
/// should count against the caller's overall ConnectTimeout budget.
136138
/// </summary>
@@ -250,6 +252,8 @@ private enum SwitchValue : byte
250252
/// The cached value of the UseLegacyIdleTimeoutBehavior switch.
251253
/// </summary>
252254
private static SwitchValue s_useLegacyIdleTimeoutBehavior = SwitchValue.None;
255+
256+
/// <summary>
253257
/// The cached value of the UseOverallConnectTimeoutForPoolWait switch.
254258
/// </summary>
255259
private static SwitchValue s_useOverallConnectTimeoutForPoolWait = SwitchValue.None;
@@ -593,6 +597,8 @@ public static bool UseCompatibilityAsyncBehaviour
593597
UseLegacyIdleTimeoutBehaviorString,
594598
defaultValue: true,
595599
ref s_useLegacyIdleTimeoutBehavior);
600+
601+
/// <summary>
596602
/// When set to true, pool operations count against the
597603
/// caller's ConnectTimeout budget. This includes waits and async operations.
598604
/// When false, pool operations receive a full ConnectTimeout and

0 commit comments

Comments
 (0)