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.

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

Merge more shared files #618

Merged
merged 4 commits into from
Jun 24, 2020
Merged

Merge more shared files #618

merged 4 commits into from
Jun 24, 2020

Conversation

Wraith2
Copy link
Contributor

@Wraith2 Wraith2 commented Jun 19, 2020

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.

Copy link
Member

@cheenamalhotra cheenamalhotra left a comment

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.

@cheenamalhotra cheenamalhotra added this to the 2.1.0-preview1 milestone Jun 23, 2020
@cheenamalhotra cheenamalhotra merged commit 5e94302 into dotnet:master Jun 24, 2020
@Wraith2 Wraith2 deleted the combine3 branch June 24, 2020 16:06
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