Skip to content
This repository has been archived by the owner on May 22, 2024. It is now read-only.

Change SDK and NuGet selection #20

Merged
merged 4 commits into from
Feb 16, 2020
Merged

Change SDK and NuGet selection #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
69c6e36
Add global.json to use .NET 3.1 SDK
mbhoek Feb 16, 2020
0148ef7
Change applicable versions of NuGet packages
mbhoek Feb 16, 2020
3cd145a
Improve project selection in Azure Pipeline
mbhoek Feb 16, 2020
08db5e8
Fix incorrectly named task property
mbhoek Feb 16, 2020
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
27 changes: 7 additions & 20 deletions SpecFlow.DependencyInjection.Tests/SpecFlow.DependencyInjection.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,36 +8,23 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersionTask" Version="5.1.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="GitVersionTask" Version="5.1.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
</ItemGroup>

<!-- .NET Core 2.1 LTS -->
<!-- .NET Core 2.1 LTS (always use lowest applicable version) -->
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1' ">
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.0.188" />
<PackageReference Include="SpecFlow.xUnit" Version="3.0.188" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

<!-- .NET Core 3.1 LTS -->
<!-- .NET Core 3.1 LTS (always use latest applicable version) -->
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
<PackageReference Include="SpecFlow.Tools.MsBuild.Generation" Version="3.1.82" />
<PackageReference Include="SpecFlow.xUnit" Version="3.1.82" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

<ItemGroup>
Expand Down
5 changes: 3 additions & 2 deletions SpecFlow.DependencyInjection.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.705
# Visual Studio Version 16
VisualStudioVersion = 16.0.29721.120
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SpecFlow.DependencyInjection", "SpecFlow.DependencyInjection\SpecFlow.DependencyInjection.csproj", "{CACF906A-7230-4E37-984C-739AB1620995}"
EndProject
Expand All @@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.gitignore = .gitignore
azure-pipelines.yml = azure-pipelines.yml
GitVersion.yml = GitVersion.yml
global.json = global.json
README.md = README.md
EndProjectSection
EndProject
Expand Down
5 changes: 1 addition & 4 deletions SpecFlow.DependencyInjection/SpecFlow.DependencyInjection.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@
<None Include="build\**" Pack="True" PackagePath="build\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="GitVersionTask" Version="5.1.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="GitVersionTask" Version="5.1.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="SpecFlow" Version="3.0.188" />
Expand Down
10 changes: 6 additions & 4 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,33 @@ steps:
displayName: Restore
inputs:
command: restore
# Build
# Build .NET Standard 2.0
- task: DotNetCoreCLI@2
displayName: Build
inputs:
command: build
projects: 'SpecFlow.DependencyInjection'
arguments: '--configuration $(BuildConfiguration)'
# Test .NET Core 2.1
- task: DotNetCoreCLI@2
displayName: Test .NET Core 2.1
inputs:
command: test
projects: '**/*.Tests/*.csproj'
projects: 'SpecFlow.DependencyInjection.Tests'
arguments: '--configuration $(BuildConfiguration) --framework netcoreapp2.1'
# Test .NET Core 3.1
- task: DotNetCoreCLI@2
displayName: Test .NET Core 3.1
inputs:
command: test
projects: '**/*.Tests/*.csproj'
projects: 'SpecFlow.DependencyInjection.Tests'
arguments: '--configuration $(BuildConfiguration) --framework netcoreapp3.1'
# Pack
# Pack output of Build command
- task: DotNetCoreCLI@2
displayName: Pack
inputs:
command: pack
packagesToPack: 'SpecFlow.DependencyInjection'
nobuild: true
# Publish
- task: PublishBuildArtifacts@1
Expand Down
5 changes: 5 additions & 0 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"sdk": {
"version": "3.1.101"
}
}