Skip to content

Commit 115c13b

Browse files
Merge branch 'master' into dependabot/nuget/Microsoft.SourceLink.GitHub-8.0.0
2 parents 77144e1 + 8de28ce commit 115c13b

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,23 @@ jobs:
2525
fail-fast: false
2626
steps:
2727
- name: Checkout
28-
uses: actions/[email protected].1
28+
uses: actions/[email protected].3
2929
with:
3030
fetch-depth: 0
3131
- name: Setup .NET SDK
32-
uses: actions/setup-dotnet@v3.2.0
32+
uses: actions/setup-dotnet@v4.0.0
3333
with:
3434
dotnet-version: |
3535
6.0.x
3636
7.0.x
37+
8.0.x
3738
- name: Build
3839
run: dotnet build src --configuration Release
3940
- name: Tests
4041
run: dotnet test src --configuration Release --no-build
4142
- name: Upload packages
4243
if: matrix.name == 'Linux'
43-
uses: actions/upload-artifact@v3.1.3
44+
uses: actions/upload-artifact@v4.3.2
4445
with:
4546
name: nuget-packages
4647
path: nugets/
@@ -51,12 +52,12 @@ jobs:
5152
if: startsWith(github.ref, 'refs/tags')
5253
runs-on: ubuntu-20.04
5354
steps:
54-
- name: Setup .NET 6
55-
uses: actions/setup-dotnet@v3.2.0
55+
- name: Setup .NET
56+
uses: actions/setup-dotnet@v4.0.0
5657
with:
57-
dotnet-version: 6.0.x
58+
dotnet-version: 8.0.x
5859
- name: Download artifacts
59-
uses: actions/download-artifact@v3.0.2
60+
uses: actions/download-artifact@v4.1.5
6061
with:
6162
name: nuget-packages
6263
path: nugets/

.github/workflows/dependabot-enable-auto-merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- name: Dependabot metadata
1515
id: metadata
16-
uses: dependabot/fetch-metadata@v1.6.0
16+
uses: dependabot/fetch-metadata@v2.0.0
1717
with:
1818
github-token: "${{ secrets.GITHUB_TOKEN }}"
1919
- name: Enable auto-merge for Dependabot PRs

.github/workflows/run-markdownsnippets.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Process documentation
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/[email protected].1
13+
- uses: actions/[email protected].3
1414
- name: Run MarkdownSnippets
1515
run: |
1616
dotnet tool install --global MarkdownSnippets.Tool

src/ServiceComposer.AspNetCore.Testing/ServiceComposer.AspNetCore.Testing.csproj

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

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

77
<PropertyGroup>
@@ -35,13 +35,17 @@
3535
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
3636
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[7.0.1, 8.0.0)" />
3737
</ItemGroup>
38+
39+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
40+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="[8.0.0, 9.0.0)" />
41+
</ItemGroup>
3842

39-
<ItemGroup>
43+
<ItemGroup>
4044
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
4145
</ItemGroup>
4246

4347
<ItemGroup>
44-
<PackageReference Include="MinVer" Version="4.3.0">
48+
<PackageReference Include="MinVer" Version="5.0.0">
4549
<PrivateAssets>all</PrivateAssets>
4650
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4751
</PackageReference>

0 commit comments

Comments
 (0)