Skip to content

Commit 3275348

Browse files
authored
Merge pull request #5 from devlead/feature/dependencies
Add net8.0 and update dependencies
2 parents 6772675 + c625f68 commit 3275348

File tree

6 files changed

+16
-11
lines changed

6 files changed

+16
-11
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"cake.tool": {
6-
"version": "2.3.0",
6+
"version": "3.1.0",
77
"commands": [
88
"dotnet-cake"
99
]

.github/workflows/build.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ jobs:
2525
with:
2626
dotnet-version: '6.0.x'
2727

28+
- name: Install .NET Core SDK 7.0.x
29+
uses: actions/setup-dotnet@v1
30+
with:
31+
dotnet-version: '7.0.x'
32+
2833
- name: Install .NET SDK (global.json)
2934
uses: actions/setup-dotnet@v3
3035
with:
@@ -44,7 +49,7 @@ jobs:
4449
with:
4550
name: scedi-package
4651
path: dist/package/
47-
52+
4853
- name: Create Release
4954
if: startsWith(github.ref, 'refs/tags/')
5055
uses: softprops/action-gh-release@v1

build.cake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#module nuget:?package=Cake.BuildSystems.Module&version=4.1.0
1+
#module nuget:?package=Cake.BuildSystems.Module&version=5.0.0
22
#load "build/helpers.cake"
33
#load "build/version.cake"
44
#tool "nuget:https://api.nuget.org/v3/index.json?package=nuget.commandline&version=5.3.1"

build/version.cake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#tool "dotnet:?package=minver-cli&version=4.2.0"
2-
#addin "nuget:?package=Cake.MinVer&version=2.0.0"
1+
#tool dotnet:?package=minver-cli&version=4.3.0
2+
#addin nuget:?package=Cake.MinVer&version=3.0.0
33

44
var fallbackVersion = Argument<string>("force-version", EnvironmentVariable("FALLBACK_VERSION") ?? "0.1.0");
55

global.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
"sdk": {
3-
"version": "7.0.100-rc.2.22477.23",
4-
"rollForward": "latestMajor",
3+
"version": "8.0.100-rc.2.23502.2",
54
"allowPrerelease": true
65
}
76
}

src/Spectre.Console.Cli.Extensions.DependencyInjection/Spectre.Console.Cli.Extensions.DependencyInjection.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net7.0;net8.0</TargetFrameworks>
55
</PropertyGroup>
66
<PropertyGroup>
77
<PackageId>Spectre.Console.Cli.Extensions.DependencyInjection</PackageId>
@@ -14,9 +14,10 @@
1414
<PackageProjectUrl>https://github.com/wcomab/Spectre.Console.Cli.Extensions.DependencyInjection</PackageProjectUrl>
1515
</PropertyGroup>
1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" Condition="'$(TargetFramework)' != 'net7.0'" />
18-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0-rc.2.22472.3" Condition="'$(TargetFramework)' == 'net7.0'" />
19-
<PackageReference Include="Spectre.Console.Cli" Version="0.45.0" />
17+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" Condition="'$(TargetFramework)' != 'net7.0' AND '$(TargetFramework)' != 'net8.0'" />
18+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" Condition="'$(TargetFramework)' == 'net7.0'" />
19+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0-rc.2.23479.6" Condition="'$(TargetFramework)' == 'net8.0'" />
20+
<PackageReference Include="Spectre.Console.Cli" Version="0.47.0" />
2021
</ItemGroup>
2122

2223
</Project>

0 commit comments

Comments
 (0)