diff --git a/Configuration.sln b/Configuration.sln
index 2126ef3..2899953 100644
--- a/Configuration.sln
+++ b/Configuration.sln
@@ -7,35 +7,35 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F141E2D0-F9B
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{B54371FF-B920-46C8-8D55-6B19DBB43EBF}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.Json", "src\Microsoft.Framework.ConfigurationModel.Json\Microsoft.Framework.ConfigurationModel.Json.xproj", "{4C4CD1BC-4411-4AFD-9D04-147053F0E259}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration.Json", "src\Microsoft.Framework.Configuration.Json\Microsoft.Framework.Configuration.Json.xproj", "{4C4CD1BC-4411-4AFD-9D04-147053F0E259}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.Xml", "src\Microsoft.Framework.ConfigurationModel.Xml\Microsoft.Framework.ConfigurationModel.Xml.xproj", "{1BEC97C1-56B9-4B2B-A95A-C0DF72F1E96A}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration.Xml", "src\Microsoft.Framework.Configuration.Xml\Microsoft.Framework.Configuration.Xml.xproj", "{1BEC97C1-56B9-4B2B-A95A-C0DF72F1E96A}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.Json.Test", "test\Microsoft.Framework.ConfigurationModel.Json.Test\Microsoft.Framework.ConfigurationModel.Json.Test.xproj", "{AE8F8C20-9ED9-4A16-9565-27DF77683789}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration.Json.Test", "test\Microsoft.Framework.Configuration.Json.Test\Microsoft.Framework.Configuration.Json.Test.xproj", "{AE8F8C20-9ED9-4A16-9565-27DF77683789}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.Xml.Test", "test\Microsoft.Framework.ConfigurationModel.Xml.Test\Microsoft.Framework.ConfigurationModel.Xml.Test.xproj", "{0786C785-944A-4423-96A6-4E7BFDB4A1B0}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration.Xml.Test", "test\Microsoft.Framework.Configuration.Xml.Test\Microsoft.Framework.Configuration.Xml.Test.xproj", "{0786C785-944A-4423-96A6-4E7BFDB4A1B0}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.Test", "test\Microsoft.Framework.ConfigurationModel.Test\Microsoft.Framework.ConfigurationModel.Test.xproj", "{8777C77E-CA2A-42C1-90CD-2EA9CBF28937}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration.Test", "test\Microsoft.Framework.Configuration.Test\Microsoft.Framework.Configuration.Test.xproj", "{8777C77E-CA2A-42C1-90CD-2EA9CBF28937}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel", "src\Microsoft.Framework.ConfigurationModel\Microsoft.Framework.ConfigurationModel.xproj", "{62BD48B5-BB0C-4C2C-9C4B-04CF75CDCCF1}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration", "src\Microsoft.Framework.Configuration\Microsoft.Framework.Configuration.xproj", "{62BD48B5-BB0C-4C2C-9C4B-04CF75CDCCF1}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.FunctionalTests", "test\Microsoft.Framework.ConfigurationModel.FunctionalTests\Microsoft.Framework.ConfigurationModel.FunctionalTests.xproj", "{EAC77F15-F12E-496B-9184-1B1DA89BFFE9}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration.FunctionalTests", "test\Microsoft.Framework.Configuration.FunctionalTests\Microsoft.Framework.Configuration.FunctionalTests.xproj", "{EAC77F15-F12E-496B-9184-1B1DA89BFFE9}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.Abstractions", "src\Microsoft.Framework.ConfigurationModel.Abstractions\Microsoft.Framework.ConfigurationModel.Abstractions.xproj", "{3F1CB08E-9FBD-4CAE-A78A-4AC43F24FC49}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration.Abstractions", "src\Microsoft.Framework.Configuration.Abstractions\Microsoft.Framework.Configuration.Abstractions.xproj", "{3F1CB08E-9FBD-4CAE-A78A-4AC43F24FC49}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.Test.Common", "test\Microsoft.Framework.ConfigurationModel.Test.Common\Microsoft.Framework.ConfigurationModel.Test.Common.xproj", "{29C120E5-F682-4BFB-826B-040A594802CA}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration.Test.Common", "test\Microsoft.Framework.Configuration.Test.Common\Microsoft.Framework.Configuration.Test.Common.xproj", "{29C120E5-F682-4BFB-826B-040A594802CA}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.CommandLine", "src\Microsoft.Framework.ConfigurationModel.CommandLine\Microsoft.Framework.ConfigurationModel.CommandLine.xproj", "{D4B7CF9B-4229-44DC-800F-CC39150CEAB2}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration.CommandLine", "src\Microsoft.Framework.Configuration.CommandLine\Microsoft.Framework.Configuration.CommandLine.xproj", "{D4B7CF9B-4229-44DC-800F-CC39150CEAB2}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.Ini", "src\Microsoft.Framework.ConfigurationModel.Ini\Microsoft.Framework.ConfigurationModel.Ini.xproj", "{C555C5D5-BF4A-451E-AB43-EBF4DE885EC7}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration.Ini", "src\Microsoft.Framework.Configuration.Ini\Microsoft.Framework.Configuration.Ini.xproj", "{C555C5D5-BF4A-451E-AB43-EBF4DE885EC7}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.EnvironmentVariables", "src\Microsoft.Framework.ConfigurationModel.EnvironmentVariables\Microsoft.Framework.ConfigurationModel.EnvironmentVariables.xproj", "{A6A2C665-E5A4-4FD3-AD0C-E33E6CFFCB88}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration.EnvironmentVariables", "src\Microsoft.Framework.Configuration.EnvironmentVariables\Microsoft.Framework.Configuration.EnvironmentVariables.xproj", "{A6A2C665-E5A4-4FD3-AD0C-E33E6CFFCB88}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.CommandLine.Test", "test\Microsoft.Framework.ConfigurationModel.CommandLine.Test\Microsoft.Framework.ConfigurationModel.CommandLine.Test.xproj", "{CE9C8903-AA8A-40E6-B03D-32A08A4A39AF}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration.CommandLine.Test", "test\Microsoft.Framework.Configuration.CommandLine.Test\Microsoft.Framework.Configuration.CommandLine.Test.xproj", "{CE9C8903-AA8A-40E6-B03D-32A08A4A39AF}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.Ini.Test", "test\Microsoft.Framework.ConfigurationModel.Ini.Test\Microsoft.Framework.ConfigurationModel.Ini.Test.xproj", "{80A8F10C-E9A6-4677-919D-FE5DB320FEDF}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration.Ini.Test", "test\Microsoft.Framework.Configuration.Ini.Test\Microsoft.Framework.Configuration.Ini.Test.xproj", "{80A8F10C-E9A6-4677-919D-FE5DB320FEDF}"
EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.ConfigurationModel.EnvironmentVariables.Test", "test\Microsoft.Framework.ConfigurationModel.EnvironmentVariables.Test\Microsoft.Framework.ConfigurationModel.EnvironmentVariables.Test.xproj", "{7D0F805B-ADFF-4C47-A90C-24DD74416821}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration.EnvironmentVariables.Test", "test\Microsoft.Framework.Configuration.EnvironmentVariables.Test\Microsoft.Framework.Configuration.EnvironmentVariables.Test.xproj", "{7D0F805B-ADFF-4C47-A90C-24DD74416821}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/Microsoft.Framework.ConfigurationModel.Abstractions/IConfiguration.cs b/src/Microsoft.Framework.Configuration.Abstractions/IConfiguration.cs
similarity index 94%
rename from src/Microsoft.Framework.ConfigurationModel.Abstractions/IConfiguration.cs
rename to src/Microsoft.Framework.Configuration.Abstractions/IConfiguration.cs
index 4e28dd6..f8b8569 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Abstractions/IConfiguration.cs
+++ b/src/Microsoft.Framework.Configuration.Abstractions/IConfiguration.cs
@@ -3,7 +3,7 @@
using System.Collections.Generic;
-namespace Microsoft.Framework.ConfigurationModel
+namespace Microsoft.Framework.Configuration
{
public interface IConfiguration
{
diff --git a/src/Microsoft.Framework.ConfigurationModel.Abstractions/IConfigurationBuilder.cs b/src/Microsoft.Framework.Configuration.Abstractions/IConfigurationBuilder.cs
similarity index 90%
rename from src/Microsoft.Framework.ConfigurationModel.Abstractions/IConfigurationBuilder.cs
rename to src/Microsoft.Framework.Configuration.Abstractions/IConfigurationBuilder.cs
index 975bdff..a6fc98a 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Abstractions/IConfigurationBuilder.cs
+++ b/src/Microsoft.Framework.Configuration.Abstractions/IConfigurationBuilder.cs
@@ -3,7 +3,7 @@
using System.Collections.Generic;
-namespace Microsoft.Framework.ConfigurationModel
+namespace Microsoft.Framework.Configuration
{
public interface IConfigurationBuilder : IConfiguration
{
diff --git a/src/Microsoft.Framework.ConfigurationModel.Abstractions/IConfigurationSource.cs b/src/Microsoft.Framework.Configuration.Abstractions/IConfigurationSource.cs
similarity index 91%
rename from src/Microsoft.Framework.ConfigurationModel.Abstractions/IConfigurationSource.cs
rename to src/Microsoft.Framework.Configuration.Abstractions/IConfigurationSource.cs
index 3076741..eab0525 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Abstractions/IConfigurationSource.cs
+++ b/src/Microsoft.Framework.Configuration.Abstractions/IConfigurationSource.cs
@@ -3,7 +3,7 @@
using System.Collections.Generic;
-namespace Microsoft.Framework.ConfigurationModel
+namespace Microsoft.Framework.Configuration
{
public interface IConfigurationSource
{
diff --git a/src/Microsoft.Framework.ConfigurationModel.Abstractions/Microsoft.Framework.ConfigurationModel.Abstractions.xproj b/src/Microsoft.Framework.Configuration.Abstractions/Microsoft.Framework.Configuration.Abstractions.xproj
similarity index 100%
rename from src/Microsoft.Framework.ConfigurationModel.Abstractions/Microsoft.Framework.ConfigurationModel.Abstractions.xproj
rename to src/Microsoft.Framework.Configuration.Abstractions/Microsoft.Framework.Configuration.Abstractions.xproj
diff --git a/src/Microsoft.Framework.ConfigurationModel.Abstractions/Properties/AssemblyInfo.cs b/src/Microsoft.Framework.Configuration.Abstractions/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.Framework.ConfigurationModel.Abstractions/Properties/AssemblyInfo.cs
rename to src/Microsoft.Framework.Configuration.Abstractions/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.Framework.ConfigurationModel.Abstractions/project.json b/src/Microsoft.Framework.Configuration.Abstractions/project.json
similarity index 100%
rename from src/Microsoft.Framework.ConfigurationModel.Abstractions/project.json
rename to src/Microsoft.Framework.Configuration.Abstractions/project.json
diff --git a/src/Microsoft.Framework.ConfigurationModel.CommandLine/CommandLineConfigurationExtension.cs b/src/Microsoft.Framework.Configuration.CommandLine/CommandLineConfigurationExtension.cs
similarity index 89%
rename from src/Microsoft.Framework.ConfigurationModel.CommandLine/CommandLineConfigurationExtension.cs
rename to src/Microsoft.Framework.Configuration.CommandLine/CommandLineConfigurationExtension.cs
index 30e6788..f934392 100644
--- a/src/Microsoft.Framework.ConfigurationModel.CommandLine/CommandLineConfigurationExtension.cs
+++ b/src/Microsoft.Framework.Configuration.CommandLine/CommandLineConfigurationExtension.cs
@@ -2,8 +2,9 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Collections.Generic;
+using Microsoft.Framework.Configuration.CommandLine;
-namespace Microsoft.Framework.ConfigurationModel.CommandLine
+namespace Microsoft.Framework.Configuration
{
public static class CommandLineConfigurationExtension
{
diff --git a/src/Microsoft.Framework.ConfigurationModel.CommandLine/CommandLineConfigurationSource.cs b/src/Microsoft.Framework.Configuration.CommandLine/CommandLineConfigurationSource.cs
similarity index 98%
rename from src/Microsoft.Framework.ConfigurationModel.CommandLine/CommandLineConfigurationSource.cs
rename to src/Microsoft.Framework.Configuration.CommandLine/CommandLineConfigurationSource.cs
index 5b7902f..6c27434 100644
--- a/src/Microsoft.Framework.ConfigurationModel.CommandLine/CommandLineConfigurationSource.cs
+++ b/src/Microsoft.Framework.Configuration.CommandLine/CommandLineConfigurationSource.cs
@@ -4,7 +4,7 @@
using System;
using System.Collections.Generic;
-namespace Microsoft.Framework.ConfigurationModel.CommandLine
+namespace Microsoft.Framework.Configuration.CommandLine
{
public class CommandLineConfigurationSource : ConfigurationSource
{
diff --git a/src/Microsoft.Framework.ConfigurationModel.CommandLine/Microsoft.Framework.ConfigurationModel.CommandLine.xproj b/src/Microsoft.Framework.Configuration.CommandLine/Microsoft.Framework.Configuration.CommandLine.xproj
similarity index 100%
rename from src/Microsoft.Framework.ConfigurationModel.CommandLine/Microsoft.Framework.ConfigurationModel.CommandLine.xproj
rename to src/Microsoft.Framework.Configuration.CommandLine/Microsoft.Framework.Configuration.CommandLine.xproj
diff --git a/src/Microsoft.Framework.ConfigurationModel.CommandLine/Properties/AssemblyInfo.cs b/src/Microsoft.Framework.Configuration.CommandLine/Properties/AssemblyInfo.cs
similarity index 79%
rename from src/Microsoft.Framework.ConfigurationModel.CommandLine/Properties/AssemblyInfo.cs
rename to src/Microsoft.Framework.Configuration.CommandLine/Properties/AssemblyInfo.cs
index cfd4ee4..49316e2 100644
--- a/src/Microsoft.Framework.ConfigurationModel.CommandLine/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.Framework.Configuration.CommandLine/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@
using System.Reflection;
using System.Runtime.CompilerServices;
-[assembly: InternalsVisibleTo("Microsoft.Framework.ConfigurationModel.CommandLine.Test")]
+[assembly: InternalsVisibleTo("Microsoft.Framework.Configuration.CommandLine.Test")]
[assembly: AssemblyMetadata("Serviceable", "True")]
\ No newline at end of file
diff --git a/src/Microsoft.Framework.ConfigurationModel.CommandLine/Properties/Resources.Designer.cs b/src/Microsoft.Framework.Configuration.CommandLine/Properties/Resources.Designer.cs
similarity index 96%
rename from src/Microsoft.Framework.ConfigurationModel.CommandLine/Properties/Resources.Designer.cs
rename to src/Microsoft.Framework.Configuration.CommandLine/Properties/Resources.Designer.cs
index 9255a8c..77452a5 100644
--- a/src/Microsoft.Framework.ConfigurationModel.CommandLine/Properties/Resources.Designer.cs
+++ b/src/Microsoft.Framework.Configuration.CommandLine/Properties/Resources.Designer.cs
@@ -1,5 +1,5 @@
//
-namespace Microsoft.Framework.ConfigurationModel.CommandLine
+namespace Microsoft.Framework.Configuration.CommandLine
{
using System.Globalization;
using System.Reflection;
@@ -8,7 +8,7 @@ namespace Microsoft.Framework.ConfigurationModel.CommandLine
internal static class Resources
{
private static readonly ResourceManager _resourceManager
- = new ResourceManager("Microsoft.Framework.ConfigurationModel.CommandLine.Resources", typeof(Resources).GetTypeInfo().Assembly);
+ = new ResourceManager("Microsoft.Framework.Configuration.CommandLine.Resources", typeof(Resources).GetTypeInfo().Assembly);
///
/// Keys in switch mappings are case-insensitive. A duplicated key '{0}' was found.
diff --git a/src/Microsoft.Framework.ConfigurationModel.CommandLine/Resources.resx b/src/Microsoft.Framework.Configuration.CommandLine/Resources.resx
similarity index 100%
rename from src/Microsoft.Framework.ConfigurationModel.CommandLine/Resources.resx
rename to src/Microsoft.Framework.Configuration.CommandLine/Resources.resx
diff --git a/src/Microsoft.Framework.ConfigurationModel.CommandLine/project.json b/src/Microsoft.Framework.Configuration.CommandLine/project.json
similarity index 84%
rename from src/Microsoft.Framework.ConfigurationModel.CommandLine/project.json
rename to src/Microsoft.Framework.Configuration.CommandLine/project.json
index 9ffa039..df80744 100644
--- a/src/Microsoft.Framework.ConfigurationModel.CommandLine/project.json
+++ b/src/Microsoft.Framework.Configuration.CommandLine/project.json
@@ -2,7 +2,7 @@
"version": "1.0.0-*",
"description": "Command line configuration source for the Configuration package.",
"dependencies": {
- "Microsoft.Framework.ConfigurationModel": "1.0.0-*",
+ "Microsoft.Framework.Configuration": "1.0.0-*",
"Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }
},
"frameworks": {
diff --git a/src/Microsoft.Framework.ConfigurationModel.EnvironmentVariables/EnvironmentVariablesConfigurationSource.cs b/src/Microsoft.Framework.Configuration.EnvironmentVariables/EnvironmentVariablesConfigurationSource.cs
similarity index 97%
rename from src/Microsoft.Framework.ConfigurationModel.EnvironmentVariables/EnvironmentVariablesConfigurationSource.cs
rename to src/Microsoft.Framework.Configuration.EnvironmentVariables/EnvironmentVariablesConfigurationSource.cs
index 608245c..08d6dcf 100644
--- a/src/Microsoft.Framework.ConfigurationModel.EnvironmentVariables/EnvironmentVariablesConfigurationSource.cs
+++ b/src/Microsoft.Framework.Configuration.EnvironmentVariables/EnvironmentVariablesConfigurationSource.cs
@@ -6,7 +6,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Linq;
-namespace Microsoft.Framework.ConfigurationModel.EnvironmentVariables
+namespace Microsoft.Framework.Configuration.EnvironmentVariables
{
public class EnvironmentVariablesConfigurationSource : ConfigurationSource
{
diff --git a/src/Microsoft.Framework.ConfigurationModel.EnvironmentVariables/EnvironmentVariablesExtension.cs b/src/Microsoft.Framework.Configuration.EnvironmentVariables/EnvironmentVariablesExtension.cs
similarity index 87%
rename from src/Microsoft.Framework.ConfigurationModel.EnvironmentVariables/EnvironmentVariablesExtension.cs
rename to src/Microsoft.Framework.Configuration.EnvironmentVariables/EnvironmentVariablesExtension.cs
index 8649f00..00b7a80 100644
--- a/src/Microsoft.Framework.ConfigurationModel.EnvironmentVariables/EnvironmentVariablesExtension.cs
+++ b/src/Microsoft.Framework.Configuration.EnvironmentVariables/EnvironmentVariablesExtension.cs
@@ -1,7 +1,9 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-namespace Microsoft.Framework.ConfigurationModel.EnvironmentVariables
+using Microsoft.Framework.Configuration.EnvironmentVariables;
+
+namespace Microsoft.Framework.Configuration
{
public static class EnvironmentVariablesExtension
{
diff --git a/src/Microsoft.Framework.ConfigurationModel.EnvironmentVariables/Microsoft.Framework.ConfigurationModel.EnvironmentVariables.xproj b/src/Microsoft.Framework.Configuration.EnvironmentVariables/Microsoft.Framework.Configuration.EnvironmentVariables.xproj
similarity index 100%
rename from src/Microsoft.Framework.ConfigurationModel.EnvironmentVariables/Microsoft.Framework.ConfigurationModel.EnvironmentVariables.xproj
rename to src/Microsoft.Framework.Configuration.EnvironmentVariables/Microsoft.Framework.Configuration.EnvironmentVariables.xproj
diff --git a/src/Microsoft.Framework.ConfigurationModel.EnvironmentVariables/Properties/AssemblyInfo.cs b/src/Microsoft.Framework.Configuration.EnvironmentVariables/Properties/AssemblyInfo.cs
similarity index 90%
rename from src/Microsoft.Framework.ConfigurationModel.EnvironmentVariables/Properties/AssemblyInfo.cs
rename to src/Microsoft.Framework.Configuration.EnvironmentVariables/Properties/AssemblyInfo.cs
index 4557d21..9e9251e 100644
--- a/src/Microsoft.Framework.ConfigurationModel.EnvironmentVariables/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.Framework.Configuration.EnvironmentVariables/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@
using System.Reflection;
using System.Runtime.CompilerServices;
-[assembly: InternalsVisibleTo("Microsoft.Framework.ConfigurationModel.EnvironmentVariables.Test")]
+[assembly: InternalsVisibleTo("Microsoft.Framework.Configuration.EnvironmentVariables.Test")]
[assembly: AssemblyMetadata("Serviceable", "True")]
diff --git a/src/Microsoft.Framework.ConfigurationModel.EnvironmentVariables/project.json b/src/Microsoft.Framework.Configuration.EnvironmentVariables/project.json
similarity index 85%
rename from src/Microsoft.Framework.ConfigurationModel.EnvironmentVariables/project.json
rename to src/Microsoft.Framework.Configuration.EnvironmentVariables/project.json
index a3ba133..1b3602e 100644
--- a/src/Microsoft.Framework.ConfigurationModel.EnvironmentVariables/project.json
+++ b/src/Microsoft.Framework.Configuration.EnvironmentVariables/project.json
@@ -2,7 +2,7 @@
"version": "1.0.0-*",
"description": "Environment variables configuration source for the Configuration package.",
"dependencies": {
- "Microsoft.Framework.ConfigurationModel": "1.0.0-*",
+ "Microsoft.Framework.Configuration": "1.0.0-*",
"Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }
},
"frameworks": {
diff --git a/src/Microsoft.Framework.ConfigurationModel.Ini/IniConfigurationExtension.cs b/src/Microsoft.Framework.Configuration.Ini/IniConfigurationExtension.cs
similarity index 95%
rename from src/Microsoft.Framework.ConfigurationModel.Ini/IniConfigurationExtension.cs
rename to src/Microsoft.Framework.Configuration.Ini/IniConfigurationExtension.cs
index bfd300a..5f9398d 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Ini/IniConfigurationExtension.cs
+++ b/src/Microsoft.Framework.Configuration.Ini/IniConfigurationExtension.cs
@@ -3,10 +3,11 @@
using System;
using System.IO;
-using Microsoft.Framework.ConfigurationModel.Helper;
+using Microsoft.Framework.Configuration.Helper;
+using Microsoft.Framework.Configuration.Ini;
using Microsoft.Framework.Internal;
-namespace Microsoft.Framework.ConfigurationModel.Ini
+namespace Microsoft.Framework.Configuration
{
public static class IniConfigurationExtension
{
diff --git a/src/Microsoft.Framework.ConfigurationModel.Ini/IniFileConfigurationSource.cs b/src/Microsoft.Framework.Configuration.Ini/IniFileConfigurationSource.cs
similarity index 98%
rename from src/Microsoft.Framework.ConfigurationModel.Ini/IniFileConfigurationSource.cs
rename to src/Microsoft.Framework.Configuration.Ini/IniFileConfigurationSource.cs
index cef4271..4c80ff5 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Ini/IniFileConfigurationSource.cs
+++ b/src/Microsoft.Framework.Configuration.Ini/IniFileConfigurationSource.cs
@@ -6,7 +6,7 @@ using System;
using System.Collections.Generic;
using System.IO;
-namespace Microsoft.Framework.ConfigurationModel.Ini
+namespace Microsoft.Framework.Configuration.Ini
{
///
/// An INI file based .
diff --git a/src/Microsoft.Framework.ConfigurationModel.Ini/Microsoft.Framework.ConfigurationModel.Ini.xproj b/src/Microsoft.Framework.Configuration.Ini/Microsoft.Framework.Configuration.Ini.xproj
similarity index 100%
rename from src/Microsoft.Framework.ConfigurationModel.Ini/Microsoft.Framework.ConfigurationModel.Ini.xproj
rename to src/Microsoft.Framework.Configuration.Ini/Microsoft.Framework.Configuration.Ini.xproj
diff --git a/src/Microsoft.Framework.ConfigurationModel.Ini/Properties/AssemblyInfo.cs b/src/Microsoft.Framework.Configuration.Ini/Properties/AssemblyInfo.cs
similarity index 95%
rename from src/Microsoft.Framework.ConfigurationModel.Ini/Properties/AssemblyInfo.cs
rename to src/Microsoft.Framework.Configuration.Ini/Properties/AssemblyInfo.cs
index 6651295..1605d67 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Ini/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.Framework.Configuration.Ini/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@
using System.Reflection;
using System.Runtime.CompilerServices;
-[assembly: InternalsVisibleTo("Microsoft.Framework.ConfigurationModel.Ini.Test")]
+[assembly: InternalsVisibleTo("Microsoft.Framework.Configuration.Ini.Test")]
[assembly: AssemblyMetadata("Serviceable", "True")]
diff --git a/src/Microsoft.Framework.ConfigurationModel.Ini/Properties/Resources.Designer.cs b/src/Microsoft.Framework.Configuration.Ini/Properties/Resources.Designer.cs
similarity index 95%
rename from src/Microsoft.Framework.ConfigurationModel.Ini/Properties/Resources.Designer.cs
rename to src/Microsoft.Framework.Configuration.Ini/Properties/Resources.Designer.cs
index acf577f..c605ee5 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Ini/Properties/Resources.Designer.cs
+++ b/src/Microsoft.Framework.Configuration.Ini/Properties/Resources.Designer.cs
@@ -1,5 +1,5 @@
//
-namespace Microsoft.Framework.ConfigurationModel.Ini
+namespace Microsoft.Framework.Configuration.Ini
{
using System.Globalization;
using System.Reflection;
@@ -8,7 +8,7 @@ namespace Microsoft.Framework.ConfigurationModel.Ini
internal static class Resources
{
private static readonly ResourceManager _resourceManager
- = new ResourceManager("Microsoft.Framework.ConfigurationModel.Ini.Resources", typeof(Resources).GetTypeInfo().Assembly);
+ = new ResourceManager("Microsoft.Framework.Configuration.Ini.Resources", typeof(Resources).GetTypeInfo().Assembly);
///
/// The configuration file '{0}' was not found and is not optional.
diff --git a/src/Microsoft.Framework.ConfigurationModel.Ini/Resources.resx b/src/Microsoft.Framework.Configuration.Ini/Resources.resx
similarity index 100%
rename from src/Microsoft.Framework.ConfigurationModel.Ini/Resources.resx
rename to src/Microsoft.Framework.Configuration.Ini/Resources.resx
diff --git a/src/Microsoft.Framework.ConfigurationModel.Ini/project.json b/src/Microsoft.Framework.Configuration.Ini/project.json
similarity index 84%
rename from src/Microsoft.Framework.ConfigurationModel.Ini/project.json
rename to src/Microsoft.Framework.Configuration.Ini/project.json
index 38af273..3cc8dcc 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Ini/project.json
+++ b/src/Microsoft.Framework.Configuration.Ini/project.json
@@ -2,7 +2,7 @@
"version": "1.0.0-*",
"description": "Ini configuration source for the Configuration package.",
"dependencies": {
- "Microsoft.Framework.ConfigurationModel": "1.0.0-*",
+ "Microsoft.Framework.Configuration": "1.0.0-*",
"Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }
},
"frameworks": {
diff --git a/src/Microsoft.Framework.ConfigurationModel.Json/JsonConfigurationExtension.cs b/src/Microsoft.Framework.Configuration.Json/JsonConfigurationExtension.cs
similarity index 94%
rename from src/Microsoft.Framework.ConfigurationModel.Json/JsonConfigurationExtension.cs
rename to src/Microsoft.Framework.Configuration.Json/JsonConfigurationExtension.cs
index ac35655..d3b80dc 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Json/JsonConfigurationExtension.cs
+++ b/src/Microsoft.Framework.Configuration.Json/JsonConfigurationExtension.cs
@@ -3,11 +3,11 @@
using System;
using System.IO;
-using Microsoft.Framework.ConfigurationModel.Helper;
-using Microsoft.Framework.ConfigurationModel.Json;
+using Microsoft.Framework.Configuration.Helper;
+using Microsoft.Framework.Configuration.Json;
using Microsoft.Framework.Internal;
-namespace Microsoft.Framework.ConfigurationModel
+namespace Microsoft.Framework.Configuration
{
///
/// Extension methods for adding .
diff --git a/src/Microsoft.Framework.ConfigurationModel.Json/JsonConfigurationFileParser.cs b/src/Microsoft.Framework.Configuration.Json/JsonConfigurationFileParser.cs
similarity index 98%
rename from src/Microsoft.Framework.ConfigurationModel.Json/JsonConfigurationFileParser.cs
rename to src/Microsoft.Framework.Configuration.Json/JsonConfigurationFileParser.cs
index d107586..fe1516f 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Json/JsonConfigurationFileParser.cs
+++ b/src/Microsoft.Framework.Configuration.Json/JsonConfigurationFileParser.cs
@@ -8,7 +8,7 @@ using System.Linq;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
-namespace Microsoft.Framework.ConfigurationModel.Json
+namespace Microsoft.Framework.Configuration.Json
{
internal class JsonConfigurationFileParser
{
diff --git a/src/Microsoft.Framework.ConfigurationModel.Json/JsonConfigurationSource.cs b/src/Microsoft.Framework.Configuration.Json/JsonConfigurationSource.cs
similarity index 96%
rename from src/Microsoft.Framework.ConfigurationModel.Json/JsonConfigurationSource.cs
rename to src/Microsoft.Framework.Configuration.Json/JsonConfigurationSource.cs
index 6643dfe..9a481b2 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Json/JsonConfigurationSource.cs
+++ b/src/Microsoft.Framework.Configuration.Json/JsonConfigurationSource.cs
@@ -4,9 +4,9 @@
using System;
using System.Collections.Generic;
using System.IO;
-using Microsoft.Framework.ConfigurationModel.Json;
+using Microsoft.Framework.Configuration.Json;
-namespace Microsoft.Framework.ConfigurationModel
+namespace Microsoft.Framework.Configuration
{
///
/// A JSON file based .
diff --git a/src/Microsoft.Framework.ConfigurationModel.Json/Microsoft.Framework.ConfigurationModel.Json.xproj b/src/Microsoft.Framework.Configuration.Json/Microsoft.Framework.Configuration.Json.xproj
similarity index 100%
rename from src/Microsoft.Framework.ConfigurationModel.Json/Microsoft.Framework.ConfigurationModel.Json.xproj
rename to src/Microsoft.Framework.Configuration.Json/Microsoft.Framework.Configuration.Json.xproj
diff --git a/src/Microsoft.Framework.ConfigurationModel.Xml/Properties/AssemblyInfo.cs b/src/Microsoft.Framework.Configuration.Json/Properties/AssemblyInfo.cs
similarity index 95%
rename from src/Microsoft.Framework.ConfigurationModel.Xml/Properties/AssemblyInfo.cs
rename to src/Microsoft.Framework.Configuration.Json/Properties/AssemblyInfo.cs
index aa14dfc..bef8ada 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Xml/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.Framework.Configuration.Json/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@
using System.Reflection;
using System.Runtime.CompilerServices;
-[assembly: InternalsVisibleTo("Microsoft.Framework.ConfigurationModel.Xml.Test")]
+[assembly: InternalsVisibleTo("Microsoft.Framework.Configuration.Json.Test")]
[assembly: AssemblyMetadata("Serviceable", "True")]
diff --git a/src/Microsoft.Framework.ConfigurationModel.Json/Properties/Resources.Designer.cs b/src/Microsoft.Framework.Configuration.Json/Properties/Resources.Designer.cs
similarity index 97%
rename from src/Microsoft.Framework.ConfigurationModel.Json/Properties/Resources.Designer.cs
rename to src/Microsoft.Framework.Configuration.Json/Properties/Resources.Designer.cs
index d5bf296..5dbec34 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Json/Properties/Resources.Designer.cs
+++ b/src/Microsoft.Framework.Configuration.Json/Properties/Resources.Designer.cs
@@ -1,5 +1,5 @@
//
-namespace Microsoft.Framework.ConfigurationModel.Json
+namespace Microsoft.Framework.Configuration.Json
{
using System.Globalization;
using System.Reflection;
@@ -8,7 +8,7 @@ namespace Microsoft.Framework.ConfigurationModel.Json
internal static class Resources
{
private static readonly ResourceManager _resourceManager
- = new ResourceManager("Microsoft.Framework.ConfigurationModel.Json.Resources", typeof(Resources).GetTypeInfo().Assembly);
+ = new ResourceManager("Microsoft.Framework.Configuration.Json.Resources", typeof(Resources).GetTypeInfo().Assembly);
///
/// Unable to commit because the following keys are missing from the configuration file: {0}.
diff --git a/src/Microsoft.Framework.ConfigurationModel.Json/Resources.resx b/src/Microsoft.Framework.Configuration.Json/Resources.resx
similarity index 100%
rename from src/Microsoft.Framework.ConfigurationModel.Json/Resources.resx
rename to src/Microsoft.Framework.Configuration.Json/Resources.resx
diff --git a/src/Microsoft.Framework.ConfigurationModel.Json/project.json b/src/Microsoft.Framework.Configuration.Json/project.json
similarity index 82%
rename from src/Microsoft.Framework.ConfigurationModel.Json/project.json
rename to src/Microsoft.Framework.Configuration.Json/project.json
index c4afd91..32b3611 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Json/project.json
+++ b/src/Microsoft.Framework.Configuration.Json/project.json
@@ -1,18 +1,18 @@
-{
- "version": "1.0.0-*",
- "description": "JSON configuration source for the ConfigurationModel package.",
- "dependencies": {
- "Newtonsoft.Json": "6.0.6",
- "Microsoft.Framework.ConfigurationModel": "1.0.0-*",
- "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }
- },
- "frameworks": {
- "net45": { },
- "dnx451": { },
- "dnxcore50": {
- "dependencies": {
- "System.Dynamic.Runtime": "4.0.10-*"
- }
- }
- }
-}
+{
+ "version": "1.0.0-*",
+ "description": "JSON configuration source for the Configuration package.",
+ "dependencies": {
+ "Newtonsoft.Json": "6.0.6",
+ "Microsoft.Framework.Configuration": "1.0.0-*",
+ "Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }
+ },
+ "frameworks": {
+ "net45": { },
+ "dnx451": { },
+ "dnxcore50": {
+ "dependencies": {
+ "System.Dynamic.Runtime": "4.0.10-*"
+ }
+ }
+ }
+}
diff --git a/src/Microsoft.Framework.ConfigurationModel.Xml/EncryptedXmlDocumentDecryptor.cs b/src/Microsoft.Framework.Configuration.Xml/EncryptedXmlDocumentDecryptor.cs
similarity index 97%
rename from src/Microsoft.Framework.ConfigurationModel.Xml/EncryptedXmlDocumentDecryptor.cs
rename to src/Microsoft.Framework.Configuration.Xml/EncryptedXmlDocumentDecryptor.cs
index a2c9b2d..eb7ccef 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Xml/EncryptedXmlDocumentDecryptor.cs
+++ b/src/Microsoft.Framework.Configuration.Xml/EncryptedXmlDocumentDecryptor.cs
@@ -6,7 +6,7 @@ using System;
using System.Security.Cryptography.Xml;
using System.Xml;
-namespace Microsoft.Framework.ConfigurationModel
+namespace Microsoft.Framework.Configuration
{
///
/// A decryptor that uses the EncryptedXml class in the desktop CLR.
diff --git a/src/Microsoft.Framework.ConfigurationModel.Xml/Microsoft.Framework.ConfigurationModel.Xml.xproj b/src/Microsoft.Framework.Configuration.Xml/Microsoft.Framework.Configuration.Xml.xproj
similarity index 100%
rename from src/Microsoft.Framework.ConfigurationModel.Xml/Microsoft.Framework.ConfigurationModel.Xml.xproj
rename to src/Microsoft.Framework.Configuration.Xml/Microsoft.Framework.Configuration.Xml.xproj
diff --git a/src/Microsoft.Framework.ConfigurationModel.Json/Properties/AssemblyInfo.cs b/src/Microsoft.Framework.Configuration.Xml/Properties/AssemblyInfo.cs
similarity index 94%
rename from src/Microsoft.Framework.ConfigurationModel.Json/Properties/AssemblyInfo.cs
rename to src/Microsoft.Framework.Configuration.Xml/Properties/AssemblyInfo.cs
index ad872b4..5b20465 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Json/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.Framework.Configuration.Xml/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@
using System.Reflection;
using System.Runtime.CompilerServices;
-[assembly: InternalsVisibleTo("Microsoft.Framework.ConfigurationModel.Json.Test")]
+[assembly: InternalsVisibleTo("Microsoft.Framework.Configuration.Xml.Test")]
[assembly: AssemblyMetadata("Serviceable", "True")]
diff --git a/src/Microsoft.Framework.ConfigurationModel.Xml/Properties/Resources.Designer.cs b/src/Microsoft.Framework.Configuration.Xml/Properties/Resources.Designer.cs
similarity index 97%
rename from src/Microsoft.Framework.ConfigurationModel.Xml/Properties/Resources.Designer.cs
rename to src/Microsoft.Framework.Configuration.Xml/Properties/Resources.Designer.cs
index d398fbc..1acdc5b 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Xml/Properties/Resources.Designer.cs
+++ b/src/Microsoft.Framework.Configuration.Xml/Properties/Resources.Designer.cs
@@ -1,5 +1,5 @@
//
-namespace Microsoft.Framework.ConfigurationModel.Xml
+namespace Microsoft.Framework.Configuration.Xml
{
using System.Globalization;
using System.Reflection;
@@ -8,7 +8,7 @@ namespace Microsoft.Framework.ConfigurationModel.Xml
internal static class Resources
{
private static readonly ResourceManager _resourceManager
- = new ResourceManager("Microsoft.Framework.ConfigurationModel.Xml.Resources", typeof(Resources).GetTypeInfo().Assembly);
+ = new ResourceManager("Microsoft.Framework.Configuration.Xml.Resources", typeof(Resources).GetTypeInfo().Assembly);
///
/// Unable to commit because the following keys are missing from the configuration file: {0}.
diff --git a/src/Microsoft.Framework.ConfigurationModel.Xml/Resources.resx b/src/Microsoft.Framework.Configuration.Xml/Resources.resx
similarity index 100%
rename from src/Microsoft.Framework.ConfigurationModel.Xml/Resources.resx
rename to src/Microsoft.Framework.Configuration.Xml/Resources.resx
diff --git a/src/Microsoft.Framework.ConfigurationModel.Xml/XmlConfigurationExtension.cs b/src/Microsoft.Framework.Configuration.Xml/XmlConfigurationExtension.cs
similarity index 94%
rename from src/Microsoft.Framework.ConfigurationModel.Xml/XmlConfigurationExtension.cs
rename to src/Microsoft.Framework.Configuration.Xml/XmlConfigurationExtension.cs
index f370bb0..91ca2d3 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Xml/XmlConfigurationExtension.cs
+++ b/src/Microsoft.Framework.Configuration.Xml/XmlConfigurationExtension.cs
@@ -3,11 +3,11 @@
using System;
using System.IO;
-using Microsoft.Framework.ConfigurationModel.Helper;
-using Microsoft.Framework.ConfigurationModel.Xml;
+using Microsoft.Framework.Configuration.Helper;
+using Microsoft.Framework.Configuration.Xml;
using Microsoft.Framework.Internal;
-namespace Microsoft.Framework.ConfigurationModel
+namespace Microsoft.Framework.Configuration
{
///
/// Extension methods for adding .
diff --git a/src/Microsoft.Framework.ConfigurationModel.Xml/XmlConfigurationSource.cs b/src/Microsoft.Framework.Configuration.Xml/XmlConfigurationSource.cs
similarity index 99%
rename from src/Microsoft.Framework.ConfigurationModel.Xml/XmlConfigurationSource.cs
rename to src/Microsoft.Framework.Configuration.Xml/XmlConfigurationSource.cs
index 10158c8..e56e574 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Xml/XmlConfigurationSource.cs
+++ b/src/Microsoft.Framework.Configuration.Xml/XmlConfigurationSource.cs
@@ -6,9 +6,9 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Xml;
-using Microsoft.Framework.ConfigurationModel.Xml;
+using Microsoft.Framework.Configuration.Xml;
-namespace Microsoft.Framework.ConfigurationModel
+namespace Microsoft.Framework.Configuration
{
///
/// An XML file based .
diff --git a/src/Microsoft.Framework.ConfigurationModel.Xml/XmlDocumentDecryptor.cs b/src/Microsoft.Framework.Configuration.Xml/XmlDocumentDecryptor.cs
similarity index 96%
rename from src/Microsoft.Framework.ConfigurationModel.Xml/XmlDocumentDecryptor.cs
rename to src/Microsoft.Framework.Configuration.Xml/XmlDocumentDecryptor.cs
index fb32cd6..a6053bc 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Xml/XmlDocumentDecryptor.cs
+++ b/src/Microsoft.Framework.Configuration.Xml/XmlDocumentDecryptor.cs
@@ -4,9 +4,9 @@
using System;
using System.IO;
using System.Xml;
-using Microsoft.Framework.ConfigurationModel.Xml;
+using Microsoft.Framework.Configuration.Xml;
-namespace Microsoft.Framework.ConfigurationModel
+namespace Microsoft.Framework.Configuration
{
internal class XmlDocumentDecryptor
{
diff --git a/src/Microsoft.Framework.ConfigurationModel.Xml/project.json b/src/Microsoft.Framework.Configuration.Xml/project.json
similarity index 90%
rename from src/Microsoft.Framework.ConfigurationModel.Xml/project.json
rename to src/Microsoft.Framework.Configuration.Xml/project.json
index 92b1f59..20c405c 100644
--- a/src/Microsoft.Framework.ConfigurationModel.Xml/project.json
+++ b/src/Microsoft.Framework.Configuration.Xml/project.json
@@ -1,8 +1,8 @@
{
"version": "1.0.0-*",
- "description": "XML configuration source for the ConfigurationModel package.",
+ "description": "XML configuration source for the Configuration package.",
"dependencies": {
- "Microsoft.Framework.ConfigurationModel": "1.0.0-*",
+ "Microsoft.Framework.Configuration": "1.0.0-*",
"Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }
},
"frameworks": {
diff --git a/src/Microsoft.Framework.ConfigurationModel/ConfigurationBinder.cs b/src/Microsoft.Framework.Configuration/ConfigurationBinder.cs
similarity index 99%
rename from src/Microsoft.Framework.ConfigurationModel/ConfigurationBinder.cs
rename to src/Microsoft.Framework.Configuration/ConfigurationBinder.cs
index 7095282..4d1bb41 100644
--- a/src/Microsoft.Framework.ConfigurationModel/ConfigurationBinder.cs
+++ b/src/Microsoft.Framework.Configuration/ConfigurationBinder.cs
@@ -7,7 +7,7 @@ using System.Linq;
using System.Reflection;
using Microsoft.Framework.Internal;
-namespace Microsoft.Framework.ConfigurationModel
+namespace Microsoft.Framework.Configuration
{
public static class ConfigurationBinder
{
diff --git a/src/Microsoft.Framework.ConfigurationModel/ConfigurationKeyComparer.cs b/src/Microsoft.Framework.Configuration/ConfigurationKeyComparer.cs
similarity index 97%
rename from src/Microsoft.Framework.ConfigurationModel/ConfigurationKeyComparer.cs
rename to src/Microsoft.Framework.Configuration/ConfigurationKeyComparer.cs
index 7cd83a0..4cb57a5 100644
--- a/src/Microsoft.Framework.ConfigurationModel/ConfigurationKeyComparer.cs
+++ b/src/Microsoft.Framework.Configuration/ConfigurationKeyComparer.cs
@@ -4,7 +4,7 @@
using System;
using System.Collections.Generic;
-namespace Microsoft.Framework.ConfigurationModel
+namespace Microsoft.Framework.Configuration
{
public class ConfigurationKeyComparer : IComparer
{
diff --git a/src/Microsoft.Framework.ConfigurationModel/Configuration.cs b/src/Microsoft.Framework.Configuration/ConfigurationSection.cs
similarity index 93%
rename from src/Microsoft.Framework.ConfigurationModel/Configuration.cs
rename to src/Microsoft.Framework.Configuration/ConfigurationSection.cs
index a0064c0..50e81fe 100644
--- a/src/Microsoft.Framework.ConfigurationModel/Configuration.cs
+++ b/src/Microsoft.Framework.Configuration/ConfigurationSection.cs
@@ -4,21 +4,21 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using Microsoft.Framework.ConfigurationModel.Internal;
+using Microsoft.Framework.Configuration.Internal;
using Microsoft.Framework.Internal;
-namespace Microsoft.Framework.ConfigurationModel
+namespace Microsoft.Framework.Configuration
{
- public class Configuration : IConfiguration, IConfigurationBuilder
+ public class ConfigurationSection : IConfiguration, IConfigurationBuilder
{
private readonly IList _sources = new List();
- public Configuration(params IConfigurationSource[] sources)
+ public ConfigurationSection(params IConfigurationSource[] sources)
: this(null, sources)
{
}
- public Configuration(string basePath, params IConfigurationSource[] sources)
+ public ConfigurationSection(string basePath, params IConfigurationSource[] sources)
{
if (sources != null)
{
diff --git a/src/Microsoft.Framework.ConfigurationModel/Constants.cs b/src/Microsoft.Framework.Configuration/Constants.cs
similarity index 84%
rename from src/Microsoft.Framework.ConfigurationModel/Constants.cs
rename to src/Microsoft.Framework.Configuration/Constants.cs
index d8f0f4c..dc1c9b2 100644
--- a/src/Microsoft.Framework.ConfigurationModel/Constants.cs
+++ b/src/Microsoft.Framework.Configuration/Constants.cs
@@ -1,7 +1,7 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-namespace Microsoft.Framework.ConfigurationModel
+namespace Microsoft.Framework.Configuration
{
public static class Constants
{
diff --git a/src/Microsoft.Framework.ConfigurationModel/Helper/ConfigurationHelper.cs b/src/Microsoft.Framework.Configuration/Helper/ConfigurationHelper.cs
similarity index 94%
rename from src/Microsoft.Framework.ConfigurationModel/Helper/ConfigurationHelper.cs
rename to src/Microsoft.Framework.Configuration/Helper/ConfigurationHelper.cs
index b6a345e..66a4111 100644
--- a/src/Microsoft.Framework.ConfigurationModel/Helper/ConfigurationHelper.cs
+++ b/src/Microsoft.Framework.Configuration/Helper/ConfigurationHelper.cs
@@ -4,7 +4,7 @@
using System;
using System.IO;
-namespace Microsoft.Framework.ConfigurationModel.Helper
+namespace Microsoft.Framework.Configuration.Helper
{
public static class ConfigurationHelper
{
diff --git a/src/Microsoft.Framework.ConfigurationModel/Internal/ConfigurationFocus.cs b/src/Microsoft.Framework.Configuration/Internal/ConfigurationFocus.cs
similarity index 97%
rename from src/Microsoft.Framework.ConfigurationModel/Internal/ConfigurationFocus.cs
rename to src/Microsoft.Framework.Configuration/Internal/ConfigurationFocus.cs
index a04b4a2..a6dad93 100644
--- a/src/Microsoft.Framework.ConfigurationModel/Internal/ConfigurationFocus.cs
+++ b/src/Microsoft.Framework.Configuration/Internal/ConfigurationFocus.cs
@@ -3,7 +3,7 @@
using System.Collections.Generic;
-namespace Microsoft.Framework.ConfigurationModel.Internal
+namespace Microsoft.Framework.Configuration.Internal
{
public class ConfigurationFocus : IConfiguration
{
diff --git a/src/Microsoft.Framework.ConfigurationModel/Microsoft.Framework.ConfigurationModel.xproj b/src/Microsoft.Framework.Configuration/Microsoft.Framework.Configuration.xproj
similarity index 100%
rename from src/Microsoft.Framework.ConfigurationModel/Microsoft.Framework.ConfigurationModel.xproj
rename to src/Microsoft.Framework.Configuration/Microsoft.Framework.Configuration.xproj
diff --git a/src/Microsoft.Framework.ConfigurationModel/Properties/AssemblyInfo.cs b/src/Microsoft.Framework.Configuration/Properties/AssemblyInfo.cs
similarity index 99%
rename from src/Microsoft.Framework.ConfigurationModel/Properties/AssemblyInfo.cs
rename to src/Microsoft.Framework.Configuration/Properties/AssemblyInfo.cs
index d094ebb..7a35c5d 100644
--- a/src/Microsoft.Framework.ConfigurationModel/Properties/AssemblyInfo.cs
+++ b/src/Microsoft.Framework.Configuration/Properties/AssemblyInfo.cs
@@ -38,6 +38,6 @@ using System.Runtime.InteropServices;
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: InternalsVisibleTo("Microsoft.Framework.ConfigurationModel.Test")]
+[assembly: InternalsVisibleTo("Microsoft.Framework.Configuration.Test")]
[assembly: NeutralResourcesLanguage("en-US")]
[assembly: AssemblyMetadata("Serviceable", "True")]
diff --git a/src/Microsoft.Framework.ConfigurationModel/Properties/Resources.Designer.cs b/src/Microsoft.Framework.Configuration/Properties/Resources.Designer.cs
similarity index 97%
rename from src/Microsoft.Framework.ConfigurationModel/Properties/Resources.Designer.cs
rename to src/Microsoft.Framework.Configuration/Properties/Resources.Designer.cs
index e4bf7a6..4010964 100644
--- a/src/Microsoft.Framework.ConfigurationModel/Properties/Resources.Designer.cs
+++ b/src/Microsoft.Framework.Configuration/Properties/Resources.Designer.cs
@@ -1,5 +1,5 @@
//
-namespace Microsoft.Framework.ConfigurationModel
+namespace Microsoft.Framework.Configuration
{
using System.Globalization;
using System.Reflection;
@@ -8,7 +8,7 @@ namespace Microsoft.Framework.ConfigurationModel
internal static class Resources
{
private static readonly ResourceManager _resourceManager
- = new ResourceManager("Microsoft.Framework.ConfigurationModel.Resources", typeof(Resources).GetTypeInfo().Assembly);
+ = new ResourceManager("Microsoft.Framework.Configuration.Resources", typeof(Resources).GetTypeInfo().Assembly);
///
/// Cannot create instance of type '{0}' because it is either abstract or an interface.
diff --git a/src/Microsoft.Framework.ConfigurationModel/Resources.resx b/src/Microsoft.Framework.Configuration/Resources.resx
similarity index 100%
rename from src/Microsoft.Framework.ConfigurationModel/Resources.resx
rename to src/Microsoft.Framework.Configuration/Resources.resx
diff --git a/src/Microsoft.Framework.ConfigurationModel/Sources/ConfigurationSource.cs b/src/Microsoft.Framework.Configuration/Sources/ConfigurationSource.cs
similarity index 97%
rename from src/Microsoft.Framework.ConfigurationModel/Sources/ConfigurationSource.cs
rename to src/Microsoft.Framework.Configuration/Sources/ConfigurationSource.cs
index de9ad61..eff84ec 100644
--- a/src/Microsoft.Framework.ConfigurationModel/Sources/ConfigurationSource.cs
+++ b/src/Microsoft.Framework.Configuration/Sources/ConfigurationSource.cs
@@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
-namespace Microsoft.Framework.ConfigurationModel
+namespace Microsoft.Framework.Configuration
{
public abstract class ConfigurationSource : IConfigurationSource
{
diff --git a/src/Microsoft.Framework.ConfigurationModel/Sources/MemoryConfigurationSource.cs b/src/Microsoft.Framework.Configuration/Sources/MemoryConfigurationSource.cs
similarity index 95%
rename from src/Microsoft.Framework.ConfigurationModel/Sources/MemoryConfigurationSource.cs
rename to src/Microsoft.Framework.Configuration/Sources/MemoryConfigurationSource.cs
index 253d0cf..0c49d93 100644
--- a/src/Microsoft.Framework.ConfigurationModel/Sources/MemoryConfigurationSource.cs
+++ b/src/Microsoft.Framework.Configuration/Sources/MemoryConfigurationSource.cs
@@ -4,7 +4,7 @@
using System.Collections;
using System.Collections.Generic;
-namespace Microsoft.Framework.ConfigurationModel
+namespace Microsoft.Framework.Configuration
{
public class MemoryConfigurationSource :
ConfigurationSource,
diff --git a/src/Microsoft.Framework.ConfigurationModel/project.json b/src/Microsoft.Framework.Configuration/project.json
similarity index 94%
rename from src/Microsoft.Framework.ConfigurationModel/project.json
rename to src/Microsoft.Framework.Configuration/project.json
index d81897d..e04c659 100644
--- a/src/Microsoft.Framework.ConfigurationModel/project.json
+++ b/src/Microsoft.Framework.Configuration/project.json
@@ -2,7 +2,7 @@
"version": "1.0.0-*",
"description": "Implementation of key-value pair based configuration. Includes configuration sources for INI, command line, and environment variables.",
"dependencies": {
- "Microsoft.Framework.ConfigurationModel.Abstractions": "1.0.0-*",
+ "Microsoft.Framework.Configuration.Abstractions": "1.0.0-*",
"Microsoft.Framework.NotNullAttribute.Sources": { "type": "build", "version": "1.0.0-*" }
},
"frameworks": {
diff --git a/test/Microsoft.Framework.ConfigurationModel.CommandLine.Test/CommandLineConfigurationSourceTest.cs b/test/Microsoft.Framework.Configuration.CommandLine.Test/CommandLineConfigurationSourceTest.cs
similarity index 98%
rename from test/Microsoft.Framework.ConfigurationModel.CommandLine.Test/CommandLineConfigurationSourceTest.cs
rename to test/Microsoft.Framework.Configuration.CommandLine.Test/CommandLineConfigurationSourceTest.cs
index 889e246..29c38f4 100644
--- a/test/Microsoft.Framework.ConfigurationModel.CommandLine.Test/CommandLineConfigurationSourceTest.cs
+++ b/test/Microsoft.Framework.Configuration.CommandLine.Test/CommandLineConfigurationSourceTest.cs
@@ -3,10 +3,10 @@
using System;
using System.Collections.Generic;
-using Microsoft.Framework.ConfigurationModel.Test;
+using Microsoft.Framework.Configuration.Test;
using Xunit;
-namespace Microsoft.Framework.ConfigurationModel.CommandLine.Test
+namespace Microsoft.Framework.Configuration.CommandLine.Test
{
public class CommandLineConfigurationSourceTest
{
diff --git a/test/Microsoft.Framework.ConfigurationModel.CommandLine.Test/Microsoft.Framework.ConfigurationModel.CommandLine.Test.xproj b/test/Microsoft.Framework.Configuration.CommandLine.Test/Microsoft.Framework.Configuration.CommandLine.Test.xproj
similarity index 100%
rename from test/Microsoft.Framework.ConfigurationModel.CommandLine.Test/Microsoft.Framework.ConfigurationModel.CommandLine.Test.xproj
rename to test/Microsoft.Framework.Configuration.CommandLine.Test/Microsoft.Framework.Configuration.CommandLine.Test.xproj
diff --git a/test/Microsoft.Framework.ConfigurationModel.Ini.Test/project.json b/test/Microsoft.Framework.Configuration.CommandLine.Test/project.json
similarity index 59%
rename from test/Microsoft.Framework.ConfigurationModel.Ini.Test/project.json
rename to test/Microsoft.Framework.Configuration.CommandLine.Test/project.json
index 32b2a77..a333b8f 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Ini.Test/project.json
+++ b/test/Microsoft.Framework.Configuration.CommandLine.Test/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
- "Microsoft.Framework.ConfigurationModel.Ini": "1.0.0-*",
- "Microsoft.Framework.ConfigurationModel.Test.Common": "1.0.0-*",
+ "Microsoft.Framework.Configuration.CommandLine": "1.0.0-*",
+ "Microsoft.Framework.Configuration.Test.Common": "1.0.0-*",
"xunit.runner.aspnet": "2.0.0-aspnet-*"
},
"frameworks": {
diff --git a/test/Microsoft.Framework.ConfigurationModel.EnvironmentVariables.Test/EnvironmentVariablesConfigurationSourceTest.cs b/test/Microsoft.Framework.Configuration.EnvironmentVariables.Test/EnvironmentVariablesConfigurationSourceTest.cs
similarity index 97%
rename from test/Microsoft.Framework.ConfigurationModel.EnvironmentVariables.Test/EnvironmentVariablesConfigurationSourceTest.cs
rename to test/Microsoft.Framework.Configuration.EnvironmentVariables.Test/EnvironmentVariablesConfigurationSourceTest.cs
index ac6533f..f635558 100644
--- a/test/Microsoft.Framework.ConfigurationModel.EnvironmentVariables.Test/EnvironmentVariablesConfigurationSourceTest.cs
+++ b/test/Microsoft.Framework.Configuration.EnvironmentVariables.Test/EnvironmentVariablesConfigurationSourceTest.cs
@@ -3,10 +3,10 @@
using System;
using System.Collections;
-using Microsoft.Framework.ConfigurationModel.Test;
+using Microsoft.Framework.Configuration.Test;
using Xunit;
-namespace Microsoft.Framework.ConfigurationModel.EnvironmentVariables.Test
+namespace Microsoft.Framework.Configuration.EnvironmentVariables.Test
{
public class EnvironmentVariablesConfigurationSourceTest
{
diff --git a/test/Microsoft.Framework.ConfigurationModel.EnvironmentVariables.Test/Microsoft.Framework.ConfigurationModel.EnvironmentVariables.Test.xproj b/test/Microsoft.Framework.Configuration.EnvironmentVariables.Test/Microsoft.Framework.Configuration.EnvironmentVariables.Test.xproj
similarity index 100%
rename from test/Microsoft.Framework.ConfigurationModel.EnvironmentVariables.Test/Microsoft.Framework.ConfigurationModel.EnvironmentVariables.Test.xproj
rename to test/Microsoft.Framework.Configuration.EnvironmentVariables.Test/Microsoft.Framework.Configuration.EnvironmentVariables.Test.xproj
diff --git a/test/Microsoft.Framework.ConfigurationModel.CommandLine.Test/project.json b/test/Microsoft.Framework.Configuration.EnvironmentVariables.Test/project.json
similarity index 58%
rename from test/Microsoft.Framework.ConfigurationModel.CommandLine.Test/project.json
rename to test/Microsoft.Framework.Configuration.EnvironmentVariables.Test/project.json
index 21c11ac..41efd63 100644
--- a/test/Microsoft.Framework.ConfigurationModel.CommandLine.Test/project.json
+++ b/test/Microsoft.Framework.Configuration.EnvironmentVariables.Test/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
- "Microsoft.Framework.ConfigurationModel.CommandLine": "1.0.0-*",
- "Microsoft.Framework.ConfigurationModel.Test.Common": "1.0.0-*",
+ "Microsoft.Framework.Configuration.EnvironmentVariables": "1.0.0-*",
+ "Microsoft.Framework.Configuration.Test.Common": "1.0.0-*",
"xunit.runner.aspnet": "2.0.0-aspnet-*"
},
"frameworks": {
diff --git a/test/Microsoft.Framework.ConfigurationModel.FunctionalTests/ArrayTests.cs b/test/Microsoft.Framework.Configuration.FunctionalTests/ArrayTests.cs
similarity index 94%
rename from test/Microsoft.Framework.ConfigurationModel.FunctionalTests/ArrayTests.cs
rename to test/Microsoft.Framework.Configuration.FunctionalTests/ArrayTests.cs
index 286b305..e508272 100644
--- a/test/Microsoft.Framework.ConfigurationModel.FunctionalTests/ArrayTests.cs
+++ b/test/Microsoft.Framework.Configuration.FunctionalTests/ArrayTests.cs
@@ -4,10 +4,10 @@
using System;
using System.IO;
using System.Linq;
-using Microsoft.Framework.ConfigurationModel.Ini;
+using Microsoft.Framework.Configuration.Ini;
using Xunit;
-namespace Microsoft.Framework.ConfigurationModel.FunctionalTests
+namespace Microsoft.Framework.Configuration.FunctionalTests
{
public class ArrayTests : IDisposable
{
@@ -50,7 +50,7 @@ i=ini_i.i.i.i
[Fact]
public void DifferentConfigSources_Merged_KeysAreSorted()
{
- var config = new Configuration();
+ var config = new ConfigurationSection();
config.AddJsonFile(_json1ConfigFilePath);
config.AddIniFile(_iniConfigFilePath);
@@ -74,7 +74,7 @@ i=ini_i.i.i.i
[Fact]
public void DifferentConfigSources_Merged_WithOverwrites()
{
- var config = new Configuration();
+ var config = new ConfigurationSection();
config.AddJsonFile(_json1ConfigFilePath);
config.AddIniFile(_iniConfigFilePath);
diff --git a/test/Microsoft.Framework.ConfigurationModel.FunctionalTests/ConfigurationTests.cs b/test/Microsoft.Framework.Configuration.FunctionalTests/ConfigurationTests.cs
similarity index 96%
rename from test/Microsoft.Framework.ConfigurationModel.FunctionalTests/ConfigurationTests.cs
rename to test/Microsoft.Framework.Configuration.FunctionalTests/ConfigurationTests.cs
index 71da3eb..8767017 100644
--- a/test/Microsoft.Framework.ConfigurationModel.FunctionalTests/ConfigurationTests.cs
+++ b/test/Microsoft.Framework.Configuration.FunctionalTests/ConfigurationTests.cs
@@ -4,10 +4,9 @@
using System;
using System.Collections.Generic;
using System.IO;
-using Microsoft.Framework.ConfigurationModel.Ini;
using Xunit;
-namespace Microsoft.Framework.ConfigurationModel.Test
+namespace Microsoft.Framework.Configuration.Test
{
public class ConfigurationTests : IDisposable
{
@@ -79,7 +78,7 @@ CommonKey3:CommonKey4=IniValue6";
public void LoadAndCombineKeyValuePairsFromDifferentConfigurationSources()
{
// Arrange
- var config = new Configuration();
+ var config = new ConfigurationSection();
// Act
config.AddIniFile(_iniConfigFilePath);
@@ -120,7 +119,7 @@ CommonKey3:CommonKey4=IniValue6";
public void CanOverrideValuesWithNewConfigurationSource()
{
// Arrange
- var config = new Configuration();
+ var config = new ConfigurationSection();
// Act & Assert
config.AddIniFile(_iniConfigFilePath);
@@ -141,7 +140,7 @@ CommonKey3:CommonKey4=IniValue6";
public void CanSetValuesAndReloadValues()
{
// Arrange
- var config = new Configuration();
+ var config = new ConfigurationSection();
config.AddIniFile(_iniConfigFilePath);
config.AddJsonFile(_jsonConfigFilePath);
config.AddXmlFile(_xmlConfigFilePath);
diff --git a/test/Microsoft.Framework.ConfigurationModel.FunctionalTests/Microsoft.Framework.ConfigurationModel.FunctionalTests.xproj b/test/Microsoft.Framework.Configuration.FunctionalTests/Microsoft.Framework.Configuration.FunctionalTests.xproj
similarity index 100%
rename from test/Microsoft.Framework.ConfigurationModel.FunctionalTests/Microsoft.Framework.ConfigurationModel.FunctionalTests.xproj
rename to test/Microsoft.Framework.Configuration.FunctionalTests/Microsoft.Framework.Configuration.FunctionalTests.xproj
diff --git a/test/Microsoft.Framework.Configuration.FunctionalTests/project.json b/test/Microsoft.Framework.Configuration.FunctionalTests/project.json
new file mode 100644
index 0000000..6850fc3
--- /dev/null
+++ b/test/Microsoft.Framework.Configuration.FunctionalTests/project.json
@@ -0,0 +1,12 @@
+{
+ "dependencies": {
+ "Microsoft.Framework.Configuration.Ini": "1.0.0-*",
+ "Microsoft.Framework.Configuration.Json": "1.0.0-*",
+ "Microsoft.Framework.Configuration.Test.Common": "1.0.0-*",
+ "Microsoft.Framework.Configuration.Xml": "1.0.0-*",
+ "xunit.runner.aspnet": "2.0.0-aspnet-*"
+ },
+ "commands": {
+ "test": "xunit.runner.aspnet"
+ }
+}
diff --git a/test/Microsoft.Framework.ConfigurationModel.Ini.Test/IniConfigurationExtensionTest.cs b/test/Microsoft.Framework.Configuration.Ini.Test/IniConfigurationExtensionTest.cs
similarity index 87%
rename from test/Microsoft.Framework.ConfigurationModel.Ini.Test/IniConfigurationExtensionTest.cs
rename to test/Microsoft.Framework.Configuration.Ini.Test/IniConfigurationExtensionTest.cs
index 0e74597..6cb4df2 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Ini.Test/IniConfigurationExtensionTest.cs
+++ b/test/Microsoft.Framework.Configuration.Ini.Test/IniConfigurationExtensionTest.cs
@@ -5,7 +5,7 @@ using System;
using System.IO;
using Xunit;
-namespace Microsoft.Framework.ConfigurationModel.Ini.Test
+namespace Microsoft.Framework.Configuration.Ini.Test
{
public class IniConfigurationExtensionTest
{
@@ -15,7 +15,7 @@ namespace Microsoft.Framework.ConfigurationModel.Ini.Test
public void AddIniFile_ThrowsIfFilePathIsNullOrEmpty(string path)
{
// Arrange
- var configurationSource = new Configuration();
+ var configurationSource = new ConfigurationSection();
// Act and Assert
var ex = Assert.Throws(
@@ -29,7 +29,7 @@ namespace Microsoft.Framework.ConfigurationModel.Ini.Test
{
// Arrange
var path = Path.Combine(Directory.GetCurrentDirectory(), "file-does-not-exist.ini");
- var configurationSource = new Configuration();
+ var configurationSource = new ConfigurationSection();
// Act and Assert
var ex = Assert.Throws(
diff --git a/test/Microsoft.Framework.ConfigurationModel.Ini.Test/IniFileConfigurationSourceTest.cs b/test/Microsoft.Framework.Configuration.Ini.Test/IniFileConfigurationSourceTest.cs
similarity index 98%
rename from test/Microsoft.Framework.ConfigurationModel.Ini.Test/IniFileConfigurationSourceTest.cs
rename to test/Microsoft.Framework.Configuration.Ini.Test/IniFileConfigurationSourceTest.cs
index 01b2495..d357eee 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Ini.Test/IniFileConfigurationSourceTest.cs
+++ b/test/Microsoft.Framework.Configuration.Ini.Test/IniFileConfigurationSourceTest.cs
@@ -3,10 +3,10 @@
using System;
using System.IO;
-using Microsoft.Framework.ConfigurationModel.Test;
+using Microsoft.Framework.Configuration.Test;
using Xunit;
-namespace Microsoft.Framework.ConfigurationModel.Ini.Test
+namespace Microsoft.Framework.Configuration.Ini.Test
{
public class IniFileConfigurationSourceTest
{
diff --git a/test/Microsoft.Framework.ConfigurationModel.Ini.Test/Microsoft.Framework.ConfigurationModel.Ini.Test.xproj b/test/Microsoft.Framework.Configuration.Ini.Test/Microsoft.Framework.Configuration.Ini.Test.xproj
similarity index 100%
rename from test/Microsoft.Framework.ConfigurationModel.Ini.Test/Microsoft.Framework.ConfigurationModel.Ini.Test.xproj
rename to test/Microsoft.Framework.Configuration.Ini.Test/Microsoft.Framework.Configuration.Ini.Test.xproj
diff --git a/test/Microsoft.Framework.ConfigurationModel.EnvironmentVariables.Test/project.json b/test/Microsoft.Framework.Configuration.Ini.Test/project.json
similarity index 56%
rename from test/Microsoft.Framework.ConfigurationModel.EnvironmentVariables.Test/project.json
rename to test/Microsoft.Framework.Configuration.Ini.Test/project.json
index b397ea7..4d9ad5b 100644
--- a/test/Microsoft.Framework.ConfigurationModel.EnvironmentVariables.Test/project.json
+++ b/test/Microsoft.Framework.Configuration.Ini.Test/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
- "Microsoft.Framework.ConfigurationModel.EnvironmentVariables": "1.0.0-*",
- "Microsoft.Framework.ConfigurationModel.Test.Common": "1.0.0-*",
+ "Microsoft.Framework.Configuration.Ini": "1.0.0-*",
+ "Microsoft.Framework.Configuration.Test.Common": "1.0.0-*",
"xunit.runner.aspnet": "2.0.0-aspnet-*"
},
"frameworks": {
diff --git a/test/Microsoft.Framework.ConfigurationModel.Json.Test/ArrayTest.cs b/test/Microsoft.Framework.Configuration.Json.Test/ArrayTest.cs
similarity index 95%
rename from test/Microsoft.Framework.ConfigurationModel.Json.Test/ArrayTest.cs
rename to test/Microsoft.Framework.Configuration.Json.Test/ArrayTest.cs
index b636698..704c1c6 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Json.Test/ArrayTest.cs
+++ b/test/Microsoft.Framework.Configuration.Json.Test/ArrayTest.cs
@@ -2,10 +2,10 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System.Linq;
-using Microsoft.Framework.ConfigurationModel.Test;
+using Microsoft.Framework.Configuration.Test;
using Xunit;
-namespace Microsoft.Framework.ConfigurationModel.Json.Test
+namespace Microsoft.Framework.Configuration.Json.Test
{
public class ArrayTest
{
@@ -101,7 +101,7 @@ namespace Microsoft.Framework.ConfigurationModel.Json.Test
var jsonConfigSource2 = new JsonConfigurationSource(TestStreamHelpers.ArbitraryFilePath);
jsonConfigSource2.Load(TestStreamHelpers.StringToStream(json2));
- var config = new Configuration();
+ var config = new ConfigurationSection();
config.Add(jsonConfigSource1, load: false);
config.Add(jsonConfigSource2, load: false);
@@ -134,7 +134,7 @@ namespace Microsoft.Framework.ConfigurationModel.Json.Test
var jsonConfigSource2 = new JsonConfigurationSource(TestStreamHelpers.ArbitraryFilePath);
jsonConfigSource2.Load(TestStreamHelpers.StringToStream(json2));
- var config = new Configuration();
+ var config = new ConfigurationSection();
config.Add(jsonConfigSource1, load: false);
config.Add(jsonConfigSource2, load: false);
@@ -167,7 +167,7 @@ namespace Microsoft.Framework.ConfigurationModel.Json.Test
var jsonConfigSource2 = new JsonConfigurationSource(TestStreamHelpers.ArbitraryFilePath);
jsonConfigSource2.Load(TestStreamHelpers.StringToStream(json2));
- var config = new Configuration();
+ var config = new ConfigurationSection();
config.Add(jsonConfigSource1, load: false);
config.Add(jsonConfigSource2, load: false);
@@ -192,7 +192,7 @@ namespace Microsoft.Framework.ConfigurationModel.Json.Test
var jsonConfigSource = new JsonConfigurationSource(TestStreamHelpers.ArbitraryFilePath);
jsonConfigSource.Load(TestStreamHelpers.StringToStream(json));
- var config = new Configuration();
+ var config = new ConfigurationSection();
config.Add(jsonConfigSource, load: false);
var configurationSection = config.GetConfigurationSection("setting");
@@ -221,7 +221,7 @@ namespace Microsoft.Framework.ConfigurationModel.Json.Test
var jsonConfigSource = new JsonConfigurationSource(TestStreamHelpers.ArbitraryFilePath);
jsonConfigSource.Load(TestStreamHelpers.StringToStream(json));
- var config = new Configuration();
+ var config = new ConfigurationSection();
config.Add(jsonConfigSource, load: false);
var configurationSection = config.GetConfigurationSection("setting");
diff --git a/test/Microsoft.Framework.ConfigurationModel.Json.Test/JsonConfigurationExtensionTest.cs b/test/Microsoft.Framework.Configuration.Json.Test/JsonConfigurationExtensionTest.cs
similarity index 87%
rename from test/Microsoft.Framework.ConfigurationModel.Json.Test/JsonConfigurationExtensionTest.cs
rename to test/Microsoft.Framework.Configuration.Json.Test/JsonConfigurationExtensionTest.cs
index 3eb5fff..b3999bb 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Json.Test/JsonConfigurationExtensionTest.cs
+++ b/test/Microsoft.Framework.Configuration.Json.Test/JsonConfigurationExtensionTest.cs
@@ -5,7 +5,7 @@ using System;
using System.IO;
using Xunit;
-namespace Microsoft.Framework.ConfigurationModel.Json
+namespace Microsoft.Framework.Configuration.Json
{
public class JsonConfigurationExtensionTest
{
@@ -15,7 +15,7 @@ namespace Microsoft.Framework.ConfigurationModel.Json
public void AddJsonFile_ThrowsIfFilePathIsNullOrEmpty(string path)
{
// Arrange
- var configurationSource = new Configuration();
+ var configurationSource = new ConfigurationSection();
// Act and Assert
var ex = Assert.Throws(() => JsonConfigurationExtension.AddJsonFile(configurationSource, path));
@@ -28,7 +28,7 @@ namespace Microsoft.Framework.ConfigurationModel.Json
{
// Arrange
var path = Path.Combine(Directory.GetCurrentDirectory(), "file-does-not-exist.json");
- var configurationSource = new Configuration();
+ var configurationSource = new ConfigurationSection();
// Act and Assert
var ex = Assert.Throws(() => JsonConfigurationExtension.AddJsonFile(configurationSource, path));
diff --git a/test/Microsoft.Framework.ConfigurationModel.Json.Test/JsonConfigurationSourceTest.cs b/test/Microsoft.Framework.Configuration.Json.Test/JsonConfigurationSourceTest.cs
similarity index 96%
rename from test/Microsoft.Framework.ConfigurationModel.Json.Test/JsonConfigurationSourceTest.cs
rename to test/Microsoft.Framework.Configuration.Json.Test/JsonConfigurationSourceTest.cs
index 2e4d99d..48bfe0f 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Json.Test/JsonConfigurationSourceTest.cs
+++ b/test/Microsoft.Framework.Configuration.Json.Test/JsonConfigurationSourceTest.cs
@@ -3,12 +3,12 @@
using System;
using System.IO;
-using Microsoft.Framework.ConfigurationModel.Json;
-using Microsoft.Framework.ConfigurationModel.Test;
+using Microsoft.Framework.Configuration.Json;
+using Microsoft.Framework.Configuration.Test;
using Newtonsoft.Json;
using Xunit;
-namespace Microsoft.Framework.ConfigurationModel
+namespace Microsoft.Framework.Configuration
{
public class JsonConfigurationSourceTest
{
diff --git a/test/Microsoft.Framework.ConfigurationModel.Json.Test/Microsoft.Framework.ConfigurationModel.Json.Test.xproj b/test/Microsoft.Framework.Configuration.Json.Test/Microsoft.Framework.Configuration.Json.Test.xproj
similarity index 100%
rename from test/Microsoft.Framework.ConfigurationModel.Json.Test/Microsoft.Framework.ConfigurationModel.Json.Test.xproj
rename to test/Microsoft.Framework.Configuration.Json.Test/Microsoft.Framework.Configuration.Json.Test.xproj
diff --git a/test/Microsoft.Framework.ConfigurationModel.Json.Test/project.json b/test/Microsoft.Framework.Configuration.Json.Test/project.json
similarity index 56%
rename from test/Microsoft.Framework.ConfigurationModel.Json.Test/project.json
rename to test/Microsoft.Framework.Configuration.Json.Test/project.json
index 61b75d7..9a6218b 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Json.Test/project.json
+++ b/test/Microsoft.Framework.Configuration.Json.Test/project.json
@@ -1,14 +1,14 @@
-{
- "dependencies": {
- "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*",
- "Microsoft.Framework.ConfigurationModel.Test.Common": "1.0.0-*",
- "xunit.runner.aspnet": "2.0.0-aspnet-*"
- },
- "frameworks": {
- "dnx451": { },
- "dnxcore50": { }
- },
- "commands": {
- "test": "xunit.runner.aspnet"
- }
-}
+{
+ "dependencies": {
+ "Microsoft.Framework.Configuration.Json": "1.0.0-*",
+ "Microsoft.Framework.Configuration.Test.Common": "1.0.0-*",
+ "xunit.runner.aspnet": "2.0.0-aspnet-*"
+ },
+ "frameworks": {
+ "dnx451": { },
+ "dnxcore50": { }
+ },
+ "commands": {
+ "test": "xunit.runner.aspnet"
+ }
+}
diff --git a/test/Microsoft.Framework.ConfigurationModel.Test.Common/ConfigurationSourceExtensions.cs b/test/Microsoft.Framework.Configuration.Test.Common/ConfigurationSourceExtensions.cs
similarity index 91%
rename from test/Microsoft.Framework.ConfigurationModel.Test.Common/ConfigurationSourceExtensions.cs
rename to test/Microsoft.Framework.Configuration.Test.Common/ConfigurationSourceExtensions.cs
index 53d6251..22fb4a0 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Test.Common/ConfigurationSourceExtensions.cs
+++ b/test/Microsoft.Framework.Configuration.Test.Common/ConfigurationSourceExtensions.cs
@@ -3,7 +3,7 @@
using System;
-namespace Microsoft.Framework.ConfigurationModel.Test
+namespace Microsoft.Framework.Configuration.Test
{
public static class ConfigurationSourceExtensions
{
diff --git a/test/Microsoft.Framework.ConfigurationModel.Test.Common/Microsoft.Framework.ConfigurationModel.Test.Common.xproj b/test/Microsoft.Framework.Configuration.Test.Common/Microsoft.Framework.Configuration.Test.Common.xproj
similarity index 100%
rename from test/Microsoft.Framework.ConfigurationModel.Test.Common/Microsoft.Framework.ConfigurationModel.Test.Common.xproj
rename to test/Microsoft.Framework.Configuration.Test.Common/Microsoft.Framework.Configuration.Test.Common.xproj
diff --git a/test/Microsoft.Framework.ConfigurationModel.Test.Common/TestStreamHelpers.cs b/test/Microsoft.Framework.Configuration.Test.Common/TestStreamHelpers.cs
similarity index 94%
rename from test/Microsoft.Framework.ConfigurationModel.Test.Common/TestStreamHelpers.cs
rename to test/Microsoft.Framework.Configuration.Test.Common/TestStreamHelpers.cs
index d734512..620b468 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Test.Common/TestStreamHelpers.cs
+++ b/test/Microsoft.Framework.Configuration.Test.Common/TestStreamHelpers.cs
@@ -3,7 +3,7 @@
using System.IO;
-namespace Microsoft.Framework.ConfigurationModel.Test
+namespace Microsoft.Framework.Configuration.Test
{
public static class TestStreamHelpers
{
diff --git a/test/Microsoft.Framework.ConfigurationModel.Test.Common/project.json b/test/Microsoft.Framework.Configuration.Test.Common/project.json
similarity index 76%
rename from test/Microsoft.Framework.ConfigurationModel.Test.Common/project.json
rename to test/Microsoft.Framework.Configuration.Test.Common/project.json
index 65a638d..41fe7db 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Test.Common/project.json
+++ b/test/Microsoft.Framework.Configuration.Test.Common/project.json
@@ -1,6 +1,6 @@
{
"dependencies": {
- "Microsoft.Framework.ConfigurationModel": "1.0.0-*"
+ "Microsoft.Framework.Configuration": "1.0.0-*"
},
"frameworks": {
"dnx451": {
diff --git a/test/Microsoft.Framework.ConfigurationModel.Test/ConfigurationBinderTests.cs b/test/Microsoft.Framework.Configuration.Test/ConfigurationBinderTests.cs
similarity index 90%
rename from test/Microsoft.Framework.ConfigurationModel.Test/ConfigurationBinderTests.cs
rename to test/Microsoft.Framework.Configuration.Test/ConfigurationBinderTests.cs
index 573b95f..329b35a 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Test/ConfigurationBinderTests.cs
+++ b/test/Microsoft.Framework.Configuration.Test/ConfigurationBinderTests.cs
@@ -6,7 +6,7 @@ using System.Collections.Generic;
using System.Reflection;
using Xunit;
-namespace Microsoft.Framework.ConfigurationModel.Test
+namespace Microsoft.Framework.Configuration.Test
{
public class ConfigurationBinderTests
{
@@ -74,7 +74,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"Boolean", "TRUe"},
{"Nested:Integer", "11"}
};
- var config = new Configuration(new MemoryConfigurationSource(dic));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(dic));
var options = ConfigurationBinder.Bind(config);
Assert.True(options.Boolean);
Assert.Equal(-2, options.Integer);
@@ -91,7 +91,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"Nested:Integer", "11"},
{"Virtual","Sup"}
};
- var config = new Configuration(new MemoryConfigurationSource(dic));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(dic));
var options = ConfigurationBinder.Bind(config);
Assert.True(options.Boolean);
Assert.Equal(-2, options.Integer);
@@ -106,7 +106,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{
{"StaticProperty", "stuff"},
};
- var config = new Configuration(new MemoryConfigurationSource(dic));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(dic));
var options = ConfigurationBinder.Bind(config);
Assert.Equal("stuff", ComplexOptions.StaticProperty);
}
@@ -122,7 +122,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{
{property, "stuff"},
};
- var config = new Configuration(new MemoryConfigurationSource(dic));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(dic));
var options = ConfigurationBinder.Bind(config);
Assert.Null(options.GetType().GetTypeInfo().GetDeclaredProperty(property).GetValue(options));
}
@@ -135,7 +135,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"ISomeInterfaceProperty:Subkey", "x"}
};
- var config = new Configuration(new MemoryConfigurationSource(input));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(input));
var exception = Assert.Throws(
() => ConfigurationBinder.Bind(config));
@@ -152,7 +152,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"ClassWithoutPublicConstructorProperty:Subkey", "x"}
};
- var config = new Configuration(new MemoryConfigurationSource(input));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(input));
var exception = Assert.Throws(
() => ConfigurationBinder.Bind(config));
@@ -171,7 +171,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"IntProperty", IncorrectValue}
};
- var config = new Configuration(new MemoryConfigurationSource(input));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(input));
var exception = Assert.Throws(
() => ConfigurationBinder.Bind(config));
@@ -189,7 +189,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"ThrowsWhenActivatedProperty:subkey", "x"}
};
- var config = new Configuration(new MemoryConfigurationSource(input));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(input));
var exception = Assert.Throws(
() => ConfigurationBinder.Bind(config));
@@ -207,7 +207,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"NestedOptionsProperty:NestedOptions2Property:ISomeInterfaceProperty:subkey", "x"}
};
- var config = new Configuration(new MemoryConfigurationSource(input));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(input));
var exception = Assert.Throws(
() => ConfigurationBinder.Bind(config));
diff --git a/test/Microsoft.Framework.ConfigurationModel.Test/ConfigurationCollectionBindingTests.cs b/test/Microsoft.Framework.Configuration.Test/ConfigurationCollectionBindingTests.cs
similarity index 90%
rename from test/Microsoft.Framework.ConfigurationModel.Test/ConfigurationCollectionBindingTests.cs
rename to test/Microsoft.Framework.Configuration.Test/ConfigurationCollectionBindingTests.cs
index fb6add1..bf78d9b 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Test/ConfigurationCollectionBindingTests.cs
+++ b/test/Microsoft.Framework.Configuration.Test/ConfigurationCollectionBindingTests.cs
@@ -5,7 +5,7 @@ using System;
using System.Collections.Generic;
using Xunit;
-namespace Microsoft.Framework.ConfigurationModel.Test
+namespace Microsoft.Framework.Configuration.Test
{
public class ConfigurationCollectionBinding
{
@@ -20,7 +20,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"StringList:x", "valx"}
};
- var config = new Configuration(new MemoryConfigurationSource(input));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(input));
var options = ConfigurationBinder.Bind(config);
@@ -45,7 +45,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"IntList:x", "45"}
};
- var config = new Configuration(new MemoryConfigurationSource(input));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(input));
var options = ConfigurationBinder.Bind(config);
@@ -70,7 +70,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"AlreadyInitializedList:x", "valx"}
};
- var config = new Configuration(new MemoryConfigurationSource(input));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(input));
var options = ConfigurationBinder.Bind(config);
@@ -96,7 +96,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"CustomList:x", "valx"}
};
- var config = new Configuration(new MemoryConfigurationSource(input));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(input));
var options = ConfigurationBinder.Bind(config);
@@ -120,7 +120,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"ObjectList:2:Integer", "32"},
};
- var config = new Configuration(new MemoryConfigurationSource(input));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(input));
var options = ConfigurationBinder.Bind(config);
@@ -143,7 +143,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"NestedLists:1:2", "val12"},
};
- var config = new Configuration(new MemoryConfigurationSource(input));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(input));
var options = ConfigurationBinder.Bind(config);
@@ -168,7 +168,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"StringDictionary:ghi", "val_3"}
};
- var config = new Configuration(new MemoryConfigurationSource(input));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(input));
var options = ConfigurationBinder.Bind(config);
@@ -189,7 +189,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"IntDictionary:ghi", "44"}
};
- var config = new Configuration(new MemoryConfigurationSource(input));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(input));
var options = ConfigurationBinder.Bind(config);
@@ -210,7 +210,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"ObjectDictionary:ghi:Integer", "3"}
};
- var config = new Configuration(new MemoryConfigurationSource(input));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(input));
var options = ConfigurationBinder.Bind(config);
@@ -233,7 +233,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"ListDictionary:def:2", "def_2"}
};
- var config = new Configuration(new MemoryConfigurationSource(input));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(input));
var options = ConfigurationBinder.Bind(config);
@@ -260,7 +260,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"ObjectList:1:ListInNestedOption:2", "12"},
};
- var config = new Configuration(new MemoryConfigurationSource(input));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(input));
var options = ConfigurationBinder.Bind(config);
@@ -285,7 +285,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
{"NonStringKeyDictionary:ghi", "val_3"}
};
- var config = new Configuration(new MemoryConfigurationSource(input));
+ var config = new ConfigurationSection(new MemoryConfigurationSource(input));
var options = ConfigurationBinder.Bind(config);
diff --git a/test/Microsoft.Framework.ConfigurationModel.Test/ConfigurationHelperTest.cs b/test/Microsoft.Framework.Configuration.Test/ConfigurationHelperTest.cs
similarity index 97%
rename from test/Microsoft.Framework.ConfigurationModel.Test/ConfigurationHelperTest.cs
rename to test/Microsoft.Framework.Configuration.Test/ConfigurationHelperTest.cs
index 377bf76..8daf7f1 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Test/ConfigurationHelperTest.cs
+++ b/test/Microsoft.Framework.Configuration.Test/ConfigurationHelperTest.cs
@@ -4,10 +4,10 @@
using System;
using System.Collections.Generic;
using System.IO;
-using Microsoft.Framework.ConfigurationModel.Helper;
+using Microsoft.Framework.Configuration.Helper;
using Xunit;
-namespace Microsoft.Framework.ConfigurationModel.Test
+namespace Microsoft.Framework.Configuration.Test
{
public class ConfigurationHelperTest
{
diff --git a/test/Microsoft.Framework.ConfigurationModel.Test/ConfigurationPathComparerTest.cs b/test/Microsoft.Framework.Configuration.Test/ConfigurationPathComparerTest.cs
similarity index 98%
rename from test/Microsoft.Framework.ConfigurationModel.Test/ConfigurationPathComparerTest.cs
rename to test/Microsoft.Framework.Configuration.Test/ConfigurationPathComparerTest.cs
index 38553dd..c2d152a 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Test/ConfigurationPathComparerTest.cs
+++ b/test/Microsoft.Framework.Configuration.Test/ConfigurationPathComparerTest.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Threading.Tasks;
using Xunit;
-namespace Microsoft.Framework.ConfigurationModel.Test
+namespace Microsoft.Framework.Configuration.Test
{
public class ConfigurationPathComparerTest
{
diff --git a/test/Microsoft.Framework.ConfigurationModel.Test/ConfigurationTest.cs b/test/Microsoft.Framework.Configuration.Test/ConfigurationTest.cs
similarity index 95%
rename from test/Microsoft.Framework.ConfigurationModel.Test/ConfigurationTest.cs
rename to test/Microsoft.Framework.Configuration.Test/ConfigurationTest.cs
index 0c42c23..4eaa42a 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Test/ConfigurationTest.cs
+++ b/test/Microsoft.Framework.Configuration.Test/ConfigurationTest.cs
@@ -7,7 +7,7 @@ using System.Collections.Generic;
using System.Linq;
using Xunit;
-namespace Microsoft.Framework.ConfigurationModel.Test
+namespace Microsoft.Framework.Configuration.Test
{
public class ConfigurationTest
{
@@ -15,7 +15,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
public void SetBasePathThroughConstructor()
{
var expectedBasePath = @"C:\ExamplePath";
- var config = new Configuration(basePath: expectedBasePath);
+ var config = new ConfigurationSection(basePath: expectedBasePath);
Assert.Equal(expectedBasePath, config.BasePath);
}
@@ -23,7 +23,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
[Fact]
public void DefaultBasePathIsNull()
{
- var config = new Configuration();
+ var config = new ConfigurationSection();
Assert.Null(config.BasePath);
}
@@ -48,7 +48,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
var memConfigSrc2 = new MemoryConfigurationSource(dic2);
var memConfigSrc3 = new MemoryConfigurationSource(dic3);
- var config = new Configuration();
+ var config = new ConfigurationSection();
string memVal1, memVal2, memVal3;
bool memRet1, memRet2, memRet3;
@@ -101,7 +101,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
var memConfigSrc1 = new MemoryConfigurationSource(dic1);
var memConfigSrc2 = new MemoryConfigurationSource(dic2);
- var config = new Configuration();
+ var config = new ConfigurationSection();
// Act
config.Add(memConfigSrc1, load: false);
@@ -124,7 +124,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
var memConfigSrc2 = new MemoryConfigurationSource(dict);
var memConfigSrc3 = new MemoryConfigurationSource(dict);
- var config = new Configuration();
+ var config = new ConfigurationSection();
config.Add(memConfigSrc1, load: false);
config.Add(memConfigSrc2, load: false);
config.Add(memConfigSrc3, load: false);
@@ -165,7 +165,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
var memConfigSrc2 = new MemoryConfigurationSource(dic2);
var memConfigSrc3 = new MemoryConfigurationSource(dic3);
- var config = new Configuration();
+ var config = new ConfigurationSection();
config.Add(memConfigSrc1, load: false);
config.Add(memConfigSrc2, load: false);
config.Add(memConfigSrc3, load: false);
@@ -227,7 +227,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
var memConfigSrc2 = new MemoryConfigurationSource(dic2);
var memConfigSrc3 = new MemoryConfigurationSource(dic3);
- var config = new Configuration();
+ var config = new ConfigurationSection();
config.Add(memConfigSrc1, load: false);
config.Add(memConfigSrc2, load: false);
config.Add(memConfigSrc3, load: false);
@@ -264,7 +264,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
memConfigSrc3
};
- var config = new Configuration();
+ var config = new ConfigurationSection();
// Act
config.Add(memConfigSrc1, load: false);
@@ -302,7 +302,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
memConfigSrc3
};
- var config = new Configuration();
+ var config = new ConfigurationSection();
// Act
config.Add(memConfigSrc1, load: false);
@@ -327,7 +327,7 @@ namespace Microsoft.Framework.ConfigurationModel.Test
public void SetValueThrowsExceptionNoSourceRegistered()
{
// Arrange
- var config = new Configuration();
+ var config = new ConfigurationSection();
var expectedMsg = Resources.Error_NoSources;
// Act
diff --git a/test/Microsoft.Framework.ConfigurationModel.Test/Microsoft.Framework.ConfigurationModel.Test.xproj b/test/Microsoft.Framework.Configuration.Test/Microsoft.Framework.Configuration.Test.xproj
similarity index 100%
rename from test/Microsoft.Framework.ConfigurationModel.Test/Microsoft.Framework.ConfigurationModel.Test.xproj
rename to test/Microsoft.Framework.Configuration.Test/Microsoft.Framework.Configuration.Test.xproj
diff --git a/test/Microsoft.Framework.ConfigurationModel.Test/project.json b/test/Microsoft.Framework.Configuration.Test/project.json
similarity index 69%
rename from test/Microsoft.Framework.ConfigurationModel.Test/project.json
rename to test/Microsoft.Framework.Configuration.Test/project.json
index c47ff84..7db2a6f 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Test/project.json
+++ b/test/Microsoft.Framework.Configuration.Test/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
- "Microsoft.Framework.ConfigurationModel": "1.0.0-*",
- "Microsoft.Framework.ConfigurationModel.Test.Common": "1.0.0-*",
+ "Microsoft.Framework.Configuration": "1.0.0-*",
+ "Microsoft.Framework.Configuration.Test.Common": "1.0.0-*",
"xunit.runner.aspnet": "2.0.0-aspnet-*"
},
"frameworks": {
diff --git a/test/Microsoft.Framework.ConfigurationModel.Xml.Test/Microsoft.Framework.ConfigurationModel.Xml.Test.xproj b/test/Microsoft.Framework.Configuration.Xml.Test/Microsoft.Framework.Configuration.Xml.Test.xproj
similarity index 100%
rename from test/Microsoft.Framework.ConfigurationModel.Xml.Test/Microsoft.Framework.ConfigurationModel.Xml.Test.xproj
rename to test/Microsoft.Framework.Configuration.Xml.Test/Microsoft.Framework.Configuration.Xml.Test.xproj
diff --git a/test/Microsoft.Framework.ConfigurationModel.Xml.Test/XmlConfigurationExtensionTest.cs b/test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationExtensionTest.cs
similarity index 87%
rename from test/Microsoft.Framework.ConfigurationModel.Xml.Test/XmlConfigurationExtensionTest.cs
rename to test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationExtensionTest.cs
index 0169c95..d70a7fb 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Xml.Test/XmlConfigurationExtensionTest.cs
+++ b/test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationExtensionTest.cs
@@ -5,7 +5,7 @@ using System;
using System.IO;
using Xunit;
-namespace Microsoft.Framework.ConfigurationModel.Xml.Test
+namespace Microsoft.Framework.Configuration.Xml.Test
{
public class XmlConfigurationExtensionTest
{
@@ -15,7 +15,7 @@ namespace Microsoft.Framework.ConfigurationModel.Xml.Test
public void AddXmlFile_ThrowsIfFilePathIsNullOrEmpty(string path)
{
// Arrange
- var configurationSource = new Configuration();
+ var configurationSource = new ConfigurationSection();
// Act and Assert
var ex = Assert.Throws(() => XmlConfigurationExtension.AddXmlFile(configurationSource, path));
@@ -28,7 +28,7 @@ namespace Microsoft.Framework.ConfigurationModel.Xml.Test
{
// Arrange
var path = Path.Combine(Directory.GetCurrentDirectory(), "file-does-not-exist.xml");
- var configurationSource = new Configuration();
+ var configurationSource = new ConfigurationSection();
// Act and Assert
var ex = Assert.Throws(() => XmlConfigurationExtension.AddXmlFile(configurationSource, path));
diff --git a/test/Microsoft.Framework.ConfigurationModel.Xml.Test/XmlConfigurationSourceTest.AspNet50.cs b/test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationSourceTest.AspNet50.cs
similarity index 96%
rename from test/Microsoft.Framework.ConfigurationModel.Xml.Test/XmlConfigurationSourceTest.AspNet50.cs
rename to test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationSourceTest.AspNet50.cs
index 7e08cd7..9887c65 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Xml.Test/XmlConfigurationSourceTest.AspNet50.cs
+++ b/test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationSourceTest.AspNet50.cs
@@ -9,10 +9,10 @@ using System.Security.Cryptography;
using System.Security.Cryptography.Xml;
using System.Xml;
using Microsoft.AspNet.Testing.xunit;
-using Microsoft.Framework.ConfigurationModel.Test;
+using Microsoft.Framework.Configuration.Test;
using Xunit;
-namespace Microsoft.Framework.ConfigurationModel.Xml.Test
+namespace Microsoft.Framework.Configuration.Xml.Test
{
public partial class XmlConfigurationSourceTest
{
diff --git a/test/Microsoft.Framework.ConfigurationModel.Xml.Test/XmlConfigurationSourceTest.AspNetCore50.cs b/test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationSourceTest.AspNetCore50.cs
similarity index 96%
rename from test/Microsoft.Framework.ConfigurationModel.Xml.Test/XmlConfigurationSourceTest.AspNetCore50.cs
rename to test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationSourceTest.AspNetCore50.cs
index 78cc1f8..148418b 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Xml.Test/XmlConfigurationSourceTest.AspNetCore50.cs
+++ b/test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationSourceTest.AspNetCore50.cs
@@ -5,10 +5,10 @@
// These tests only run on Core CLR.
using System;
-using Microsoft.Framework.ConfigurationModel.Test;
+using Microsoft.Framework.Configuration.Test;
using Xunit;
-namespace Microsoft.Framework.ConfigurationModel.Xml.Test
+namespace Microsoft.Framework.Configuration.Xml.Test
{
public partial class XmlConfigurationSourceTest
{
diff --git a/test/Microsoft.Framework.ConfigurationModel.Xml.Test/XmlConfigurationSourceTest.cs b/test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationSourceTest.cs
similarity index 99%
rename from test/Microsoft.Framework.ConfigurationModel.Xml.Test/XmlConfigurationSourceTest.cs
rename to test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationSourceTest.cs
index 5e38280..ee83d5d 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Xml.Test/XmlConfigurationSourceTest.cs
+++ b/test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationSourceTest.cs
@@ -3,10 +3,10 @@
using System;
using System.IO;
-using Microsoft.Framework.ConfigurationModel.Test;
+using Microsoft.Framework.Configuration.Test;
using Xunit;
-namespace Microsoft.Framework.ConfigurationModel.Xml.Test
+namespace Microsoft.Framework.Configuration.Xml.Test
{
public partial class XmlConfigurationSourceTest
{
diff --git a/test/Microsoft.Framework.ConfigurationModel.Xml.Test/project.json b/test/Microsoft.Framework.Configuration.Xml.Test/project.json
similarity index 64%
rename from test/Microsoft.Framework.ConfigurationModel.Xml.Test/project.json
rename to test/Microsoft.Framework.Configuration.Xml.Test/project.json
index 4f9febe..aad3749 100644
--- a/test/Microsoft.Framework.ConfigurationModel.Xml.Test/project.json
+++ b/test/Microsoft.Framework.Configuration.Xml.Test/project.json
@@ -1,7 +1,7 @@
{
"dependencies": {
- "Microsoft.Framework.ConfigurationModel.Xml": "1.0.0-*",
- "Microsoft.Framework.ConfigurationModel.Test.Common": "1.0.0-*",
+ "Microsoft.Framework.Configuration.Xml": "1.0.0-*",
+ "Microsoft.Framework.Configuration.Test.Common": "1.0.0-*",
"Microsoft.AspNet.Testing": "1.0.0-*",
"xunit.runner.aspnet": "2.0.0-aspnet-*"
},
diff --git a/test/Microsoft.Framework.ConfigurationModel.FunctionalTests/project.json b/test/Microsoft.Framework.ConfigurationModel.FunctionalTests/project.json
deleted file mode 100644
index ecd9277..0000000
--- a/test/Microsoft.Framework.ConfigurationModel.FunctionalTests/project.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
- "dependencies": {
- "Microsoft.Framework.ConfigurationModel.Ini": "1.0.0-*",
- "Microsoft.Framework.ConfigurationModel.Json": "1.0.0-*",
- "Microsoft.Framework.ConfigurationModel.Test.Common": "1.0.0-*",
- "Microsoft.Framework.ConfigurationModel.Xml": "1.0.0-*",
- "xunit.runner.aspnet": "2.0.0-aspnet-*"
- },
- "commands": {
- "test": "xunit.runner.aspnet"
- }
-}