diff --git a/src/MusicStore/Config.json b/src/MusicStore/Config.json index 5959953d17..305952680d 100644 --- a/src/MusicStore/Config.json +++ b/src/MusicStore/Config.json @@ -1,4 +1,9 @@ { "DefaultAdminUsername": "Administrator", - "DefaultAdminPassword": "YouShouldChangeThisPassword" + "DefaultAdminPassword": "YouShouldChangeThisPassword", + "Data": { + "DefaultConnection": { + "Connectionstring": "Server=(localdb)\\v11.0;Database=MusicStore;Trusted_Connection=True;" + } + } } \ No newline at end of file diff --git a/src/MusicStore/Controllers/AccountController.cs b/src/MusicStore/Controllers/AccountController.cs index 9c82bb2a2b..75e08cada9 100644 --- a/src/MusicStore/Controllers/AccountController.cs +++ b/src/MusicStore/Controllers/AccountController.cs @@ -103,7 +103,7 @@ namespace MusicStore.Controllers { return Json(result.Errors); //https://github.com/aspnet/WebFx/issues/289 - AddErrors(result); + //AddErrors(result); } } diff --git a/src/MusicStore/LKG.json b/src/MusicStore/LKG.json index 8e3d571eb8..392060bcad 100644 --- a/src/MusicStore/LKG.json +++ b/src/MusicStore/LKG.json @@ -1,36 +1,36 @@ { "version": "0.1-alpha-*", "dependencies": { - "Helios": "0.1-alpha-275", - "Microsoft.AspNet.Abstractions": "0.1-alpha-261", - "Microsoft.AspNet.Mvc": "0.1-alpha-629", - "Microsoft.AspNet.Razor": "0.1-alpha-181", - "Microsoft.AspNet.ConfigurationModel": "0.1-alpha-176", - "Microsoft.AspNet.DependencyInjection": "0.1-alpha-252", - "Microsoft.AspNet.RequestContainer": "0.1-alpha-267", - "Microsoft.AspNet.Routing": "0.1-alpha-244", - "Microsoft.AspNet.Mvc.ModelBinding": "0.1-alpha-629", - "Microsoft.AspNet.Mvc.Core": "0.1-alpha-629", - "Microsoft.AspNet.Mvc.Razor": "0.1-alpha-629", - "Microsoft.AspNet.StaticFiles": "0.1-alpha-201", - "System.Security.Claims": "0.1-alpha-135", + "Helios": "0.1-alpha-330", + "Microsoft.AspNet.Abstractions": "0.1-alpha-291", + "Microsoft.AspNet.Mvc": "0.1-alpha-735", + "Microsoft.AspNet.Razor": "0.1-alpha-182", + "Microsoft.AspNet.ConfigurationModel": "0.1-alpha-185", + "Microsoft.AspNet.DependencyInjection": "0.1-alpha-278", + "Microsoft.AspNet.RequestContainer": "0.1-alpha-320", + "Microsoft.AspNet.Routing": "0.1-alpha-303", + "Microsoft.AspNet.Mvc.ModelBinding": "0.1-alpha-735", + "Microsoft.AspNet.Mvc.Core": "0.1-alpha-735", + "Microsoft.AspNet.Mvc.Razor": "0.1-alpha-735", + "Microsoft.AspNet.StaticFiles": "0.1-alpha-237", + "System.Security.Claims": "0.1-alpha-160", "System.Security.Principal": "4.0.0.0", "Microsoft.AspNet.Security.DataProtection": "0.1-alpha-144", - "Microsoft.AspNet.Identity": "0.1-alpha-370", - "Microsoft.AspNet.Identity.Entity": "0.1-alpha-370", - "Microsoft.AspNet.Identity.InMemory": "0.1-alpha-370", - "Microsoft.AspNet.Identity.Security": "0.1-alpha-370", - "Microsoft.Data.Entity": "0.1-alpha-441", - "Microsoft.Data.Relational": "0.1-alpha-441", - "Microsoft.Data.SqlServer": "0.1-pre-419", - "Microsoft.Data.InMemory": "0.1-alpha-441", - "Microsoft.Data.Migrations": "0.1-alpha-441", - "Microsoft.AspNet.Diagnostics": "0.1-alpha-153", - "Microsoft.AspNet.Hosting": "0.1-alpha-267", - "Microsoft.AspNet.Server.WebListener": "0.1-alpha-210", - "Microsoft.AspNet.Configuration.Json": "0.1-alpha-176", - "Microsoft.AspNet.Security": "0.1-alpha-123", - "Microsoft.AspNet.Security.Cookies": "0.1-alpha-123", + "Microsoft.AspNet.Identity": "0.1-alpha-433", + "Microsoft.AspNet.Identity.Entity": "0.1-alpha-433", + "Microsoft.AspNet.Identity.InMemory": "0.1-alpha-433", + "Microsoft.AspNet.Identity.Security": "0.1-alpha-433", + "Microsoft.Data.Entity": "0.1-alpha-495", + "Microsoft.Data.Relational": "0.1-alpha-495", + "Microsoft.Data.SqlServer": "0.1-alpha-476", + "Microsoft.Data.InMemory": "0.1-alpha-495", + "Microsoft.Data.Migrations": "0.1-alpha-495", + "Microsoft.AspNet.Diagnostics": "0.1-alpha-220", + "Microsoft.AspNet.Hosting": "0.1-alpha-320", + "Microsoft.AspNet.Server.WebListener": "0.1-alpha-265", + "Microsoft.AspNet.ConfigurationModel.Json": "0.1-alpha-185", + "Microsoft.AspNet.Security": "0.1-alpha-192", + "Microsoft.AspNet.Security.Cookies": "0.1-alpha-192", "Microsoft.AspNet.Logging": "0.1-alpha-159" }, "configurations": { diff --git a/src/MusicStore/Models/MusicStoreContext.cs b/src/MusicStore/Models/MusicStoreContext.cs index afd07d8d1b..3003fdbed2 100644 --- a/src/MusicStore/Models/MusicStoreContext.cs +++ b/src/MusicStore/Models/MusicStoreContext.cs @@ -3,6 +3,8 @@ using Microsoft.Data.Entity; using Microsoft.Data.Entity.Metadata; using Microsoft.Data.InMemory; using Microsoft.Data.SqlServer; +using Microsoft.AspNet.DependencyInjection; +using Microsoft.AspNet.ConfigurationModel; namespace MusicStore.Models { @@ -22,8 +24,9 @@ namespace MusicStore.Models protected override void OnConfiguring(EntityConfigurationBuilder builder) { + var configuration = builder.BuildConfiguration().Services.GetService(); #if NET45 - builder.SqlServerConnectionString(@"Server=(localdb)\v11.0;Database=MusicStore;Trusted_Connection=True;"); + builder.SqlServerConnectionString(configuration.Get("Data:DefaultConnection:ConnectionString")); #else builder.UseInMemoryStore(persist: true); #endif diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs index b72e6b32af..b1778bcc83 100644 --- a/src/MusicStore/Startup.cs +++ b/src/MusicStore/Startup.cs @@ -30,6 +30,13 @@ public class Startup { app.UseServices(services => { + //Add configuration as a service + var applicationEnvironment = app.ApplicationServices.GetService(); + var configuration = new Configuration(); + configuration.AddJsonFile(Path.Combine(applicationEnvironment.ApplicationBasePath, "Config.json")); + configuration.AddEnvironmentVariables(); //If configuration flows through environment we should pick that first + services.AddInstance(configuration); + services.AddInstance(new NullLoggerFactory()); services.AddMvc(); #if NET45 @@ -87,12 +94,7 @@ public class Startup private async void CreateAdminUser(IServiceProvider serviceProvider) { - var applicationEnvironment = serviceProvider.GetService(); - - var configuration = new Configuration(); - configuration.AddEnvironmentVariables(); //If configuration flows through environment we should pick that first - configuration.AddJsonFile(Path.Combine(applicationEnvironment.ApplicationBasePath, "Config.json")); - + var configuration = serviceProvider.GetService(); var userName = configuration.Get("DefaultAdminUsername"); var password = configuration.Get("DefaultAdminPassword"); const string adminRole = "Administrator";