From 8e1588ee96c442c7aa48e907d9f744ae4dd74079 Mon Sep 17 00:00:00 2001 From: Mark Hoek Date: Fri, 2 Dec 2022 16:10:42 +0100 Subject: [PATCH 1/2] Support SpecFlow v4 beta and upgrade packages Requires .NET Framework v4.6.2 or above. Requires .NET 6.0.0 or above. +semver: major --- GitVersion.yml | 4 ---- README.md | 4 ++-- .../SpecFlow.DependencyInjection.Tests.csproj | 20 +++++++++---------- .../SpecFlow.DependencyInjection.csproj | 12 +++++------ 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/GitVersion.yml b/GitVersion.yml index f9f5ce0..6bb4cdb 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -4,9 +4,5 @@ assembly-file-versioning-format: '{Major}.{Minor}.{Patch}.{env:BUILD_BUILDID ?? assembly-informational-format: '{SemVer}+{ShortSha}' continuous-delivery-fallback-tag: preview branches: - main: - regex: ^main$ - develop: - regex: ^dev$ pull-request: tag: pr diff --git a/README.md b/README.md index 0cf4e2e..bcd0cb6 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,8 @@ SpecFlow plugin that enables to use Microsoft.Extensions.DependencyInjection for resolving test dependencies. Currently supports: -* [SpecFlow v3.9.8](https://www.nuget.org/packages/SpecFlow/3.9.8) or above -* [Microsoft.Extensions.DependencyInjection v3.1.0](https://www.nuget.org/packages/Microsoft.Extensions.DependencyInjection/3.1.0) or above +* [SpecFlow v4](https://www.nuget.org/packages/SpecFlow/4) or above +* [Microsoft.Extensions.DependencyInjection v6.0.0](https://www.nuget.org/packages/Microsoft.Extensions.DependencyInjection/6.0.0) or above Based on [SpecFlow.Autofac](https://github.com/gasparnagy/SpecFlow.Autofac). Listed on [Available Plugins for SpecFlow](https://specflow.org/documentation/Available-Plugins/). diff --git a/SpecFlow.DependencyInjection.Tests/SpecFlow.DependencyInjection.Tests.csproj b/SpecFlow.DependencyInjection.Tests/SpecFlow.DependencyInjection.Tests.csproj index 30e3080..4c2d39a 100644 --- a/SpecFlow.DependencyInjection.Tests/SpecFlow.DependencyInjection.Tests.csproj +++ b/SpecFlow.DependencyInjection.Tests/SpecFlow.DependencyInjection.Tests.csproj @@ -1,7 +1,7 @@  - net461;netcoreapp3.1;net5.0;net6.0 + net462;net6.0 false SpecFlow.DependencyInjection SolidToken.SpecFlow.DependencyInjection.Tests @@ -9,27 +9,27 @@ - + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/SpecFlow.DependencyInjection/SpecFlow.DependencyInjection.csproj b/SpecFlow.DependencyInjection/SpecFlow.DependencyInjection.csproj index fb4a30a..167d7d7 100644 --- a/SpecFlow.DependencyInjection/SpecFlow.DependencyInjection.csproj +++ b/SpecFlow.DependencyInjection/SpecFlow.DependencyInjection.csproj @@ -31,15 +31,15 @@ - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + From 3e7731d14c67e18729aff055cc1420203be88ff2 Mon Sep 17 00:00:00 2001 From: Mark Hoek Date: Fri, 2 Dec 2022 16:33:07 +0100 Subject: [PATCH 2/2] Update Azure Pipelines --- azure-pipelines.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a628bc0..9d0ff9e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -32,14 +32,6 @@ stages: jobs: - job: Build steps: - - task: UseDotNet@2 - displayName: '.NET SDK 3.1 (until December 3, 2022)' - inputs: - version: 3.1.x - - task: UseDotNet@2 - displayName: '.NET SDK 5.0 (until May 8, 2022)' - inputs: - version: 5.0.x - task: UseDotNet@2 displayName: '.NET SDK 6.0 (until November 8, 2024)' inputs: @@ -47,7 +39,7 @@ stages: - task: gitversion/setup@0 displayName: 'Prepare' inputs: - versionSpec: '5.x' + versionSpec: '5.11.1' - task: gitversion/execute@0 name: 'Version' - task: DotNetCoreCLI@2