Skip to content

Commit ba30fd1

Browse files
Update packages (#34)
1 parent c4694c3 commit ba30fd1

55 files changed

Lines changed: 16420 additions & 21347 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-outdated-tool": {
6-
"version": "4.6.9",
6+
"version": "4.8.1",
77
"commands": [
88
"dotnet-outdated"
99
],

‎.github/workflows/build.yml‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ jobs:
3131

3232
steps:
3333
- name: CargoWall
34-
uses: code-cargo/cargowall-action@fc9644606d84536b4e59a30ad2802904f7b4ff22 # v1.2.0
34+
uses: code-cargo/cargowall-action@c0bd989036354f795a5150d478fce5bd510586af # v1.3.2-rc.3
3535
- name: Checkout
36-
uses: actions/checkout@v6
36+
uses: actions/checkout@v7
3737

3838
- name: Setup dotnet
3939
uses: actions/setup-dotnet@v5
@@ -44,6 +44,17 @@ jobs:
4444
8.x
4545
10.x
4646
47+
- name: Verify NuGet lock files are in sync
48+
run: |
49+
./dev/update-nuget-lockfiles.sh
50+
changes="$(git status --porcelain -- '*.lock.json')"
51+
if [ -n "$changes" ]; then
52+
echo "::error::NuGet lock files are out of date. Run ./dev/update-nuget-lockfiles.sh and commit the result."
53+
echo "$changes"
54+
git diff -- '*.lock.json'
55+
exit 1
56+
fi
57+
4758
- name: Build
4859
run: dotnet build -p TreatWarningsAsErrors=true
4960

‎.github/workflows/publish.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ jobs:
2222
id-token: write
2323
steps:
2424
- name: CargoWall
25-
uses: code-cargo/cargowall-action@fc9644606d84536b4e59a30ad2802904f7b4ff22 # v1.2.0
26-
- uses: actions/checkout@v6
25+
uses: code-cargo/cargowall-action@c0bd989036354f795a5150d478fce5bd510586af # v1.3.2-rc.3
26+
- uses: actions/checkout@v7
2727

2828
- name: Setup dotnet
2929
uses: actions/setup-dotnet@v5

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## Dependencies
44

5-
- .NET 8+ SDK
5+
- .NET 10 SDK - required to build the Aspire AppHosts; the libraries still target net8.0 and net10.0
66
- Docker or Docker Desktop - The tests use Aspire to start a NATS Server Docker container
77

88
## Project Directories
@@ -64,6 +64,7 @@ Use the provided script to update all platform-specific lock files:
6464

6565
This will generate lock files for:
6666

67+
- Linux ARM64: `packages.linux-arm64.lock.json`
6768
- Linux x64: `packages.linux-x64.lock.json`
6869
- macOS ARM64: `packages.osx-arm64.lock.json`
6970
- Windows x64: `packages.win-x64.lock.json`

‎NatsDistributedCache.sln‎

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

‎NatsDistributedCache.slnx‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Solution>
2+
<Configurations>
3+
<Platform Name="Any CPU" />
4+
<Platform Name="x64" />
5+
<Platform Name="x86" />
6+
</Configurations>
7+
<Folder Name="/src/">
8+
<Project Path="src/NatsDistributedCache/NatsDistributedCache.csproj" />
9+
<Project Path="src/NatsHybridCacheExtensions/NatsHybridCacheExtensions.csproj" />
10+
</Folder>
11+
<Folder Name="/test/">
12+
<Project Path="test/IntegrationTests/IntegrationTests.csproj" />
13+
<Project Path="test/TestUtils/TestUtils.csproj" />
14+
<Project Path="test/UnitTests/UnitTests.csproj" />
15+
</Folder>
16+
<Folder Name="/util/">
17+
<Project Path="util/NatsAppHost/NatsAppHost.csproj" />
18+
<Project Path="util/PerfTest/PerfTest.csproj" />
19+
<Project Path="util/ReadmeExample/ReadmeExample.csproj" />
20+
<Project Path="util/RedisAppHost/RedisAppHost.csproj" />
21+
</Folder>
22+
</Solution>

‎dev/generate-snk.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
#!/bin/bash
22
set -e
33

4-
# Navigate to the root directory containing the .sln file
4+
# Navigate to the root directory containing the .slnx file
55
cd "$(dirname "$0")/.."
66

7-
# Find the .sln file in the current directory
7+
# Find the .slnx file in the current directory
88
CUR_DIR="$(pwd)"
9-
SLN_FILE=$(ls "$CUR_DIR"/*.sln 2>/dev/null | head -n 1)
9+
SLN_FILE=$(ls "$CUR_DIR"/*.slnx 2>/dev/null | head -n 1)
1010
if [ -z "$SLN_FILE" ]; then
11-
echo "Error: No .sln file found."
11+
echo "Error: No .slnx file found."
1212
exit 1
1313
fi
1414

1515
# Extract the solution name without the extension
16-
SLN_NAME=$(basename "$SLN_FILE" .sln)
16+
SLN_NAME=$(basename "$SLN_FILE" .slnx)
1717

1818
# Get the current date
1919
DATE="$(date "+%Y-%m-%d")"

‎dev/update-nuget-lockfiles.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
cd "$(dirname "$0")/.."
44
set -e
55

6-
for runtime in linux-x64 osx-arm64 win-x64; do
6+
for runtime in linux-arm64 linux-x64 osx-arm64 win-x64; do
77
dotnet restore -p:NuGetLockRuntimeIdentifier="$runtime" --force-evaluate
88
done

‎dev/verify-snk.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
#!/bin/bash
22
set -e
33

4-
# Navigate to the root directory containing the .sln file
4+
# Navigate to the root directory containing the .slnx file
55
cd "$(dirname "$0")/.."
66

7-
# Find the .sln file in the current directory
7+
# Find the .slnx file in the current directory
88
CUR_DIR="$(pwd)"
9-
SLN_FILE=$(ls "$CUR_DIR"/*.sln 2>/dev/null | head -n 1)
9+
SLN_FILE=$(ls "$CUR_DIR"/*.slnx 2>/dev/null | head -n 1)
1010
if [ -z "$SLN_FILE" ]; then
11-
echo "Error: No .sln file found."
11+
echo "Error: No .slnx file found."
1212
exit 1
1313
fi
1414

1515
# Extract the solution name without the extension
16-
SLN_NAME=$(basename "$SLN_FILE" .sln)
16+
SLN_NAME=$(basename "$SLN_FILE" .slnx)
1717

1818
# Define key paths
1919
KEYS_DIR="$CUR_DIR/keys"

‎src/NatsDistributedCache/NatsDistributedCache.csproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@
2828
</PropertyGroup>
2929

3030
<ItemGroup>
31-
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.1" />
32-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
33-
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.1" />
34-
<PackageReference Include="NATS.Client.KeyValueStore" Version="2.7.0" />
35-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
31+
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.9" />
32+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.9" />
33+
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.9" />
34+
<PackageReference Include="NATS.Client.KeyValueStore" Version="2.8.2" />
35+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.300" PrivateAssets="All" />
3636
</ItemGroup>
3737

3838
<ItemGroup>

0 commit comments

Comments
 (0)