Merge more shared files #618
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/ApplicationIntent.cs
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/PoolBlockingPeriod.cs
Show resolved
Hide resolved
src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlBuffer.cs
Outdated
Show resolved
Hide resolved
cheenamalhotra
approved these changes
Jun 23, 2020
cheenamalhotra
requested changes
Jun 23, 2020
src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/PoolBlockingPeriod.cs
Outdated
Show resolved
Hide resolved
cheenamalhotra
approved these changes
Jun 23, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is another chunk of code mostly shared between the netfx and netcore codebases.
The majority of files needed tiny changes like Bool to bool, whitespace or other harmless changes. Two files I've put a [Serializable] attribute in a 'NETFRAMEWORK define after checking that the symbol is only defined (by the msbuild not the csproj files) on netfx builds.
The only file changed not merged and moved is SqlBuffer. I synced most harmless changes from core to netfx but left out functional changes.