Skip to content

Commit 6648fbc

Browse files
clrudolphigasparnagy304NotModified
authored
Update new project wizard to latest framework versions (#113)
* Update New Project Wizard Dialog to refer to Reqnroll v3 and the latest versions of the test frameworks. Add xUnit.v3 and TUnit. Remove unsupported versions of older .net frameworks. * Update Changelog * Revert default .net framework to .net8.0 * Correcting combobox items in New Project Dialog xaml file. * Update Reqnroll.VisualStudio/UI/ViewModels/AddNewReqnrollProjectViewModel.cs Co-authored-by: Julian Verdurmen <[email protected]> --------- Co-authored-by: Gáspár Nagy <[email protected]> Co-authored-by: Julian Verdurmen <[email protected]>
1 parent ed6b6d7 commit 6648fbc

File tree

4 files changed

+22
-17
lines changed

4 files changed

+22
-17
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## Improvements:
44

5+
* New Project Wizard references the latest versions of supported test frameworks and .Net frameworks
56
* Format Document will now right-align numeric values in tables. This can be overridden to left align them by setting "gherkin_table_cell_right_align_numeric_content = false" in .editorconfig file within a [*.feature] section.
67

78
## Bug fixes:

‎Reqnroll.VisualStudio.ProjectTemplate/ProjectTemplate.csproj‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,22 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />$if$ ('$unittestframework$' == 'xUnit')
11-
<PackageReference Include="Reqnroll.xUnit" Version="2.2.1" />
12-
<PackageReference Include="xunit" Version="2.8.1" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />$endif$$if$ ('$unittestframework$' == 'NUnit')
14-
<PackageReference Include="Reqnroll.NUnit" Version="2.2.1" />
15-
<PackageReference Include="nunit" Version="3.14.0" />
16-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />$endif$$if$ ('$unittestframework$' == 'MSTest')
17-
<PackageReference Include="Reqnroll.MsTest" Version="2.2.1" />
18-
<PackageReference Include="MSTest.TestAdapter" Version="3.4.3" />
19-
<PackageReference Include="MSTest.TestFramework" Version="3.4.3" />$endif$$if$ ('$fluentassertionsincluded$' == 'True')
20-
<PackageReference Include="FluentAssertions" Version="6.12.0" />$endif$
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />$if$ ('$unittestframework$' == 'xUnit')
11+
<PackageReference Include="Reqnroll.xUnit" Version="3.0.0" />
12+
<PackageReference Include="xunit" Version="2.9.3" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.3" />$endif$$if$ ('$unittestframework$' == 'xUnit3')
14+
<PackageReference Include="Reqnroll.xUnit3" Version="3.0.0" />
15+
<PackageReference Include="xunit.v3" Version="3.0.0" />
16+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.3" />$endif$$if$ ('$unittestframework$' == 'NUnit')
17+
<PackageReference Include="Reqnroll.NUnit" Version="3.0.0" />
18+
<PackageReference Include="nunit" Version="4.4.0" />
19+
<PackageReference Include="NUnit3TestAdapter" Version="5.1.0" />$endif$$if$ ('$unittestframework$' == 'MSTest')
20+
<PackageReference Include="Reqnroll.MsTest" Version="3.0.0" />
21+
<PackageReference Include="MSTest.TestAdapter" Version="3.10.2" />
22+
<PackageReference Include="MSTest.TestFramework" Version="3.10.2" />$endif$$if$ ('$unittestframework$' == 'TUnit')
23+
<PackageReference Include="Reqnroll.TUnit" Version="3.0.0" />
24+
<PackageReference Include="TUnit" Version="0.55.23" />$endif$$if$ ('$fluentassertionsincluded$' == 'True')
25+
<PackageReference Include="FluentAssertions" Version="7.2.0" />$endif$
2126
</ItemGroup>
2227

2328
<ItemGroup>

‎Reqnroll.VisualStudio.UI/Dialogs/AddNewReqnrollProjectDialog.xaml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -229,10 +229,8 @@
229229
<ComboBoxItem Tag="net471">.NET Framework 4.7.1</ComboBoxItem>
230230
<ComboBoxItem Tag="net472">.NET Framework 4.7.2</ComboBoxItem>
231231
<ComboBoxItem Tag="net48">.NET Framework 4.8</ComboBoxItem>
232-
<ComboBoxItem Tag="net48">.NET Framework 4.8.1</ComboBoxItem>
233-
<ComboBoxItem Tag="net6.0">.NET 6.0</ComboBoxItem>
234-
<ComboBoxItem Tag="net7.0">.NET 7.0</ComboBoxItem>
235-
<ComboBoxItem Tag="net8.0" IsSelected="True">.NET 8.0</ComboBoxItem>
232+
<ComboBoxItem Tag="net481">.NET Framework 4.8.1</ComboBoxItem>
233+
<ComboBoxItem Tag="net8.0" IsSelected="True">.NET 8.0</ComboBoxItem>
236234
<ComboBoxItem Tag="net9.0">.NET 9.0</ComboBoxItem>
237235
</ComboBox>
238236
</StackPanel>

‎Reqnroll.VisualStudio/UI/ViewModels/AddNewReqnrollProjectViewModel.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ public class AddNewReqnrollProjectViewModel : INotifyPropertyChanged
55
{
66
private const string MsTest = "MsTest";
77
private const string Net8 = "net8.0";
8+
private const string Net9 = "net9.0";
89

910
#if DEBUG
1011
public static AddNewReqnrollProjectViewModel DesignData = new()
1112
{
12-
DotNetFramework = Net8,
13+
DotNetFramework = Net9,
1314
UnitTestFramework = MsTest,
1415
FluentAssertionsIncluded = false
1516
};
@@ -31,7 +32,7 @@ public string DotNetFramework
3132
// See https://xceed.com/fluent-assertions-faq/
3233
// Maybe we could consider suggesting https://github.com/shouldly/shouldly instead.
3334
public bool FluentAssertionsIncluded { get; set; } = false;
34-
public ObservableCollection<string> TestFrameworks { get; } = new(new List<string> { "MSTest", "NUnit", "xUnit" });
35+
public ObservableCollection<string> TestFrameworks { get; } = new(new List<string> { "MSTest", "NUnit", "xUnit", "xUnit.v3", "TUnit" });
3536

3637
public event PropertyChangedEventHandler PropertyChanged;
3738

0 commit comments

Comments
 (0)