Add xunit project to PowerShell.sln and make it runable from within VisualStudio by bergmeister · Pull Request #7254 · PowerShell/PowerShell

bergmeister · 2018-07-09T22:52:26Z

PR Summary

Resolves XUnit test project not part of Visual Studio solution PowerShell.sln -> make XUnit runable from within VS test explorer #7253 by adding the XUnit test project to PowerShell.sln and tweaking it to make the project load in VS (by adding the ToolsVersion) and making it runable in the VS test explorer by adding the required NuGet packages xunit.runner.visualstudio.
Related Update PackageReferences to GA releases #6977 by updating the xunit package from 2.4.0-beta.2.build4010 to 2.4.0 (RTM) that got recently released

PR Checklist

…to run it within vs

…o AddXUnitToVs

anmenaga · 2018-07-13T18:48:28Z

PowerShell.sln

 		{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
+		{190BB016-1395-4944-853F-98F8A4277483}.CodeCoverage|Any CPU.ActiveCfg = Release|Any CPU


Can you please explain why these changes to ConfigurationPlatforms are necessary?

This is done automatically by VS when adding an existing project...

adityapatwardhan · 2018-07-13T21:02:41Z

@bergmeister Please have a look at merge conflicts.

bergmeister · 2018-07-13T21:29:24Z

@adityapatwardhan I cannot take the upstream changes because PR #6926 invalidated the PowerShell solution file in such a way that it even prevents the XUnit project now from loading. I will therefore wait until the solution file has been fixed in master.
EDIT: after some debugging/experimenting, it seems it was not the referenced PR but some other recently merged PR that breaks my branch in the sense that the XUnit project now does not load in VS any more.... The configuration changes in the references PR to the sln file should be still be re-reviewed though as they seem to be accidental.

…ToVs

…ToVs # Conflicts: # PowerShell.sln

…o AddXUnitToVs

…lstudio package is now sufficient for running tests in VS in the latest version (15.7.5)

…ease version (was already pre-release)

daxian-dbw · 2018-07-17T04:49:32Z

PowerShell.sln

-		{07BFD271-8992-4F34-9091-6CFC3E224A24}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{07BFD271-8992-4F34-9091-6CFC3E224A24}.Release|Any CPU.Build.0 = Release|Any CPU
-		{8F63D134-E413-4181-936D-D82F3F5F1D85}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
-		{8F63D134-E413-4181-936D-D82F3F5F1D85}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU


You removed these two entries that are associated with 8F63D134-E413-4181-936D-D82F3F5F1D85, but left two entries associated with 07BFD271-8992-4F34-9091-6CFC3E224A24 above. Is that intentional?

I believe it is better to rebase then try to resolve conflicts in such auto changed file.

The conflict is already resolved and I resolved it by taking HEAD and adding the project again to the solution

@bergmeister Please take a look at the highlighted entries in the screenshot below. It looks to me you shouldn't remove the two 8F63D134 entries.

@daxian-dbw Sorry, thanks for reminding me to address your comment as well. Yes, I made 3 commits to address this:

Remove the 2 redundant 07BFD271 lines

Revert the removal of the 2 8F63D134 lines

Reorder lines so that VS does not automatically re-order them on save,

bergmeister · 2018-07-17T18:08:14Z

UPDATE: I addressed the comments about the solution file and also updated the XUnit Nuget package from the preview version of 2.4.0 to the RTM version as it got published today. Shall I also update the xunit reference in test/hosting/hosting.tests.csproj from 2.3.1 to 2.4.0?

daxian-dbw · 2018-07-17T18:31:56Z

Shall I also update the xunit reference in test/hosting/hosting.tests.csproj from 2.3.1 to 2.4.0?

I'm fine with updating the xunit reference, as long as it doesn't break our xunit test run 😄

…to AddXUnitToVs

anmenaga · 2018-07-27T20:05:06Z

@adityapatwardhan This looks ready for merge.

adityapatwardhan · 2018-08-02T18:51:43Z

@bergmeister Thank you for your contribution!

iSazonov · 2018-08-03T03:57:29Z

test/hosting/hosting.tests.csproj

-    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit" Version="2.4.0" />
    <!-- DotNetCliToolReference element specifies the CLI tool that the user wants to restore in the context of the project. -->
    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />


@bergmeister We skipped the old version :-)

Did you mean dotnet-xunit? Version 2.4.0 of it is still in preview
https://www.nuget.org/packages/dotnet-xunit/2.4.0-beta.1.build3958

Yes, we add it in csharp.tests.csproj in the PR.

Ok, I see what you mean now. If it's not essential, then I'd still just wait for 2.4.0 of this package to become RTM.

We can wait. My comment is informational only.

powercode · 2018-08-03T08:57:58Z

@bergmeister Really happy about this PR! Thx!

bergmeister · 2018-08-03T09:02:28Z

Thanks @powercode , I also plan to do something similar for the hosting tests. Thanks for your efforts about the ReSharper settings as well.

bergmeister added 3 commits July 9, 2018 22:33

Update xunit from 2.4.0-beta.2.build4010 to 2.4.0-rc.1.build403

fa7b192

Upgrade xunit. add Xunit test project to sln and make it runnable

d6e7362

add csproj ref to sln

e55477a

bergmeister requested review from TravisEz13, adityapatwardhan, anmenaga and daxian-dbw as code owners July 9, 2018 22:52

bergmeister changed the title ~~Add xunit project to PowerShell.sln and make it runable from within VisualStudio~~ WIP Add xunit project to PowerShell.sln and make it runable from within VisualStudio Jul 9, 2018

Due to RuntimeFrameworkVersion, the common props file cannot be used …

bba4616

…to run it within vs

bergmeister changed the title ~~WIP Add xunit project to PowerShell.sln and make it runable from within VisualStudio~~ Add xunit project to PowerShell.sln and make it runable from within VisualStudio Jul 9, 2018

bergmeister added 2 commits July 10, 2018 08:00

trigger ci

1cb8a4f

trigger ci

02b2a74

bergmeister changed the title ~~Add xunit project to PowerShell.sln and make it runable from within VisualStudio~~ WIP Add xunit project to PowerShell.sln and make it runable from within VisualStudio Jul 10, 2018

bergmeister added 2 commits July 10, 2018 23:45

simplify (need to install correct sdk sytem wide)

9b56adc

cleanup spaces

83897c9

bergmeister changed the title ~~WIP Add xunit project to PowerShell.sln and make it runable from within VisualStudio~~ Add xunit project to PowerShell.sln and make it runable from within VisualStudio Jul 10, 2018

Merge branch 'master' of https://github.com/PowerShell/PowerShell int…

d60a2f4

…o AddXUnitToVs

iSazonov approved these changes Jul 12, 2018

View reviewed changes

iSazonov assigned adityapatwardhan Jul 12, 2018

anmenaga reviewed Jul 13, 2018

View reviewed changes

bergmeister added 6 commits July 14, 2018 07:43

Merge commit 'b15709f444a1501bac962fea50ca05f5fb7c03a1' into AddXUnit…

075a150

…ToVs

Merge commit '7ba4d65a4230b5242ba22e71b3ccfe75ceb2e57d' into AddXUnit…

896afc1

…ToVs # Conflicts: # PowerShell.sln

Merge branch 'master' of https://github.com/PowerShell/PowerShell int…

53cff30

…o AddXUnitToVs

add section that vs adds by default

51c6678

Remove Microsoft.NET.Test.Sdk NuGet reference. The xunit.runner.visua…

bfb3d5b

…lstudio package is now sufficient for running tests in VS in the latest version (15.7.5)

Update xunit and xunit.runner.visualstudio packages to latest pre-rel…

414c3f5

…ease version (was already pre-release)

daxian-dbw reviewed Jul 17, 2018

View reviewed changes

remove redundant lines in sln

5ae8e50

bergmeister added 3 commits July 17, 2018 18:49

Add lines that were initially removed

d7ebc43

move lines to reduce automatic changes on save by VS

56ed22f

use RTM versions of XUnit 2.4.0 that got published today

2a10609

bergmeister added 2 commits July 23, 2018 22:44

Merge branch 'master' of https://github.com/bergmeister/PowerShell in…

4d63ed9

…to AddXUnitToVs

Update XUnit in hosting project as well to newer release

2af3995

bergmeister requested a review from dantraMSFT as a code owner July 23, 2018 21:47

SteveL-MSFT approved these changes Jul 24, 2018

View reviewed changes

TravisEz13 approved these changes Jul 27, 2018

View reviewed changes

anmenaga approved these changes Jul 27, 2018

View reviewed changes

adityapatwardhan merged commit 5717a5d into PowerShell:master Aug 2, 2018

iSazonov reviewed Aug 3, 2018

View reviewed changes

Conversation

bergmeister commented Jul 9, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Summary

PR Checklist

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

adityapatwardhan commented Jul 13, 2018

Uh oh!

bergmeister commented Jul 13, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bergmeister commented Jul 17, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

daxian-dbw commented Jul 17, 2018

Uh oh!

anmenaga commented Jul 27, 2018

Uh oh!

adityapatwardhan commented Aug 2, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

powercode commented Aug 3, 2018

Uh oh!

bergmeister commented Aug 3, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Comments

bergmeister commented Jul 9, 2018 •

edited

Loading

bergmeister commented Jul 13, 2018 •

edited

Loading

bergmeister commented Jul 17, 2018 •

edited

Loading