Integration tests running and passing.

mperdeck · Jul 11, 2016 · b4e2865 · b4e2865
1 parent 589b874
commit b4e2865
Show file tree

Hide file tree

Showing 10 changed files with 4,474 additions and 3,444 deletions.
diff --git a/global.json b/global.json
@@ -4,6 +4,6 @@
     "test"
   ],
   "sdk": {
-    "version": "1.0.0-preview1-002702"
+    "version": "1.0.0-preview2-003121"
   }
 }
diff --git a/src/JSNLog.TestSite/Startup.cs b/src/JSNLog.TestSite/Startup.cs
@@ -26,7 +26,7 @@ public void ConfigureServices(IServiceCollection services)
         public void Configure(IApplicationBuilder app)
         {
             app.UseDeveloperExceptionPage();
-            app.UseRuntimeInfoPage();
+          //  app.UseRuntimeInfoPage();
 
           //  app.UseIISPlatformHandler();
             app.UseStaticFiles();

diff --git a/src/JSNLog.TestSite/Views/Home/RequestIdTest.cshtml b/src/JSNLog.TestSite/Views/Home/RequestIdTest.cshtml
@@ -1,5 +1,5 @@
 @using JSNLog
-@using Microsoft.AspNet.Http;
+@using Microsoft.AspNetCore.Http;
 @using JSNLog.Tests.Common;
 
 @inject IHttpContextAccessor httpContextAccessor

diff --git a/src/JSNLog.TestSite/project.json b/src/JSNLog.TestSite/project.json
@@ -17,34 +17,35 @@
     },
     "copyToOutput": {
       "include": [
-        "Views"
+        "Views",
+        "wwwroot"
       ]
     }
   },
   "dependencies": {
     "JSNLog": "2.17.4",
     "JSNLog.Tests": "2.17.4",
-    "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.StaticFiles": "1.0.0-rc2-final",
+    "Microsoft.AspNetCore.Diagnostics": "1.0.0",
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
+    "Microsoft.AspNetCore.Mvc": "1.0.0",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
+    "Microsoft.AspNetCore.StaticFiles": "1.0.0",
     "Microsoft.VisualStudio.Web.CodeGeneration.Tools": {
-      "version": "1.0.0-preview1-final",
+      "version": "1.0.0-preview2-final",
       "type": "build"
     },
-    "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-final"
+    "Microsoft.AspNetCore.Hosting": "1.0.0",
+    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0"
   },
   "tools": {
     "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
-      "version": "1.0.0-preview1-final",
+      "version": "1.0.0-preview2-final",
       "imports": [
         "portable-net45+win8+dnxcore50"
       ]
     },
     "Microsoft.VisualStudio.Web.CodeGeneration.Tools": {
-      "version": "1.0.0-preview1-final",
+      "version": "1.0.0-preview2-final",
       "imports": [
         "portable-net45+win8+dnxcore50",
         "portable-net45+win8"