From 511538a19e9066220100df634ef59963c0d76fb6 Mon Sep 17 00:00:00 2001
From: Ryan Brandenburg <rybrande@microsoft.com>
Date: Thu, 21 Feb 2019 21:46:27 -0800
Subject: [PATCH] Revert bad merge in React app (#7769)

---
 .../React-CSharp/ClientApp/.eslintrc.json     |  3 ---
 .../React-CSharp/ClientApp/tsconfig.json      | 24 -------------------
 .../test/SpaTemplateTest/ReactTemplateTest.cs |  2 +-
 3 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/.eslintrc.json
 delete mode 100644 src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/tsconfig.json

diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/.eslintrc.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/.eslintrc.json
deleted file mode 100644
index a07f42e6a8..0000000000
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/.eslintrc.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "parser": "typescript-eslint-parser"
-}
\ No newline at end of file
diff --git a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/tsconfig.json b/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/tsconfig.json
deleted file mode 100644
index 8a6b4c16b4..0000000000
--- a/src/ProjectTemplates/Web.Spa.ProjectTemplates/content/React-CSharp/ClientApp/tsconfig.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "es5",
-    "allowJs": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "module": "esnext",
-    "moduleResolution": "node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "jsx": "preserve",
-    "lib": [
-      "es2015",
-      "dom"
-    ],
-    "skipLibCheck": false
-  },
-  "include": [
-    "src"
-  ]
-}
diff --git a/src/ProjectTemplates/test/SpaTemplateTest/ReactTemplateTest.cs b/src/ProjectTemplates/test/SpaTemplateTest/ReactTemplateTest.cs
index 25afb0b24e..ef73344f05 100644
--- a/src/ProjectTemplates/test/SpaTemplateTest/ReactTemplateTest.cs
+++ b/src/ProjectTemplates/test/SpaTemplateTest/ReactTemplateTest.cs
@@ -14,7 +14,7 @@ namespace Templates.Test.SpaTemplateTest
         {
         }
 
-        [Fact(Skip = "This test is broken. Using https://github.com/aspnet/AspNetCore-Internal/issues/1745 to track re-enabling this.")]
+        [Fact]
         public void ReactTemplate_Works_NetCore()
             => SpaTemplateImpl("react");
     }