.net core 1.0 upgrade and documentation

oazabir · Jul 15, 2016 · a3265ea · a3265ea
1 parent 1184419
commit a3265ea
Show file tree

Hide file tree

Showing 20 changed files with 1,947 additions and 106 deletions.
diff --git a/DotNetCore/HackerSpray.Middleware.Test/project.json b/DotNetCore/HackerSpray.Middleware.Test/project.json
@@ -8,20 +8,20 @@
     "HackerSpray.Middleware": "1.0.0-*",
     "HackerSpray.Module": "1.0.0-*",
     "MSTest.TestFramework": "1.0.0-preview",
-    "Microsoft.AspNetCore.TestHost": "1.0.0-rc2-final",
-    "Microsoft.EntityFrameworkCore": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Identity": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc2-final",
-    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Hosting": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-rc2-final",
-    "System.Diagnostics.TextWriterTraceListener": "4.0.0-beta-23516",
+    "Microsoft.AspNetCore.TestHost": "1.0.0",
+    "Microsoft.EntityFrameworkCore": "1.0.0",
+    "Microsoft.AspNetCore.Identity": "1.0.0",
+    "Microsoft.AspNetCore.Mvc": "1.0.0",
+    "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0",
+    "Microsoft.Extensions.Logging.Console": "1.0.0",
+    "Microsoft.Extensions.Logging.Debug": "1.0.0",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
+    "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0",
+    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0",
+    "Microsoft.AspNetCore.Hosting": "1.0.0",
+    "Microsoft.AspNetCore.Http.Abstractions": "1.0.0",
+    "System.Diagnostics.TextWriterTraceListener": "4.0.0",
     "Serilog": "2.0.0-rc-622",
     "Serilog.Sinks.Seq": "2.0.0-rc-55",
     "Serilog.Extensions.Logging": "1.0.0-rc2-10110"
@@ -36,7 +36,7 @@
 
       "dependencies": {
         "Microsoft.NETCore.App": {
-          "version": "1.0.0-rc2-3002702",
+          "version": "1.0.0",
           "type": "platform"
         }
       }

diff --git a/DotNetCore/HackerSpray.Middleware/project.json b/DotNetCore/HackerSpray.Middleware/project.json
@@ -5,19 +5,24 @@
   "version": "1.0.0-*",
 
   "dependencies": {
-    "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Options": "1.0.0-rc2-final",
-    "NETStandard.Library": "1.5.0-rc2-24027"
+    "Microsoft.AspNetCore.Http.Abstractions": "1.0.0",
+    "Microsoft.Extensions.Configuration.Abstractions": "1.0.0",
+    "Microsoft.Extensions.Logging.Abstractions": "1.0.0",
+    "Microsoft.Extensions.Options": "1.0.0",
+    "NETStandard.Library": "1.6.0"
   },
 
   "frameworks": {
-    "netstandard1.5": {
+    "netstandard1.6": {
       "dependencies": {
         "HackerSpray.Module": "1.0.0-*"
       },
       "imports": "dnxcore50"
-    }    
+    },
+    "netcoreapp1.0": {
+      "dependencies": {
+        "HackerSpray.Module": "1.0.0-*"
+      }
+    }
   }
 }
diff --git a/DotNetCore/HackerSpray.Module/project.json b/DotNetCore/HackerSpray.Module/project.json
@@ -5,15 +5,18 @@
   "version": "1.0.0-*",
 
   "dependencies": {
-    "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-final",
-    "NETStandard.Library": "1.5.0-rc2-24027",
+    "Microsoft.Extensions.Logging.Abstractions": "1.0.0",
+    "NETStandard.Library": "1.6.0",
     "StackExchange.Redis": "1.1.604-alpha",
     "System.Diagnostics.TraceSource": "4.0.0-rc2-24027"
   },
 
   "frameworks": {
-    "netstandard1.5": {
+    "netstandard1.6": {
       "imports": "dnxcore50"
+    },
+    "netcoreapp1.0": {
+
     }
   }
 }
diff --git a/DotNetCore/SampleASPNETCoreWebApp/Data/log-20160711.txt b/DotNetCore/SampleASPNETCoreWebApp/Data/log-20160711.txt
@@ -0,0 +1,12 @@
+2016-07-11 20:47:13.200 +01:00 [Fatal] Application startup exception
+StackExchange.Redis.RedisConnectionException: It was not possible to connect to the redis server(s); to create a disconnected multiplexer, disable AbortOnConnectFail. SocketFailure on PING
+   at StackExchange.Redis.ConnectionMultiplexer.ConnectImpl(Func`1 multiplexerFactory, TextWriter log)
+   at HackerSpray.Module.RedisDefenceStore..ctor(String connectionString, String prefix, DefenceConfig config) in E:\GitHub\HackerSpray\DotNetCore\HackerSpray.Module\RedisDefenceStore.cs:line 33
+   at HackerSpray.Middleware.HackerSprayerMiddleware..ctor(RequestDelegate next, ILoggerFactory loggerFactory, HackerSprayOption option) in E:\GitHub\HackerSpray\DotNetCore\HackerSpray.Middleware\HackerSprayerMiddleware.cs:line 41
+--- End of stack trace from previous location where exception was thrown ---
+   at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
+   at Microsoft.Extensions.Internal.ActivatorUtilities.ConstructorMatcher.CreateInstance(IServiceProvider provider)
+   at Microsoft.Extensions.Internal.ActivatorUtilities.CreateInstance(IServiceProvider provider, Type instanceType, Object[] parameters)
+   at Microsoft.AspNetCore.Builder.UseMiddlewareExtensions.<>c__DisplayClass3_0.<UseMiddleware>b__0(RequestDelegate next)
+   at Microsoft.AspNetCore.Builder.Internal.ApplicationBuilder.Build()
+   at Microsoft.AspNetCore.Hosting.Internal.WebHost.BuildApplication()
diff --git a/DotNetCore/SampleASPNETCoreWebApp/Data/log-20160712.txt b/DotNetCore/SampleASPNETCoreWebApp/Data/log-20160712.txt
@@ -0,0 +1,12 @@
+2016-07-12 23:07:27.509 +01:00 [Fatal] Application startup exception
+StackExchange.Redis.RedisConnectionException: It was not possible to connect to the redis server(s); to create a disconnected multiplexer, disable AbortOnConnectFail. SocketFailure on PING
+   at StackExchange.Redis.ConnectionMultiplexer.ConnectImpl(Func`1 multiplexerFactory, TextWriter log)
+   at HackerSpray.Module.RedisDefenceStore..ctor(String connectionString, String prefix, DefenceConfig config) in E:\GitHub\HackerSpray\DotNetCore\HackerSpray.Module\RedisDefenceStore.cs:line 32
+   at HackerSpray.Middleware.HackerSprayerMiddleware..ctor(RequestDelegate next, ILoggerFactory loggerFactory, HackerSprayOption option) in E:\GitHub\HackerSpray\DotNetCore\HackerSpray.Middleware\HackerSprayerMiddleware.cs:line 41
+--- End of stack trace from previous location where exception was thrown ---
+   at System.Runtime.ExceptionServices.ExceptionDispatchInfo.Throw()
+   at Microsoft.Extensions.Internal.ActivatorUtilities.ConstructorMatcher.CreateInstance(IServiceProvider provider)
+   at Microsoft.Extensions.Internal.ActivatorUtilities.CreateInstance(IServiceProvider provider, Type instanceType, Object[] parameters)
+   at Microsoft.AspNetCore.Builder.UseMiddlewareExtensions.<>c__DisplayClass3_0.<UseMiddleware>b__0(RequestDelegate next)
+   at Microsoft.AspNetCore.Builder.Internal.ApplicationBuilder.Build()
+   at Microsoft.AspNetCore.Hosting.Internal.WebHost.BuildApplication()
diff --git a/DotNetCore/SampleASPNETCoreWebApp/Startup.cs b/DotNetCore/SampleASPNETCoreWebApp/Startup.cs
@@ -27,6 +27,7 @@ public Startup(IHostingEnvironment env)
             var builder = new ConfigurationBuilder()
                 .SetBasePath(env.ContentRootPath)
                 .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
+                .AddJsonFile("hackerspray.json", optional: true, reloadOnChange: true)
                 .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true);
 
             if (env.IsDevelopment())

diff --git a/DotNetCore/SampleASPNETCoreWebApp/appsettings.json b/DotNetCore/SampleASPNETCoreWebApp/appsettings.json
@@ -3,15 +3,7 @@
     //"DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=aspnet-SampleASPNETCoreWebApp-c969a878-7ed3-488b-a03d-d360a385aaa6;Trusted_Connection=True;MultipleActiveResultSets=true"
     "DefaultConnection": "Server=.\\sqlexpress12;Database=aspnet5-HackerSpray.SampleDotNetCoreWebsite-f6a67b61-ff0f-4456-9e9e-edc29843b443;Trusted_Connection=True;MultipleActiveResultSets=true"
   },
-  "HackerSpray": {
-    "Redis": "127.0.0.1",
-    "Prefix": "AuthTest-Core:",
-    "Keys": [
-      "POST /Account/Login 100 00:10:00 key+origin",
-      "GET /Account/Login 100 00:10:00 key+origin",
-      "GET /Home/ 10000 00:10:00 key+origin"
-    ]
-  },
+
   "Logging": {
     "IncludeScopes": false,
     "LogLevel": {

diff --git a/DotNetCore/SampleASPNETCoreWebApp/hackerspray.json b/DotNetCore/SampleASPNETCoreWebApp/hackerspray.json
@@ -0,0 +1,11 @@
+{
+  "HackerSpray": {
+    "Redis": "127.0.0.1",
+    "Prefix": "AuthTest-Core:",
+    "Keys": [
+      "POST /Account/Login 100 00:10:00 key+origin",
+      "GET /Account/Login 100 00:10:00 key+origin",
+      "GET /Home/ 10000 00:10:00 key+origin"
+    ]
+  }
+}
diff --git a/DotNetCore/SampleASPNETCoreWebApp/project.json b/DotNetCore/SampleASPNETCoreWebApp/project.json
@@ -1,75 +1,65 @@
 {
-  "userSecretsId": "aspnet-SampleASPNETCoreWebApp-c969a878-7ed3-488b-a03d-d360a385aaa6",
+  "userSecretsId": "aspnet-WebApplication5-1e3fe45c-e09a-4240-967b-54897fdc035a",
 
   "dependencies": {
     "Microsoft.NETCore.App": {
-      "version": "1.0.0-rc2-3002702",
+      "version": "1.0.0",
       "type": "platform"
     },
-    "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final",
+    "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0",
+    "Microsoft.AspNetCore.Diagnostics": "1.0.0",
+    "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0",
+    "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0",
+    "Microsoft.AspNetCore.Mvc": "1.0.0",
     "Microsoft.AspNetCore.Razor.Tools": {
-      "version": "1.0.0-preview1-final",
+      "version": "1.0.0-preview2-final",
+      "type": "build"
+    },
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
+    "Microsoft.AspNetCore.StaticFiles": "1.0.0",
+    "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0",
+    "Microsoft.EntityFrameworkCore.SqlServer.Design": {
+      "version": "1.0.0",
       "type": "build"
     },
-    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.StaticFiles": "1.0.0-rc2-final",
-    "Microsoft.EntityFrameworkCore.SqlServer": "1.0.0-rc2-final",
     "Microsoft.EntityFrameworkCore.Tools": {
-      "version": "1.0.0-preview1-final",
+      "version": "1.0.0-preview2-final",
       "type": "build"
     },
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Logging": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final",
-    "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0-rc2-final",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0",
+    "Microsoft.Extensions.Configuration.UserSecrets": "1.0.0",
+    "Microsoft.Extensions.Logging": "1.0.0",
+    "Microsoft.Extensions.Logging.Console": "1.0.0",
+    "Microsoft.Extensions.Logging.Debug": "1.0.0",
+    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
+    "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0",
     "Microsoft.VisualStudio.Web.CodeGeneration.Tools": {
-      "version": "1.0.0-preview1-final",
+      "version": "1.0.0-preview2-final",
       "type": "build"
     },
     "Microsoft.VisualStudio.Web.CodeGenerators.Mvc": {
-      "version": "1.0.0-preview1-final",
+      "version": "1.0.0-preview2-final",
       "type": "build"
     },
     "HackerSpray.Module": "1.0.0-*",
     "HackerSpray.Middleware": "1.0.0-*",
-    "System.Diagnostics.TextWriterTraceListener": "4.0.0-beta-23516",
+    "System.Diagnostics.TextWriterTraceListener": "4.0.0",
     "Serilog": "2.0.0-rc-622",
     "Serilog.Sinks.Seq": "2.0.0-rc-55",
     "Serilog.Extensions.Logging": "1.0.0-rc2-10110"
   },
 
   "tools": {
-    "Microsoft.AspNetCore.Razor.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": "portable-net45+win8+dnxcore50"
-    },
-    "Microsoft.AspNetCore.Server.IISIntegration.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": "portable-net45+win8+dnxcore50"
-    },
-    "Microsoft.EntityFrameworkCore.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": [
-        "portable-net45+win8+dnxcore50",
-        "portable-net45+win8"
-      ]
-    },
-    "Microsoft.Extensions.SecretManager.Tools": {
-      "version": "1.0.0-preview1-final",
-      "imports": "portable-net45+win8+dnxcore50"
-    },
+    "BundlerMinifier.Core": "2.0.238",
+    "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final",
+    "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final",
+    "Microsoft.EntityFrameworkCore.Tools": "1.0.0-preview2-final",
+    "Microsoft.Extensions.SecretManager.Tools": "1.0.0-preview2-final",
     "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"
       ]
     }
@@ -79,7 +69,6 @@
     "netcoreapp1.0": {
       "imports": [
         "dotnet5.6",
-        "dnxcore50",
         "portable-net45+win8"
       ]
     }
@@ -91,20 +80,23 @@
   },
 
   "runtimeOptions": {
-    "gcServer": true
+    "configProperties": {
+      "System.GC.Server": true
+    }
   },
 
   "publishOptions": {
     "include": [
       "wwwroot",
       "Views",
+      "Areas/**/Views",
       "appsettings.json",
       "web.config"
     ]
   },
 
   "scripts": {
-    "prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ],
+    "prepublish": [ "bower install", "dotnet bundle" ],
     "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
   }
 }