Skip to content

Commit 683e8be

Browse files
hangyhangy
committed
Merge remote-tracking branch 'origin/beta'
2 parents 7944df0 + cdb54d9 commit 683e8be

18 files changed

Lines changed: 2922 additions & 2340 deletions

File tree

‎.github/workflows/codeql.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@ jobs:
3636

3737
steps:
3838
- name: Checkout repository
39-
uses: actions/checkout@v6
39+
uses: actions/checkout@v7
4040
with:
4141
fetch-depth: 0
4242

4343
# Initializes the CodeQL tools for scanning.
4444
- name: Initialize CodeQL
45-
uses: github/codeql-action/init@v4
45+
uses: github/codeql-action/init@v4.37.7
4646
with:
4747
languages: ${{ matrix.language }}
4848

4949
- name: Setup .NET
50-
uses: actions/setup-dotnet@v5
50+
uses: actions/setup-dotnet@v6
5151
with:
5252
global-json-file: global.json
5353

@@ -58,4 +58,4 @@ jobs:
5858
run: dotnet build --no-restore
5959

6060
- name: Perform CodeQL Analysis
61-
uses: github/codeql-action/analyze@v4
61+
uses: github/codeql-action/analyze@v4.37.7

‎.github/workflows/component-detection.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212
dependency-submission:
1313
runs-on: ubuntu-slim
1414
steps:
15-
- uses: actions/checkout@v6
15+
- uses: actions/checkout@v7
1616
- name: Component detection
17-
uses: advanced-security/component-detection-dependency-submission-action@v0.1.1
17+
uses: advanced-security/component-detection-dependency-submission-action@v0.1.4

‎.github/workflows/dependency-review.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ jobs:
99
runs-on: ubuntu-slim
1010
steps:
1111
- name: "Checkout Repository"
12-
uses: actions/checkout@v6
12+
uses: actions/checkout@v7
1313
- name: "Dependency Review"
1414
uses: actions/dependency-review-action@v5.0.0

‎.github/workflows/devsecops.yml‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎.github/workflows/dotnet.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ jobs:
2121
runs-on: ubuntu-latest
2222

2323
steps:
24-
- uses: actions/checkout@v6
24+
- uses: actions/checkout@v7
2525
- name: Fix libldap for tests
2626
run: |
2727
sudo apt-get update
2828
sudo apt-get install --upgrade -y libldap2
2929
sudo ln -s /usr/lib/x86_64-linux-gnu/libldap.so.2 /usr/lib/libldap-2.5.so.0
3030
- name: Setup .NET
31-
uses: actions/setup-dotnet@v5
31+
uses: actions/setup-dotnet@v6
3232
with:
3333
global-json-file: global.json
3434
- name: Restore tools
@@ -44,7 +44,7 @@ jobs:
4444
run: |
4545
find . -name "*.trx" -exec dotnet tool run trx2junit --output TestResults/JUnit {} +
4646
- name: Upload coverage reports to Codecov
47-
uses: codecov/codecov-action@v6.0.0
47+
uses: codecov/codecov-action@v7.0.0
4848
with:
4949
token: ${{ secrets.CODECOV_TOKEN }}
5050
slug: AlbusKavaliro/TraceableLdapClient

‎.github/workflows/linter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
# Checkout the code base #
4848
##########################
4949
- name: Checkout Code
50-
uses: actions/checkout@v6
50+
uses: actions/checkout@v7
5151
with:
5252
# Full git history is needed to get a proper
5353
# list of changed files within `super-linter`

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
packages: write # to be able to publish to GitHub Packages
2424
steps:
2525
- name: Checkout
26-
uses: actions/checkout@v6
26+
uses: actions/checkout@v7
2727
with:
2828
fetch-depth: 0
2929
- name: Fix libldap for tests
@@ -32,13 +32,13 @@ jobs:
3232
sudo apt-get install --upgrade -y libldap2
3333
sudo ln -s /usr/lib/x86_64-linux-gnu/libldap.so.2 /usr/lib/libldap-2.5.so.0
3434
- name: Setup .NET
35-
uses: actions/setup-dotnet@v5
35+
uses: actions/setup-dotnet@v6
3636
with:
3737
global-json-file: global.json
3838
- name: Restore dependencies
3939
run: dotnet restore --locked-mode
4040
- name: Setup Node.js
41-
uses: actions/setup-node@v6
41+
uses: actions/setup-node@v7
4242
with:
4343
node-version: "lts/*"
4444
check-latest: true

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<PublishRepositoryUrl>true</PublishRepositoryUrl>
1919
<RepositoryType>git</RepositoryType>
2020
<RepositoryBranch>main</RepositoryBranch>
21-
<RepositoryCommit>5c50d2c80972ff148d50dab639826378cf3cefef</RepositoryCommit>
22-
<Version>1.0.3</Version>
21+
<RepositoryCommit>dbc889ff4237b689becb1d9fe00680679999d89b</RepositoryCommit>
22+
<Version>1.0.4-beta.1</Version>
2323
</PropertyGroup>
2424

2525
</Project>

‎Directory.Packages.props‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@
55
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
66
</PropertyGroup>
77
<ItemGroup Label="Aspire">
8-
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.3.0" />
8+
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.4.6" />
99
</ItemGroup>
1010
<ItemGroup Label="Microsoft">
11-
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.7" />
12-
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.5.0" />
13-
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.5.0" />
14-
<PackageVersion Include="System.DirectoryServices.Protocols" Version="10.0.7" />
11+
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.11" />
12+
<PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.9.0" />
13+
<PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.9.0" />
14+
<PackageVersion Include="System.DirectoryServices.Protocols" Version="10.0.11" />
1515
</ItemGroup>
1616
<ItemGroup Label="OpenTelemetry">
17-
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
18-
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
19-
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
20-
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
21-
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
17+
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.17.0" />
18+
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.17.0" />
19+
<PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.17.0" />
20+
<PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.17.0" />
21+
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.17.0" />
2222
</ItemGroup>
2323
<ItemGroup Label="Test">
24-
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.6.2" />
25-
<PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="2.2.2" />
26-
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.2.2" />
27-
<PackageVersion Include="TUnit" Version="1.43.41" />
28-
<PackageVersion Include="Testcontainers" Version="4.11.0" />
24+
<PackageVersion Include="Microsoft.Testing.Extensions.CodeCoverage" Version="18.10.0" />
25+
<PackageVersion Include="Microsoft.Testing.Extensions.CrashDump" Version="2.3.3" />
26+
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.3.3" />
27+
<PackageVersion Include="TUnit" Version="1.65.0" />
28+
<PackageVersion Include="Testcontainers" Version="4.14.0" />
2929
</ItemGroup>
30-
</Project>
30+
</Project>

‎example/AppHost/AppHost.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<Sdk Name="Aspire.AppHost.Sdk" />
44

55
<PropertyGroup>
6+
<TargetFramework>net10.0</TargetFramework>
67
<OutputType>Exe</OutputType>
78
<UserSecretsId>7245e7e7-859c-4e9f-a8fd-2cd8e0f8209e</UserSecretsId>
89
</PropertyGroup>

0 commit comments

Comments
 (0)