Skip to content

Conversation

@jameshkramer
Copy link
Contributor

This PR is for user story #1576037.

It adds four article files, makes corresponding deletions from the C# and VB folders, and adds redirection entries. It also fixes some article files.

Please merge #18439, #18541, #18580, #18589, #18673, #18700, #18711, #18781, and #18802 before merging this.

cc: @BillWagner @mairaw @tfosmark @marteeleigh

Contributes to #4728

@dotnet-bot dotnet-bot added this to the June 2020 milestone Jun 6, 2020
@mairaw mairaw added the vendor-project Indicates the issue/pr is related to a vendor project. label Jun 9, 2020
@jameshkramer jameshkramer force-pushed the br43-add-topic-files-135-to-138 branch from 102eac8 to c652822 Compare June 10, 2020 20:52
@mairaw
Copy link
Contributor

mairaw commented Jun 24, 2020

Last set of merge conflicts to resolve for now @jameshkramer 😄

Copy link
Contributor

@mairaw mairaw left a comment

Choose a reason for hiding this comment

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

Looks good. A few suggestions...

Copy link
Contributor

@mairaw mairaw left a comment

Choose a reason for hiding this comment

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

LGTM

@mairaw mairaw merged commit aae7164 into dotnet:linq-to-xml Jun 24, 2020
@jameshkramer
Copy link
Contributor Author

@mairaw @BillWagner @tfosmark @marteeleigh

Maira, thanks for getting these PRs merged. I'll have some changes to redirections this week. Then we test?

Jim

@mairaw
Copy link
Contributor

mairaw commented Jun 25, 2020

Sounds good @jameshkramer. There are also some warnings showing up in #16969 after I merged the last PR, so you should take a look at that as well.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants