Merge branch '3.8-dev'

# Conflicts:
#	gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/Gremlin.cs

Author: xiazcy

gremlin-dotnet/Examples/BasicGremlin/BasicGremlin.cs

@@ -31,7 +31,7 @@ static async Task Main()
     {
         var server = new GremlinServer(ServerHost, ServerPort);
         using var remoteConnection = new DriverRemoteConnection(new GremlinClient(server), "g");
-        var g = Traversal().WithRemote(remoteConnection);
+        var g = Traversal().With(remoteConnection);
 
         // Basic Gremlin: adding and retrieving data
         var v1 = g.AddV(VertexLabel).Property("name", "marko").Next();

gremlin-dotnet/Examples/Connections/Connections.cs

@@ -30,17 +30,17 @@ public class ConnectionExample
 
     static void Main()
     {
-        WithRemote();
+        WithRemoteConnection();
         WithConf();
         WithSerializer();
     }
 
     // Connecting to the server
-    static void WithRemote()
+    static void WithRemoteConnection()
     {
         var server = new GremlinServer(ServerHost, ServerPort);
         using var remoteConnection = new DriverRemoteConnection(new GremlinClient(server), "g");
-        var g = Traversal().WithRemote(remoteConnection);
+        var g = Traversal().With(remoteConnection);
 
         // Simple query to verify connection
         var v = g.AddV(VertexLabel).Iterate();
@@ -53,7 +53,7 @@ static void WithConf()
     {
         using var remoteConnection = new DriverRemoteConnection(new GremlinClient(
         new GremlinServer(hostname: ServerHost, port: ServerPort, enableSsl: false, username: "", password: "")), "g");
-        var g = Traversal().WithRemote(remoteConnection);
+        var g = Traversal().With(remoteConnection);
 
         var v = g.AddV(VertexLabel).Iterate();
         var count = g.V().HasLabel(VertexLabel).Count().Next();
@@ -66,7 +66,7 @@ static void WithSerializer()
         var server = new GremlinServer(ServerHost, ServerPort);
         var client = new GremlinClient(server, new GraphSON3MessageSerializer());
         using var remoteConnection = new DriverRemoteConnection(client, "g");
-        var g = Traversal().WithRemote(remoteConnection);
+        var g = Traversal().With(remoteConnection);
 
         var v = g.AddV(VertexLabel).Iterate();
         var count = g.V().HasLabel(VertexLabel).Count().Next();

gremlin-dotnet/Examples/ModernTraversals/ModernTraversals.cs

@@ -36,7 +36,7 @@ static void Main()
         // Use gmodern in CI environment, default connection locally
         var traversalSource = IsDocker ? "gmodern" : "g";
         using var remoteConnection = new DriverRemoteConnection(new GremlinClient(server), traversalSource);
-        var g = Traversal().WithRemote(remoteConnection);
+        var g = Traversal().With(remoteConnection);
 
         /*
         This example requires the Modern toy graph to be preloaded upon launching the Gremlin server.

gremlin-dotnet/build/generate.groovy

@@ -114,13 +114,13 @@ radishGremlinFile.withWriter('UTF-8') { Writer writer ->
                 writer.write("(g,p) =>")
                 writer.write(t.getTranslated().
                         replaceAll("xx([0-9]+)", "p[\"xx\$1\"]").
-                        replaceAll("v([0-9]+)", "(Vertex) p[\"v\$1\"]").
+                        replaceAll("(?<![\\w\\-])v([0-9]+)(?![\\w\\.])", "(Vertex) p[\"v\$1\"]").
                         replaceAll("vid([0-9]+)", "p[\"vid\$1\"]").
-                        replaceAll("e([0-9]+)", "p[\"e\$1\"]").
+                        replaceAll("(?<![\\w\\-])e([0-9]+)(?![\\w\\.])", "p[\"e\$1\"]").
                         replaceAll("eid([0-9]+)", "p[\"eid\$1\"]").
-                        replaceAll("l([0-9]+)", "(IFunction) p[\"l\$1\"]").
+                        replaceAll("(?<![\\w\\-])l([0-9]+)(?![\\w\\.])", "(IFunction) p[\"l\$1\"]").
                         replaceAll("pred([0-9]+)", "(IPredicate) p[\"pred\$1\"]").
-                        replaceAll("c([0-9]+)", "(IComparator) p[\"c\$1\"]"))
+                        replaceAll("(?<![\\w\\-])c([0-9]+)(?![\\w\\.])", "(IComparator) p[\"c\$1\"]"))
                 if (gremlinItty.hasNext())
                     writer.write(', ')
                 else

gremlin-dotnet/docker-compose.yml

@@ -58,8 +58,11 @@ services:
       - VERTEX_LABEL=dotnet-example
     working_dir: /gremlin-dotnet
     command: >
-      bash -c "dotnet tool update -g dotnet-trx; dotnet test ./Gremlin.Net.sln -c Release --logger trx; /root/.dotnet/tools/trx;
+      bash -c "find . -path '*/TestResults/*.trx' -delete 2>/dev/null || true;
+      dotnet tool update -g dotnet-trx; dotnet test ./Gremlin.Net.sln -c Release --logger trx;
       EXIT_CODE=$$?;
+      /root/.dotnet/tools/trx || true;
+      if [ $$EXIT_CODE -ne 0 ]; then echo '❌ dotnet test FAILED (exit code '$$EXIT_CODE') — build or test errors above'; fi;
       echo 'Running examples...';
       dotnet run --project Examples/BasicGremlin/BasicGremlin.csproj;
       dotnet run --project Examples/Connections/Connections.csproj;