Skip to content

Merge more shared files#618

Merged
cheenamalhotra merged 4 commits into
dotnet:masterfrom
Wraith2:combine3
Jun 24, 2020
Merged

Merge more shared files#618
cheenamalhotra merged 4 commits into
dotnet:masterfrom
Wraith2:combine3

Conversation

@Wraith2

@Wraith2 Wraith2 commented Jun 19, 2020

Copy link
Copy Markdown
Contributor

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.

@cheenamalhotra cheenamalhotra left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Overall looks good, except SqlBuffer changes.

Comment thread src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlBuffer.cs Outdated
@cheenamalhotra cheenamalhotra added this to the 2.1.0-preview1 milestone Jun 23, 2020
Comment thread src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/PoolBlockingPeriod.cs Outdated
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants