Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Introducing 'netcoreapp3.1' DLL with Cross-Platform TCP Keep Alive support #395

Merged
merged 17 commits into from
Jan 31, 2020
Merged

Introducing 'netcoreapp3.1' DLL with Cross-Platform TCP Keep Alive support #395

merged 17 commits into from
Jan 31, 2020

Conversation

cheenamalhotra
Copy link
Member

@cheenamalhotra cheenamalhotra commented Jan 23, 2020 •
edited
Loading

This PR:

Note:
Windows: TCP Keep Alive will be supported starting .NET Core 3.1 (LTS)
Unix: TCP Keep Alive will be supported starting .NET Core 2.1 (as supported by System.Data.SqlClient).

Additional changes:

  • Moves all versions to versions.props file (Only nuspec is exclusive)
  • Removes all "Configuration.props" not applicable to projects.
  • Address some random test failures.

@cheenamalhotra cheenamalhotra changed the title Introducing 'netcoreapp3.1' DLL with Cross-Platform TCP Keep Alive support WIP: Introducing 'netcoreapp3.1' DLL with Cross-Platform TCP Keep Alive support Jan 23, 2020
@cheenamalhotra
Revert to older version for now.
cd3a308
@cheenamalhotra
Disable failing test + minor edits
3b36217
@cheenamalhotra
Merge branch 'randomfailures' into netcore31
236aa5e 
# Conflicts:
#	src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
#	src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj
@cheenamalhotra
Remove unwanted configuration.props
ce1067a
@cheenamalhotra cheenamalhotra changed the title WIP: Introducing 'netcoreapp3.1' DLL with Cross-Platform TCP Keep Alive support Introducing 'netcoreapp3.1' DLL with Cross-Platform TCP Keep Alive support Jan 29, 2020
David-Engel
David-Engel reviewed Jan 30, 2020
View reviewed changes
Copy link
Contributor

@David-Engel David-Engel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are a lot of changes here not just related to the subject. It would have been better to break them up, especially the test fixes. I'll have to continue my review tomorrow.

src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.csproj Show resolved Hide resolved
src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj Outdated Show resolved Hide resolved
David-Engel
David-Engel reviewed Jan 30, 2020
View reviewed changes
src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj Outdated Show resolved Hide resolved
src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj Outdated Show resolved Hide resolved
src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj Outdated Show resolved Hide resolved
src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj Outdated Show resolved Hide resolved
src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj Show resolved Hide resolved
...crosoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj Outdated Show resolved Hide resolved
...crosoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj Outdated Show resolved Hide resolved
src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/ConnectivityTests/AADConnectionTest.cs Outdated Show resolved Hide resolved
@cheenamalhotra cheenamalhotra added this to the 2.0.0-preview2 milestone Jan 31, 2020
@cheenamalhotra cheenamalhotra merged commit 5ed506e into dotnet:master Jan 31, 2020
@cheenamalhotra cheenamalhotra added the 📍 Push to Commit Feed This label will be added to PRs whose NuGet Package will be available from CI Public Feed. label Jan 31, 2020
@cheenamalhotra cheenamalhotra deleted the netcore31 branch January 31, 2020 17:15
@cheenamalhotra
Copy link
Member Author

Package created for this change: Microsoft.Data.SqlClient v2.0.0-build.20031.1-5ed506e

@HavretGC HavretGC mentioned this pull request Feb 19, 2020
Closed
sergeikrasnov
sergeikrasnov reviewed Dec 14, 2020
View reviewed changes
src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SNI/SNITcpHandle.cs
{

#if NETCORE3
socket.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.KeepAlive, true);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will this work for .Net 5?

@karinazhou karinazhou mentioned this pull request Dec 14, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sergeikrasnov sergeikrasnov sergeikrasnov left review comments

@David-Engel David-Engel David-Engel approved these changes

@karinazhou karinazhou Awaiting requested review from karinazhou

@JRahnama JRahnama Awaiting requested review from JRahnama

Assignees
No one assigned
Labels
📍 Push to Commit Feed This label will be added to PRs whose NuGet Package will be available from CI Public Feed.
Projects
None yet
Milestone
2.0.0-preview2
Development

Successfully merging this pull request may close these issues.
3 participants
@cheenamalhotra @David-Engel @sergeikrasnov