Release 2.0 alpha.1 (take2) (#122)

* Do not pack sandbox or test projects * Clean-up and test flapper fix
nats-io · Aug 31, 2023 · 77d3b90 · 77d3b90
1 parent 7b20ddc
commit 77d3b90
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 149 deletions.
diff --git a/sandbox/ConsoleApp1/ConsoleApp1.csproj b/sandbox/ConsoleApp1/ConsoleApp1.csproj
diff --git a/sandbox/ConsoleApp1/Program.cs b/sandbox/ConsoleApp1/Program.cs
diff --git a/sandbox/ConsoleApp2/ConsoleApp2.csproj b/sandbox/ConsoleApp2/ConsoleApp2.csproj
diff --git a/sandbox/ConsoleApp2/Program.cs b/sandbox/ConsoleApp2/Program.cs
diff --git a/sandbox/Example.JetStream.PullConsumer/Example.JetStream.PullConsumer.csproj b/sandbox/Example.JetStream.PullConsumer/Example.JetStream.PullConsumer.csproj
@@ -5,6 +5,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+      <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/tests/NATS.Client.JetStream.Tests/ConsumerConsumeTest.cs b/tests/NATS.Client.JetStream.Tests/ConsumerConsumeTest.cs
@@ -1,3 +1,4 @@
+using System.Text.RegularExpressions;
 using NATS.Client.Core.Tests;
 
 namespace NATS.Client.JetStream.Tests;
@@ -64,13 +65,12 @@ await Retry.Until(
             .Where(f => f.Message.StartsWith("PUB $JS.API.CONSUMER.MSG.NEXT.s1.c1"))
             .ToList();
 
-        // Initial pull
-        Assert.Matches(@"^PUB.*""batch"":10\b", msgNextRequests.First().Message);
-
-        foreach (var frame in msgNextRequests.Skip(1))
+        foreach (var frame in msgNextRequests)
         {
-            // Consequent pulls should top-up to max value
-            Assert.Matches(@"^PUB.*""batch"":5\b", frame.Message);
+            var match = Regex.Match(frame.Message, @"^PUB.*""batch"":(\d+)");
+            Assert.True(match.Success);
+            var batch = int.Parse(match.Groups[1].Value);
+            Assert.True(batch <= 10);
         }
     }
 

diff --git a/tests/NATS.Client.Perf/NATS.Client.Perf.csproj b/tests/NATS.Client.Perf/NATS.Client.Perf.csproj
@@ -5,6 +5,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+      <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>