diff --git a/appveyor.yml b/appveyor.yml index 59c3d42..e80d75e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,9 +8,9 @@ before_build: - ps: "&{$Branch='dev';iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.ps1'))}" - ps: dnvm upgrade - ps: dnvm update-self - - ps: dnvm install 1.0.0-beta7 + - ps: dnvm install 1.0.0-beta8 - ps: dnvm list - - ps: dnvm use 1.0.0-beta7 + - ps: dnvm use 1.0.0-beta8 - ps: npm cache clean - ps: npm install -g gulp bower - ps: dnu restore diff --git a/global.json b/global.json index 329918d..e9536a8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ -{ +{ "projects": [ "src", "test" ], "sdk": { - "version": "1.0.0-beta7" + "version": "1.0.0-beta8" } } diff --git a/src/DotNetMashup.Web/Repositories/TwitterRepository.cs b/src/DotNetMashup.Web/Repositories/TwitterRepository.cs index a333448..6a35a93 100644 --- a/src/DotNetMashup.Web/Repositories/TwitterRepository.cs +++ b/src/DotNetMashup.Web/Repositories/TwitterRepository.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; @@ -10,7 +9,6 @@ using Microsoft.Framework.Configuration; using Tweetinvi; using Tweetinvi.Core.Credentials; using Tweetinvi.Core.Enum; -using Tweetinvi.Core.Interfaces; using Tweetinvi.Core.Parameters; namespace DotNetMashup.Web.Repositories diff --git a/src/DotNetMashup.Web/Startup.cs b/src/DotNetMashup.Web/Startup.cs index 6a2796c..a863cb4 100644 --- a/src/DotNetMashup.Web/Startup.cs +++ b/src/DotNetMashup.Web/Startup.cs @@ -65,13 +65,13 @@ namespace DotNetMashup.Web if(env.IsDevelopment()) { app.UseBrowserLink(); - app.UseErrorPage(); + 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.UseErrorHandler("/Home/Error"); + app.UseExceptionHandler("/Home/Error"); } // Add static files to the request pipeline. diff --git a/src/DotNetMashup.Web/hosting.ini b/src/DotNetMashup.Web/hosting.ini deleted file mode 100644 index 126132d..0000000 --- a/src/DotNetMashup.Web/hosting.ini +++ /dev/null @@ -1,2 +0,0 @@ -server=Microsoft.AspNet.Server.WebListener -server.urls=http://localhost:5000 diff --git a/src/DotNetMashup.Web/project.json b/src/DotNetMashup.Web/project.json index 63a9feb..80076ad 100644 --- a/src/DotNetMashup.Web/project.json +++ b/src/DotNetMashup.Web/project.json @@ -3,18 +3,18 @@ "version": "1.0.0-*", "dependencies": { - "Microsoft.AspNet.Diagnostics": "1.0.0-beta7", - "Microsoft.AspNet.Mvc": "6.0.0-beta7", - "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta7", - "Microsoft.AspNet.Server.IIS": "1.0.0-beta7", - "Microsoft.AspNet.Server.WebListener": "1.0.0-beta7", - "Microsoft.AspNet.StaticFiles": "1.0.0-beta7", - "Microsoft.AspNet.Tooling.Razor": "1.0.0-beta7", - "Microsoft.Framework.Configuration.Json": "1.0.0-beta7", - "Microsoft.Framework.Logging": "1.0.0-beta7", - "Microsoft.Framework.Logging.Console": "1.0.0-beta7", - "Microsoft.Framework.Logging.Debug": "1.0.0-beta7", - "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0-beta7", + "Microsoft.AspNet.Diagnostics": "1.0.0-beta8", + "Microsoft.AspNet.Mvc": "6.0.0-beta8", + "Microsoft.AspNet.Mvc.TagHelpers": "6.0.0-beta8", + "Microsoft.AspNet.Server.Kestrel": "1.0.0-beta8", + "Microsoft.AspNet.StaticFiles": "1.0.0-beta8", + "Microsoft.AspNet.Tooling.Razor": "1.0.0-beta8", + "Microsoft.AspNet.IISPlatformHandler": "1.0.0-beta8", + "Microsoft.Framework.Configuration.Json": "1.0.0-beta8", + "Microsoft.Framework.Logging": "1.0.0-beta8", + "Microsoft.Framework.Logging.Console": "1.0.0-beta8", + "Microsoft.Framework.Logging.Debug": "1.0.0-beta8", + "Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0-beta8", "Newtonsoft.Json": "7.0.1", "TweetinviAPI": "0.9.9.8", "Octokit": "0.16.0", @@ -22,7 +22,7 @@ }, "commands": { - "web": "Microsoft.AspNet.Hosting --config hosting.ini" + "web": "Microsoft.AspNet.Server.Kestrel" }, "frameworks": { diff --git a/src/DotNetMashup.Web/wwwroot/web.config b/src/DotNetMashup.Web/wwwroot/web.config index 8e3f2a6..aa41566 100644 --- a/src/DotNetMashup.Web/wwwroot/web.config +++ b/src/DotNetMashup.Web/wwwroot/web.config @@ -2,10 +2,8 @@ - - - - + + - + \ No newline at end of file