JSON package and json array correct string format.

Zefek · Oct 1, 2017 · 5d5635c · 5d5635c
1 parent 8527b8c
commit 5d5635c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 ################################################################################
 
 /4.0.0.4/packages/Newtonsoft.Json.10.0.3
+/4.0.0.4/.vs/WLive/v14/.suo
diff --git a/4.0.0.4/AGetConverter.cs b/4.0.0.4/AGetConverter.cs
@@ -130,11 +130,13 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
                             {
                                 writer.WritePropertyName(wa.Name);
                                 writer.WriteStartArray();
+                                List<string> arrayData = new List<string>();
                                 foreach (var loop in (dynamic)mi.GetValue(value, null))
                                 {
                                     string data = JsonConvert.SerializeObject(loop, Settings);
-                                    writer.WriteRaw(data);
+                                    arrayData.Add(data);
                                 }
+                                writer.WriteRaw(string.Join(", ", arrayData));
                                 writer.WriteEndArray();
                             }
                             else if (jo[mi.Name].Type == JTokenType.Object)

diff --git a/4.0.0.4/WLive.csproj b/4.0.0.4/WLive.csproj
@@ -43,8 +43,9 @@
     <AssemblyOriginatorKeyFile>WLiveFW.pfx</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json">
-      <HintPath>..\..\Nová složka\dll\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>packages\Newtonsoft.Json.10.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
@@ -94,6 +95,7 @@
     <Compile Include="WLiveObjects\Work.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="WLive.ruleset" />
     <None Include="WLiveFW.pfx" />
   </ItemGroup>

diff --git a/4.0.0.4/packages.config b/4.0.0.4/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net40" />
+</packages>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3,3 +3,4 @@
		################################################################################

		/4.0.0.4/packages/Newtonsoft.Json.10.0.3
		/4.0.0.4/.vs/WLive/v14/.suo