Fixes GUI updates when collecting. (#401)

* Fix Gui Spinner issue.
microsoft · Apr 24, 2020 · 2e6f58d · 2e6f58d
1 parent 9e5ae0a
commit 2e6f58d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/Cli/Cli.csproj b/Cli/Cli.csproj
@@ -67,7 +67,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Utf8Json" Version="1.3.7" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Cli/Controllers/HomeController.cs b/Cli/Controllers/HomeController.cs
@@ -8,14 +8,14 @@
 using AttackSurfaceAnalyzer.Utils;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
 using System.Web;
-using Utf8Json;
 
 namespace AttackSurfaceAnalyzer.Gui.Controllers
 {
@@ -51,7 +51,7 @@ public ActionResult GetMonitorResults(string RunId, int Offset, int NumResults)
             output["Requested"] = NumResults;
             output["Actual"] = results.Count;
 
-            return Json(JsonSerializer.Serialize(output));
+            return Json(JsonConvert.SerializeObject(output));
         }
 
         public ActionResult GetResults(string BaseId, string CompareId, int ResultType, int Offset, int NumResults)
@@ -65,7 +65,7 @@ public ActionResult GetResults(string BaseId, string CompareId, int ResultType,
             output["Offset"] = Offset;
             output["Requested"] = NumResults;
             output["Actual"] = results.Count;
-            return Json(JsonSerializer.Serialize(output));
+            return Json(JsonConvert.SerializeObject(output));
         }
 
 
@@ -91,7 +91,7 @@ public ActionResult GetCollectors()
             Dictionary<string, object> output = new Dictionary<string, object>();
             output.Add("RunId", RunId);
             output.Add("Runs", dict);
-            return Json(JsonSerializer.Serialize(output));
+            return Json(JsonConvert.SerializeObject(output));
         }
 
         public ActionResult GetLatestRunId()
@@ -110,7 +110,7 @@ public ActionResult GetMonitorStatus()
             }
 
             //@TODO: Also return the RunId
-            return Json(JsonSerializer.Serialize(dict));
+            return Json(JsonConvert.SerializeObject(dict));
         }
 
         public ActionResult GetComparators()
@@ -124,7 +124,7 @@ public ActionResult GetComparators()
             }
 
             //@TODO: Also return the RunId
-            return Json(JsonSerializer.Serialize(dict));
+            return Json(JsonConvert.SerializeObject(dict));
         }
 
 

diff --git a/README.md b/README.md
@@ -7,7 +7,11 @@ If you have .NET Core 3.1 installed you can install Attack Surface Analyzer with
 Platform specific binaries for Attack Surface Analyzer are distributed via our GitHub [releases](https://github.com/Microsoft/AttackSurfaceAnalyzer/releases/latest) page.
 
 ## Note on Version
-The latest stable version of Attack Surface Analyzer is 2.1 (see [Release\v2.1](https://github.com/Microsoft/AttackSurfaceAnalyzer/tree/release/v2.1)).  2.2 is available in Beta.
+The latest stable version of Attack Surface Analyzer is 2.1 (see [Release\v2.1](https://github.com/Microsoft/AttackSurfaceAnalyzer/tree/release/v2.1)).  
+
+2.2 is available in Beta. 
+
+2.3 is now in development.  You can see the features coming [here](https://github.com/microsoft/attacksurfaceanalyzer/issues?q=is%3Aissue+milestone%3Av2.3+).
 
 ## New Features in 2.2