From b0d9a65cd4291a72f5ee0e28808e82e9c15d86eb Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Thu, 30 May 2019 14:15:17 -0700
Subject: [PATCH] Remove Newtonsoft.Json (dotnet/aspnetcore#10630)

Commit migrated from dotnet/aspnetcore@18a230737a3e
---
 src/Angular-CSharp.csproj.in                         | 1 -
 src/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj | 1 -
 src/React-CSharp.csproj.in                           | 1 -
 src/ReactRedux-CSharp.csproj.in                      | 1 -
 src/content/Angular-CSharp/Startup.cs                | 3 +--
 src/content/React-CSharp/Startup.cs                  | 3 +--
 src/content/ReactRedux-CSharp/Startup.cs             | 3 +--
 7 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/Angular-CSharp.csproj.in b/src/Angular-CSharp.csproj.in
index 082a437..bd29440 100644
--- a/src/Angular-CSharp.csproj.in
+++ b/src/Angular-CSharp.csproj.in
@@ -15,7 +15,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="${MicrosoftAspNetCoreMvcNewtonsoftJsonPackageVersion}" />
     <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="${MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion}" />
     <PackageReference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="${MicrosoftAspNetCoreApiAuthorizationIdentityServerPackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' " />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="${MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' " />
diff --git a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
index ff58449..5929c7c 100644
--- a/src/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
+++ b/src/Microsoft.DotNet.Web.Spa.ProjectTemplates.csproj
@@ -22,7 +22,6 @@
 
   <ItemGroup>
     <!-- These projects product packages that the templates depend on. See GenerateContent.targets -->
-    <PackageVersionVariableReference Include="$(RepoRoot)src\Mvc\Mvc.NewtonsoftJson\src\Microsoft.AspNetCore.Mvc.NewtonsoftJson.csproj" />
     <PackageVersionVariableReference Include="$(RepoRoot)src\Middleware\SpaServices.Extensions\src\Microsoft.AspNetCore.SpaServices.Extensions.csproj" />
     <PackageVersionVariableReference Include="$(RepoRoot)src\Identity\ApiAuthorization.IdentityServer\src\Microsoft.AspNetCore.ApiAuthorization.IdentityServer.csproj" />
     <PackageVersionVariableReference Include="$(RepoRoot)src\Identity\EntityFrameworkCore\src\Microsoft.AspNetCore.Identity.EntityFrameworkCore.csproj" />
diff --git a/src/React-CSharp.csproj.in b/src/React-CSharp.csproj.in
index 5b930eb..dc4897f 100644
--- a/src/React-CSharp.csproj.in
+++ b/src/React-CSharp.csproj.in
@@ -12,7 +12,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="${MicrosoftAspNetCoreMvcNewtonsoftJsonPackageVersion}" />
     <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="${MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion}" />
     <PackageReference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="${MicrosoftAspNetCoreApiAuthorizationIdentityServerPackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' " />
     <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="${MicrosoftAspNetCoreDiagnosticsEntityFrameworkCorePackageVersion}" Condition=" '$(IndividualLocalAuth)' == 'True' " />
diff --git a/src/ReactRedux-CSharp.csproj.in b/src/ReactRedux-CSharp.csproj.in
index eee417f..71a0a80 100644
--- a/src/ReactRedux-CSharp.csproj.in
+++ b/src/ReactRedux-CSharp.csproj.in
@@ -12,7 +12,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="${MicrosoftAspNetCoreMvcNewtonsoftJsonPackageVersion}" />
     <PackageReference Include="Microsoft.AspNetCore.SpaServices.Extensions" Version="${MicrosoftAspNetCoreSpaServicesExtensionsPackageVersion}" />
   </ItemGroup>
 
diff --git a/src/content/Angular-CSharp/Startup.cs b/src/content/Angular-CSharp/Startup.cs
index c00c010..b5d6e74 100644
--- a/src/content/Angular-CSharp/Startup.cs
+++ b/src/content/Angular-CSharp/Startup.cs
@@ -53,8 +53,7 @@ namespace Company.WebApplication1
             services.AddAuthentication()
                 .AddIdentityServerJwt();
 #endif
-            services.AddMvc(options => options.EnableEndpointRouting = false)
-                .AddNewtonsoftJson();
+            services.AddMvc(options => options.EnableEndpointRouting = false);
 
             // In production, the Angular files will be served from this directory
             services.AddSpaStaticFiles(configuration =>
diff --git a/src/content/React-CSharp/Startup.cs b/src/content/React-CSharp/Startup.cs
index c49c59d..2303f02 100644
--- a/src/content/React-CSharp/Startup.cs
+++ b/src/content/React-CSharp/Startup.cs
@@ -53,8 +53,7 @@ namespace Company.WebApplication1
             services.AddAuthentication()
                 .AddIdentityServerJwt();
 #endif
-            services.AddMvc(options => options.EnableEndpointRouting = false)
-                .AddNewtonsoftJson();
+            services.AddMvc(options => options.EnableEndpointRouting = false);
 
             // In production, the React files will be served from this directory
             services.AddSpaStaticFiles(configuration =>
diff --git a/src/content/ReactRedux-CSharp/Startup.cs b/src/content/ReactRedux-CSharp/Startup.cs
index f0e7cf2..620d39f 100644
--- a/src/content/ReactRedux-CSharp/Startup.cs
+++ b/src/content/ReactRedux-CSharp/Startup.cs
@@ -23,8 +23,7 @@ namespace Company.WebApplication1
         // This method gets called by the runtime. Use this method to add services to the container.
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc(options => options.EnableEndpointRouting = false)
-                .AddNewtonsoftJson();
+            services.AddMvc(options => options.EnableEndpointRouting = false);
 
             // In production, the React files will be served from this directory
             services.AddSpaStaticFiles(configuration =>