From 5ba6be826bbed183609d78b31c02bbe587ab8f43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Oct 2018 12:00:41 +0000 Subject: [PATCH 01/11] Updating version files --- eng/Version.Details.xml | 26 +++++++++++++------------- eng/common/darc-init.ps1 | 6 +++--- global.json | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3a61c55822c9..d817e7966b59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,33 +2,33 @@ - + https://github.com/dotnet/arcade - dd701110d79bb60c84a141ab9017320ed2df0b41 + beb04fa9474ba68d0ce0cb309d7a3cf7572a5f9d - + https://github.com/dotnet/arcade - dd701110d79bb60c84a141ab9017320ed2df0b41 + beb04fa9474ba68d0ce0cb309d7a3cf7572a5f9d https://github.com/dotnet/arcade 55c0d49b9bec66981f7dd6d8f51a8dad43e8fbe0 - + https://github.com/dotnet/arcade - dd701110d79bb60c84a141ab9017320ed2df0b41 + beb04fa9474ba68d0ce0cb309d7a3cf7572a5f9d - + https://github.com/dotnet/arcade - dd701110d79bb60c84a141ab9017320ed2df0b41 + beb04fa9474ba68d0ce0cb309d7a3cf7572a5f9d - + https://github.com/dotnet/arcade - dd701110d79bb60c84a141ab9017320ed2df0b41 + beb04fa9474ba68d0ce0cb309d7a3cf7572a5f9d - + https://github.com/dotnet/arcade - dd701110d79bb60c84a141ab9017320ed2df0b41 + beb04fa9474ba68d0ce0cb309d7a3cf7572a5f9d - + \ No newline at end of file diff --git a/eng/common/darc-init.ps1 b/eng/common/darc-init.ps1 index d50dbbe02494..af182d8f8410 100644 --- a/eng/common/darc-init.ps1 +++ b/eng/common/darc-init.ps1 @@ -4,17 +4,17 @@ $verbosity = "m" function InstallDarcCli { $darcCliPackageName = "microsoft.dotnet.darc" $dotnet = "$env:DOTNET_INSTALL_DIR\dotnet.exe" - $toolList = Invoke-Expression "$dotnet tool list -g" + $toolList = Invoke-Expression "& `"$dotnet`" tool list -g" if ($toolList -like "*$darcCliPackageName*") { - Invoke-Expression "$dotnet tool uninstall $darcCliPackageName -g" + Invoke-Expression "& `"$dotnet`" tool uninstall $darcCliPackageName -g" } $toolsetVersion = $GlobalJson.'msbuild-sdks'.'Microsoft.DotNet.Arcade.Sdk' Write-Host "Installing Darc CLI version $toolsetVersion..." Write-Host "You may need to restart your command window if this is the first dotnet tool you have installed." - Invoke-Expression "$dotnet tool install $darcCliPackageName --version $toolsetVersion -v $verbosity -g" + Invoke-Expression "& `"$dotnet`" tool install $darcCliPackageName --version $toolsetVersion -v $verbosity -g" } InitializeTools diff --git a/global.json b/global.json index 8e78987eeed9..a9f208aed383 100644 --- a/global.json +++ b/global.json @@ -3,7 +3,7 @@ "dotnet": "2.1.401" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18522.6", + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18523.13", "Microsoft.NET.Sdk.IL": "3.0.0-preview1-27024-01" } } \ No newline at end of file From d627a217ae6decd5e450e6e4a87f16e270cb43db Mon Sep 17 00:00:00 2001 From: Afsaneh Rafighi Date: Wed, 24 Oct 2018 11:03:42 -0700 Subject: [PATCH 02/11] Enable keep alive on SqlClient TCP sockets --- .../src/System/Data/SqlClient/SNI/SNITcpHandle.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs index 5c49c70cb442..b32d1a175f1e 100644 --- a/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs +++ b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs @@ -223,6 +223,14 @@ void Cancel() if (ipAddresses[i] != null) { sockets[i] = new Socket(ipAddresses[i].AddressFamily, SocketType.Stream, ProtocolType.Tcp); + + // enable keep-alive on socket + const int time = 30; + const int interval = 1000; + sockets[i].SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true); + sockets[i].SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveInterval, interval); + sockets[i].SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveTime, time); + sockets[i].Connect(ipAddresses[i], port); if (sockets[i] != null) // sockets[i] can be null if cancel callback is executed during connect() { From f7467b0e1638b961ddf27c2d88d15084aeac3a48 Mon Sep 17 00:00:00 2001 From: Afsaneh Rafighi Date: Wed, 24 Oct 2018 14:19:52 -0700 Subject: [PATCH 03/11] make KeepAlive netcoreapp specific --- .../src/System/Data/SqlClient/SNI/SNITcpHandle.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs index b32d1a175f1e..bfdfe1903859 100644 --- a/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs +++ b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs @@ -223,14 +223,14 @@ void Cancel() if (ipAddresses[i] != null) { sockets[i] = new Socket(ipAddresses[i].AddressFamily, SocketType.Stream, ProtocolType.Tcp); - +#if netcoreapp // enable keep-alive on socket const int time = 30; const int interval = 1000; sockets[i].SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true); sockets[i].SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveInterval, interval); sockets[i].SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveTime, time); - +#endif sockets[i].Connect(ipAddresses[i], port); if (sockets[i] != null) // sockets[i] can be null if cancel callback is executed during connect() { From 73c4a571a64ea4dc8ad72b479e6c8a762608da75 Mon Sep 17 00:00:00 2001 From: Afsaneh Rafighi Date: Thu, 25 Oct 2018 10:14:48 -0700 Subject: [PATCH 04/11] added condition for uapassembly --- .../src/System.Data.SqlClient.csproj | 1 + .../src/System/Data/SqlClient/SNI/SNITcpHandle.cs | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj index 2c0e366c9167..e8e74bfb043a 100644 --- a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj +++ b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj @@ -9,6 +9,7 @@ 4.0.0.0 4.1.0.0 $(DefineConstants);netcoreapp + $(DefineConstants);uapassembly net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.1-Debug;netcoreapp2.1-Release;netcoreapp2.1-Unix-Debug;netcoreapp2.1-Unix-Release;netcoreapp2.1-Windows_NT-Debug;netcoreapp2.1-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard-Debug;netstandard-Release;netstandard-Unix-Debug;netstandard-Unix-Release;netstandard-Windows_NT-Debug;netstandard-Windows_NT-Release;netstandard1.2-Debug;netstandard1.2-Release;netstandard1.3-Debug;netstandard1.3-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uap10.0.16299-Windows_NT-Debug;uap10.0.16299-Windows_NT-Release diff --git a/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs index bfdfe1903859..b71611ce6c23 100644 --- a/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs +++ b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs @@ -224,13 +224,15 @@ void Cancel() { sockets[i] = new Socket(ipAddresses[i].AddressFamily, SocketType.Stream, ProtocolType.Tcp); #if netcoreapp +#if uapassembly // enable keep-alive on socket - const int time = 30; - const int interval = 1000; + const int Time = 30; + const int Interval = 1000; sockets[i].SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true); - sockets[i].SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveInterval, interval); - sockets[i].SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveTime, time); + sockets[i].SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveInterval, Interval); + sockets[i].SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveTime, Time); #endif +#endif sockets[i].Connect(ipAddresses[i], port); if (sockets[i] != null) // sockets[i] can be null if cancel callback is executed during connect() { From b2c4a9b88cda85f1b768f3f387b387df16413d94 Mon Sep 17 00:00:00 2001 From: Afsaneh Rafighi Date: Fri, 26 Oct 2018 09:12:29 -0700 Subject: [PATCH 05/11] added a new defineConstants called FEATURE_TCPKEEPALIVE --- .../src/System.Data.SqlClient.csproj | 2 +- .../src/System/Data/SqlClient/SNI/SNITcpHandle.cs | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj index e8e74bfb043a..513af15bf581 100644 --- a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj +++ b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj @@ -9,7 +9,7 @@ 4.0.0.0 4.1.0.0 $(DefineConstants);netcoreapp - $(DefineConstants);uapassembly + $(DefineConstants);FEATURE_TCPKEEPALIVE net461-Windows_NT-Debug;net461-Windows_NT-Release;netcoreapp-Debug;netcoreapp-Release;netcoreapp-Unix-Debug;netcoreapp-Unix-Release;netcoreapp-Windows_NT-Debug;netcoreapp-Windows_NT-Release;netcoreapp2.1-Debug;netcoreapp2.1-Release;netcoreapp2.1-Unix-Debug;netcoreapp2.1-Unix-Release;netcoreapp2.1-Windows_NT-Debug;netcoreapp2.1-Windows_NT-Release;netfx-Windows_NT-Debug;netfx-Windows_NT-Release;netstandard-Debug;netstandard-Release;netstandard-Unix-Debug;netstandard-Unix-Release;netstandard-Windows_NT-Debug;netstandard-Windows_NT-Release;netstandard1.2-Debug;netstandard1.2-Release;netstandard1.3-Debug;netstandard1.3-Release;uap-Windows_NT-Debug;uap-Windows_NT-Release;uap10.0.16299-Windows_NT-Debug;uap10.0.16299-Windows_NT-Release diff --git a/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs index b71611ce6c23..6af73cf311c3 100644 --- a/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs +++ b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs @@ -223,15 +223,11 @@ void Cancel() if (ipAddresses[i] != null) { sockets[i] = new Socket(ipAddresses[i].AddressFamily, SocketType.Stream, ProtocolType.Tcp); -#if netcoreapp -#if uapassembly +#if FEATURE_TCPKEEPALIVE // enable keep-alive on socket - const int Time = 30; - const int Interval = 1000; sockets[i].SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true); - sockets[i].SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveInterval, Interval); - sockets[i].SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveTime, Time); -#endif + sockets[i].SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveInterval, 1000); + sockets[i].SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveTime, 30); #endif sockets[i].Connect(ipAddresses[i], port); if (sockets[i] != null) // sockets[i] can be null if cancel callback is executed during connect() From f4519f3b8c58fa56ce74502cc2faf4141d671fa8 Mon Sep 17 00:00:00 2001 From: Afsaneh Rafighi Date: Thu, 1 Nov 2018 14:05:11 -0700 Subject: [PATCH 06/11] update TCPKeepAliveInterval value --- .../src/System/Data/SqlClient/SNI/SNITcpHandle.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs index 6af73cf311c3..3388400b8ad5 100644 --- a/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs +++ b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs @@ -226,7 +226,7 @@ void Cancel() #if FEATURE_TCPKEEPALIVE // enable keep-alive on socket sockets[i].SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true); - sockets[i].SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveInterval, 1000); + sockets[i].SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveInterval, 1); sockets[i].SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveTime, 30); #endif sockets[i].Connect(ipAddresses[i], port); From 261eb30fa64766cf36e2e1d2601f46b20d6731a5 Mon Sep 17 00:00:00 2001 From: Afsaneh Rafighi Date: Thu, 1 Nov 2018 17:16:53 -0700 Subject: [PATCH 07/11] set KeepAlive values in unix only --- .../src/System.Data.SqlClient.csproj | 2 ++ .../Data/SqlClient/SNI/SNITcpHandle.Unix.cs | 19 +++++++++++++++++++ .../SqlClient/SNI/SNITcpHandle.Windows.cs | 14 ++++++++++++++ .../System/Data/SqlClient/SNI/SNITcpHandle.cs | 4 +--- 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.Unix.cs create mode 100644 src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.Windows.cs diff --git a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj index 513af15bf581..70f0d00660ae 100644 --- a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj +++ b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj @@ -264,6 +264,7 @@ Common\Interop\Windows\Interop.RtlNtStatusToDosError.cs + @@ -476,6 +477,7 @@ + diff --git a/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.Unix.cs b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.Unix.cs new file mode 100644 index 000000000000..be2a26abcb68 --- /dev/null +++ b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.Unix.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Net.Sockets; +using System.Text; + +namespace System.Data.SqlClient.SNI +{ + internal partial class SNITcpHandle + { + internal static void SetKeepAliveValues(ref Socket socket) + { +#if FEATURE_TCPKEEPALIVE + socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true); + socket.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveInterval, 1); + socket.SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveTime, 30); +#endif + } + } +} diff --git a/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.Windows.cs b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.Windows.cs new file mode 100644 index 000000000000..0a270e5a00d1 --- /dev/null +++ b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.Windows.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Net.Sockets; +using System.Text; + +namespace System.Data.SqlClient.SNI +{ + internal partial class SNITcpHandle + { + internal static void SetKeepAliveValues(ref Socket socket) + { + } + } +} diff --git a/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs index 3388400b8ad5..b0140dc05f66 100644 --- a/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs +++ b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs @@ -225,9 +225,7 @@ void Cancel() sockets[i] = new Socket(ipAddresses[i].AddressFamily, SocketType.Stream, ProtocolType.Tcp); #if FEATURE_TCPKEEPALIVE // enable keep-alive on socket - sockets[i].SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true); - sockets[i].SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveInterval, 1); - sockets[i].SetSocketOption(SocketOptionLevel.Tcp, SocketOptionName.TcpKeepAliveTime, 30); + SNITcpHandle.SetKeepAliveValues(ref sockets[i]); #endif sockets[i].Connect(ipAddresses[i], port); if (sockets[i] != null) // sockets[i] can be null if cancel callback is executed during connect() From 3a5b18a4087ffc1838a776f5737d2226f8f91bd3 Mon Sep 17 00:00:00 2001 From: Afsaneh Rafighi Date: Thu, 1 Nov 2018 17:55:01 -0700 Subject: [PATCH 08/11] add documentation and add link to Github Issue --- .../src/System/Data/SqlClient/SNI/SNITcpHandle.Windows.cs | 2 ++ .../src/System/Data/SqlClient/SNI/SNITcpHandle.cs | 4 +--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.Windows.cs b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.Windows.cs index 0a270e5a00d1..15a8a4e98526 100644 --- a/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.Windows.cs +++ b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.Windows.cs @@ -9,6 +9,8 @@ internal partial class SNITcpHandle { internal static void SetKeepAliveValues(ref Socket socket) { + //This method will later be setting the KeepAlive, TcpKeepAliveInterval and TcpKeepAliveTime based on Windows platform specific checks. + // Link to issue: https://github.com/dotnet/corefx/issues/33209 } } } diff --git a/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs index b0140dc05f66..3e42ae78ad68 100644 --- a/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs +++ b/src/System.Data.SqlClient/src/System/Data/SqlClient/SNI/SNITcpHandle.cs @@ -223,10 +223,8 @@ void Cancel() if (ipAddresses[i] != null) { sockets[i] = new Socket(ipAddresses[i].AddressFamily, SocketType.Stream, ProtocolType.Tcp); -#if FEATURE_TCPKEEPALIVE // enable keep-alive on socket - SNITcpHandle.SetKeepAliveValues(ref sockets[i]); -#endif + SNITcpHandle.SetKeepAliveValues(ref sockets[i]); sockets[i].Connect(ipAddresses[i], port); if (sockets[i] != null) // sockets[i] can be null if cancel callback is executed during connect() { From 9bf5e5ffd67a0f5e33b42a27478758bc31600130 Mon Sep 17 00:00:00 2001 From: Afsaneh Rafighi Date: Fri, 2 Nov 2018 15:03:29 -0700 Subject: [PATCH 09/11] move SNITcpHandle.Windows.cs available in UAP --- src/System.Data.SqlClient/src/System.Data.SqlClient.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj index 70f0d00660ae..12ad28f8ab16 100644 --- a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj +++ b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj @@ -279,6 +279,7 @@ + From b9cd903dcd6cdf7cac3481e37ce4a64ea8319adb Mon Sep 17 00:00:00 2001 From: Afsaneh Rafighi Date: Fri, 2 Nov 2018 16:11:47 -0700 Subject: [PATCH 10/11] updating csproj for SNITcpHandle --- src/System.Data.SqlClient/src/System.Data.SqlClient.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj index 12ad28f8ab16..c5689bf24471 100644 --- a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj +++ b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj @@ -275,6 +275,7 @@ + From e2b2f6ef87255d428df41a5c0820cdeab090a19e Mon Sep 17 00:00:00 2001 From: Afsaneh Rafighi Date: Fri, 2 Nov 2018 16:39:04 -0700 Subject: [PATCH 11/11] fix in csproj for CI failure --- src/System.Data.SqlClient/src/System.Data.SqlClient.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj index c5689bf24471..a288a3ed5c6a 100644 --- a/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj +++ b/src/System.Data.SqlClient/src/System.Data.SqlClient.csproj @@ -264,7 +264,6 @@ Common\Interop\Windows\Interop.RtlNtStatusToDosError.cs -