Skip to content

Commit daf014a

Browse files
reducktedreduckted
authored
Merge pull request #10 from reduckted/feature/xunit3
Updated to xUnit v3
2 parents 72fb8d2 + 088d650 commit daf014a

7 files changed

Lines changed: 50 additions & 16 deletions

File tree

‎.editorconfig‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ insert_final_newline = true
1111
[*.yml]
1212
indent_size = 2
1313

14+
[Directory.Packages.props]
15+
indent_size = 2
16+
insert_final_newline = false
17+
1418
# C# files
1519
[*.cs]
1620

‎Directory.Packages.props‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<PackageVersion Include="Community.VisualStudio.SourceGenerators" Version="1.0.3" />
8+
<PackageVersion Include="Community.VisualStudio.Toolkit.17" Version="17.0.533" />
9+
<PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" />
10+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
11+
<PackageVersion Include="Microsoft.VisualStudio.SDK" Version="17.0.32112.339" />
12+
<PackageVersion Include="Microsoft.VisualStudio.Sdk.TestFramework.Xunit.v3" Version="17.11.66" />
13+
<PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.14.2094" />
14+
<PackageVersion Include="NSubstitute" Version="5.3.0" />
15+
<PackageVersion Include="xunit" Version="2.6.3" />
16+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.3" />
17+
<PackageVersion Include="Xunit.StaFact" Version="3.0.13" />
18+
<PackageVersion Include="xunit.v3" Version="3.0.0" />
19+
</ItemGroup>
20+
</Project>

‎ProjectFilter.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".solution", ".solution", "{
1515
.editorconfig = .editorconfig
1616
CHANGELOG.md = CHANGELOG.md
1717
Directory.Build.props = Directory.Build.props
18+
Directory.Packages.props = Directory.Packages.props
1819
global.json = global.json
1920
nuget.config = nuget.config
2021
README.md = README.md

‎source/ProjectFilter/ProjectFilter.csproj‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,19 @@
7676
</ItemGroup>
7777

7878
<ItemGroup>
79-
<PackageReference Include="Community.VisualStudio.SourceGenerators" Version="1.0.3">
79+
<PackageReference Include="Community.VisualStudio.SourceGenerators">
8080
<PrivateAssets>all</PrivateAssets>
8181
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8282
</PackageReference>
83-
<PackageReference Include="Community.VisualStudio.Toolkit.17" Version="17.0.533" />
84-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
83+
<PackageReference Include="Community.VisualStudio.Toolkit.17" />
84+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
8585
<PrivateAssets>all</PrivateAssets>
8686
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8787
</PackageReference>
88-
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.32112.339" ExcludeAssets="runtime">
88+
<PackageReference Include="Microsoft.VisualStudio.SDK" ExcludeAssets="runtime">
8989
<IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
9090
</PackageReference>
91-
<PackageReference Include="Microsoft.VSSDK.BuildTools" Version="17.14.2094">
91+
<PackageReference Include="Microsoft.VSSDK.BuildTools">
9292
<PrivateAssets>all</PrivateAssets>
9393
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
9494
</PackageReference>
@@ -102,6 +102,14 @@
102102
<Reference Include="WindowsBase" />
103103
</ItemGroup>
104104

105+
<ItemGroup>
106+
<Compile Update="VSCommandTable.cs">
107+
<DesignTime>True</DesignTime>
108+
<AutoGen>True</AutoGen>
109+
<DependentUpon>VSCommandTable.vsct</DependentUpon>
110+
</Compile>
111+
</ItemGroup>
112+
105113
<Target Name="VsixVersion" Returns="$(Version)" />
106114

107115
<!-- Workaround for https://github.com/dotnet/wpf/issues/6792 -->

‎tests/ProjectFilter.UnitTests/ProjectFilter.UnitTests.csproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22

33
<PropertyGroup>
44
<RootNamespace>ProjectFilter</RootNamespace>
5+
<OutputType>Exe</OutputType>
56
<IsPackable>false</IsPackable>
67
</PropertyGroup>
78

89
<ItemGroup>
9-
<PackageReference Include="Community.VisualStudio.Toolkit.17" Version="17.0.533" />
10-
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
10+
<PackageReference Include="Community.VisualStudio.Toolkit.17" />
11+
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
1112
<PrivateAssets>all</PrivateAssets>
1213
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1314
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
15-
<PackageReference Include="Microsoft.VisualStudio.SDK" Version="17.0.32112.339" />
16-
<PackageReference Include="Microsoft.VisualStudio.Sdk.TestFramework" Version="17.2.7" />
17-
<PackageReference Include="Microsoft.VisualStudio.Sdk.TestFramework.Xunit" Version="17.2.7" />
18-
<PackageReference Include="NSubstitute" Version="5.3.0" />
19-
<PackageReference Include="xunit" Version="2.6.3" />
20-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.5">
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
16+
<PackageReference Include="Microsoft.VisualStudio.SDK" />
17+
<PackageReference Include="Microsoft.VisualStudio.Sdk.TestFramework.Xunit.v3" />
18+
<PackageReference Include="NSubstitute" />
19+
<PackageReference Include="xunit.runner.visualstudio">
2120
<PrivateAssets>all</PrivateAssets>
2221
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2322
</PackageReference>
24-
<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
23+
<PackageReference Include="Xunit.StaFact" />
24+
<PackageReference Include="xunit.v3" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

‎tests/ProjectFilter.UnitTests/UI/FilterDialogViewModelTests.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
namespace ProjectFilter.UI;
1616

1717

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

2021
public class LoadingVisibilityProperty : TestBase {

‎tests/ProjectFilter.UnitTests/UI/HierarchyTreeViewItemCollectionTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public void ReturnsNullWhenAllItemsAreIndeterminate() {
114114
public class FilterMethod {
115115

116116
[Fact]
117-
public void FiltersCollectionToOnlyContainItemsThatMatchFilterWhenItemshaveNoChildren() {
117+
public void FiltersCollectionToOnlyContainItemsThatMatchFilterWhenItemsHaveNoChildren() {
118118
HierarchyTreeViewItemCollection collection;
119119
HierarchyTreeViewItem foo;
120120
HierarchyTreeViewItem bar;

0 commit comments

Comments
 (0)