.github/workflows/build-linux.yml

@@ -37,7 +37,7 @@ jobs:
         fetch-depth: '0'
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v5.0.1
+      uses: actions/setup-dotnet@v5.0.0
       with:
         dotnet-version: '8.0.x'
 

.github/workflows/build-osx.yml

@@ -32,7 +32,7 @@ jobs:
         fetch-depth: '0'
 
     - name: Setup
-      uses: actions/setup-dotnet@v5.0.1
+      uses: actions/setup-dotnet@v5.0.0
       with:
         dotnet-version: '8.0.x'
 

.github/workflows/build-windows-desktop.yml

@@ -32,7 +32,7 @@ jobs:
         fetch-depth: '0'
 
     - name: Setup
-      uses: actions/setup-dotnet@v5.0.1
+      uses: actions/setup-dotnet@v5.0.0
       with:
         dotnet-version: '8.0.x'
 

.github/workflows/build-windows.yml

@@ -30,7 +30,7 @@ jobs:
       uses: actions/checkout@v6.0.0
 
     - name: Setup
-      uses: actions/setup-dotnet@v5.0.1
+      uses: actions/setup-dotnet@v5.0.0
       with:
         dotnet-version: '8.0.x'
 

v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs

@@ -118,15 +118,22 @@ public class BaseFmt
                 }
                 if (item.Extra.IsNotEmpty())
                 {
-                    var node = JsonUtils.ParseJson(item.Extra);
+                    var extra = item.Extra;
-                    var extra = node != null
+                    try
-                        ? JsonUtils.Serialize(node, new JsonSerializerOptions
+                    {
+                        var node = JsonNode.Parse(item.Extra);
+                        if (node != null)
+                        {
+                            extra = node.ToJsonString(new JsonSerializerOptions
                             {
                                 WriteIndented = false,
-                            DefaultIgnoreCondition = JsonIgnoreCondition.Never,
                                 Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
-                        })
+                            });
-                        : item.Extra;
+                        }
+                    }
+                    catch
+                    {
+                    }
                     dicQuery.Add("extra", Utils.UrlEncode(extra));
                 }
                 break;
@@ -246,21 +253,7 @@ public class BaseFmt
                 item.RequestHost = GetQueryDecoded(query, "host");
                 item.Path = GetQueryDecoded(query, "path", "/");
                 item.HeaderType = GetQueryDecoded(query, "mode");
-                var extraDecoded = GetQueryDecoded(query, "extra");
+                item.Extra = GetQueryDecoded(query, "extra");
-                if (extraDecoded.IsNotEmpty())
-                {
-                    var node = JsonUtils.ParseJson(extraDecoded);
-                    if (node != null)
-                    {
-                        extraDecoded = JsonUtils.Serialize(node, new JsonSerializerOptions
-                        {
-                            WriteIndented = true,
-                            DefaultIgnoreCondition = JsonIgnoreCondition.Never,
-                            Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
-                        });
-                    }
-                }
-                item.Extra = extraDecoded;
                 break;
 
             case nameof(ETransport.http):