Skip to content

Add xunit project to PowerShell.sln and make it runable from within VisualStudio #7254

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.

Sign up for GitHub

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

Merged
adityapatwardhan merged 21 commits into from
Aug 2, 2018
Merged

Add xunit project to PowerShell.sln and make it runable from within VisualStudio #7254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
fa7b192
Update xunit from 2.4.0-beta.2.build4010 to 2.4.0-rc.1.build403
bergmeister Jul 9, 2018
d6e7362
Upgrade xunit. add Xunit test project to sln and make it runnable
bergmeister Jul 9, 2018
e55477a
add csproj ref to sln
bergmeister Jul 9, 2018
bba4616
Due to RuntimeFrameworkVersion, the common props file cannot be used …
bergmeister Jul 9, 2018
1cb8a4f
trigger ci
bergmeister Jul 10, 2018
02b2a74
trigger ci
bergmeister Jul 10, 2018
9b56adc
simplify (need to install correct sdk sytem wide)
bergmeister Jul 10, 2018
83897c9
cleanup spaces
bergmeister Jul 10, 2018
d60a2f4
Merge branch 'master' of https://github.com/PowerShell/PowerShell int…
bergmeister Jul 11, 2018
075a150
Merge commit 'b15709f444a1501bac962fea50ca05f5fb7c03a1' into AddXUnit…
bergmeister Jul 14, 2018
896afc1
Merge commit '7ba4d65a4230b5242ba22e71b3ccfe75ceb2e57d' into AddXUnit…
bergmeister Jul 14, 2018
53cff30
Merge branch 'master' of https://github.com/PowerShell/PowerShell int…
bergmeister Jul 14, 2018
51c6678
add section that vs adds by default
bergmeister Jul 14, 2018
bfb3d5b
Remove Microsoft.NET.Test.Sdk NuGet reference. The xunit.runner.visua…
bergmeister Jul 14, 2018
414c3f5
Update xunit and xunit.runner.visualstudio packages to latest pre-rel…
bergmeister Jul 14, 2018
5ae8e50
remove redundant lines in sln
bergmeister Jul 17, 2018
d7ebc43
Add lines that were initially removed
bergmeister Jul 17, 2018
56ed22f
move lines to reduce automatic changes on save by VS
bergmeister Jul 17, 2018
2a10609
use RTM versions of XUnit 2.4.0 that got published today
bergmeister Jul 17, 2018
4d63ed9
Merge branch 'master' of https://github.com/bergmeister/PowerShell in…
bergmeister Jul 23, 2018
2af3995
Update XUnit in hosting project as well to newer release
bergmeister Jul 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions PowerShell.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "powershell-unix", "src\powe
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerShell.MarkdownRender", "src\Microsoft.PowerShell.MarkdownRender\Microsoft.PowerShell.MarkdownRender.csproj", "{43D4F8DA-A7DE-494B-81B0-BDE3CFD7B1F1}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "csharp.tests", "test\csharp\csharp.tests.csproj", "{08704934-9764-48CE-86DB-BCF0A1CF7899}"
EndProject
# Configuration mapping comment
# All global configurations must be mapped to project configurations
#
Expand Down Expand Up @@ -121,14 +123,6 @@ Global
{439A24FC-8E0A-48B6-8227-44C297311F49}.Linux|Any CPU.Build.0 = Linux|Any CPU
{439A24FC-8E0A-48B6-8227-44C297311F49}.Release|Any CPU.ActiveCfg = Release|Any CPU
{439A24FC-8E0A-48B6-8227-44C297311F49}.Release|Any CPU.Build.0 = Release|Any CPU
{07BFD271-8992-4F34-9091-6CFC3E224A24}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
{07BFD271-8992-4F34-9091-6CFC3E224A24}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
{07BFD271-8992-4F34-9091-6CFC3E224A24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{07BFD271-8992-4F34-9091-6CFC3E224A24}.Debug|Any CPU.Build.0 = Debug|Any CPU
{07BFD271-8992-4F34-9091-6CFC3E224A24}.Linux|Any CPU.ActiveCfg = Linux|Any CPU
{07BFD271-8992-4F34-9091-6CFC3E224A24}.Linux|Any CPU.Build.0 = Linux|Any CPU
{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
{8F63D134-E413-4181-936D-D82F3F5F1D85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -169,6 +163,14 @@ Global
{43D4F8DA-A7DE-494B-81B0-BDE3CFD7B1F1}.Linux|Any CPU.Build.0 = Linux|Any CPU
{43D4F8DA-A7DE-494B-81B0-BDE3CFD7B1F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
{43D4F8DA-A7DE-494B-81B0-BDE3CFD7B1F1}.Release|Any CPU.Build.0 = Release|Any CPU
{08704934-9764-48CE-86DB-BCF0A1CF7899}.CodeCoverage|Any CPU.ActiveCfg = CodeCoverage|Any CPU
{08704934-9764-48CE-86DB-BCF0A1CF7899}.CodeCoverage|Any CPU.Build.0 = CodeCoverage|Any CPU
{08704934-9764-48CE-86DB-BCF0A1CF7899}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{08704934-9764-48CE-86DB-BCF0A1CF7899}.Debug|Any CPU.Build.0 = Debug|Any CPU
{08704934-9764-48CE-86DB-BCF0A1CF7899}.Linux|Any CPU.ActiveCfg = Linux|Any CPU
{08704934-9764-48CE-86DB-BCF0A1CF7899}.Linux|Any CPU.Build.0 = Linux|Any CPU
{08704934-9764-48CE-86DB-BCF0A1CF7899}.Release|Any CPU.ActiveCfg = Release|Any CPU
{08704934-9764-48CE-86DB-BCF0A1CF7899}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
5 changes: 3 additions & 2 deletions test/csharp/csharp.tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">

<Import Project="../Test.Common.props"/>

Expand All @@ -21,8 +21,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="xunit" Version="2.4.0-beta.2.build4010" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="Xunit.SkippableFact" Version="1.3.6" />
<PackageReference Include="xunit.runner.visualstudio" 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.4.0-beta.1.build3958" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion test/hosting/hosting.tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</PropertyGroup>

<ItemGroup>
<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" />
Copy link
Collaborator

@iSazonov iSazonov Aug 3, 2018

Choose a reason for hiding this comment

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

@bergmeister We skipped the old version :-)

Copy link
Contributor Author

@bergmeister bergmeister Aug 3, 2018

Choose a reason for hiding this comment

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

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

Copy link
Collaborator

@iSazonov iSazonov Aug 3, 2018

Choose a reason for hiding this comment

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

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

Copy link
Contributor Author

@bergmeister bergmeister Aug 3, 2018

Choose a reason for hiding this comment

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

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.

Copy link
Collaborator

@iSazonov iSazonov Aug 3, 2018

Choose a reason for hiding this comment

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

We can wait. My comment is informational only.

<PackageReference Include="Microsoft.PowerShell.SDK" Version="6.0.2" />
Expand Down