Upgrade to ASP.NET Core RTM

Daniel15 · Aug 22, 2016 · bf69a63 · bf69a63
1 parent fbe2915
commit bf69a63
Show file tree

Hide file tree

Showing 10 changed files with 45 additions and 61 deletions.
diff --git a/Daniel15.BusinessLayer/project.json b/Daniel15.BusinessLayer/project.json
@@ -6,11 +6,11 @@
       "target": "project"
     },
     "MarkdownDeep.NET": "1.5.0",
-    "Microsoft.AspNetCore.Http.Extensions": "1.0.0-rc2-final"
+    "Microsoft.AspNetCore.Http.Extensions": "1.0.0"
   },
 
     "frameworks": {
-        "net451": {
+        "net452": {
           "frameworkAssemblies": {
             "System.Net": "4.0.0.0"
           },

diff --git a/Daniel15.Cron/project.json b/Daniel15.Cron/project.json
@@ -19,20 +19,20 @@
     "Daniel15.Data": {
       "target": "project"
     },
-    "Microsoft.Extensions.DependencyInjection": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration": "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.PlatformAbstractions": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Http.Extensions": "1.0.0-rc2-final"
+    "Microsoft.Extensions.DependencyInjection": "1.0.0",
+    "Microsoft.Extensions.Configuration": "1.0.0",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
+    "Microsoft.Extensions.PlatformAbstractions": "1.0.0",
+    "Microsoft.AspNetCore.Http.Extensions": "1.0.0"
   },
 
   "commands": {
     "Daniel15.Cron": "Daniel15.Cron"
   },
 
   "frameworks": {
-    "net451": {
+    "net452": {
       "imports": [
         ".NetFramework 3.5,Version=v0.0"
       ]

diff --git a/Daniel15.Data/project.json b/Daniel15.Data/project.json
@@ -8,12 +8,12 @@
     "EntityFramework": "6.1.3",
     "Newtonsoft.Json": "7.0.1",
     "MySql.Data.Entity": "6.9.7",
-    "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-rc2-final",
+    "Microsoft.Extensions.Configuration.Abstractions": "1.0.0",
     "System.Text.Encodings.Web": "4.0.0-rc2-24027"
   },
 
     "frameworks": {
-        "net451": {
+        "net452": {
             "dependencies": {
             },
             "frameworkAssemblies": {

diff --git a/Daniel15.Infrastructure/project.json b/Daniel15.Infrastructure/project.json
@@ -4,12 +4,12 @@
   "dependencies": {
     "Daniel15.BusinessLayer": "1.0.0-*",
     "Daniel15.Data": "1.0.0-*",
-    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0-rc2-final"
+    "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0",
+    "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0"
   },
 
     "frameworks": {
-      "net451": {
+      "net452": {
         "imports": [
           ".NetFramework 3.5,Version=v0.0"
         ]

diff --git a/Daniel15.Shared/project.json b/Daniel15.Shared/project.json
@@ -4,7 +4,7 @@
   "dependencies": { },
 
   "frameworks": {
-    "net451": {
+    "net452": {
       "frameworkAssemblies": {
         "System.Drawing": "4.0.0.0"
       }

diff --git a/Daniel15.Web/Properties/launchSettings.json b/Daniel15.Web/Properties/launchSettings.json
@@ -12,13 +12,7 @@
       "commandName": "IISExpress",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNET_ENV": "Development"
-      }
-    },
-    "web": {
-      "commandName": "web",
-      "environmentVariables": {
-        "Hosting:Environment": "Development"
+        "ASPNETCORE_ENVIRONMENT": "Development"
       }
     }
   }

diff --git a/Daniel15.Web/Startup.cs b/Daniel15.Web/Startup.cs
@@ -18,7 +18,7 @@ public Startup(IHostingEnvironment env)
 		{
 			var builder = new ConfigurationBuilder()
 				.SetBasePath(env.ContentRootPath)
-				.AddJsonFile("config.json")
+				.AddJsonFile("config.json", optional: false, reloadOnChange: true)
 				.AddJsonFile("config.generated.json", optional: true)
 				.AddJsonFile($"config.{env.EnvironmentName}.json", optional: true)
 				.AddEnvironmentVariables();

diff --git a/Daniel15.Web/app.config b/Daniel15.Web/app.config
@@ -0,0 +1,5 @@
+<configuration>
+	<runtime>
+		<gcServer enabled="true"/>
+	</runtime>
+</configuration>
diff --git a/Daniel15.Web/project.json b/Daniel15.Web/project.json
@@ -18,48 +18,36 @@
     "Daniel15.Shared": {
       "target": "project"
     },
-    "Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Diagnostics.Abstractions": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Http.Abstractions": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final",
+    "Microsoft.AspNetCore.Diagnostics": "1.0.0",
+    "Microsoft.AspNetCore.Diagnostics.Abstractions": "1.0.0",
+    "Microsoft.AspNetCore.Http.Abstractions": "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-rc2-final",
-    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.StaticFiles": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
-    "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0-rc2-final",
-    "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0-rc2-final",
-    "Microsoft.AspNetCore.Session": "1.0.0-rc2-final",
-    "Daniel15.SimpleIdentity": "1.1.0",
-    "React.AspNet": "2.4.0",
-    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final",
-    "Microsoft.Extensions.Configuration.CommandLine": "1.0.0-rc2-final"
+    "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
+    "Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
+    "Microsoft.AspNetCore.StaticFiles": "1.0.0",
+    "Microsoft.Extensions.Configuration.Json": "1.0.0",
+    "Microsoft.Extensions.Logging.Console": "1.0.0",
+    "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0",
+    "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.0",
+    "Microsoft.AspNetCore.Session": "1.0.0",
+    "Daniel15.SimpleIdentity": "1.2.0",
+    "React.AspNet": "2.5.0",
+    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
+    "Microsoft.Extensions.Logging.Debug": "1.0.0",
+    "Microsoft.Extensions.Configuration.CommandLine": "1.0.0"
   },
 
   "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"
-    }
-  },
-
-  "commands": {
-    "web": "Microsoft.AspNetCore.Server.Kestrel",
-    "web-live": "Microsoft.AspNetCore.Server.Kestrel --server.urls http://unix:/run/dan-live.sock",
-    "web-staging": "Microsoft.AspNetCore.Server.Kestrel --server.urls http://unix:/run/dan-staging.sock"
+    "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final",
+    "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final"
   },
 
   "frameworks": {
-    "net451": {
+    "net452": {
       "dependencies": { },
       "frameworkAssemblies": {
         "System.Drawing": "4.0.0.0"
@@ -70,14 +58,11 @@
     }
   },
 
-  "runtimeOptions": {
-    "gcServer": true
-  },
-
   "publishOptions": {
     "include": [
       "wwwroot",
       "Views",
+      "Areas/**/Views",
       "config.json",
       "config.Development.json",
       "config.generated.json",

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-      "version": "1.0.0-preview1-002702"
+      "version": "1.0.0-preview2-003121"
     }
 }