Skip to content

Commit 14a6b5f

Browse files
martincostellomartincostello
committed
Merge branch 'main' into dotnet-vnext
2 parents 10bb70c + f059440 commit 14a6b5f

File tree

8 files changed

+18
-18
lines changed

8 files changed

+18
-18
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"rollForward": false
1111
},
1212
"meziantou.framework.nugetpackagevalidation.tool": {
13-
"version": "1.0.31",
13+
"version": "1.0.36",
1414
"commands": [
1515
"meziantou.validate-nuget-package"
1616
],

‎.github/workflows/ci.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
run: dotnet test --configuration Release --logger:"GitHubActions;report-warnings=false"
7171

7272
- name: Generate SBOM
73-
uses: anchore/sbom-action@f8bdd1d8ac5e901a77a92f111440fdb1b593736b # v0.20.6
73+
uses: anchore/sbom-action@8e94d75ddd33f69f691467e42275782e4bfefe84 # v0.20.9
7474
if: runner.os == 'Windows'
7575
with:
7676
artifact-name: grafana-opentelemetry-dotnet.spdx.json
@@ -90,7 +90,7 @@ jobs:
9090
./artifacts/package/release/*
9191
9292
- name: Publish NuGet packages
93-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
93+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
9494
with:
9595
name: packages-${{ matrix.os-name }}
9696
path: ./artifacts/package/release
@@ -112,7 +112,7 @@ jobs:
112112
steps:
113113

114114
- name: Download packages
115-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
115+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
116116
with:
117117
name: packages-windows
118118

@@ -173,7 +173,7 @@ jobs:
173173
steps:
174174

175175
- name: Download packages
176-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
176+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
177177
with:
178178
name: packages-windows
179179

@@ -214,7 +214,7 @@ jobs:
214214
steps:
215215

216216
- name: Download packages
217-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
217+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
218218
with:
219219
name: packages-windows
220220

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ jobs:
3636
show-progress: false
3737

3838
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
39+
uses: github/codeql-action/init@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
4040
with:
4141
build-mode: none
4242
languages: ${{ matrix.language }}
4343
queries: security-and-quality
4444

4545
- name: Perform CodeQL Analysis
46-
uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
46+
uses: github/codeql-action/analyze@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
4747
with:
4848
category: '/language:${{ matrix.language }}'
4949

‎.github/workflows/oats.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: dotnet build --configuration Release
3636

3737
- name: Publish NuGet packages
38-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
38+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
3939
with:
4040
name: oats-packages
4141
path: ./artifacts/package/release
@@ -56,7 +56,7 @@ jobs:
5656
show-progress: false
5757

5858
- name: Download packages
59-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
59+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
6060
with:
6161
name: oats-packages
6262
path: ./.packages
@@ -79,7 +79,7 @@ jobs:
7979
run: oats --timeout=5m ./docker/docker-compose-aspnetcore
8080

8181
- name: Upload log file
82-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
82+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
8383
if: failure()
8484
with:
8585
name: docker-compose.log

‎docker/docker-compose-aspnetcore/docker-compose.oats.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ services:
2222
- redis
2323
- mssql
2424
redis:
25-
image: redis:8.2@sha256:f0957bcaa75fd58a9a1847c1f07caf370579196259d69ac07f2e27b5b389b021
25+
image: redis:8.2.3@sha256:5c7c0445ed86918cb9efb96d95a6bfc03ed2059fe2c5f02b4d74f477ffe47915
2626
ports:
2727
- "6379:6379"
2828
healthcheck:
@@ -38,7 +38,7 @@ services:
3838
- ACCEPT_EULA=Y
3939
- MSSQL_SA_PASSWORD=Password12345%%
4040
localstack:
41-
image: localstack/localstack:4.9.2@sha256:59373b4a27dba3ec15c4db0b7455f0cb68c8a42300e2cbbe362b440f9a131697
41+
image: localstack/localstack:4.10.0@sha256:a65ee2a9d45a7a34a1f1faae515d2e577ce11210312c077700ccc82daefec238
4242
ports:
4343
- "4510-4559:4510-4559"
4444
- "4566:4566"

‎docker/docker-compose-aspnetcore/docker-compose.self-contained.oats.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ services:
2323
- redis
2424
- mssql
2525
redis:
26-
image: redis:8.2@sha256:f0957bcaa75fd58a9a1847c1f07caf370579196259d69ac07f2e27b5b389b021
26+
image: redis:8.2.3@sha256:5c7c0445ed86918cb9efb96d95a6bfc03ed2059fe2c5f02b4d74f477ffe47915
2727
ports:
2828
- "6379:6379"
2929
healthcheck:
@@ -39,7 +39,7 @@ services:
3939
- ACCEPT_EULA=Y
4040
- MSSQL_SA_PASSWORD=Password12345%%
4141
localstack:
42-
image: localstack/localstack:4.9.2@sha256:59373b4a27dba3ec15c4db0b7455f0cb68c8a42300e2cbbe362b440f9a131697
42+
image: localstack/localstack:4.10.0@sha256:a65ee2a9d45a7a34a1f1faae515d2e577ce11210312c077700ccc82daefec238
4343
ports:
4444
- "4510-4559:4510-4559"
4545
- "4566:4566"

‎docker/docker-compose-aspnetcore/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ services:
2020
- OTEL_BSP_SCHEDULE_DELAY=5000
2121
- OTEL_METRIC_EXPORT_INTERVAL=5000
2222
redis:
23-
image: redis:8.2@sha256:f0957bcaa75fd58a9a1847c1f07caf370579196259d69ac07f2e27b5b389b021
23+
image: redis:8.2.3@sha256:5c7c0445ed86918cb9efb96d95a6bfc03ed2059fe2c5f02b4d74f477ffe47915
2424
ports:
2525
- "6379:6379"
2626
mssql:
@@ -31,7 +31,7 @@ services:
3131
- ACCEPT_EULA=Y
3232
- MSSQL_SA_PASSWORD=Password12345%%
3333
localstack:
34-
image: localstack/localstack:4.9.2@sha256:59373b4a27dba3ec15c4db0b7455f0cb68c8a42300e2cbbe362b440f9a131697
34+
image: localstack/localstack:4.10.0@sha256:a65ee2a9d45a7a34a1f1faae515d2e577ce11210312c077700ccc82daefec238
3535
ports:
3636
- "4510-4559:4510-4559"
3737
- "4566:4566"

‎examples/net10.0/aspnetcore/aspnetcore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="AWSSDK.S3" Version="4.0.7.9" />
13+
<PackageReference Include="AWSSDK.S3" Version="4.0.11.1" />
1414
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.1.2" />
1515
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0" />
1616
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />

0 commit comments

Comments
 (0)