Skip to content

Add Microsoft.PowerShell.MarkdownRender to PowerShell.sln#7288

Merged
daxian-dbw merged 2 commits intoPowerShell:masterfrom
adityapatwardhan:FixPSSln
Jul 14, 2018
Merged

Add Microsoft.PowerShell.MarkdownRender to PowerShell.sln#7288
daxian-dbw merged 2 commits intoPowerShell:masterfrom
adityapatwardhan:FixPSSln

Conversation

@adityapatwardhan
Copy link
Copy Markdown
Member

@adityapatwardhan adityapatwardhan commented Jul 14, 2018

PR Summary

#6926 caused a merge issue. Fixing the solution to retain new changes and add Microsoft.PowerShell.MarkdownRender.csproj to the solution.

PR Checklist

@adityapatwardhan
Copy link
Copy Markdown
Member Author

adityapatwardhan commented Jul 14, 2018

@bergmeister Can you also review.

@daxian-dbw
Copy link
Copy Markdown
Member

daxian-dbw commented Jul 14, 2018

I compared the content of powershell.sln from this PR with the content before #6926 was merged (see https://github.com/PowerShell/PowerShell/commits/master/PowerShell.sln), and the changes look good.

@bergmeister could you please double check?

@daxian-dbw
Copy link
Copy Markdown
Member

daxian-dbw commented Jul 14, 2018

Here is the diff between the previous correct content vs. the content in this PR:

image

I think we are good, and going to merge this PR to unblock @bergmeister.

@bergmeister Please let us know if you run into any other issues. Again, we apologize for the inconvinence.

@daxian-dbw daxian-dbw merged commit 7ba4d65 into PowerShell:master Jul 14, 2018
@daxian-dbw daxian-dbw mentioned this pull request Jul 14, 2018
Merged
11 tasks
@bergmeister
Copy link
Copy Markdown
Contributor

bergmeister commented Jul 14, 2018 •
edited
Loading

Thanks for coming back to this and fixing it. I left some comments.

bergmeister
bergmeister reviewed Jul 14, 2018
View reviewed changes
PowerShell.sln
{73EA0BE6-C0C5-4B56-A5AA-DADA4C01D690}.Debug|Any CPU.ActiveCfg = Linux|Any CPU
{73EA0BE6-C0C5-4B56-A5AA-DADA4C01D690}.Debug|Any CPU.Build.0 = Linux|Any CPU
{73EA0BE6-C0C5-4B56-A5AA-DADA4C01D690}.CodeCoverage|Any CPU.ActiveCfg = Linux|Any CPU
{73EA0BE6-C0C5-4B56-A5AA-DADA4C01D690}.CodeCoverage|Any CPU.Build.0 = Linux|Any CPU
Copy link
Copy Markdown
Contributor

@bergmeister bergmeister Jul 14, 2018

Choose a reason for hiding this comment

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

By comparing this to other projects, should the right hand side of this line and the line above be CodeCoverage|Any CPU? cc @TravisEz13

Copy link
Copy Markdown
Member Author

@adityapatwardhan adityapatwardhan Jul 16, 2018

Choose a reason for hiding this comment

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

I will have a look.

bergmeister
bergmeister reviewed Jul 14, 2018
View reviewed changes
PowerShell.sln
{43D4F8DA-A7DE-494B-81B0-BDE3CFD7B1F1}.CodeCoverage|Any CPU.ActiveCfg = Debug|Any CPU
{43D4F8DA-A7DE-494B-81B0-BDE3CFD7B1F1}.CodeCoverage|Any CPU.Build.0 = Debug|Any CPU
{73EA0BE6-C0C5-4B56-A5AA-DADA4C01D690}.Linux|Any CPU.ActiveCfg = Linux|Any CPU
{73EA0BE6-C0C5-4B56-A5AA-DADA4C01D690}.Linux|Any CPU.Build.0 = Linux|Any CPU
Copy link
Copy Markdown
Contributor

@bergmeister bergmeister Jul 14, 2018

Choose a reason for hiding this comment

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

By comparing this to other projects, should the right hand side of this line and the line above be Release|Any CPU? cc @TravisEz13

bergmeister
bergmeister reviewed Jul 14, 2018
View reviewed changes
PowerShell.sln
{73EA0BE6-C0C5-4B56-A5AA-DADA4C01D690}.Linux|Any CPU.ActiveCfg = Linux|Any CPU
{73EA0BE6-C0C5-4B56-A5AA-DADA4C01D690}.Linux|Any CPU.Build.0 = Linux|Any CPU
{73EA0BE6-C0C5-4B56-A5AA-DADA4C01D690}.Release|Any CPU.ActiveCfg = Linux|Any CPU
{73EA0BE6-C0C5-4B56-A5AA-DADA4C01D690}.Release|Any CPU.Build.0 = Linux|Any CPU
Copy link
Copy Markdown
Contributor

@bergmeister bergmeister Jul 14, 2018

Choose a reason for hiding this comment

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

By comparing this to other projects, should the right hand side of this line and the line above be Release|Any CPU? cc @TravisEz13

bergmeister
bergmeister reviewed Jul 14, 2018
View reviewed changes
PowerShell.sln
{73EA0BE6-C0C5-4B56-A5AA-DADA4C01D690}.Release|Any CPU.ActiveCfg = Linux|Any CPU
{73EA0BE6-C0C5-4B56-A5AA-DADA4C01D690}.Release|Any CPU.Build.0 = Linux|Any CPU
{73EA0BE6-C0C5-4B56-A5AA-DADA4C01D690}.Debug|Any CPU.ActiveCfg = Linux|Any CPU
{73EA0BE6-C0C5-4B56-A5AA-DADA4C01D690}.Debug|Any CPU.Build.0 = Linux|Any CPU
Copy link
Copy Markdown
Contributor

@bergmeister bergmeister Jul 14, 2018

Choose a reason for hiding this comment

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

By comparing this to other projects, should the right hand side of this line and the line above be Debug|Any CPU? cc @TravisEz13

@adityapatwardhan adityapatwardhan deleted the FixPSSln branch July 16, 2018 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@daxian-dbw daxian-dbw daxian-dbw approved these changes

+1 more reviewer

@bergmeister bergmeister bergmeister left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@daxian-dbw daxian-dbw

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@adityapatwardhan @daxian-dbw @bergmeister