Update ReactGrid example to RC2

samples/react/ReactGrid/Controllers/HomeController.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace ReactExample.Controllers
 {

samples/react/ReactGrid/Controllers/PeopleApiController.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
-using Microsoft.AspNet.Mvc;
+using Microsoft.AspNetCore.Mvc;
 
 namespace ReactExample.Controllers
 {
@@ -10,9 +10,9 @@ namespace ReactExample.Controllers
         public ActionResult UpdatePerson([FromBody] PersonDto person)
         {
             if (!ModelState.IsValid) {
-                return HttpBadRequest(ModelState);
+                return BadRequest(ModelState);
             } else {
-                return new HttpOkResult();
+                return new OkResult();
             }
         }
     }

samples/react/ReactGrid/Startup.cs

@@ -1,60 +1,34 @@
-using Microsoft.AspNet.Builder;
+using System;
-using Microsoft.AspNet.Hosting;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNet.SpaServices.Webpack;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.PlatformAbstractions;
+using Newtonsoft.Json.Serialization;
 
-namespace ReactExample
+namespace ReactGrid
 {
     public class Startup
     {
-        public Startup(IHostingEnvironment env, IApplicationEnvironment appEnv)
+        // This method gets called by the runtime. Use this method to add services to the container.
-        {
-            // Setup configuration sources.
-            var builder = new ConfigurationBuilder()
-                .SetBasePath(appEnv.ApplicationBasePath)
-                .AddJsonFile("appsettings.json")
-                .AddEnvironmentVariables();
-            Configuration = builder.Build();
-        }
-
-        public IConfigurationRoot Configuration { get; set; }
-
-        // This method gets called by the runtime.
         public void ConfigureServices(IServiceCollection services)
         {
-            // Add MVC services to the services container.
+            services.AddMvc().AddJsonOptions(options =>
-            services.AddMvc();
+            {
+                options.SerializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
+            });
         }
 
-        // Configure is called after ConfigureServices is called.
+        // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
-        public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
+        public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory, IHostingEnvironment env)
         {
-            loggerFactory.MinimumLevel = LogLevel.Warning;
+            app.UseDeveloperExceptionPage();
-            loggerFactory.AddConsole();
-            loggerFactory.AddDebug();
 
-            // Configure the HTTP request pipeline.
-
-            // Add the platform handler to the request pipeline.
-            app.UseIISPlatformHandler();
-
-            // Add the following to the request pipeline only in development environment.
-            if (env.IsDevelopment())
-            {
-                app.UseDeveloperExceptionPage();
-            }
-            else
-            {
-                // Add Error handling middleware which catches all application specific errors and
-                // send the request to the following path or controller action.
-                app.UseExceptionHandler("/Home/Error");
-            }
-
-            // In dev mode, the JS/TS/etc is compiled and served dynamically and supports hot replacement.
-            // In production, we assume you've used webpack to emit the prebuilt content to disk.
             if (env.IsDevelopment()) {
                 app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions {
                     HotModuleReplacement = true,
@@ -62,16 +36,31 @@ namespace ReactExample
                 });
             }
 
-            // Add static files to the request pipeline.
             app.UseStaticFiles();
-
+            loggerFactory.AddConsole();
-            // Add MVC to the request pipeline.
             app.UseMvc(routes =>
             {
-                routes.MapSpaFallbackRoute(
+                routes.MapRoute(
                     name: "default",
-                    defaults: new { controller="Home", action = "Index" });
+                    template: "{controller=Home}/{action=Index}/{id?}");
+
+                routes.MapSpaFallbackRoute(
+                    name: "spa-fallback",
+                    defaults: new { controller = "Home", action = "Index" });
             });
         }
+
+        public static void Main(string[] args)
+        {
+            var host = new WebHostBuilder()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseDefaultHostingConfiguration(args)
+                .UseIISPlatformHandlerUrl()
+                .UseKestrel()
+                .UseStartup<Startup>()
+                .Build();
+
+            host.Run();
+        }
     }
 }

samples/react/ReactGrid/Views/_ViewImports.cshtml

@@ -1,3 +1,3 @@
 @using ReactExample
-@addTagHelper "*, Microsoft.AspNet.Mvc.TagHelpers"
+@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
 @addTagHelper "*, Microsoft.AspNet.SpaServices"

samples/react/ReactGrid/package.json

@@ -18,6 +18,9 @@
     "webpack-externals-plugin": "^1.0.0"
   },
   "devDependencies": {
+    "aspnet-prerendering": "^1.0.0",
+    "aspnet-webpack": "^1.0.3",
+    "aspnet-webpack-react": "^1.0.1",
     "babel-loader": "^6.2.1",
     "babel-plugin-react-transform": "^2.0.0",
     "babel-preset-es2015": "^6.3.13",

samples/react/ReactGrid/project.json

@@ -1,19 +1,21 @@
 {
-  "webroot": "wwwroot",
   "version": "1.0.0-*",
-  "tooling": {
+  "compilationOptions": {
-    "defaultNamespace": "ReactExample"
+    "emitEntryPoint": true,
+    "warningsAsErrors": true,
+    "preserveCompilationContext": true
   },
   "dependencies": {
-    "Microsoft.AspNet.Diagnostics": "1.0.0-rc1-*",
+    "Microsoft.AspNetCore.Diagnostics": "1.0.0-*",
-    "Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-*",
+    "Microsoft.AspNetCore.IISPlatformHandler": "1.0.0-*",
-    "Microsoft.AspNet.Mvc": "6.0.0-rc1-*",
+    "Microsoft.AspNetCore.Mvc": "1.0.0-*",
-    "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-rc1-*",
+    "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-*",
-    "Microsoft.AspNet.Server.Kestrel": "1.0.0-rc1-*",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-*",
-    "Microsoft.AspNet.StaticFiles": "1.0.0-rc1-*",
+    "Microsoft.AspNetCore.StaticFiles": "1.0.0-*",
-    "Microsoft.AspNet.Tooling.Razor": "1.0.0-rc1-*",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0-*",
-    "Microsoft.Extensions.Logging.Console": "1.0.0-rc1-*",
+    "Microsoft.Extensions.Logging.Console": "1.0.0-*",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-rc1-*",
+    "Microsoft.NETCore.Platforms": "1.0.1-*",
+    "Microsoft.Extensions.Logging.Debug": "1.0.0-*",
     "Microsoft.AspNet.ReactServices": "1.0.0-*"
   },
   "commands": {
@@ -21,23 +23,31 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ],
+      "dependencies": {
+        "NETStandard.Library": "1.5.0-*"
+      }
+    }
   },
+
   "exclude": [
     "wwwroot",
-    "node_modules",
+    "node_modules"
-    "bower_components"
   ],
   "publishExclude": [
     "node_modules",
-    "bower_components",
     "**.xproj",
     "**.user",
     "**.vspscc"
   ],
   "scripts": {
-    "prepublish": [
+    "prepare": [
-      "npm install"
+      "npm install",
+      "webpack"
     ]
   }
 }