From b271887d9f9e7062204257b4a0c6cc83f6305286 Mon Sep 17 00:00:00 2001 From: Kirthi Krishnamraju Date: Fri, 14 Aug 2015 10:59:21 -0700 Subject: [PATCH] fix build break due to aspnet/configuration #246 --- src/MusicStore.Spa/Startup.cs | 6 +++--- src/MusicStore/Models/SampleData.cs | 8 ++++---- src/MusicStore/Startup.cs | 4 ++-- src/MusicStore/StartupNtlmAuthentication.cs | 4 ++-- src/MusicStore/StartupOpenIdConnect.cs | 4 ++-- .../compiler/shared/Mocks/StartupOpenIdConnectTesting.cs | 4 ++-- .../compiler/shared/Mocks/StartupSocialTesting.cs | 7 +++---- 7 files changed, 18 insertions(+), 19 deletions(-) diff --git a/src/MusicStore.Spa/Startup.cs b/src/MusicStore.Spa/Startup.cs index 0d5df9c9e9..2b58654259 100644 --- a/src/MusicStore.Spa/Startup.cs +++ b/src/MusicStore.Spa/Startup.cs @@ -27,8 +27,8 @@ namespace MusicStore.Spa { services.Configure(settings => { - settings.DefaultAdminUsername = Configuration.Get("DefaultAdminUsername"); - settings.DefaultAdminPassword = Configuration.Get("DefaultAdminPassword"); + settings.DefaultAdminUsername = Configuration["DefaultAdminUsername"]; + settings.DefaultAdminPassword = Configuration["DefaultAdminPassword"]; }); // Add MVC services to the service container @@ -39,7 +39,7 @@ namespace MusicStore.Spa .AddSqlServer() .AddDbContext(options => { - options.UseSqlServer(Configuration.Get("Data:DefaultConnection:ConnectionString")); + options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"]); }); // Add Identity services to the services container diff --git a/src/MusicStore/Models/SampleData.cs b/src/MusicStore/Models/SampleData.cs index a707059782..fa214fe44a 100644 --- a/src/MusicStore/Models/SampleData.cs +++ b/src/MusicStore/Models/SampleData.cs @@ -92,17 +92,17 @@ namespace MusicStore.Models // await roleManager.CreateAsync(new IdentityRole(adminRole)); //} - var user = await userManager.FindByNameAsync(configuration.Get(defaultAdminUserName)); + var user = await userManager.FindByNameAsync(configuration[defaultAdminUserName]); if (user == null) { - user = new ApplicationUser { UserName = configuration.Get(defaultAdminUserName) }; - await userManager.CreateAsync(user, configuration.Get(defaultAdminPassword)); + user = new ApplicationUser { UserName = configuration[defaultAdminUserName] }; + await userManager.CreateAsync(user, configuration[defaultAdminPassword]); //await userManager.AddToRoleAsync(user, adminRole); await userManager.AddClaimAsync(user, new Claim("ManageStore", "Allowed")); } #if TESTING - var envPerfLab = configuration.Get("PERF_LAB"); + var envPerfLab = configuration["PERF_LAB"]; if (envPerfLab == "true") { for (int i = 0; i < 100; ++i) diff --git a/src/MusicStore/Startup.cs b/src/MusicStore/Startup.cs index ca7a4ee3e9..ec09c54d0d 100644 --- a/src/MusicStore/Startup.cs +++ b/src/MusicStore/Startup.cs @@ -36,7 +36,7 @@ namespace MusicStore public void ConfigureServices(IServiceCollection services) { - services.Configure(Configuration.GetConfigurationSection("AppSettings")); + services.Configure(Configuration.GetSection("AppSettings")); var useInMemoryStore = _platform.IsRunningOnMono || _platform.IsRunningOnNanoServer; @@ -53,7 +53,7 @@ namespace MusicStore services.AddEntityFramework() .AddSqlServer() .AddDbContext(options => - options.UseSqlServer(Configuration.Get("Data:DefaultConnection:ConnectionString"))); + options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"])); } // Add Identity services to the services container diff --git a/src/MusicStore/StartupNtlmAuthentication.cs b/src/MusicStore/StartupNtlmAuthentication.cs index d50a76396d..b1ad93c2b4 100644 --- a/src/MusicStore/StartupNtlmAuthentication.cs +++ b/src/MusicStore/StartupNtlmAuthentication.cs @@ -46,13 +46,13 @@ namespace MusicStore public void ConfigureServices(IServiceCollection services) { - services.Configure(Configuration.GetConfigurationSection("AppSettings")); + services.Configure(Configuration.GetSection("AppSettings")); // Add EF services to the services container services.AddEntityFramework() .AddSqlServer() .AddDbContext(options => - options.UseSqlServer(Configuration.Get("Data:DefaultConnection:ConnectionString"))); + options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"])); services.ConfigureCors(options => { diff --git a/src/MusicStore/StartupOpenIdConnect.cs b/src/MusicStore/StartupOpenIdConnect.cs index 923e2a2bb3..7fbd3ced95 100644 --- a/src/MusicStore/StartupOpenIdConnect.cs +++ b/src/MusicStore/StartupOpenIdConnect.cs @@ -48,7 +48,7 @@ namespace MusicStore public void ConfigureServices(IServiceCollection services) { - services.Configure(Configuration.GetConfigurationSection("AppSettings")); + services.Configure(Configuration.GetSection("AppSettings")); var useInMemoryStore = _platform.IsRunningOnMono || _platform.IsRunningOnNanoServer; @@ -65,7 +65,7 @@ namespace MusicStore services.AddEntityFramework() .AddSqlServer() .AddDbContext(options => - options.UseSqlServer(Configuration.Get("Data:DefaultConnection:ConnectionString"))); + options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"])); } // Add Identity services to the services container diff --git a/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs b/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs index 22f75e0726..99ced17861 100644 --- a/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs +++ b/test/E2ETests/compiler/shared/Mocks/StartupOpenIdConnectTesting.cs @@ -39,7 +39,7 @@ namespace MusicStore public void ConfigureServices(IServiceCollection services) { - services.Configure(Configuration.GetConfigurationSection("AppSettings")); + services.Configure(Configuration.GetSection("AppSettings")); //Sql client not available on mono var useInMemoryStore = _runtimeEnvironment.RuntimeType.Equals("Mono", StringComparison.OrdinalIgnoreCase); @@ -57,7 +57,7 @@ namespace MusicStore services.AddEntityFramework() .AddSqlServer() .AddDbContext(options => - options.UseSqlServer(Configuration.Get("Data:DefaultConnection:ConnectionString"))); + options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"])); } // Add Identity services to the services container diff --git a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs index bfd505f20c..027a2cbf35 100644 --- a/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs +++ b/test/E2ETests/compiler/shared/Mocks/StartupSocialTesting.cs @@ -44,11 +44,10 @@ namespace MusicStore public void ConfigureServices(IServiceCollection services) { - services.Configure(Configuration.GetConfigurationSection("AppSettings")); + services.Configure(Configuration.GetSection("AppSettings")); //Sql client not available on mono - string value; - var useInMemoryStore = Configuration.TryGet("UseInMemoryStore", out value) && value == "true" ? + var useInMemoryStore = Configuration["UseInMemoryStore"] == "true" ? true : _runtimeEnvironment.RuntimeType.Equals("Mono", StringComparison.OrdinalIgnoreCase); @@ -65,7 +64,7 @@ namespace MusicStore services.AddEntityFramework() .AddSqlServer() .AddDbContext(options => - options.UseSqlServer(Configuration.Get("Data:DefaultConnection:ConnectionString"))); + options.UseSqlServer(Configuration["Data:DefaultConnection:ConnectionString"])); } // Add Identity services to the services container