Skip to content

Commit 4095112

Browse files
authored
Merge branch 'master' into DOC-4733-geo-index-examples
2 parents 7b10f64 + 125cfd3 commit 4095112

File tree

93 files changed

+614
-4361
lines changed

Some content is hidden

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

93 files changed

+614
-4361
lines changed

.github/wordlist.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ TimeSeries
2323
triaging
2424
www
2525
yml
26+
runsettings

.github/workflows/integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
max-parallel: 15
3838
fail-fast: false
3939
matrix:
40-
redis-version: [ '8.0-M02', '8.0-M03', '${{ needs.redis_version.outputs.CURRENT }}', '7.2.6', '6.2.16']
40+
redis-version: [ '8.0-M04-pre', '${{ needs.redis_version.outputs.CURRENT }}', '7.2.6', '6.2.16']
4141
dotnet-version: ['6.0', '7.0', '8.0']
4242
env:
4343
ACTIONS_ALLOW_UNSECURE_COMMANDS: true

.github/workflows/nuget-release.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,25 @@ jobs:
1919
run: dotnet --list-sdks
2020
- name: Check .NET runtimes
2121
run: dotnet --list-runtimes
22+
23+
- name: get version from tag
24+
id: get_version
25+
run: |
26+
realversion="${GITHUB_REF/refs\/tags\//}"
27+
realversion="${realversion//v/}"
28+
echo "VERSION=$realversion" >> $GITHUB_OUTPUT
29+
30+
- name: Update version in csproj
31+
run: |
32+
VERSION=${{ steps.get_version.outputs.VERSION }}
33+
echo "Setting version to $VERSION"
34+
35+
# Update the version in the NRedisStack.csproj file
36+
sed -i "s|<Version>.*</Version>|<Version>$VERSION</Version>|" ./src/NRedisStack/NRedisStack.csproj
37+
sed -i "s|<ReleaseVersion>.*</ReleaseVersion>|<ReleaseVersion>$VERSION</ReleaseVersion>|" ./src/NRedisStack/NRedisStack.csproj
38+
sed -i "s|<PackageVersion>.*</PackageVersion>|<PackageVersion>$VERSION</PackageVersion>|" ./src/NRedisStack/NRedisStack.csproj
39+
cat ./src/NRedisStack/NRedisStack.csproj
40+
2241
- name: Build
2342
run: dotnet pack -c Release --output .
2443
- name: Publish

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ FodyWeavers.xsd
382382
!.vscode/tasks.json
383383
!.vscode/launch.json
384384
!.vscode/extensions.json
385+
!.vscode/.runsettings
385386
*.code-workspace
386387

387388
# Local History for Visual Studio Code

.vscode/.runsettings

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- File name extension must be .runsettings -->
3+
<RunSettings>
4+
<RunConfiguration>
5+
<EnvironmentVariables>
6+
<!-- List of environment variables we want to set-->
7+
<REDIS_VERSION>7.4.0</REDIS_VERSION>
8+
</EnvironmentVariables>
9+
</RunConfiguration>
10+
</RunSettings>

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"dotnet-test-explorer.testArguments": "/p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput=./lcov.info",
33
"dotnet-test-explorer.testProjectPath": "**/*NRedisStack.Tests.csproj",
4-
"dotnet.defaultSolution": "NRedisStack.sln"
4+
"dotnet.defaultSolution": "NRedisStack.sln",
5+
"dotnet.unitTests.runSettingsPath": ".vscode/.runsettings"
56
}

CONTRIBUTING.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,19 @@ e.g:
113113
dotnet test --environment="REDIS=127.17.0.1:6379"
114114
```
115115

116+
Most of the integration tests rely on specific server capabilities,
117+
so, to be able run matching test cases properly you will need to set `REDIS_VERSION` variable with your actual server version that tests running against.
118+
```bash
119+
dotnet test --environment="REDIS=<redisServer:port>" --environment="REDIS_VERSION=<redisServerVersion>"
120+
```
121+
e.g:
122+
```bash
123+
dotnet test --environment="REDIS=127.17.0.1:6379" --environment="REDIS_VERSION=7.4.0"
124+
```
125+
126+
If you are relying on an IDE to run the tests, then you can set these parameters in [.runsettings](.vscode/.runsettings) file.
127+
You also need to check if your IDE supports [settings.json](.vscode/settings.json) for this to work.
128+
116129
To run your tests against an oss cluster:
117130
```bash
118131
dotnet test --environment "REDIS_CLUSTER=<redisServer:port>" --environment "NUM_REDIS_CLUSTER_NODES=<number of nodes in the cluster>"

README.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ Each module has a command class with its own commands.
4141
The supported modules are [Search](https://redis.io/commands/?group=search), [JSON](https://redis.io/commands/?group=json), [TimeSeries](https://redis.io/commands/?group=timeseries), [Bloom Filter](https://redis.io/commands/?group=bf), [Cuckoo Filter](https://redis.io/commands/?group=cf), [T-Digest](https://redis.io/commands/?group=tdigest), [Count-min Sketch](https://redis.io/commands/?group=cms), and [Top-K](https://redis.io/commands/?group=topk).
4242

4343
**Note:** RedisGraph support has been deprecated starting from Redis Stack version 7.2. For more information, please refer to [this blog post](https://redis.com/blog/redisgraph-eol/).
44+
**IMPORTANT:** NRedisStack will end the support for Graph functionalities with version 0.13.x
4445

4546
# Usage
4647

@@ -87,7 +88,7 @@ TdigestCommands tdigest = db.TDIGEST();
8788
SearchCommands ft = db.FT();
8889
JsonCommands json = db.JSON();
8990
TimeSeriesCommands ts = db.TS();
90-
GraphCommands graph = db.GRAPH(); // If Redis version is less than 7.2
91+
GraphCommands graph = db.GRAPH(); // If Redis version is less than 7.2 and NRedisStack version is less than 0.13.x
9192
```
9293
Then, that variable will allow you to call all the commands of that module.
9394

@@ -154,9 +155,12 @@ ft.DropIndex("myIndex");
154155

155156
More examples can be found in the [examples folder](Examples).
156157

158+
## For Contributors
159+
To contribute NRedisStack, please see :point_right: [Contribution notes](CONTRIBUTING.md)
160+
157161
------
158162

159-
### Author
163+
# Author
160164

161165
NRedisStack is developed and maintained by [Redis Inc](https://redis.com). It can be found [here](
162166
https://github.com/redis/NRedisStack), or downloaded from [NuGet](https://www.nuget.org/packages/NRedisStack).

src/NRedisStack/Graph/DataTypes/Edge.cs

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

src/NRedisStack/Graph/DataTypes/GraphEntity.cs

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

0 commit comments

Comments
 (0)