Merge branch 'master' into dependabot/nuget/BouncyCastle.Cryptography-2.3.0

shacharPash · web-flow · commit ad159ed68af9 · 2024-04-21T13:29:00.000+03:00
diff --git a/src/NRedisStack/Auxiliary.cs b/src/NRedisStack/Auxiliary.cs
@@ -48,30 +48,28 @@ public static IDatabase GetDatabase(this ConnectionMultiplexer redis,
         return _db;
     }
 
-    private static void SetInfoInPipeline(this IDatabase db)
+    internal static void SetInfoInPipeline(this IDatabase db)
     {
-        if (_libraryName == null) return;
-        Pipeline pipeline = new Pipeline(db);
-        _ = pipeline.Db.ClientSetInfoAsync(SetInfoAttr.LibraryName, _libraryName!);
-        _ = pipeline.Db.ClientSetInfoAsync(SetInfoAttr.LibraryVersion, GetNRedisStackVersion());
-        pipeline.Execute();
+        if (_setInfo)
+        {
+            _setInfo = false;
+            if (_libraryName == null) return;
+            Pipeline pipeline = new Pipeline(db);
+            _ = pipeline.Db.ClientSetInfoAsync(SetInfoAttr.LibraryName, _libraryName!);
+            _ = pipeline.Db.ClientSetInfoAsync(SetInfoAttr.LibraryVersion, GetNRedisStackVersion());
+            pipeline.Execute();
+        }
     }
 
     public static RedisResult Execute(this IDatabase db, SerializedCommand command)
     {
-        if (!_setInfo) return db.Execute(command.Command, command.Args);
-        _setInfo = false;
         db.SetInfoInPipeline();
         return db.Execute(command.Command, command.Args);
     }
 
     public static async Task<RedisResult> ExecuteAsync(this IDatabaseAsync db, SerializedCommand command)
     {
-        if (_setInfo)
-        {
-            _setInfo = false;
-            ((IDatabase)db).SetInfoInPipeline();
-        }
+        ((IDatabase)db).SetInfoInPipeline();
         return await db.ExecuteAsync(command.Command, command.Args);
     }
 
diff --git a/src/NRedisStack/NRedisStack.csproj b/src/NRedisStack/NRedisStack.csproj
@@ -18,7 +18,7 @@
   <ItemGroup>
 	<PackageReference Include="NetTopologySuite" Version="2.5.0" />
 	<PackageReference Include="System.Text.Json" Version="7.0.2" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
-	<PackageReference Include="StackExchange.Redis" Version="2.6.122" />
+	<PackageReference Include="StackExchange.Redis" Version="2.7.33" />
 	<None Include="..\..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 
diff --git a/src/NRedisStack/Transactions.cs b/src/NRedisStack/Transactions.cs
@@ -9,6 +9,7 @@ public class Transaction
 
         public Transaction(IDatabase db)
         {
+            db.SetInfoInPipeline();
             _transaction = db.CreateTransaction();
         }
 
diff --git a/tests/Doc/Doc.csproj b/tests/Doc/Doc.csproj
@@ -16,7 +16,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="StackExchange.Redis" Version="2.6.122" />
+    <PackageReference Include="StackExchange.Redis" Version="2.7.33" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\NRedisStack\NRedisStack.csproj" />
diff --git a/tests/Doc/StreamTutorial.cs b/tests/Doc/StreamTutorial.cs
diff --git a/tests/NRedisStack.Tests/NRedisStack.Tests.csproj b/tests/NRedisStack.Tests/NRedisStack.Tests.csproj

Original file line number	Diff line number	Diff line change
`@@ -48,30 +48,28 @@ public static IDatabase GetDatabase(this ConnectionMultiplexer redis,`
`48`	`48`	`return _db;`
`49`	`49`	`}`
`50`	`50`
`51`		`- private static void SetInfoInPipeline(this IDatabase db)`
	`51`	`+ internal static void SetInfoInPipeline(this IDatabase db)`
`52`	`52`	`{`
`53`		`- if (_libraryName == null) return;`
`54`		`- Pipeline pipeline = new Pipeline(db);`
`55`		`- _ = pipeline.Db.ClientSetInfoAsync(SetInfoAttr.LibraryName, _libraryName!);`
`56`		`- _ = pipeline.Db.ClientSetInfoAsync(SetInfoAttr.LibraryVersion, GetNRedisStackVersion());`
`57`		`- pipeline.Execute();`
	`53`	`+ if (_setInfo)`
	`54`	`+ {`
	`55`	`+ _setInfo = false;`
	`56`	`+ if (_libraryName == null) return;`
	`57`	`+ Pipeline pipeline = new Pipeline(db);`
	`58`	`+ _ = pipeline.Db.ClientSetInfoAsync(SetInfoAttr.LibraryName, _libraryName!);`
	`59`	`+ _ = pipeline.Db.ClientSetInfoAsync(SetInfoAttr.LibraryVersion, GetNRedisStackVersion());`
	`60`	`+ pipeline.Execute();`
	`61`	`+ }`
`58`	`62`	`}`
`59`	`63`
`60`	`64`	`public static RedisResult Execute(this IDatabase db, SerializedCommand command)`
`61`	`65`	`{`
`62`		`- if (!_setInfo) return db.Execute(command.Command, command.Args);`
`63`		`- _setInfo = false;`
`64`	`66`	`db.SetInfoInPipeline();`
`65`	`67`	`return db.Execute(command.Command, command.Args);`
`66`	`68`	`}`
`67`	`69`
`68`	`70`	`public static async Task<RedisResult> ExecuteAsync(this IDatabaseAsync db, SerializedCommand command)`
`69`	`71`	`{`
`70`		`- if (_setInfo)`
`71`		`- {`
`72`		`- _setInfo = false;`
`73`		`- ((IDatabase)db).SetInfoInPipeline();`
`74`		`- }`
	`72`	`+ ((IDatabase)db).SetInfoInPipeline();`
`75`	`73`	`return await db.ExecuteAsync(command.Command, command.Args);`
`76`	`74`	`}`
`77`	`75`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ public class Transaction`
`9`	`9`
`10`	`10`	`public Transaction(IDatabase db)`
`11`	`11`	`{`
	`12`	`+ db.SetInfoInPipeline();`
`12`	`13`	`_transaction = db.CreateTransaction();`
`13`	`14`	`}`
`14`	`15`