From a500812e88ac5a8acdd9732963e6fae95c0a73e6 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Thu, 7 May 2020 22:41:37 -0400
Subject: update web project to .NET Core 3.1

---
 src/SMAPI.Web/Views/JsonValidator/Index.cshtml |  2 +-
 src/SMAPI.Web/Views/LogParser/Index.cshtml     | 14 ++++++--------
 src/SMAPI.Web/Views/Mods/Index.cshtml          |  8 ++++----
 3 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'src/SMAPI.Web/Views')

diff --git a/src/SMAPI.Web/Views/JsonValidator/Index.cshtml b/src/SMAPI.Web/Views/JsonValidator/Index.cshtml
index 7287e00b..f255a72f 100644
--- a/src/SMAPI.Web/Views/JsonValidator/Index.cshtml
+++ b/src/SMAPI.Web/Views/JsonValidator/Index.cshtml
@@ -40,7 +40,7 @@
     <script src="~/Content/js/json-validator.js?r=202002"></script>
     <script>
         $(function() {
-            smapi.jsonValidator(@Json.Serialize(this.Url.PlainAction("Index", "JsonValidator", new { schemaName = "$schemaName", id = "$id" })), @Json.Serialize(Model.PasteID));
+            smapi.jsonValidator(@this.ForJson(this.Url.PlainAction("Index", "JsonValidator", new { schemaName = "$schemaName", id = "$id" })), @this.ForJson(Model.PasteID));
         });
     </script>
 }
diff --git a/src/SMAPI.Web/Views/LogParser/Index.cshtml b/src/SMAPI.Web/Views/LogParser/Index.cshtml
index 2183992b..9b611bcd 100644
--- a/src/SMAPI.Web/Views/LogParser/Index.cshtml
+++ b/src/SMAPI.Web/Views/LogParser/Index.cshtml
@@ -1,5 +1,4 @@
 @using Humanizer
-@using Newtonsoft.Json
 @using StardewModdingAPI.Toolkit.Utilities
 @using StardewModdingAPI.Web.Framework
 @using StardewModdingAPI.Web.Framework.LogParsing.Models
@@ -12,7 +11,6 @@
         .GetValues(typeof(LogLevel))
         .Cast<LogLevel>()
         .ToDictionary(level => level.ToString().ToLower(), level => level != LogLevel.Trace);
-    JsonSerializerSettings noFormatting = new JsonSerializerSettings { Formatting = Formatting.None };
 
     string curPageUrl = this.Url.PlainAction("Index", "LogParser", new { id = Model.PasteID }, absoluteUrl: true);
 }
@@ -32,12 +30,12 @@
     <script>
         $(function() {
             smapi.logParser({
-                logStarted: new Date(@Json.Serialize(Model.ParsedLog?.Timestamp)),
-                showPopup: @Json.Serialize(Model.ParsedLog == null),
-                showMods: @Json.Serialize(Model.ParsedLog?.Mods?.Select(p => Model.GetSlug(p.Name)).Distinct().ToDictionary(slug => slug, slug => true), noFormatting),
-                showSections: @Json.Serialize(Enum.GetNames(typeof(LogSection)).ToDictionary(section => section, section => false), noFormatting),
-                showLevels: @Json.Serialize(defaultFilters, noFormatting),
-                enableFilters: @Json.Serialize(!Model.ShowRaw)
+                logStarted: new Date(@this.ForJson(Model.ParsedLog?.Timestamp)),
+                showPopup: @this.ForJson(Model.ParsedLog == null),
+                showMods: @this.ForJson(Model.ParsedLog?.Mods?.Select(p => Model.GetSlug(p.Name)).Distinct().ToDictionary(slug => slug, slug => true)),
+                showSections: @this.ForJson(Enum.GetNames(typeof(LogSection)).ToDictionary(section => section, section => false)),
+                showLevels: @this.ForJson(defaultFilters),
+                enableFilters: @this.ForJson(!Model.ShowRaw)
             }, '@this.Url.PlainAction("Index", "LogParser", values: null)');
         });
     </script>
diff --git a/src/SMAPI.Web/Views/Mods/Index.cshtml b/src/SMAPI.Web/Views/Mods/Index.cshtml
index b1d9ae2c..f5506287 100644
--- a/src/SMAPI.Web/Views/Mods/Index.cshtml
+++ b/src/SMAPI.Web/Views/Mods/Index.cshtml
@@ -1,6 +1,6 @@
 @using Humanizer
 @using Humanizer.Localisation
-@using Newtonsoft.Json
+@using StardewModdingAPI.Web.Framework
 @model StardewModdingAPI.Web.ViewModels.ModListModel
 @{
     ViewData["Title"] = "Mod compatibility";
@@ -15,8 +15,8 @@
     <script src="~/Content/js/mods.js?r=20200218"></script>
     <script>
         $(function() {
-            var data = @Json.Serialize(Model.Mods, new JsonSerializerSettings { Formatting = Formatting.None });
-            var enableBeta = @Json.Serialize(Model.BetaVersion != null);
+            var data = @this.ForJson(Model.Mods);
+            var enableBeta = @this.ForJson(Model.BetaVersion != null);
             smapi.modList(data, enableBeta);
         });
     </script>
@@ -86,7 +86,7 @@ else
                     </td>
                     <td class="mod-page-links">
                         <span v-for="(link, i) in mod.ModPages">
-                            <a v-bind:href="link.Url">{{link.Text}}</a>{{i < mod.ModPages.length - 1 ? ', ' : ''}}
+                            <a v-bind:href="link.Url">{{link.Text}}</a>{{i &lt; mod.ModPages.length - 1 ? ', ' : ''}}
                         </span>
                     </td>
                     <td>
-- 
cgit