Upgrade website to ASP.NET Core 6.0

Author: tgjones

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2022-02-02
+
+* Upgraded website to ASP.NET Core 6.0
+
 ## 2021-10-26
 
 * Added Metal compiler 2.0

src/ShaderPlayground.Core.Tests/ShaderPlayground.Core.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

src/ShaderPlayground.Core/ShaderCompilerParameter.cs

@@ -1,6 +1,5 @@
 using System;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
+using System.Text.Json.Serialization;
 
 namespace ShaderPlayground.Core
 {
@@ -9,7 +8,7 @@ public sealed class ShaderCompilerParameter
         public string Name { get; }
         public string DisplayName { get; }
 
-        [JsonConverter(typeof(StringEnumConverter))]
+        [JsonConverter(typeof(JsonStringEnumConverter))]
         public ShaderCompilerParameterType ParameterType { get; }
 
         public string[] Options { get; }

src/ShaderPlayground.Core/ShaderPlayground.Core.csproj

@@ -1,13 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <LangVersion>8.0</LangVersion>
+    <TargetFramework>net6.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="CsvHelper" Version="12.2.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
   </ItemGroup>
 
   <ItemGroup>

src/ShaderPlayground.Core/Util/JsonTableUtility.cs

@@ -1,5 +1,5 @@
 using System.Collections.Generic;
-using Newtonsoft.Json;
+using System.Text.Json;
 
 namespace ShaderPlayground.Core.Util
 {
@@ -11,7 +11,7 @@ internal sealed class JsonTable
 
         public string ToJson()
         {
-            return JsonConvert.SerializeObject(this);
+            return JsonSerializer.Serialize(this);
         }
     }
 

src/ShaderPlayground.Web/Models/GitHubUtility.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc.NewtonsoftJson;
 using Newtonsoft.Json;
 using Octokit;
 using ShaderPlayground.Core;
@@ -14,7 +13,7 @@ internal static class GitHubUtility
 
         static GitHubUtility()
         {
-            SerializerSettings = JsonSerializerSettingsProvider.CreateSerializerSettings();
+            SerializerSettings = new JsonSerializerSettings();
             SerializerSettings.Formatting = Formatting.Indented;
         }
 

src/ShaderPlayground.Web/ShaderPlayground.Web.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <UserSecretsId>0d767b89-f281-4b11-a100-c06e6f634c5e</UserSecretsId>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <ApplicationInsightsResourceId>/subscriptions/890b998c-6372-4369-8f70-cb6709a640d4/resourcegroups/DefaultResourceGroup/providers/microsoft.insights/components/tryhlsl</ApplicationInsightsResourceId>
@@ -12,7 +12,6 @@
   <ItemGroup>
     <PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
     <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.15.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8" />
     <PackageReference Include="Microsoft.Web.LibraryManager.Build" Version="2.1.76" />
     <PackageReference Include="Octokit" Version="0.48.0" />
   </ItemGroup>

src/ShaderPlayground.Web/Startup.cs

@@ -22,8 +22,7 @@ public void ConfigureServices(IServiceCollection services)
                 .AddMvc(options =>
                 {
                     options.EnableEndpointRouting = false;
-                })
-                .AddNewtonsoftJson();
+                });
 
             services.AddApplicationInsightsTelemetry();
         }