Updated to IConfiguration

Chris Young · Chris Young · commit 94edcb2f2cbb · 2018-04-25T14:47:32.000-05:00
diff --git a/src/ArchitectNow.Caching/ArchitectNow.Caching.csproj b/src/ArchitectNow.Caching/ArchitectNow.Caching.csproj
@@ -26,6 +26,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.1" />
+    <PackageReference Include="NETStandard.Library" Version="2.0.2" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\VersionAssemblyInfo.cs" Link="VersionAssemblyInfo.cs" />
diff --git a/src/ArchitectNow.Caching/CachingModule.cs b/src/ArchitectNow.Caching/CachingModule.cs
@@ -12,9 +12,9 @@ protected override void Load(ContainerBuilder builder)
             builder.RegisterType<CacheMangerFactory>().As<ICacheMangerFactory>().SingleInstance();
             builder.RegisterGeneric(typeof(CacheKeeper<>)).As(typeof(ICacheKeeper<>)).SingleInstance();
 
-            builder.Register(context => context.Resolve<IConfigurationRoot>().CreateOptions<RedisOptions>("redis")).AsSelf().SingleInstance();
+            builder.Register(context => context.Resolve<IConfiguration>().CreateOptions<RedisOptions>("redis")).AsSelf().SingleInstance();
             
-            builder.Register(context => context.Resolve<IConfigurationRoot>().CreateOptions<CachingOptions>("caching")).AsSelf().SingleInstance();
+            builder.Register(context => context.Resolve<IConfiguration>().CreateOptions<CachingOptions>("caching")).AsSelf().SingleInstance();
             
         }
     }
diff --git a/src/ArchitectNow.Caching/OptionsExtensions.cs b/src/ArchitectNow.Caching/OptionsExtensions.cs
@@ -5,9 +5,9 @@ namespace ArchitectNow.Caching
 {
     static class OptionsExtensions
     {
-        public static IOptions<TOptions> CreateOptions<TOptions>(this IConfigurationRoot configurationRoot, string section) where TOptions : class, new()
+        public static IOptions<TOptions> CreateOptions<TOptions>(this IConfiguration configuration, string section) where TOptions : class, new()
         {
-            return new OptionsWrapper<TOptions>(configurationRoot.GetSection(section).Get<TOptions>());
+            return new OptionsWrapper<TOptions>(configuration.GetSection(section).Get<TOptions>());
         }
     }
 }
diff --git a/src/ArchitectNow.FluentValidation/ArchitectNow.FluentValidation.csproj b/src/ArchitectNow.FluentValidation/ArchitectNow.FluentValidation.csproj
diff --git a/src/ArchitectNow.FluentValidation/Class1.cs b/src/ArchitectNow.FluentValidation/Class1.cs
diff --git a/src/ArchitectNow.Models/ArchitectNow.Models.csproj b/src/ArchitectNow.Models/ArchitectNow.Models.csproj
@@ -23,7 +23,8 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.1" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.2.1" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.2.2" />
+    <PackageReference Include="NETStandard.Library" Version="2.0.2" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\VersionAssemblyInfo.cs" Link="VersionAssemblyInfo.cs" />
diff --git a/src/ArchitectNow.Models/Options/OptionsExtensions.cs b/src/ArchitectNow.Models/Options/OptionsExtensions.cs
@@ -5,11 +5,11 @@ namespace ArchitectNow.Models.Options
 {
     public static class OptionsExtensions
     {
-	    public static IOptions<TOptions> CreateOptions<TOptions>(this IConfigurationRoot configurationRoot, string section) where TOptions : class, new()
+	    public static IOptions<TOptions> CreateOptions<TOptions>(this IConfiguration configuration, string section) where TOptions : class, new()
 	    {
-		    var options = configurationRoot.GetSection(section).Get<TOptions>();
+		    var options = configuration.GetSection(section).Get<TOptions>();
 
 		    return new OptionsWrapper<TOptions>(options);
-		}
+	    }
     }
 }
diff --git a/src/ArchitectNow.Mongo/ArchitectNow.Mongo.csproj b/src/ArchitectNow.Mongo/ArchitectNow.Mongo.csproj
@@ -25,7 +25,8 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.1" />
-    <PackageReference Include="MongoDB.Driver" Version="2.5.1" />
+    <PackageReference Include="MongoDB.Driver" Version="2.6.0" />
+    <PackageReference Include="NETStandard.Library" Version="2.0.2" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.1" />
   </ItemGroup>
diff --git a/src/ArchitectNow.Mongo/MongoModule.cs b/src/ArchitectNow.Mongo/MongoModule.cs
@@ -18,7 +18,7 @@ protected override void Load(ContainerBuilder builder)
 		    builder.RegisterType<MongoDataContextService>().As<IDataContextService<MongoDataContext>>()
 			    .InstancePerLifetimeScope();
 			
-		    builder.Register(context => context.Resolve<IConfigurationRoot>().CreateOptions<MongoOptions>("mongo")).As<IOptions<MongoOptions>>().SingleInstance();
+		    builder.Register(context => context.Resolve<IConfiguration>().CreateOptions<MongoOptions>("mongo")).As<IOptions<MongoOptions>>().SingleInstance();
 		}
     }
 }
diff --git a/src/ArchitectNow.Redis/ArchitectNow.Redis.csproj b/src/ArchitectNow.Redis/ArchitectNow.Redis.csproj
@@ -1,7 +1,8 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard1.4</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="NETStandard.Library" Version="2.0.2" />
   </ItemGroup>
 </Project>
diff --git a/src/ArchitectNow.Services/ArchitectNow.Services.csproj b/src/ArchitectNow.Services/ArchitectNow.Services.csproj
@@ -22,6 +22,7 @@
   <ItemGroup>
     <PackageReference Include="Autofac" Version="4.8.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.1" />
+    <PackageReference Include="NETStandard.Library" Version="2.0.2" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\VersionAssemblyInfo.cs" Link="VersionAssemblyInfo.cs" />
diff --git a/src/ArchitectNow.Web.Mongo/ArchitectNow.Web.Mongo.csproj b/src/ArchitectNow.Web.Mongo/ArchitectNow.Web.Mongo.csproj
@@ -47,6 +47,7 @@
     <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="NETStandard.Library" Version="2.0.2" />
     <PackageReference Include="NSwag.AspNetCore" Version="11.17.2" />
     <PackageReference Include="Serilog" Version="2.6.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="2.0.2" />
diff --git a/src/ArchitectNow.Web.Mongo/Configuration/HangfireExtensions.cs b/src/ArchitectNow.Web.Mongo/Configuration/HangfireExtensions.cs
@@ -4,7 +4,7 @@
 
 namespace ArchitectNow.Web.Mongo.Configuration
 {
-	static class HangfireExtensions
+	public static class HangfireExtensions
 	{
 		public static void ConfigureHangfire(this IServiceCollection services, string connectionString, string databaseName, Action<IGlobalConfiguration> setupAction = null)
 		{
diff --git a/src/ArchitectNow.Web.Mongo/Startup.cs b/src/ArchitectNow.Web.Mongo/Startup.cs
@@ -109,7 +109,7 @@ public void Configure(
             IApplicationBuilder app,
             IApplicationLifetime appLifetime,
             IAntiforgery antiforgery,
-            IConfigurationRoot configurationRoot)
+            IConfiguration configuration)
         {
             _logger.LogInformation($"{nameof(Configure)} starting...");
 
diff --git a/src/ArchitectNow.Web.Redis/ArchitectNow.Web.Redis.csproj b/src/ArchitectNow.Web.Redis/ArchitectNow.Web.Redis.csproj
@@ -47,6 +47,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.1" />
+    <PackageReference Include="NETStandard.Library" Version="2.0.2" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="NSwag.AspNetCore" Version="11.17.2" />
     <PackageReference Include="Serilog" Version="2.6.0" />
diff --git a/src/ArchitectNow.Web.Redis/Startup.cs b/src/ArchitectNow.Web.Redis/Startup.cs
@@ -107,7 +107,7 @@ public void Configure(
             IApplicationBuilder app,
             IApplicationLifetime appLifetime,
             IAntiforgery antiforgery,
-            IConfigurationRoot configurationRoot)
+            IConfiguration configuration)
         {
             _logger.LogInformation($"{nameof(Configure)} starting...");
 
diff --git a/src/ArchitectNow.Web.Sql/ArchitectNow.Web.Sql.csproj b/src/ArchitectNow.Web.Sql/ArchitectNow.Web.Sql.csproj
@@ -46,6 +46,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.1" />
+    <PackageReference Include="NETStandard.Library" Version="2.0.2" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="NSwag.AspNetCore" Version="11.17.2" />
     <PackageReference Include="Serilog" Version="2.6.0" />
diff --git a/src/ArchitectNow.Web.Sql/SqlStartup.cs b/src/ArchitectNow.Web.Sql/SqlStartup.cs
@@ -107,7 +107,7 @@ public void Configure(
             IApplicationBuilder app,
             IApplicationLifetime appLifetime,
             IAntiforgery antiforgery,
-            IConfigurationRoot configurationRoot)
+            IConfiguration configuration)
         {
             _logger.LogInformation($"{nameof(Configure)} starting...");
 
diff --git a/src/ArchitectNow.Web/ArchitectNow.Web.csproj b/src/ArchitectNow.Web/ArchitectNow.Web.csproj
@@ -51,6 +51,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.1" />
+    <PackageReference Include="NETStandard.Library" Version="2.0.2" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="NSwag.AspNetCore" Version="11.17.2" />
     <PackageReference Include="Serilog" Version="2.6.0" />
diff --git a/src/ArchitectNow.Web/Configuration/AssetStartupFilter.cs b/src/ArchitectNow.Web/Configuration/AssetStartupFilter.cs
@@ -13,10 +13,10 @@ public Action<IApplicationBuilder> Configure(Action<IApplicationBuilder> next)
         {
             return builder =>
             {
-                var configurationRoot = builder.ApplicationServices.GetService<IConfigurationRoot>();
+                var configuration = builder.ApplicationServices.GetService<IConfiguration>();
                 builder.UseFileServer();
 
-                var uploadsPath = configurationRoot["uploadsPath"] ?? Path.Combine(Directory.GetCurrentDirectory(), "uploads");
+                var uploadsPath = configuration["uploadsPath"] ?? Path.Combine(Directory.GetCurrentDirectory(), "uploads");
                 if (!Directory.Exists(uploadsPath))
                 {
                     Directory.CreateDirectory(uploadsPath);
diff --git a/src/ArchitectNow.Web/Startup.cs b/src/ArchitectNow.Web/Startup.cs
@@ -100,7 +100,7 @@ public void Configure(
             IApplicationBuilder app,
             IApplicationLifetime appLifetime,
             IAntiforgery antiforgery,
-            IConfigurationRoot configurationRoot)
+            IConfiguration configuration)
         {
             _logger.LogInformation($"{nameof(Configure)} starting...");
 
diff --git a/src/ArchitectNow.Web/WebModule.cs b/src/ArchitectNow.Web/WebModule.cs
@@ -22,8 +22,8 @@ protected override void Load(ContainerBuilder builder)
 
             builder.Register(context =>
             {
-                var configurationRoot = context.Resolve<IConfigurationRoot>();
-                var issuerOptions = configurationRoot.GetSection("jwtIssuerOptions").Get<JwtIssuerOptions>();
+                var configuration = context.Resolve<IConfiguration>();
+                var issuerOptions = configuration.GetSection("jwtIssuerOptions").Get<JwtIssuerOptions>();
 
                 var key = context.Resolve<JwtSigningKey>();
 

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ protected override void Load(ContainerBuilder builder)`
`12`	`12`	`builder.RegisterType<CacheMangerFactory>().As<ICacheMangerFactory>().SingleInstance();`
`13`	`13`	`builder.RegisterGeneric(typeof(CacheKeeper<>)).As(typeof(ICacheKeeper<>)).SingleInstance();`
`14`	`14`
`15`		`- builder.Register(context => context.Resolve<IConfigurationRoot>().CreateOptions<RedisOptions>("redis")).AsSelf().SingleInstance();`
	`15`	`+ builder.Register(context => context.Resolve<IConfiguration>().CreateOptions<RedisOptions>("redis")).AsSelf().SingleInstance();`
`16`	`16`
`17`		`- builder.Register(context => context.Resolve<IConfigurationRoot>().CreateOptions<CachingOptions>("caching")).AsSelf().SingleInstance();`
	`17`	`+ builder.Register(context => context.Resolve<IConfiguration>().CreateOptions<CachingOptions>("caching")).AsSelf().SingleInstance();`
`18`	`18`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@ namespace ArchitectNow.Caching`
`5`	`5`	`{`
`6`	`6`	`static class OptionsExtensions`
`7`	`7`	`{`
`8`		`- public static IOptions<TOptions> CreateOptions<TOptions>(this IConfigurationRoot configurationRoot, string section) where TOptions : class, new()`
	`8`	`+ public static IOptions<TOptions> CreateOptions<TOptions>(this IConfiguration configuration, string section) where TOptions : class, new()`
`9`	`9`	`{`
`10`		`- return new OptionsWrapper<TOptions>(configurationRoot.GetSection(section).Get<TOptions>());`
	`10`	`+ return new OptionsWrapper<TOptions>(configuration.GetSection(section).Get<TOptions>());`
`11`	`11`	`}`
`12`	`12`	`}`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,11 @@ namespace ArchitectNow.Models.Options`
`5`	`5`	`{`
`6`	`6`	`public static class OptionsExtensions`
`7`	`7`	`{`
`8`		`- public static IOptions<TOptions> CreateOptions<TOptions>(this IConfigurationRoot configurationRoot, string section) where TOptions : class, new()`
	`8`	`+ public static IOptions<TOptions> CreateOptions<TOptions>(this IConfiguration configuration, string section) where TOptions : class, new()`
`9`	`9`	`{`
`10`		`- var options = configurationRoot.GetSection(section).Get<TOptions>();`
	`10`	`+ var options = configuration.GetSection(section).Get<TOptions>();`
`11`	`11`
`12`	`12`	`return new OptionsWrapper<TOptions>(options);`
`13`		`- }`
	`13`	`+ }`
`14`	`14`	`}`
`15`	`15`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ protected override void Load(ContainerBuilder builder)`
`18`	`18`	`builder.RegisterType<MongoDataContextService>().As<IDataContextService<MongoDataContext>>()`
`19`	`19`	`.InstancePerLifetimeScope();`
`20`	`20`
`21`		`- builder.Register(context => context.Resolve<IConfigurationRoot>().CreateOptions<MongoOptions>("mongo")).As<IOptions<MongoOptions>>().SingleInstance();`
	`21`	`+ builder.Register(context => context.Resolve<IConfiguration>().CreateOptions<MongoOptions>("mongo")).As<IOptions<MongoOptions>>().SingleInstance();`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`	`}`