Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"isRoot": true,
"tools": {
"dotnet-outdated-tool": {
"version": "4.6.9",
"version": "4.8.1",
"commands": [
"dotnet-outdated"
],
Expand Down
15 changes: 13 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ jobs:

steps:
- name: CargoWall
uses: code-cargo/cargowall-action@fc9644606d84536b4e59a30ad2802904f7b4ff22 # v1.2.0
uses: code-cargo/cargowall-action@c0bd989036354f795a5150d478fce5bd510586af # v1.3.2-rc.3
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v7

- name: Setup dotnet
uses: actions/setup-dotnet@v5
Expand All @@ -44,6 +44,17 @@ jobs:
8.x
10.x

- name: Verify NuGet lock files are in sync
run: |
./dev/update-nuget-lockfiles.sh
changes="$(git status --porcelain -- '*.lock.json')"
if [ -n "$changes" ]; then
echo "::error::NuGet lock files are out of date. Run ./dev/update-nuget-lockfiles.sh and commit the result."
echo "$changes"
git diff -- '*.lock.json'
exit 1
fi

- name: Build
run: dotnet build -p TreatWarningsAsErrors=true

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
id-token: write
steps:
- name: CargoWall
uses: code-cargo/cargowall-action@fc9644606d84536b4e59a30ad2802904f7b4ff22 # v1.2.0
- uses: actions/checkout@v6
uses: code-cargo/cargowall-action@c0bd989036354f795a5150d478fce5bd510586af # v1.3.2-rc.3
- uses: actions/checkout@v7

- name: Setup dotnet
uses: actions/setup-dotnet@v5
Expand Down
3 changes: 2 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Dependencies

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

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

This will generate lock files for:

- Linux ARM64: `packages.linux-arm64.lock.json`
- Linux x64: `packages.linux-x64.lock.json`
- macOS ARM64: `packages.osx-arm64.lock.json`
- Windows x64: `packages.win-x64.lock.json`
Expand Down
163 changes: 0 additions & 163 deletions NatsDistributedCache.sln

This file was deleted.

22 changes: 22 additions & 0 deletions NatsDistributedCache.slnx
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<Solution>
<Configurations>
<Platform Name="Any CPU" />
<Platform Name="x64" />
<Platform Name="x86" />
</Configurations>
<Folder Name="/src/">
<Project Path="src/NatsDistributedCache/NatsDistributedCache.csproj" />
<Project Path="src/NatsHybridCacheExtensions/NatsHybridCacheExtensions.csproj" />
</Folder>
<Folder Name="/test/">
<Project Path="test/IntegrationTests/IntegrationTests.csproj" />
<Project Path="test/TestUtils/TestUtils.csproj" />
<Project Path="test/UnitTests/UnitTests.csproj" />
</Folder>
<Folder Name="/util/">
<Project Path="util/NatsAppHost/NatsAppHost.csproj" />
<Project Path="util/PerfTest/PerfTest.csproj" />
<Project Path="util/ReadmeExample/ReadmeExample.csproj" />
<Project Path="util/RedisAppHost/RedisAppHost.csproj" />
</Folder>
</Solution>
10 changes: 5 additions & 5 deletions dev/generate-snk.sh
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#!/bin/bash
set -e

# Navigate to the root directory containing the .sln file
# Navigate to the root directory containing the .slnx file
cd "$(dirname "$0")/.."

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

# Extract the solution name without the extension
SLN_NAME=$(basename "$SLN_FILE" .sln)
SLN_NAME=$(basename "$SLN_FILE" .slnx)

# Get the current date
DATE="$(date "+%Y-%m-%d")"
Expand Down
2 changes: 1 addition & 1 deletion dev/update-nuget-lockfiles.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
cd "$(dirname "$0")/.."
set -e

for runtime in linux-x64 osx-arm64 win-x64; do
for runtime in linux-arm64 linux-x64 osx-arm64 win-x64; do
dotnet restore -p:NuGetLockRuntimeIdentifier="$runtime" --force-evaluate
done
10 changes: 5 additions & 5 deletions dev/verify-snk.sh
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#!/bin/bash
set -e

# Navigate to the root directory containing the .sln file
# Navigate to the root directory containing the .slnx file
cd "$(dirname "$0")/.."

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

# Extract the solution name without the extension
SLN_NAME=$(basename "$SLN_FILE" .sln)
SLN_NAME=$(basename "$SLN_FILE" .slnx)

# Define key paths
KEYS_DIR="$CUR_DIR/keys"
Expand Down
10 changes: 5 additions & 5 deletions src/NatsDistributedCache/NatsDistributedCache.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.1" />
<PackageReference Include="NATS.Client.KeyValueStore" Version="2.7.0" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.9" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.9" />
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.9" />
<PackageReference Include="NATS.Client.KeyValueStore" Version="2.8.2" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.300" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading
Loading