Added project to solution; Fixed references

CodingMadeEasy · CodingMadeEasy · commit 08d72eaa9dab · 2018-06-14T01:38:20.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+/**/bin/*
+/**/obj/*
+/**/nuget/*
diff --git a/C9S.Extensions.Configuration.sln b/C9S.Extensions.Configuration.sln
@@ -1,8 +1,10 @@
-﻿
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "C9S.Extensions.Configuration", "C9S.Extensions.Configuration\C9S.Extensions.Configuration.csproj", "{80360538-3243-4FFD-9360-7D41A04C16E5}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,4 +17,18 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{80360538-3243-4FFD-9360-7D41A04C16E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{80360538-3243-4FFD-9360-7D41A04C16E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{80360538-3243-4FFD-9360-7D41A04C16E5}.Debug|x64.ActiveCfg = Debug|x64
+		{80360538-3243-4FFD-9360-7D41A04C16E5}.Debug|x64.Build.0 = Debug|x64
+		{80360538-3243-4FFD-9360-7D41A04C16E5}.Debug|x86.ActiveCfg = Debug|x86
+		{80360538-3243-4FFD-9360-7D41A04C16E5}.Debug|x86.Build.0 = Debug|x86
+		{80360538-3243-4FFD-9360-7D41A04C16E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{80360538-3243-4FFD-9360-7D41A04C16E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{80360538-3243-4FFD-9360-7D41A04C16E5}.Release|x64.ActiveCfg = Release|x64
+		{80360538-3243-4FFD-9360-7D41A04C16E5}.Release|x64.Build.0 = Release|x64
+		{80360538-3243-4FFD-9360-7D41A04C16E5}.Release|x86.ActiveCfg = Release|x86
+		{80360538-3243-4FFD-9360-7D41A04C16E5}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
 EndGlobal
diff --git a/C9S.Extensions.Configuration/C9S.Extensions.Configuration.csproj b/C9S.Extensions.Configuration/C9S.Extensions.Configuration.csproj
@@ -1,7 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.0" />
+  </ItemGroup>
+</Project>
diff --git a/C9S.Extensions.Configuration/ConfigurationRootExtensions.cs b/C9S.Extensions.Configuration/ConfigurationRootExtensions.cs
@@ -1,21 +1,27 @@
 ﻿using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text.RegularExpressions;
+using Microsoft.Extensions.Configuration;
 
 namespace C9S.Extensions.Configuration
 {
     public static class ConfigurationRootExtensions
     {
-        public static void ResolveVariables(this IConfigurationRoot configuration)
+        private static Regex variableRegex = new Regex(@"\{{(?<var>[^}}]+)\}}");
+
+        public static void ResolveVariables(this IConfiguration configuration)
         {
             foreach (var configSection in configuration.GetChildren())
             {
                 foreach (Match match in variableRegex.Matches(configSection.Value ?? ""))
                 {
                     var variable = match.Groups["var"].Value;
-                    var sections = new List<string>(variable.Split('.', System.StringSplitOptions.RemoveEmptyEntries));
+                    var sections = new List<string>(variable.Split(new [] { '.' }, StringSplitOptions.RemoveEmptyEntries));
                     IConfigurationSection section = configSection;
                     if (sections.Any())
                     {
-                        section = Configuration.GetSection(sections[0]);
+                        section = configuration.GetSection(sections[0]);
                         var key = sections.Last();
 
                         sections.RemoveAt(0);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/*/bin/`
	`2`	`+/*/obj/`
	`3`	`+/*/nuget/`
Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,27 @@`
`1`	`1`	`using System;`
	`2`	`+using System.Collections.Generic;`
	`3`	`+using System.Linq;`
	`4`	`+using System.Text.RegularExpressions;`
	`5`	`+using Microsoft.Extensions.Configuration;`
`2`	`6`
`3`	`7`	`namespace C9S.Extensions.Configuration`
`4`	`8`	`{`
`5`	`9`	`public static class ConfigurationRootExtensions`
`6`	`10`	`{`
`7`		`- public static void ResolveVariables(this IConfigurationRoot configuration)`
	`11`	`+ private static Regex variableRegex = new Regex(@"\{{(?<var>[^}}]+)\}}");`
	`12`	`+`
	`13`	`+ public static void ResolveVariables(this IConfiguration configuration)`
`8`	`14`	`{`
`9`	`15`	`foreach (var configSection in configuration.GetChildren())`
`10`	`16`	`{`
`11`	`17`	`foreach (Match match in variableRegex.Matches(configSection.Value ?? ""))`
`12`	`18`	`{`
`13`	`19`	`var variable = match.Groups["var"].Value;`
`14`		`- var sections = new List<string>(variable.Split('.', System.StringSplitOptions.RemoveEmptyEntries));`
	`20`	`+ var sections = new List<string>(variable.Split(new [] { '.' }, StringSplitOptions.RemoveEmptyEntries));`
`15`	`21`	`IConfigurationSection section = configSection;`
`16`	`22`	`if (sections.Any())`
`17`	`23`	`{`
`18`		`- section = Configuration.GetSection(sections[0]);`
	`24`	`+ section = configuration.GetSection(sections[0]);`
`19`	`25`	`var key = sections.Last();`
`20`	`26`
`21`	`27`	`sections.RemoveAt(0);`