Skip to content

Updated to xUnit v3 #10

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
reduckted merged 1 commit into from
Aug 13, 2025
Merged

Updated to xUnit v3 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ insert_final_newline = true
[*.yml]
indent_size = 2

[Directory.Packages.props]
indent_size = 2
insert_final_newline = false

# C# files
[*.cs]

Expand Down
20 changes: 20 additions & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Community.VisualStudio.SourceGenerators" Version="1.0.3" />
<PackageVersion Include="Community.VisualStudio.Toolkit.17" Version="17.0.533" />
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.0.32112.339" />
<PackageVersion Include="Microsoft.VisualStudio.Sdk.TestFramework.Xunit.v3" Version="17.11.66" />
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.14.2094" />
<PackageVersion Include="NSubstitute" Version="5.3.0" />
<PackageVersion Include="xunit" Version="2.6.3" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
<PackageVersion Include="Xunit.StaFact" Version="3.0.13" />
<PackageVersion Include="xunit.v3" Version="3.0.0" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions ProjectFilter.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".solution", ".solution", "{
.editorconfig = .editorconfig
CHANGELOG.md = CHANGELOG.md
Directory.Build.props = Directory.Build.props
Directory.Packages.props = Directory.Packages.props
global.json = global.json
nuget.config = nuget.config
README.md = README.md
Expand Down
18 changes: 13 additions & 5 deletions source/ProjectFilter/ProjectFilter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,19 +76,19 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Community.VisualStudio.SourceGenerators" Version="1.0.3">
<PackageReference Include="Community.VisualStudio.SourceGenerators">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Community.VisualStudio.Toolkit.17" Version="17.0.533" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
<PackageReference Include="Community.VisualStudio.Toolkit.17" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.32112.339" ExcludeAssets="runtime">
<PackageReference Include="Microsoft.VisualStudio.SDK" ExcludeAssets="runtime">
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.14.2094">
<PackageReference Include="Microsoft.VSSDK.BuildTools">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand All @@ -102,6 +102,14 @@
<Reference Include="WindowsBase" />
</ItemGroup>

<ItemGroup>
<Compile Update="VSCommandTable.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>VSCommandTable.vsct</DependentUpon>
</Compile>
</ItemGroup>

<Target Name="VsixVersion" Returns="$(Version)" />

<!-- Workaround for https://github.com/dotnet/wpf/issues/6792 -->
Expand Down
20 changes: 10 additions & 10 deletions tests/ProjectFilter.UnitTests/ProjectFilter.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@

<PropertyGroup>
<RootNamespace>ProjectFilter</RootNamespace>
<OutputType>Exe</OutputType>
<IsPackable>false</IsPackable>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Community.VisualStudio.Toolkit.17" Version="17.0.533" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
<PackageReference Include="Community.VisualStudio.Toolkit.17" />
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.32112.339" />
<PackageReference Include="Microsoft.VisualStudio.Sdk.TestFramework" Version="17.2.7" />
<PackageReference Include="Microsoft.VisualStudio.Sdk.TestFramework.Xunit" Version="17.2.7" />
<PackageReference Include="NSubstitute" Version="5.3.0" />
<PackageReference Include="xunit" Version="2.6.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="Microsoft.VisualStudio.SDK" />
<PackageReference Include="Microsoft.VisualStudio.Sdk.TestFramework.Xunit.v3" />
<PackageReference Include="NSubstitute" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
<PackageReference Include="Xunit.StaFact" />
<PackageReference Include="xunit.v3" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions tests/ProjectFilter.UnitTests/UI/FilterDialogViewModelTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
namespace ProjectFilter.UI;


[SuppressMessage("Usage", "VSTHRD003:Avoid awaiting foreign Tasks", Justification = "Not using VS services.")]
public static class FilterDialogViewModelTests {

public class LoadingVisibilityProperty : TestBase {
Expand Down
2 changes: 1 addition & 1 deletion tests/ProjectFilter.UnitTests/UI/HierarchyTreeViewItemCollectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public void ReturnsNullWhenAllItemsAreIndeterminate() {
public class FilterMethod {

[Fact]
public void FiltersCollectionToOnlyContainItemsThatMatchFilterWhenItemshaveNoChildren() {
public void FiltersCollectionToOnlyContainItemsThatMatchFilterWhenItemsHaveNoChildren() {
HierarchyTreeViewItemCollection collection;
HierarchyTreeViewItem foo;
HierarchyTreeViewItem bar;
Expand Down
Loading