Skip to content

Commit 763b28f

Browse files
committed
Merge main into lauterm/otel
Resolve stale CI action pins in favor of main's dependabot versions (actions/checkout@v7, actions/cache@v6, Microsoft.NET.Test.Sdk 18.7.0). Net content is identical to main.
2 parents 8880dfa + 5765cad commit 763b28f

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/actions/setup-dotnet/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ runs:
1010
global-json-file: global.json
1111

1212
- name: Cache NuGet packages
13-
uses: actions/cache@v5
13+
uses: actions/cache@v6
1414
with:
1515
path: ~/.nuget/packages
1616
key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.csproj', 'Directory.Packages.props') }}

.github/workflows/dotnet.publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
test:
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/checkout@v6
24+
- uses: actions/checkout@v7
2525
- uses: ./.github/actions/setup-dotnet
2626

2727
- name: Restore dependencies
@@ -39,7 +39,7 @@ jobs:
3939
permissions:
4040
contents: read
4141
steps:
42-
- uses: actions/checkout@v6
42+
- uses: actions/checkout@v7
4343
- uses: ./.github/actions/setup-dotnet
4444

4545
- name: Resolve package version

.github/workflows/dotnet.tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
format:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v6
22+
- uses: actions/checkout@v7
2323
- uses: ./.github/actions/setup-dotnet
2424

2525
- name: Verify formatting
@@ -31,7 +31,7 @@ jobs:
3131
matrix:
3232
configuration: [ Debug, Release ]
3333
steps:
34-
- uses: actions/checkout@v6
34+
- uses: actions/checkout@v7
3535
- uses: ./.github/actions/setup-dotnet
3636

3737
- name: Restore dependencies

Directory.Packages.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
4040
<PackageVersion Include="coverlet.msbuild" Version="10.0.1" />
4141
<PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="10.7.0" />
42-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
42+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
4343
<PackageVersion Include="xunit.v3" Version="3.2.2" />
4444
<!-- Granular xunit.v3 libs for the shared arch-test base (a class library, not an executable test project) -->
4545
<PackageVersion Include="xunit.v3.extensibility.core" Version="3.2.2" />

0 commit comments

Comments
 (0)