Skip to content
This repository was archived by the owner on Dec 20, 2023. It is now read-only.

Commit eec965c

Browse files
nils-anils-a
authored
Merge pull request #83 from nils-a/release/0.5.0
Release/0.5.0
2 parents 0e9ad2e + 08f5113 commit eec965c

File tree

9 files changed

+75
-43
lines changed

9 files changed

+75
-43
lines changed

‎.github/renovate.json‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,28 @@
11
{
2-
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3-
"extends": [ "github>nils-a/renovate-config" ],
4-
"packageRules": [
5-
{
6-
"matchPackageNames": ["cake.tool", "Spectre.Console", "SimpleInjector"],
7-
"enabled": false
8-
}
9-
]
10-
}
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [ "github>nils-org/renovate-config:minimal" ],
4+
"packageRules": [
5+
{
6+
"matchPackageNames": [
7+
"cake.tool",
8+
"SimpleInjector"
9+
],
10+
"matchUpdateTypes": ["minor", "patch"],
11+
"enabled": false
12+
},
13+
{
14+
"matchPackageNames": [
15+
"SimpleInjector"
16+
],
17+
"matchUpdateTypes": ["major"],
18+
"labels": ["Breaking Change"]
19+
},
20+
{
21+
"matchPackagePatterns": [
22+
"^Spectre\\.Console\\..*"
23+
],
24+
"matchUpdateTypes": ["major", "minor"],
25+
"labels": ["Breaking Change"]
26+
}
27+
]
28+
}

‎.github/workflows/build.yml‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ${{ matrix.os }}
2020
strategy:
2121
matrix:
22-
os: [ windows-2019, ubuntu-18.04, macos-11 ]
22+
os: [ windows-2022, ubuntu-22.04, macos-12 ]
2323
env:
2424
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
2525
GITHUB_PAT: ${{ secrets.GH_TOKEN }}
@@ -38,43 +38,44 @@ jobs:
3838
#WYAM_ACCESS_TOKEN: ${{ secrets.WYAM_ACCESS_TOKEN }}
3939
#WYAM_DEPLOY_BRANCH: "gh-pages"
4040
#WYAM_DEPLOY_REMOTE: ${{ github.event.repository.html_url }}
41-
41+
4242
steps:
43-
- name: Checkout the repository
44-
uses: actions/checkout@v3
43+
- name: Checkout the repository
44+
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
4545
- name: Fetch all tags and branches
4646
run: git fetch --prune --unshallow
47-
- uses: actions/setup-dotnet@v3.0.3
47+
- uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
4848
with:
4949
# codecov needs 2.1
5050
dotnet-version: |
5151
2.1
5252
3.1
5353
5.0
5454
6.0
55+
7.0
5556
- name: Cache Tools
56-
uses: actions/cache@v3
57+
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3
5758
with:
5859
path: tools
5960
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
6061
- name: Build project
61-
uses: cake-build/cake-action@v1
62+
uses: cake-build/cake-action@a6eb054329257c9e70a6c6bf01747ad6e1d9d52b # v1
6263
with:
6364
script-path: recipe.cake
6465
target: CI
6566
cake-version: 1.3.0
6667
- name: Upload Issues
67-
uses: actions/upload-artifact@v3
68+
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
6869
with:
6970
if-no-files-found: warn
7071
name: ${{ matrix.os }} Issues
7172
path: |
7273
BuildArtifacts/report.html
7374
BuildArtifacts/**/coverlet/*.xml
7475
- name: Upload Packages
75-
uses: actions/upload-artifact@v3
76+
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
7677
if: runner.os == 'Windows'
7778
with:
7879
if-no-files-found: warn
7980
name: package
80-
path: BuildArtifacts/Packages/**/*
81+
path: BuildArtifacts/Packages/**/*

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
jobs:
1818
analyze:
1919
name: Analyze
20-
runs-on: ubuntu-18.04
20+
runs-on: ubuntu-22.04
2121

2222
strategy:
2323
fail-fast: false
@@ -30,41 +30,42 @@ jobs:
3030

3131
steps:
3232
- name: Checkout repository
33-
uses: actions/checkout@v3
33+
uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4
3434
with:
3535
fetch-depth: 0
3636

37-
- uses: actions/setup-dotnet@v3.0.3
37+
- uses: actions/setup-dotnet@3447fd6a9f9e57506b15f895c5b76d3b197dc7c2 # v3.2.0
3838
with:
3939
# codecov needs 2.1
4040
dotnet-version: |
4141
2.1
4242
3.1
4343
5.0
4444
6.0
45+
7.0
4546
4647
- name: Cache Tools
47-
uses: actions/cache@v3
48+
uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84 # v3
4849
with:
4950
path: tools
5051
key: ${{ runner.os }}-tools-${{ hashFiles('recipe.cake') }}
5152

5253
# Initializes the CodeQL tools for scanning.
5354
- name: Initialize CodeQL
54-
uses: github/codeql-action/init@v2
55+
uses: github/codeql-action/init@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2
5556
with:
5657
languages: ${{ matrix.language }}
5758
# If you wish to specify custom queries, you can do so here or in a config file.
58-
# By default, queries listed here will override any specified in a config file.
59+
# By default, queries listed here will override any specified in a config file.
5960
# Prefix the list here with "+" to use these queries and those in the config file.
6061
# queries: ./path/to/local/query, your-org/your-repo/queries@main
6162

6263
- name: Build project
63-
uses: cake-build/cake-action@v1
64+
uses: cake-build/cake-action@a6eb054329257c9e70a6c6bf01747ad6e1d9d52b # v1
6465
with:
6566
script-path: recipe.cake
6667
target: DotNetCore-Build
6768
cake-version: 1.3.0
6869

6970
- name: Perform CodeQL Analysis
70-
uses: github/codeql-action/analyze@v2
71+
uses: github/codeql-action/analyze@00e563ead9f72a8461b24876bee2d0c2e8bd2ee8 # v2

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
33
"allowPrerelease": true,
4-
"version": "6.0.402",
4+
"version": "7.0.400",
55
"rollForward": "latestFeature"
66
}
7-
}
7+
}

‎recipe.cake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#load nuget:?package=Cake.Recipe&version=3.0.1
1+
#load nuget:?package=Cake.Recipe&version=3.1.1
22

33
var standardNotificationMessage = "Version {0} of {1} has just been released, it will be available here https://www.nuget.org/packages/{1}, once package indexing is complete.";
44

‎src/Directory.Build.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<PropertyGroup>
3+
<LangVersion>latest</LangVersion>
4+
<Nullable>enable</Nullable>
5+
</PropertyGroup>
6+
</Project>

‎src/Spectre.Console.Registrars.SimpleInjector.Tests/Spectre.Console.Registrars.SimpleInjector.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>net5.0;net6.0;net7.0</TargetFrameworks>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="coverlet.msbuild" Version="3.2.0">
8+
<PackageReference Include="coverlet.msbuild" Version="6.0.0">
99
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1010
<PrivateAssets>all</PrivateAssets>
1111
</PackageReference>
12-
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
14-
<PackageReference Include="Moq" Version="4.18.2" />
15-
<PackageReference Include="Shouldly" Version="4.1.0" />
12+
<PackageReference Include="JetBrains.Annotations" Version="2023.2.0" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
14+
<PackageReference Include="Moq" Version="4.20.69" />
15+
<PackageReference Include="Shouldly" Version="4.2.1" />
1616
<PackageReference Include="SimpleInjector" Version="5.4.1" />
17-
<PackageReference Include="Spectre.Console.Cli" Version="0.45.0" />
18-
<PackageReference Include="Spectre.Console.Testing" Version="0.45.0" />
19-
<PackageReference Include="xunit" Version="2.4.2" />
20-
<PackageReference Include="xunit.analyzers" Version="1.0.0" />
21-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
17+
<PackageReference Include="Spectre.Console.Cli" Version="0.47.0" />
18+
<PackageReference Include="Spectre.Console.Testing" Version="0.47.0" />
19+
<PackageReference Include="xunit" Version="2.5.0" />
20+
<PackageReference Include="xunit.analyzers" Version="1.2.0" />
21+
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
2222
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2323
<PrivateAssets>all</PrivateAssets>
2424
</PackageReference>

‎src/Spectre.Console.Registrars.SimpleInjector.sln‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spectre.Console.Registrars.
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spectre.Console.Registrars.SimpleInjector.Tests", "Spectre.Console.Registrars.SimpleInjector.Tests\Spectre.Console.Registrars.SimpleInjector.Tests.csproj", "{A9545423-59A6-43C7-BC0B-A2F775E5AD0F}"
99
EndProject
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionFolder", "SolutionFolder", "{9297320E-891C-415B-AEEC-946F1EACC60F}"
11+
ProjectSection(SolutionItems) = preProject
12+
Directory.Build.props = Directory.Build.props
13+
Directory.Build.targets = Directory.Build.targets
14+
EndProjectSection
15+
EndProject
1016
Global
1117
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1218
Debug|Any CPU = Debug|Any CPU

‎src/Spectre.Console.Registrars.SimpleInjector/Spectre.Console.Registrars.SimpleInjector.csproj‎

Lines changed: 2 additions & 2 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;net5.0;net6.0</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;net7.0;net6.0</TargetFrameworks>
55
<RootNamespace>Spectre.Console</RootNamespace>
66
</PropertyGroup>
77

@@ -34,7 +34,7 @@
3434
<PrivateAssets>all</PrivateAssets>
3535
</PackageReference>
3636
<PackageReference Include="SimpleInjector" Version="5.0.0" PrivateAssets="all" />
37-
<PackageReference Include="Spectre.Console.Cli" Version="0.45.0" PrivateAssets="all" />
37+
<PackageReference Include="Spectre.Console.Cli" Version="0.47.0" PrivateAssets="all" />
3838
</ItemGroup>
3939

4040
</Project>

0 commit comments

Comments
 (0)