Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Setup .NET
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.0.x
dotnet-version: 9.0.x
- id: versions
name: Calculate versions
shell: pwsh
Expand Down Expand Up @@ -121,7 +121,7 @@ jobs:
dotnet add ./Tests/Connector/Reqnroll.VisualStudio.ReqnrollConnector.Tests/Reqnroll.VisualStudio.ReqnrollConnector.Tests.csproj package GitHubActionsTestLogger
dotnet add ./Tests/Connector/Reqnroll.VisualStudio.ReqnrollConnector.V1.Tests/Reqnroll.VisualStudio.ReqnrollConnector.V1.Tests.csproj package GitHubActionsTestLogger
- name: Build
run: msbuild -property:DeployExtension=false -property:Configuration=${{ steps.versions.outputs.product_configuration }} ${{ steps.versions.outputs.build_params }}
run: msbuild -restore -target:Rebuild -property:DeployExtension=false -property:Configuration=${{ steps.versions.outputs.product_configuration }} ${{ steps.versions.outputs.build_params }}
- name: Unit Tests
run: dotnet test ./Tests/Reqnroll.VisualStudio.Tests/Reqnroll.VisualStudio.Tests.csproj ${{ steps.versions.outputs.test_params }}
- name: Upload vsix
Expand Down
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

## Improvements:

## Bug fixes:
*Added support for .NET 9 through the Visual Studio extension.

*Contributors of this release (in alphabetical order):*
*Contributors of this release (in alphabetical order):* @UL-ChrisGlew

# v2024.6.176 - 2024-11-08

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<AssemblyName>reqnroll-vs</AssemblyName>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\reqnroll.snk</AssemblyOriginatorKeyFile>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<AssemblyName>specflow-vs</AssemblyName>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\reqnroll.snk</AssemblyOriginatorKeyFile>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<AssemblyName>specflow-vs</AssemblyName>
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\reqnroll.snk</AssemblyOriginatorKeyFile>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
Expand Down
12 changes: 12 additions & 0 deletions Connectors/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ dotnet publish -f net8.0 $buildArgs

Copy-Item bin\$configuration\net8.0\publish\ $outputFolder\Reqnroll-Generic-net8.0\ -Recurse

dotnet publish -f net9.0 $buildArgs

Copy-Item bin\$configuration\net9.0\publish\ $outputFolder\Reqnroll-Generic-net9.0\ -Recurse

popd

# build SpecFlow V1 any cpu
Expand Down Expand Up @@ -104,6 +108,10 @@ dotnet publish -f net8.0 $buildArgs

Copy-Item bin\$configuration\net8.0\publish\ $outputFolder\SpecFlow-V3-net8.0\ -Recurse

dotnet publish -f net9.0 $buildArgs

Copy-Item bin\$configuration\net9.0\publish\ $outputFolder\SpecFlow-V3-net9.0\ -Recurse

cd ..

# build SpecFlow generic any cpu
Expand All @@ -122,4 +130,8 @@ dotnet publish -f net8.0 $buildArgs

Copy-Item bin\$configuration\net8.0\publish\ $outputFolder\SpecFlow-Generic-net8.0\ -Recurse

dotnet publish -f net9.0 $buildArgs

Copy-Item bin\$configuration\net9.0\publish\ $outputFolder\SpecFlow-Generic-net9.0\ -Recurse

popd
6 changes: 3 additions & 3 deletions Reqnroll.VisualStudio.ProjectTemplate/ProjectTemplate.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />$if$ ('$unittestframework$' == 'xUnit')
<PackageReference Include="Reqnroll.xUnit" Version="2.0.2" />
<PackageReference Include="Reqnroll.xUnit" Version="2.2.1" />
<PackageReference Include="xunit" Version="2.8.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1" />$endif$$if$ ('$unittestframework$' == 'NUnit')
<PackageReference Include="Reqnroll.NUnit" Version="2.0.2" />
<PackageReference Include="Reqnroll.NUnit" Version="2.2.1" />
<PackageReference Include="nunit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />$endif$$if$ ('$unittestframework$' == 'MSTest')
<PackageReference Include="Reqnroll.MsTest" Version="2.0.2" />
<PackageReference Include="Reqnroll.MsTest" Version="2.2.1" />
<PackageReference Include="MSTest.TestAdapter" Version="3.4.3" />
<PackageReference Include="MSTest.TestFramework" Version="3.4.3" />$endif$$if$ ('$fluentassertionsincluded$' == 'True')
<PackageReference Include="FluentAssertions" Version="6.12.0" />$endif$
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,8 @@
<ComboBoxItem Tag="net6.0">.NET 6.0</ComboBoxItem>
<ComboBoxItem Tag="net7.0">.NET 7.0</ComboBoxItem>
<ComboBoxItem Tag="net8.0" IsSelected="True">.NET 8.0</ComboBoxItem>
</ComboBox>
<ComboBoxItem Tag="net9.0">.NET 9.0</ComboBoxItem>
</ComboBox>
</StackPanel>

<StackPanel Grid.Row="1" Grid.Column="0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ public class GenericOutProcReqnrollConnector : OutProcReqnrollConnector
private const string ConnectorNet60 = @"Reqnroll-Generic-net6.0\reqnroll-vs.dll";
private const string ConnectorNet70 = @"Reqnroll-Generic-net7.0\reqnroll-vs.dll";
private const string ConnectorNet80 = @"Reqnroll-Generic-net8.0\reqnroll-vs.dll";
private const string ConnectorNet90 = @"Reqnroll-Generic-net9.0\reqnroll-vs.dll";
private const string SpecFlowConnectorNet60 = @"SpecFlow-Generic-net6.0\specflow-vs.dll";
private const string SpecFlowConnectorNet70 = @"SpecFlow-Generic-net7.0\specflow-vs.dll";
private const string SpecFlowConnectorNet80 = @"SpecFlow-Generic-net8.0\specflow-vs.dll";
private const string SpecFlowConnectorNet90 = @"SpecFlow-Generic-net9.0\specflow-vs.dll";

public GenericOutProcReqnrollConnector(
DeveroomConfiguration configuration,
Expand Down Expand Up @@ -46,6 +48,13 @@ protected override string GetConnectorPath(List<string> arguments)
SpecFlowConnectorNet80 : ConnectorNet80;
}

if (_targetFrameworkMoniker.IsNetCore && _targetFrameworkMoniker.HasVersion &&
_targetFrameworkMoniker.Version.Major >= 9)
{
connector = _projectSettings.IsSpecFlowProject ?
SpecFlowConnectorNet90 : ConnectorNet90;
}

var connectorsFolder = GetConnectorsFolder();
return GetDotNetExecCommand(arguments, connectorsFolder, connector);
}
Expand Down
5 changes: 5 additions & 0 deletions Reqnroll.VisualStudio/ProjectSystem/TargetFrameworkMoniker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ public class TargetFrameworkMoniker
private const string Net6ShortValuePrefix = "net6";
private const string Net7ShortValuePrefix = "net7";
private const string Net8ShortValuePrefix = "net8";
private const string Net9ShortValuePrefix = "net9";

private TargetFrameworkMoniker(string value)
{
Expand Down Expand Up @@ -76,6 +77,10 @@ public static TargetFrameworkMoniker CreateFromShortName(string shortValue)
{
value = $".NETCoreApp,Version=v{shortValue.Substring(Net8ShortValuePrefix.Length - 1)}";
}
else if (shortValue.StartsWith(Net9ShortValuePrefix))
{
value = $".NETCoreApp,Version=v{shortValue.Substring(Net9ShortValuePrefix.Length - 1)}";
}
else if (shortValue.StartsWith(NetFrameworkShortValuePrefix))
{
if (shortValue.Length == 5)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ Scenario Outline: Discover bindings from a Reqnroll project in different .NET Co
When the binding discovery performed
Then the discovery succeeds with several step definitions
Examples:
| framework |
| net6.0 |
| net7.0 |
| net8.0 |
| framework |
| net6.0 |
| net7.0 |
| net8.0 |
| net9.0 |
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ Examples:
| net6.0 |
| net7.0 |
| net8.0 |
| net9.0 |
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ public static class DomainDefaults
//TODO: calculate latest versions automatically
public static NuGetVersion LatestSpecFlowV2Version = new("2.4.1", "2.4.1");
public static NuGetVersion LatestSpecFlowV3Version = new("3.6.23", "3.6.23");
public static NuGetVersion LatestReqnrollVersion = new("2.0.2", "2.0.2");
public static NuGetVersion LatestReqnrollVersion = new("2.2.1", "2.2.1");
}
Loading