diff --git a/Configuration.sln b/Configuration.sln index 79f402d4..8a4df609 100644 --- a/Configuration.sln +++ b/Configuration.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.23107.0 @@ -7,43 +7,43 @@ 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.Configuration.Json", "src\Microsoft.Framework.Configuration.Json\Microsoft.Framework.Configuration.Json.xproj", "{4C4CD1BC-4411-4AFD-9D04-147053F0E259}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.Json", "src\Microsoft.Extensions.Configuration.Json\Microsoft.Extensions.Configuration.Json.xproj", "{4C4CD1BC-4411-4AFD-9D04-147053F0E259}" EndProject -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}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.Xml", "src\Microsoft.Extensions.Configuration.Xml\Microsoft.Extensions.Configuration.Xml.xproj", "{1BEC97C1-56B9-4B2B-A95A-C0DF72F1E96A}" EndProject -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}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.Json.Test", "test\Microsoft.Extensions.Configuration.Json.Test\Microsoft.Extensions.Configuration.Json.Test.xproj", "{AE8F8C20-9ED9-4A16-9565-27DF77683789}" EndProject -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}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.Xml.Test", "test\Microsoft.Extensions.Configuration.Xml.Test\Microsoft.Extensions.Configuration.Xml.Test.xproj", "{0786C785-944A-4423-96A6-4E7BFDB4A1B0}" EndProject -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}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.Test", "test\Microsoft.Extensions.Configuration.Test\Microsoft.Extensions.Configuration.Test.xproj", "{8777C77E-CA2A-42C1-90CD-2EA9CBF28937}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration", "src\Microsoft.Framework.Configuration\Microsoft.Framework.Configuration.xproj", "{62BD48B5-BB0C-4C2C-9C4B-04CF75CDCCF1}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration", "src\Microsoft.Extensions.Configuration\Microsoft.Extensions.Configuration.xproj", "{62BD48B5-BB0C-4C2C-9C4B-04CF75CDCCF1}" EndProject -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}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.FunctionalTests", "test\Microsoft.Extensions.Configuration.FunctionalTests\Microsoft.Extensions.Configuration.FunctionalTests.xproj", "{EAC77F15-F12E-496B-9184-1B1DA89BFFE9}" EndProject -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}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.Abstractions", "src\Microsoft.Extensions.Configuration.Abstractions\Microsoft.Extensions.Configuration.Abstractions.xproj", "{3F1CB08E-9FBD-4CAE-A78A-4AC43F24FC49}" EndProject -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}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.Test.Common", "test\Microsoft.Extensions.Configuration.Test.Common\Microsoft.Extensions.Configuration.Test.Common.xproj", "{29C120E5-F682-4BFB-826B-040A594802CA}" EndProject -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}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.CommandLine", "src\Microsoft.Extensions.Configuration.CommandLine\Microsoft.Extensions.Configuration.CommandLine.xproj", "{D4B7CF9B-4229-44DC-800F-CC39150CEAB2}" EndProject -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}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.Ini", "src\Microsoft.Extensions.Configuration.Ini\Microsoft.Extensions.Configuration.Ini.xproj", "{C555C5D5-BF4A-451E-AB43-EBF4DE885EC7}" EndProject -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}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.EnvironmentVariables", "src\Microsoft.Extensions.Configuration.EnvironmentVariables\Microsoft.Extensions.Configuration.EnvironmentVariables.xproj", "{A6A2C665-E5A4-4FD3-AD0C-E33E6CFFCB88}" EndProject -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}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.CommandLine.Test", "test\Microsoft.Extensions.Configuration.CommandLine.Test\Microsoft.Extensions.Configuration.CommandLine.Test.xproj", "{CE9C8903-AA8A-40E6-B03D-32A08A4A39AF}" EndProject -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}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.Ini.Test", "test\Microsoft.Extensions.Configuration.Ini.Test\Microsoft.Extensions.Configuration.Ini.Test.xproj", "{80A8F10C-E9A6-4677-919D-FE5DB320FEDF}" EndProject -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}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.EnvironmentVariables.Test", "test\Microsoft.Extensions.Configuration.EnvironmentVariables.Test\Microsoft.Extensions.Configuration.EnvironmentVariables.Test.xproj", "{7D0F805B-ADFF-4C47-A90C-24DD74416821}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration.Binder", "src\Microsoft.Framework.Configuration.Binder\Microsoft.Framework.Configuration.Binder.xproj", "{D506FD2F-59A0-4A26-AA6D-E81998B58B34}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.Binder", "src\Microsoft.Extensions.Configuration.Binder\Microsoft.Extensions.Configuration.Binder.xproj", "{D506FD2F-59A0-4A26-AA6D-E81998B58B34}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration.Binder.Test", "test\Microsoft.Framework.Configuration.Binder.Test\Microsoft.Framework.Configuration.Binder.Test.xproj", "{AE6FFE9B-6378-4D57-AA24-7D257F18B235}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.Binder.Test", "test\Microsoft.Extensions.Configuration.Binder.Test\Microsoft.Extensions.Configuration.Binder.Test.xproj", "{AE6FFE9B-6378-4D57-AA24-7D257F18B235}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration.FileExtensions", "src\Microsoft.Framework.Configuration.FileExtensions\Microsoft.Framework.Configuration.FileExtensions.xproj", "{881E7CBC-492C-47C5-98A6-61DD1C753EE6}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.FileExtensions", "src\Microsoft.Extensions.Configuration.FileExtensions\Microsoft.Extensions.Configuration.FileExtensions.xproj", "{881E7CBC-492C-47C5-98A6-61DD1C753EE6}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Framework.Configuration.FileExtensions.Test", "test\Microsoft.Framework.Configuration.FileExtensions.Test\Microsoft.Framework.Configuration.FileExtensions.Test.xproj", "{F7932F19-EB68-4C52-9CD1-3B51E48C2337}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.FileExtensions.Test", "test\Microsoft.Extensions.Configuration.FileExtensions.Test\Microsoft.Extensions.Configuration.FileExtensions.Test.xproj", "{F7932F19-EB68-4C52-9CD1-3B51E48C2337}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json index 61e7ccfa..8bc919a8 100644 --- a/NuGetPackageVerifier.json +++ b/NuGetPackageVerifier.json @@ -9,14 +9,14 @@ "StrictSemanticVersionValidationRule" ], "packages": { - "Microsoft.Framework.Configuration": { }, - "Microsoft.Framework.Configuration.Abstractions": { }, - "Microsoft.Framework.Configuration.Binder": { }, - "Microsoft.Framework.Configuration.CommandLine": { }, - "Microsoft.Framework.Configuration.EnvironmentVariables": { }, - "Microsoft.Framework.Configuration.Ini": { }, - "Microsoft.Framework.Configuration.Json": { }, - "Microsoft.Framework.Configuration.Xml": { } + "Microsoft.Extensions.Configuration": { }, + "Microsoft.Extensions.Configuration.Abstractions": { }, + "Microsoft.Extensions.Configuration.Binder": { }, + "Microsoft.Extensions.Configuration.CommandLine": { }, + "Microsoft.Extensions.Configuration.EnvironmentVariables": { }, + "Microsoft.Extensions.Configuration.Ini": { }, + "Microsoft.Extensions.Configuration.Json": { }, + "Microsoft.Extensions.Configuration.Xml": { } } }, "Default": { // Rules to run for packages not listed in any other set. diff --git a/README.md b/README.md index d71f1175..999e06ee 100644 --- a/README.md +++ b/README.md @@ -11,5 +11,5 @@ This project is part of ASP.NET 5. You can find samples, documentation and getti ## Blog posts * [ASP.NET 5 Moving Parts: IConfiguration](http://whereslou.com/2014/05/23/asp-net-vnext-moving-parts-iconfiguration/) -* [ASP.NET 5 Configuration - Microsoft.Framework.ConfigurationModel](http://blog.jsinh.in/asp-net-5-configuration-microsoft-framework-configurationmodel/) +* [ASP.NET 5 Configuration - Microsoft.Extensions.ConfigurationModel](http://blog.jsinh.in/asp-net-5-configuration-microsoft-framework-configurationmodel/) diff --git a/src/Microsoft.Framework.Configuration.Abstractions/IConfiguration.cs b/src/Microsoft.Extensions.Configuration.Abstractions/IConfiguration.cs similarity index 90% rename from src/Microsoft.Framework.Configuration.Abstractions/IConfiguration.cs rename to src/Microsoft.Extensions.Configuration.Abstractions/IConfiguration.cs index a5d8a884..7778dbd2 100644 --- a/src/Microsoft.Framework.Configuration.Abstractions/IConfiguration.cs +++ b/src/Microsoft.Extensions.Configuration.Abstractions/IConfiguration.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { public interface IConfiguration { diff --git a/src/Microsoft.Framework.Configuration.Abstractions/IConfigurationBuilder.cs b/src/Microsoft.Extensions.Configuration.Abstractions/IConfigurationBuilder.cs similarity index 91% rename from src/Microsoft.Framework.Configuration.Abstractions/IConfigurationBuilder.cs rename to src/Microsoft.Extensions.Configuration.Abstractions/IConfigurationBuilder.cs index f1591127..c857a3ee 100644 --- a/src/Microsoft.Framework.Configuration.Abstractions/IConfigurationBuilder.cs +++ b/src/Microsoft.Extensions.Configuration.Abstractions/IConfigurationBuilder.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { public interface IConfigurationBuilder { diff --git a/src/Microsoft.Framework.Configuration.Abstractions/IConfigurationProvider.cs b/src/Microsoft.Extensions.Configuration.Abstractions/IConfigurationProvider.cs similarity index 92% rename from src/Microsoft.Framework.Configuration.Abstractions/IConfigurationProvider.cs rename to src/Microsoft.Extensions.Configuration.Abstractions/IConfigurationProvider.cs index a73156c1..5d2f0382 100644 --- a/src/Microsoft.Framework.Configuration.Abstractions/IConfigurationProvider.cs +++ b/src/Microsoft.Extensions.Configuration.Abstractions/IConfigurationProvider.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { public interface IConfigurationProvider { diff --git a/src/Microsoft.Framework.Configuration.Abstractions/IConfigurationRoot.cs b/src/Microsoft.Extensions.Configuration.Abstractions/IConfigurationRoot.cs similarity index 67% rename from src/Microsoft.Framework.Configuration.Abstractions/IConfigurationRoot.cs rename to src/Microsoft.Extensions.Configuration.Abstractions/IConfigurationRoot.cs index fc262e1e..161b08ba 100644 --- a/src/Microsoft.Framework.Configuration.Abstractions/IConfigurationRoot.cs +++ b/src/Microsoft.Extensions.Configuration.Abstractions/IConfigurationRoot.cs @@ -1,7 +1,7 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Configuration +namespace Microsoft.Extensions.Configuration { public interface IConfigurationRoot : IConfiguration { diff --git a/src/Microsoft.Framework.Configuration.Abstractions/IConfigurationSection.cs b/src/Microsoft.Extensions.Configuration.Abstractions/IConfigurationSection.cs similarity index 73% rename from src/Microsoft.Framework.Configuration.Abstractions/IConfigurationSection.cs rename to src/Microsoft.Extensions.Configuration.Abstractions/IConfigurationSection.cs index 9f32c04a..10d17a27 100644 --- a/src/Microsoft.Framework.Configuration.Abstractions/IConfigurationSection.cs +++ b/src/Microsoft.Extensions.Configuration.Abstractions/IConfigurationSection.cs @@ -1,8 +1,8 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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.Configuration +namespace Microsoft.Extensions.Configuration { public interface IConfigurationSection : IConfiguration { diff --git a/src/Microsoft.Framework.Configuration.Abstractions/Microsoft.Framework.Configuration.Abstractions.xproj b/src/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.xproj similarity index 100% rename from src/Microsoft.Framework.Configuration.Abstractions/Microsoft.Framework.Configuration.Abstractions.xproj rename to src/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.xproj diff --git a/src/Microsoft.Framework.Configuration.Abstractions/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration.Abstractions/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.Framework.Configuration.Abstractions/Properties/AssemblyInfo.cs rename to src/Microsoft.Extensions.Configuration.Abstractions/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.Framework.Configuration.Abstractions/project.json b/src/Microsoft.Extensions.Configuration.Abstractions/project.json similarity index 100% rename from src/Microsoft.Framework.Configuration.Abstractions/project.json rename to src/Microsoft.Extensions.Configuration.Abstractions/project.json diff --git a/src/Microsoft.Framework.Configuration.Binder/ConfigurationBinder.cs b/src/Microsoft.Extensions.Configuration.Binder/ConfigurationBinder.cs similarity index 99% rename from src/Microsoft.Framework.Configuration.Binder/ConfigurationBinder.cs rename to src/Microsoft.Extensions.Configuration.Binder/ConfigurationBinder.cs index 2e4229e1..d8cc5a78 100644 --- a/src/Microsoft.Framework.Configuration.Binder/ConfigurationBinder.cs +++ b/src/Microsoft.Extensions.Configuration.Binder/ConfigurationBinder.cs @@ -6,9 +6,9 @@ using System.ComponentModel; using System.Linq; using System.Reflection; -using Microsoft.Framework.Configuration.Binder; +using Microsoft.Extensions.Configuration.Binder; -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { public static class ConfigurationBinder { diff --git a/src/Microsoft.Framework.Configuration.Binder/Microsoft.Framework.Configuration.Binder.xproj b/src/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.xproj similarity index 88% rename from src/Microsoft.Framework.Configuration.Binder/Microsoft.Framework.Configuration.Binder.xproj rename to src/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.xproj index b11b4975..41141213 100644 --- a/src/Microsoft.Framework.Configuration.Binder/Microsoft.Framework.Configuration.Binder.xproj +++ b/src/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -8,7 +8,7 @@ d506fd2f-59a0-4a26-aa6d-e81998b58b34 - Microsoft.Framework.Configuration.ConfigurationBinder + Microsoft.Extensions.Configuration.ConfigurationBinder ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.Framework.Configuration.Binder/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration.Binder/Properties/AssemblyInfo.cs similarity index 68% rename from src/Microsoft.Framework.Configuration.Binder/Properties/AssemblyInfo.cs rename to src/Microsoft.Extensions.Configuration.Binder/Properties/AssemblyInfo.cs index 61ea9f86..d2269b8b 100644 --- a/src/Microsoft.Framework.Configuration.Binder/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Extensions.Configuration.Binder/Properties/AssemblyInfo.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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. using System.Reflection; using System.Resources; using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Microsoft.Framework.Configuration.Binder.Test")] +[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Binder.Test")] [assembly: AssemblyMetadata("Serviceable", "True")] [assembly: NeutralResourcesLanguage("en-US")] diff --git a/src/Microsoft.Framework.Configuration.Binder/Properties/Resources.Designer.cs b/src/Microsoft.Extensions.Configuration.Binder/Properties/Resources.Designer.cs similarity index 95% rename from src/Microsoft.Framework.Configuration.Binder/Properties/Resources.Designer.cs rename to src/Microsoft.Extensions.Configuration.Binder/Properties/Resources.Designer.cs index b799d82d..7ce4358f 100644 --- a/src/Microsoft.Framework.Configuration.Binder/Properties/Resources.Designer.cs +++ b/src/Microsoft.Extensions.Configuration.Binder/Properties/Resources.Designer.cs @@ -1,5 +1,5 @@ // -namespace Microsoft.Framework.Configuration.Binder +namespace Microsoft.Extensions.Configuration.Binder { using System.Globalization; using System.Reflection; @@ -8,7 +8,7 @@ namespace Microsoft.Framework.Configuration.Binder internal static class Resources { private static readonly ResourceManager _resourceManager - = new ResourceManager("Microsoft.Framework.Configuration.Binder.Resources", typeof(Resources).GetTypeInfo().Assembly); + = new ResourceManager("Microsoft.Extensions.Configuration.Binder.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.Configuration.Binder/Resources.resx b/src/Microsoft.Extensions.Configuration.Binder/Resources.resx similarity index 100% rename from src/Microsoft.Framework.Configuration.Binder/Resources.resx rename to src/Microsoft.Extensions.Configuration.Binder/Resources.resx diff --git a/src/Microsoft.Framework.Configuration.Binder/project.json b/src/Microsoft.Extensions.Configuration.Binder/project.json similarity index 94% rename from src/Microsoft.Framework.Configuration.Binder/project.json rename to src/Microsoft.Extensions.Configuration.Binder/project.json index e43fa487..c6b6009d 100644 --- a/src/Microsoft.Framework.Configuration.Binder/project.json +++ b/src/Microsoft.Extensions.Configuration.Binder/project.json @@ -6,7 +6,7 @@ "url": "https://github.com/aspnet/configuration" }, "dependencies": { - "Microsoft.Framework.Configuration": "1.0.0-*" + "Microsoft.Extensions.Configuration": "1.0.0-*" }, "frameworks": { "net45": { }, diff --git a/src/Microsoft.Framework.Configuration.CommandLine/CommandLineConfigurationExtensions.cs b/src/Microsoft.Extensions.Configuration.CommandLine/CommandLineConfigurationExtensions.cs similarity index 84% rename from src/Microsoft.Framework.Configuration.CommandLine/CommandLineConfigurationExtensions.cs rename to src/Microsoft.Extensions.Configuration.CommandLine/CommandLineConfigurationExtensions.cs index ae856164..79d8f4aa 100644 --- a/src/Microsoft.Framework.Configuration.CommandLine/CommandLineConfigurationExtensions.cs +++ b/src/Microsoft.Extensions.Configuration.CommandLine/CommandLineConfigurationExtensions.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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. using System.Collections.Generic; -using Microsoft.Framework.Configuration.CommandLine; +using Microsoft.Extensions.Configuration.CommandLine; -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { public static class CommandLineConfigurationExtensions { diff --git a/src/Microsoft.Framework.Configuration.CommandLine/CommandLineConfigurationProvider.cs b/src/Microsoft.Extensions.Configuration.CommandLine/CommandLineConfigurationProvider.cs similarity index 99% rename from src/Microsoft.Framework.Configuration.CommandLine/CommandLineConfigurationProvider.cs rename to src/Microsoft.Extensions.Configuration.CommandLine/CommandLineConfigurationProvider.cs index 6e49ff13..35b89642 100644 --- a/src/Microsoft.Framework.Configuration.CommandLine/CommandLineConfigurationProvider.cs +++ b/src/Microsoft.Extensions.Configuration.CommandLine/CommandLineConfigurationProvider.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.Framework.Configuration.CommandLine +namespace Microsoft.Extensions.Configuration.CommandLine { public class CommandLineConfigurationProvider : ConfigurationProvider { diff --git a/src/Microsoft.Framework.Configuration.CommandLine/Microsoft.Framework.Configuration.CommandLine.xproj b/src/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.xproj similarity index 89% rename from src/Microsoft.Framework.Configuration.CommandLine/Microsoft.Framework.Configuration.CommandLine.xproj rename to src/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.xproj index a013cffb..7c4412ad 100644 --- a/src/Microsoft.Framework.Configuration.CommandLine/Microsoft.Framework.Configuration.CommandLine.xproj +++ b/src/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -8,7 +8,7 @@ d4b7cf9b-4229-44dc-800f-cc39150ceab2 - Microsoft.Framework.Configuration.CommandLine + Microsoft.Extensions.Configuration.CommandLine ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.Extensions.Configuration.CommandLine/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration.CommandLine/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..71e6fcd6 --- /dev/null +++ b/src/Microsoft.Extensions.Configuration.CommandLine/Properties/AssemblyInfo.cs @@ -0,0 +1,10 @@ +// 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. + +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.CommandLine.Test")] +[assembly: AssemblyMetadata("Serviceable", "True")] +[assembly: NeutralResourcesLanguage("en-US")] diff --git a/src/Microsoft.Framework.Configuration.CommandLine/Properties/Resources.Designer.cs b/src/Microsoft.Extensions.Configuration.CommandLine/Properties/Resources.Designer.cs similarity index 94% rename from src/Microsoft.Framework.Configuration.CommandLine/Properties/Resources.Designer.cs rename to src/Microsoft.Extensions.Configuration.CommandLine/Properties/Resources.Designer.cs index 77452a55..93a8b6bd 100644 --- a/src/Microsoft.Framework.Configuration.CommandLine/Properties/Resources.Designer.cs +++ b/src/Microsoft.Extensions.Configuration.CommandLine/Properties/Resources.Designer.cs @@ -1,5 +1,5 @@ // -namespace Microsoft.Framework.Configuration.CommandLine +namespace Microsoft.Extensions.Configuration.CommandLine { using System.Globalization; using System.Reflection; @@ -8,7 +8,7 @@ namespace Microsoft.Framework.Configuration.CommandLine internal static class Resources { private static readonly ResourceManager _resourceManager - = new ResourceManager("Microsoft.Framework.Configuration.CommandLine.Resources", typeof(Resources).GetTypeInfo().Assembly); + = new ResourceManager("Microsoft.Extensions.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.Configuration.CommandLine/Resources.resx b/src/Microsoft.Extensions.Configuration.CommandLine/Resources.resx similarity index 100% rename from src/Microsoft.Framework.Configuration.CommandLine/Resources.resx rename to src/Microsoft.Extensions.Configuration.CommandLine/Resources.resx diff --git a/src/Microsoft.Framework.Configuration.CommandLine/project.json b/src/Microsoft.Extensions.Configuration.CommandLine/project.json similarity index 85% rename from src/Microsoft.Framework.Configuration.CommandLine/project.json rename to src/Microsoft.Extensions.Configuration.CommandLine/project.json index 7516ccf1..40878662 100644 --- a/src/Microsoft.Framework.Configuration.CommandLine/project.json +++ b/src/Microsoft.Extensions.Configuration.CommandLine/project.json @@ -1,4 +1,4 @@ -{ +{ "version": "1.0.0-*", "description": "Command line configuration provider for the Configuration package.", "repository": { @@ -6,7 +6,7 @@ "url": "https://github.com/aspnet/configuration" }, "dependencies": { - "Microsoft.Framework.Configuration": "1.0.0-*" + "Microsoft.Extensions.Configuration": "1.0.0-*" }, "frameworks": { "net45": { }, diff --git a/src/Microsoft.Framework.Configuration.EnvironmentVariables/EnvironmentVariablesConfigurationProvider.cs b/src/Microsoft.Extensions.Configuration.EnvironmentVariables/EnvironmentVariablesConfigurationProvider.cs similarity index 98% rename from src/Microsoft.Framework.Configuration.EnvironmentVariables/EnvironmentVariablesConfigurationProvider.cs rename to src/Microsoft.Extensions.Configuration.EnvironmentVariables/EnvironmentVariablesConfigurationProvider.cs index 6947cc91..f7ab8f67 100644 --- a/src/Microsoft.Framework.Configuration.EnvironmentVariables/EnvironmentVariablesConfigurationProvider.cs +++ b/src/Microsoft.Extensions.Configuration.EnvironmentVariables/EnvironmentVariablesConfigurationProvider.cs @@ -6,7 +6,7 @@ using System.Collections.Generic; using System.Linq; -namespace Microsoft.Framework.Configuration.EnvironmentVariables +namespace Microsoft.Extensions.Configuration.EnvironmentVariables { public class EnvironmentVariablesConfigurationProvider : ConfigurationProvider { diff --git a/src/Microsoft.Framework.Configuration.EnvironmentVariables/EnvironmentVariablesExtensions.cs b/src/Microsoft.Extensions.Configuration.EnvironmentVariables/EnvironmentVariablesExtensions.cs similarity index 82% rename from src/Microsoft.Framework.Configuration.EnvironmentVariables/EnvironmentVariablesExtensions.cs rename to src/Microsoft.Extensions.Configuration.EnvironmentVariables/EnvironmentVariablesExtensions.cs index ad520857..d0014e97 100644 --- a/src/Microsoft.Framework.Configuration.EnvironmentVariables/EnvironmentVariablesExtensions.cs +++ b/src/Microsoft.Extensions.Configuration.EnvironmentVariables/EnvironmentVariablesExtensions.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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. -using Microsoft.Framework.Configuration.EnvironmentVariables; +using Microsoft.Extensions.Configuration.EnvironmentVariables; -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { public static class EnvironmentVariablesExtensions { diff --git a/src/Microsoft.Framework.Configuration.EnvironmentVariables/Microsoft.Framework.Configuration.EnvironmentVariables.xproj b/src/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.xproj similarity index 88% rename from src/Microsoft.Framework.Configuration.EnvironmentVariables/Microsoft.Framework.Configuration.EnvironmentVariables.xproj rename to src/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.xproj index d234e222..d0a4a5b3 100644 --- a/src/Microsoft.Framework.Configuration.EnvironmentVariables/Microsoft.Framework.Configuration.EnvironmentVariables.xproj +++ b/src/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -8,7 +8,7 @@ a6a2c665-e5a4-4fd3-ad0c-e33e6cffcb88 - Microsoft.Framework.Configuration.EnvironmentVariables + Microsoft.Extensions.Configuration.EnvironmentVariables ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.Extensions.Configuration.EnvironmentVariables/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration.EnvironmentVariables/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..f52f4f10 --- /dev/null +++ b/src/Microsoft.Extensions.Configuration.EnvironmentVariables/Properties/AssemblyInfo.cs @@ -0,0 +1,10 @@ +// 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. + +using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; + +[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.EnvironmentVariables.Test")] +[assembly: AssemblyMetadata("Serviceable", "True")] +[assembly: NeutralResourcesLanguage("en-US")] diff --git a/src/Microsoft.Framework.Configuration.EnvironmentVariables/project.json b/src/Microsoft.Extensions.Configuration.EnvironmentVariables/project.json similarity index 85% rename from src/Microsoft.Framework.Configuration.EnvironmentVariables/project.json rename to src/Microsoft.Extensions.Configuration.EnvironmentVariables/project.json index a8fd2d25..f5886917 100644 --- a/src/Microsoft.Framework.Configuration.EnvironmentVariables/project.json +++ b/src/Microsoft.Extensions.Configuration.EnvironmentVariables/project.json @@ -1,4 +1,4 @@ -{ +{ "version": "1.0.0-*", "description": "Environment variables configuration provider for the Configuration package.", "repository": { @@ -6,7 +6,7 @@ "url": "https://github.com/aspnet/configuration" }, "dependencies": { - "Microsoft.Framework.Configuration": "1.0.0-*" + "Microsoft.Extensions.Configuration": "1.0.0-*" }, "frameworks": { "net45": { }, diff --git a/src/Microsoft.Framework.Configuration.FileExtensions/FileConfigurationExtensions.cs b/src/Microsoft.Extensions.Configuration.FileExtensions/FileConfigurationExtensions.cs similarity index 97% rename from src/Microsoft.Framework.Configuration.FileExtensions/FileConfigurationExtensions.cs rename to src/Microsoft.Extensions.Configuration.FileExtensions/FileConfigurationExtensions.cs index b3cdd80c..ff185a55 100644 --- a/src/Microsoft.Framework.Configuration.FileExtensions/FileConfigurationExtensions.cs +++ b/src/Microsoft.Extensions.Configuration.FileExtensions/FileConfigurationExtensions.cs @@ -4,7 +4,7 @@ using System; using System.IO; -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { public static class FileConfigurationExtensions { diff --git a/src/Microsoft.Framework.Configuration.FileExtensions/Microsoft.Framework.Configuration.FileExtensions.xproj b/src/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.xproj similarity index 90% rename from src/Microsoft.Framework.Configuration.FileExtensions/Microsoft.Framework.Configuration.FileExtensions.xproj rename to src/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.xproj index 22078a90..7095860e 100644 --- a/src/Microsoft.Framework.Configuration.FileExtensions/Microsoft.Framework.Configuration.FileExtensions.xproj +++ b/src/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -7,7 +7,7 @@ 881e7cbc-492c-47c5-98a6-61dd1c753ee6 - Microsoft.Framework.Configuration.Ini + Microsoft.Extensions.Configuration.Ini ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.Framework.Configuration.CommandLine/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration.FileExtensions/Properties/AssemblyInfo.cs similarity index 67% rename from src/Microsoft.Framework.Configuration.CommandLine/Properties/AssemblyInfo.cs rename to src/Microsoft.Extensions.Configuration.FileExtensions/Properties/AssemblyInfo.cs index c88e1c1b..f24a3ae4 100644 --- a/src/Microsoft.Framework.Configuration.CommandLine/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Extensions.Configuration.FileExtensions/Properties/AssemblyInfo.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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. using System.Reflection; using System.Resources; using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Microsoft.Framework.Configuration.CommandLine.Test")] +[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.FileExtensions.Test")] [assembly: AssemblyMetadata("Serviceable", "True")] [assembly: NeutralResourcesLanguage("en-US")] diff --git a/src/Microsoft.Framework.Configuration.FileExtensions/project.json b/src/Microsoft.Extensions.Configuration.FileExtensions/project.json similarity index 85% rename from src/Microsoft.Framework.Configuration.FileExtensions/project.json rename to src/Microsoft.Extensions.Configuration.FileExtensions/project.json index 3a044a55..6aa7ad2c 100644 --- a/src/Microsoft.Framework.Configuration.FileExtensions/project.json +++ b/src/Microsoft.Extensions.Configuration.FileExtensions/project.json @@ -1,4 +1,4 @@ -{ +{ "version": "1.0.0-*", "description": "File based provider configuration extensions for the Configuration package.", "repository": { @@ -6,7 +6,7 @@ "url": "https://github.com/aspnet/configuration" }, "dependencies": { - "Microsoft.Framework.Configuration": "1.0.0-*" + "Microsoft.Extensions.Configuration": "1.0.0-*" }, "frameworks": { "net45": { }, diff --git a/src/Microsoft.Framework.Configuration.Ini/IniConfigurationExtensions.cs b/src/Microsoft.Extensions.Configuration.Ini/IniConfigurationExtensions.cs similarity index 97% rename from src/Microsoft.Framework.Configuration.Ini/IniConfigurationExtensions.cs rename to src/Microsoft.Extensions.Configuration.Ini/IniConfigurationExtensions.cs index d2b7bd83..7a56d82e 100644 --- a/src/Microsoft.Framework.Configuration.Ini/IniConfigurationExtensions.cs +++ b/src/Microsoft.Extensions.Configuration.Ini/IniConfigurationExtensions.cs @@ -3,9 +3,9 @@ using System; using System.IO; -using Microsoft.Framework.Configuration.Ini; +using Microsoft.Extensions.Configuration.Ini; -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { public static class IniConfigurationExtensions { diff --git a/src/Microsoft.Framework.Configuration.Ini/IniConfigurationProvider.cs b/src/Microsoft.Extensions.Configuration.Ini/IniConfigurationProvider.cs similarity index 99% rename from src/Microsoft.Framework.Configuration.Ini/IniConfigurationProvider.cs rename to src/Microsoft.Extensions.Configuration.Ini/IniConfigurationProvider.cs index 18edfd79..8d470494 100644 --- a/src/Microsoft.Framework.Configuration.Ini/IniConfigurationProvider.cs +++ b/src/Microsoft.Extensions.Configuration.Ini/IniConfigurationProvider.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.IO; -namespace Microsoft.Framework.Configuration.Ini +namespace Microsoft.Extensions.Configuration.Ini { /// /// An INI file based . diff --git a/src/Microsoft.Framework.Configuration.Ini/Microsoft.Framework.Configuration.Ini.xproj b/src/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.xproj similarity index 90% rename from src/Microsoft.Framework.Configuration.Ini/Microsoft.Framework.Configuration.Ini.xproj rename to src/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.xproj index a5719d4e..f9fef35d 100644 --- a/src/Microsoft.Framework.Configuration.Ini/Microsoft.Framework.Configuration.Ini.xproj +++ b/src/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -8,7 +8,7 @@ c555c5d5-bf4a-451e-ab43-ebf4de885ec7 - Microsoft.Framework.Configuration.Ini + Microsoft.Extensions.Configuration.Ini ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/src/Microsoft.Framework.Configuration.Json/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration.Ini/Properties/AssemblyInfo.cs similarity index 81% rename from src/Microsoft.Framework.Configuration.Json/Properties/AssemblyInfo.cs rename to src/Microsoft.Extensions.Configuration.Ini/Properties/AssemblyInfo.cs index c4d1ba74..1a336ca5 100644 --- a/src/Microsoft.Framework.Configuration.Json/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Extensions.Configuration.Ini/Properties/AssemblyInfo.cs @@ -5,6 +5,6 @@ using System.Resources; using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Microsoft.Framework.Configuration.Json.Test")] +[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Ini.Test")] [assembly: AssemblyMetadata("Serviceable", "True")] [assembly: NeutralResourcesLanguage("en-US")] diff --git a/src/Microsoft.Framework.Configuration.Ini/Properties/Resources.Designer.cs b/src/Microsoft.Extensions.Configuration.Ini/Properties/Resources.Designer.cs similarity index 94% rename from src/Microsoft.Framework.Configuration.Ini/Properties/Resources.Designer.cs rename to src/Microsoft.Extensions.Configuration.Ini/Properties/Resources.Designer.cs index c605ee50..a7ea3572 100644 --- a/src/Microsoft.Framework.Configuration.Ini/Properties/Resources.Designer.cs +++ b/src/Microsoft.Extensions.Configuration.Ini/Properties/Resources.Designer.cs @@ -1,5 +1,5 @@ // -namespace Microsoft.Framework.Configuration.Ini +namespace Microsoft.Extensions.Configuration.Ini { using System.Globalization; using System.Reflection; @@ -8,7 +8,7 @@ namespace Microsoft.Framework.Configuration.Ini internal static class Resources { private static readonly ResourceManager _resourceManager - = new ResourceManager("Microsoft.Framework.Configuration.Ini.Resources", typeof(Resources).GetTypeInfo().Assembly); + = new ResourceManager("Microsoft.Extensions.Configuration.Ini.Resources", typeof(Resources).GetTypeInfo().Assembly); /// /// The configuration file '{0}' was not found and is not optional. diff --git a/src/Microsoft.Framework.Configuration.Ini/Resources.resx b/src/Microsoft.Extensions.Configuration.Ini/Resources.resx similarity index 100% rename from src/Microsoft.Framework.Configuration.Ini/Resources.resx rename to src/Microsoft.Extensions.Configuration.Ini/Resources.resx diff --git a/src/Microsoft.Framework.Configuration.Ini/project.json b/src/Microsoft.Extensions.Configuration.Ini/project.json similarity index 81% rename from src/Microsoft.Framework.Configuration.Ini/project.json rename to src/Microsoft.Extensions.Configuration.Ini/project.json index 85d43dec..e4867c81 100644 --- a/src/Microsoft.Framework.Configuration.Ini/project.json +++ b/src/Microsoft.Extensions.Configuration.Ini/project.json @@ -1,4 +1,4 @@ -{ +{ "version": "1.0.0-*", "description": "INI configuration provider for the Configuration package.", "repository": { @@ -6,8 +6,8 @@ "url": "https://github.com/aspnet/configuration" }, "dependencies": { - "Microsoft.Framework.Configuration": "1.0.0-*", - "Microsoft.Framework.Configuration.FileExtensions": "1.0.0-*" + "Microsoft.Extensions.Configuration": "1.0.0-*", + "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-*" }, "frameworks": { "net45": { }, diff --git a/src/Microsoft.Framework.Configuration.Json/JsonConfigurationExtensions.cs b/src/Microsoft.Extensions.Configuration.Json/JsonConfigurationExtensions.cs similarity index 97% rename from src/Microsoft.Framework.Configuration.Json/JsonConfigurationExtensions.cs rename to src/Microsoft.Extensions.Configuration.Json/JsonConfigurationExtensions.cs index 125fdddf..10c4e329 100644 --- a/src/Microsoft.Framework.Configuration.Json/JsonConfigurationExtensions.cs +++ b/src/Microsoft.Extensions.Configuration.Json/JsonConfigurationExtensions.cs @@ -3,9 +3,9 @@ using System; using System.IO; -using Microsoft.Framework.Configuration.Json; +using Microsoft.Extensions.Configuration.Json; -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { /// /// Extension methods for adding . diff --git a/src/Microsoft.Framework.Configuration.Json/JsonConfigurationFileParser.cs b/src/Microsoft.Extensions.Configuration.Json/JsonConfigurationFileParser.cs similarity index 98% rename from src/Microsoft.Framework.Configuration.Json/JsonConfigurationFileParser.cs rename to src/Microsoft.Extensions.Configuration.Json/JsonConfigurationFileParser.cs index 58f9101b..b2c0aba7 100644 --- a/src/Microsoft.Framework.Configuration.Json/JsonConfigurationFileParser.cs +++ b/src/Microsoft.Extensions.Configuration.Json/JsonConfigurationFileParser.cs @@ -8,7 +8,7 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; -namespace Microsoft.Framework.Configuration.Json +namespace Microsoft.Extensions.Configuration.Json { internal class JsonConfigurationFileParser { diff --git a/src/Microsoft.Framework.Configuration.Json/JsonConfigurationProvider.cs b/src/Microsoft.Extensions.Configuration.Json/JsonConfigurationProvider.cs similarity index 98% rename from src/Microsoft.Framework.Configuration.Json/JsonConfigurationProvider.cs rename to src/Microsoft.Extensions.Configuration.Json/JsonConfigurationProvider.cs index 02ca171b..f0ec013f 100644 --- a/src/Microsoft.Framework.Configuration.Json/JsonConfigurationProvider.cs +++ b/src/Microsoft.Extensions.Configuration.Json/JsonConfigurationProvider.cs @@ -7,7 +7,7 @@ using System.Linq; using Newtonsoft.Json; -namespace Microsoft.Framework.Configuration.Json +namespace Microsoft.Extensions.Configuration.Json { /// /// A JSON file based . diff --git a/src/Microsoft.Framework.Configuration.Json/Microsoft.Framework.Configuration.Json.xproj b/src/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.xproj similarity index 100% rename from src/Microsoft.Framework.Configuration.Json/Microsoft.Framework.Configuration.Json.xproj rename to src/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.xproj diff --git a/src/Microsoft.Framework.Configuration.Ini/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration.Json/Properties/AssemblyInfo.cs similarity index 68% rename from src/Microsoft.Framework.Configuration.Ini/Properties/AssemblyInfo.cs rename to src/Microsoft.Extensions.Configuration.Json/Properties/AssemblyInfo.cs index 92699427..9316fba7 100644 --- a/src/Microsoft.Framework.Configuration.Ini/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Extensions.Configuration.Json/Properties/AssemblyInfo.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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. using System.Reflection; using System.Resources; using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Microsoft.Framework.Configuration.Ini.Test")] +[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Json.Test")] [assembly: AssemblyMetadata("Serviceable", "True")] [assembly: NeutralResourcesLanguage("en-US")] diff --git a/src/Microsoft.Framework.Configuration.Json/Properties/Resources.Designer.cs b/src/Microsoft.Extensions.Configuration.Json/Properties/Resources.Designer.cs similarity index 96% rename from src/Microsoft.Framework.Configuration.Json/Properties/Resources.Designer.cs rename to src/Microsoft.Extensions.Configuration.Json/Properties/Resources.Designer.cs index 3c2b73c3..d896a5aa 100644 --- a/src/Microsoft.Framework.Configuration.Json/Properties/Resources.Designer.cs +++ b/src/Microsoft.Extensions.Configuration.Json/Properties/Resources.Designer.cs @@ -1,5 +1,5 @@ // -namespace Microsoft.Framework.Configuration.Json +namespace Microsoft.Extensions.Configuration.Json { using System.Globalization; using System.Reflection; @@ -8,7 +8,7 @@ namespace Microsoft.Framework.Configuration.Json internal static class Resources { private static readonly ResourceManager _resourceManager - = new ResourceManager("Microsoft.Framework.Configuration.Json.Resources", typeof(Resources).GetTypeInfo().Assembly); + = new ResourceManager("Microsoft.Extensions.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.Configuration.Json/Resources.resx b/src/Microsoft.Extensions.Configuration.Json/Resources.resx similarity index 100% rename from src/Microsoft.Framework.Configuration.Json/Resources.resx rename to src/Microsoft.Extensions.Configuration.Json/Resources.resx diff --git a/src/Microsoft.Framework.Configuration.Json/project.json b/src/Microsoft.Extensions.Configuration.Json/project.json similarity index 85% rename from src/Microsoft.Framework.Configuration.Json/project.json rename to src/Microsoft.Extensions.Configuration.Json/project.json index 0d89dd50..06639c76 100644 --- a/src/Microsoft.Framework.Configuration.Json/project.json +++ b/src/Microsoft.Extensions.Configuration.Json/project.json @@ -7,8 +7,8 @@ }, "dependencies": { "Newtonsoft.Json": "6.0.6", - "Microsoft.Framework.Configuration": "1.0.0-*", - "Microsoft.Framework.Configuration.FileExtensions": "1.0.0-*" + "Microsoft.Extensions.Configuration": "1.0.0-*", + "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-*" }, "frameworks": { "net45": { }, diff --git a/src/Microsoft.Framework.Configuration.Xml/EncryptedXmlDocumentDecryptor.cs b/src/Microsoft.Extensions.Configuration.Xml/EncryptedXmlDocumentDecryptor.cs similarity index 97% rename from src/Microsoft.Framework.Configuration.Xml/EncryptedXmlDocumentDecryptor.cs rename to src/Microsoft.Extensions.Configuration.Xml/EncryptedXmlDocumentDecryptor.cs index 9ac9f455..edae3485 100644 --- a/src/Microsoft.Framework.Configuration.Xml/EncryptedXmlDocumentDecryptor.cs +++ b/src/Microsoft.Extensions.Configuration.Xml/EncryptedXmlDocumentDecryptor.cs @@ -6,7 +6,7 @@ using System.Security.Cryptography.Xml; using System.Xml; -namespace Microsoft.Framework.Configuration.Xml +namespace Microsoft.Extensions.Configuration.Xml { /// /// A decryptor that uses the EncryptedXml class in the desktop CLR. diff --git a/src/Microsoft.Framework.Configuration.Xml/Microsoft.Framework.Configuration.Xml.xproj b/src/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.xproj similarity index 100% rename from src/Microsoft.Framework.Configuration.Xml/Microsoft.Framework.Configuration.Xml.xproj rename to src/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.xproj diff --git a/src/Microsoft.Framework.Configuration.Xml/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration.Xml/Properties/AssemblyInfo.cs similarity index 81% rename from src/Microsoft.Framework.Configuration.Xml/Properties/AssemblyInfo.cs rename to src/Microsoft.Extensions.Configuration.Xml/Properties/AssemblyInfo.cs index 9888ebbe..fdc171e9 100644 --- a/src/Microsoft.Framework.Configuration.Xml/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Extensions.Configuration.Xml/Properties/AssemblyInfo.cs @@ -5,6 +5,6 @@ using System.Resources; using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Microsoft.Framework.Configuration.Xml.Test")] +[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Xml.Test")] [assembly: AssemblyMetadata("Serviceable", "True")] [assembly: NeutralResourcesLanguage("en-US")] diff --git a/src/Microsoft.Framework.Configuration.Xml/Properties/Resources.Designer.cs b/src/Microsoft.Extensions.Configuration.Xml/Properties/Resources.Designer.cs similarity index 97% rename from src/Microsoft.Framework.Configuration.Xml/Properties/Resources.Designer.cs rename to src/Microsoft.Extensions.Configuration.Xml/Properties/Resources.Designer.cs index 1acdc5b6..96d87bab 100644 --- a/src/Microsoft.Framework.Configuration.Xml/Properties/Resources.Designer.cs +++ b/src/Microsoft.Extensions.Configuration.Xml/Properties/Resources.Designer.cs @@ -1,5 +1,5 @@ // -namespace Microsoft.Framework.Configuration.Xml +namespace Microsoft.Extensions.Configuration.Xml { using System.Globalization; using System.Reflection; @@ -8,7 +8,7 @@ namespace Microsoft.Framework.Configuration.Xml internal static class Resources { private static readonly ResourceManager _resourceManager - = new ResourceManager("Microsoft.Framework.Configuration.Xml.Resources", typeof(Resources).GetTypeInfo().Assembly); + = new ResourceManager("Microsoft.Extensions.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.Configuration.Xml/Resources.resx b/src/Microsoft.Extensions.Configuration.Xml/Resources.resx similarity index 100% rename from src/Microsoft.Framework.Configuration.Xml/Resources.resx rename to src/Microsoft.Extensions.Configuration.Xml/Resources.resx diff --git a/src/Microsoft.Framework.Configuration.Xml/XmlConfigurationExtensions.cs b/src/Microsoft.Extensions.Configuration.Xml/XmlConfigurationExtensions.cs similarity index 97% rename from src/Microsoft.Framework.Configuration.Xml/XmlConfigurationExtensions.cs rename to src/Microsoft.Extensions.Configuration.Xml/XmlConfigurationExtensions.cs index d7d64a0d..9842dec7 100644 --- a/src/Microsoft.Framework.Configuration.Xml/XmlConfigurationExtensions.cs +++ b/src/Microsoft.Extensions.Configuration.Xml/XmlConfigurationExtensions.cs @@ -3,9 +3,9 @@ using System; using System.IO; -using Microsoft.Framework.Configuration.Xml; +using Microsoft.Extensions.Configuration.Xml; -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { /// /// Extension methods for adding . diff --git a/src/Microsoft.Framework.Configuration.Xml/XmlConfigurationProvider.cs b/src/Microsoft.Extensions.Configuration.Xml/XmlConfigurationProvider.cs similarity index 99% rename from src/Microsoft.Framework.Configuration.Xml/XmlConfigurationProvider.cs rename to src/Microsoft.Extensions.Configuration.Xml/XmlConfigurationProvider.cs index bef8c9bc..8be13654 100644 --- a/src/Microsoft.Framework.Configuration.Xml/XmlConfigurationProvider.cs +++ b/src/Microsoft.Extensions.Configuration.Xml/XmlConfigurationProvider.cs @@ -7,7 +7,7 @@ using System.Linq; using System.Xml; -namespace Microsoft.Framework.Configuration.Xml +namespace Microsoft.Extensions.Configuration.Xml { /// /// An XML file based . diff --git a/src/Microsoft.Framework.Configuration.Xml/XmlDocumentDecryptor.cs b/src/Microsoft.Extensions.Configuration.Xml/XmlDocumentDecryptor.cs similarity index 98% rename from src/Microsoft.Framework.Configuration.Xml/XmlDocumentDecryptor.cs rename to src/Microsoft.Extensions.Configuration.Xml/XmlDocumentDecryptor.cs index bb7ef8cb..ede49dc0 100644 --- a/src/Microsoft.Framework.Configuration.Xml/XmlDocumentDecryptor.cs +++ b/src/Microsoft.Extensions.Configuration.Xml/XmlDocumentDecryptor.cs @@ -5,7 +5,7 @@ using System.IO; using System.Xml; -namespace Microsoft.Framework.Configuration.Xml +namespace Microsoft.Extensions.Configuration.Xml { internal class XmlDocumentDecryptor { diff --git a/src/Microsoft.Framework.Configuration.Xml/project.json b/src/Microsoft.Extensions.Configuration.Xml/project.json similarity index 89% rename from src/Microsoft.Framework.Configuration.Xml/project.json rename to src/Microsoft.Extensions.Configuration.Xml/project.json index 20c325fb..a2969a0f 100644 --- a/src/Microsoft.Framework.Configuration.Xml/project.json +++ b/src/Microsoft.Extensions.Configuration.Xml/project.json @@ -6,8 +6,8 @@ "url": "https://github.com/aspnet/configuration" }, "dependencies": { - "Microsoft.Framework.Configuration": "1.0.0-*", - "Microsoft.Framework.Configuration.FileExtensions": "1.0.0-*" + "Microsoft.Extensions.Configuration": "1.0.0-*", + "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-*" }, "frameworks": { "net45": { diff --git a/src/Microsoft.Framework.Configuration/ConfigurationBase.cs b/src/Microsoft.Extensions.Configuration/ConfigurationBase.cs similarity index 97% rename from src/Microsoft.Framework.Configuration/ConfigurationBase.cs rename to src/Microsoft.Extensions.Configuration/ConfigurationBase.cs index 67d46a2c..27be3e0a 100644 --- a/src/Microsoft.Framework.Configuration/ConfigurationBase.cs +++ b/src/Microsoft.Extensions.Configuration/ConfigurationBase.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Linq; -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { public abstract class ConfigurationBase : IConfiguration { diff --git a/src/Microsoft.Framework.Configuration/ConfigurationBuilder.cs b/src/Microsoft.Extensions.Configuration/ConfigurationBuilder.cs similarity index 95% rename from src/Microsoft.Framework.Configuration/ConfigurationBuilder.cs rename to src/Microsoft.Extensions.Configuration/ConfigurationBuilder.cs index 7fdb2d17..e166d827 100644 --- a/src/Microsoft.Framework.Configuration/ConfigurationBuilder.cs +++ b/src/Microsoft.Extensions.Configuration/ConfigurationBuilder.cs @@ -1,9 +1,9 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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. using System.Collections.Generic; -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { public class ConfigurationBuilder : IConfigurationBuilder { diff --git a/src/Microsoft.Framework.Configuration/ConfigurationKeyComparer.cs b/src/Microsoft.Extensions.Configuration/ConfigurationKeyComparer.cs similarity index 97% rename from src/Microsoft.Framework.Configuration/ConfigurationKeyComparer.cs rename to src/Microsoft.Extensions.Configuration/ConfigurationKeyComparer.cs index f040f4f0..c67a3415 100644 --- a/src/Microsoft.Framework.Configuration/ConfigurationKeyComparer.cs +++ b/src/Microsoft.Extensions.Configuration/ConfigurationKeyComparer.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { public class ConfigurationKeyComparer : IComparer { diff --git a/src/Microsoft.Framework.Configuration/ConfigurationProvider.cs b/src/Microsoft.Extensions.Configuration/ConfigurationProvider.cs similarity index 97% rename from src/Microsoft.Framework.Configuration/ConfigurationProvider.cs rename to src/Microsoft.Extensions.Configuration/ConfigurationProvider.cs index 58838283..e3e5c76f 100644 --- a/src/Microsoft.Framework.Configuration/ConfigurationProvider.cs +++ b/src/Microsoft.Extensions.Configuration/ConfigurationProvider.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Linq; -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { public abstract class ConfigurationProvider : IConfigurationProvider { diff --git a/src/Microsoft.Framework.Configuration/ConfigurationRoot.cs b/src/Microsoft.Extensions.Configuration/ConfigurationRoot.cs similarity index 95% rename from src/Microsoft.Framework.Configuration/ConfigurationRoot.cs rename to src/Microsoft.Extensions.Configuration/ConfigurationRoot.cs index 99d522db..9293c347 100644 --- a/src/Microsoft.Framework.Configuration/ConfigurationRoot.cs +++ b/src/Microsoft.Extensions.Configuration/ConfigurationRoot.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { public class ConfigurationRoot : ConfigurationBase, IConfigurationRoot { diff --git a/src/Microsoft.Framework.Configuration/ConfigurationSection.cs b/src/Microsoft.Extensions.Configuration/ConfigurationSection.cs similarity index 97% rename from src/Microsoft.Framework.Configuration/ConfigurationSection.cs rename to src/Microsoft.Extensions.Configuration/ConfigurationSection.cs index 5afd6433..be5bd32c 100644 --- a/src/Microsoft.Framework.Configuration/ConfigurationSection.cs +++ b/src/Microsoft.Extensions.Configuration/ConfigurationSection.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Linq; -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { public class ConfigurationSection : ConfigurationBase, IConfigurationSection { diff --git a/src/Microsoft.Framework.Configuration/Constants.cs b/src/Microsoft.Extensions.Configuration/Constants.cs similarity index 85% rename from src/Microsoft.Framework.Configuration/Constants.cs rename to src/Microsoft.Extensions.Configuration/Constants.cs index dc1c9b24..8b5b7590 100644 --- a/src/Microsoft.Framework.Configuration/Constants.cs +++ b/src/Microsoft.Extensions.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.Configuration +namespace Microsoft.Extensions.Configuration { public static class Constants { diff --git a/src/Microsoft.Framework.Configuration/MemoryConfigurationExtensions.cs b/src/Microsoft.Extensions.Configuration/MemoryConfigurationExtensions.cs similarity index 95% rename from src/Microsoft.Framework.Configuration/MemoryConfigurationExtensions.cs rename to src/Microsoft.Extensions.Configuration/MemoryConfigurationExtensions.cs index 9b991e27..39af892b 100644 --- a/src/Microsoft.Framework.Configuration/MemoryConfigurationExtensions.cs +++ b/src/Microsoft.Extensions.Configuration/MemoryConfigurationExtensions.cs @@ -3,9 +3,9 @@ using System; using System.Collections.Generic; -using Microsoft.Framework.Configuration.Memory; +using Microsoft.Extensions.Configuration.Memory; -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { public static class MemoryConfigurationExtensions { diff --git a/src/Microsoft.Framework.Configuration/MemoryConfigurationProvider.cs b/src/Microsoft.Extensions.Configuration/MemoryConfigurationProvider.cs similarity index 95% rename from src/Microsoft.Framework.Configuration/MemoryConfigurationProvider.cs rename to src/Microsoft.Extensions.Configuration/MemoryConfigurationProvider.cs index ed8d370d..8c0090c9 100644 --- a/src/Microsoft.Framework.Configuration/MemoryConfigurationProvider.cs +++ b/src/Microsoft.Extensions.Configuration/MemoryConfigurationProvider.cs @@ -4,7 +4,7 @@ using System.Collections; using System.Collections.Generic; -namespace Microsoft.Framework.Configuration.Memory +namespace Microsoft.Extensions.Configuration.Memory { public class MemoryConfigurationProvider : ConfigurationProvider, diff --git a/src/Microsoft.Framework.Configuration/Microsoft.Framework.Configuration.xproj b/src/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.xproj similarity index 100% rename from src/Microsoft.Framework.Configuration/Microsoft.Framework.Configuration.xproj rename to src/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.xproj diff --git a/src/Microsoft.Framework.Configuration/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration/Properties/AssemblyInfo.cs similarity index 95% rename from src/Microsoft.Framework.Configuration/Properties/AssemblyInfo.cs rename to src/Microsoft.Extensions.Configuration/Properties/AssemblyInfo.cs index 7a35c5dc..5b7bde87 100644 --- a/src/Microsoft.Framework.Configuration/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Extensions.Configuration/Properties/AssemblyInfo.cs @@ -38,6 +38,6 @@ // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] -[assembly: InternalsVisibleTo("Microsoft.Framework.Configuration.Test")] +[assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Test")] [assembly: NeutralResourcesLanguage("en-US")] [assembly: AssemblyMetadata("Serviceable", "True")] diff --git a/src/Microsoft.Framework.Configuration/Properties/Resources.Designer.cs b/src/Microsoft.Extensions.Configuration/Properties/Resources.Designer.cs similarity index 94% rename from src/Microsoft.Framework.Configuration/Properties/Resources.Designer.cs rename to src/Microsoft.Extensions.Configuration/Properties/Resources.Designer.cs index 9f9cf544..60eb6279 100644 --- a/src/Microsoft.Framework.Configuration/Properties/Resources.Designer.cs +++ b/src/Microsoft.Extensions.Configuration/Properties/Resources.Designer.cs @@ -1,5 +1,5 @@ // -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { using System.Globalization; using System.Reflection; @@ -8,7 +8,7 @@ namespace Microsoft.Framework.Configuration internal static class Resources { private static readonly ResourceManager _resourceManager - = new ResourceManager("Microsoft.Framework.Configuration.Resources", typeof(Resources).GetTypeInfo().Assembly); + = new ResourceManager("Microsoft.Extensions.Configuration.Resources", typeof(Resources).GetTypeInfo().Assembly); /// /// Empty key is not allowed. diff --git a/src/Microsoft.Framework.Configuration/Resources.resx b/src/Microsoft.Extensions.Configuration/Resources.resx similarity index 100% rename from src/Microsoft.Framework.Configuration/Resources.resx rename to src/Microsoft.Extensions.Configuration/Resources.resx diff --git a/src/Microsoft.Framework.Configuration/project.json b/src/Microsoft.Extensions.Configuration/project.json similarity index 94% rename from src/Microsoft.Framework.Configuration/project.json rename to src/Microsoft.Extensions.Configuration/project.json index defeb1ed..3c140f23 100644 --- a/src/Microsoft.Framework.Configuration/project.json +++ b/src/Microsoft.Extensions.Configuration/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "description": "Implementation of key-value pair based configuration. Includes the memory configuration provider.", "dependencies": { - "Microsoft.Framework.Configuration.Abstractions": "1.0.0-*" + "Microsoft.Extensions.Configuration.Abstractions": "1.0.0-*" }, "repository": { "type": "git", diff --git a/src/Microsoft.Framework.Configuration.EnvironmentVariables/Properties/AssemblyInfo.cs b/src/Microsoft.Framework.Configuration.EnvironmentVariables/Properties/AssemblyInfo.cs deleted file mode 100644 index 5b1cef28..00000000 --- a/src/Microsoft.Framework.Configuration.EnvironmentVariables/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Microsoft.Framework.Configuration.EnvironmentVariables.Test")] -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-US")] diff --git a/src/Microsoft.Framework.Configuration.FileExtensions/Properties/AssemblyInfo.cs b/src/Microsoft.Framework.Configuration.FileExtensions/Properties/AssemblyInfo.cs deleted file mode 100644 index 7d6cadd9..00000000 --- a/src/Microsoft.Framework.Configuration.FileExtensions/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; - -[assembly: InternalsVisibleTo("Microsoft.Framework.Configuration.FileExtensions.Test")] -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-US")] diff --git a/test/Microsoft.Framework.Configuration.Binder.Test/ConfigurationBinderTests.cs b/test/Microsoft.Extensions.Configuration.Binder.Test/ConfigurationBinderTests.cs similarity index 99% rename from test/Microsoft.Framework.Configuration.Binder.Test/ConfigurationBinderTests.cs rename to test/Microsoft.Extensions.Configuration.Binder.Test/ConfigurationBinderTests.cs index a4c5a103..69a92bc6 100644 --- a/test/Microsoft.Framework.Configuration.Binder.Test/ConfigurationBinderTests.cs +++ b/test/Microsoft.Extensions.Configuration.Binder.Test/ConfigurationBinderTests.cs @@ -5,10 +5,10 @@ using System.Collections.Generic; using System.ComponentModel; using System.Reflection; -using Microsoft.Framework.Configuration.Memory; +using Microsoft.Extensions.Configuration.Memory; using Xunit; -namespace Microsoft.Framework.Configuration.Binder.Test +namespace Microsoft.Extensions.Configuration.Binder.Test { public class ConfigurationBinderTests { diff --git a/test/Microsoft.Framework.Configuration.Binder.Test/ConfigurationCollectionBindingTests.cs b/test/Microsoft.Extensions.Configuration.Binder.Test/ConfigurationCollectionBindingTests.cs similarity index 99% rename from test/Microsoft.Framework.Configuration.Binder.Test/ConfigurationCollectionBindingTests.cs rename to test/Microsoft.Extensions.Configuration.Binder.Test/ConfigurationCollectionBindingTests.cs index 477afe90..3d69b6b6 100644 --- a/test/Microsoft.Framework.Configuration.Binder.Test/ConfigurationCollectionBindingTests.cs +++ b/test/Microsoft.Extensions.Configuration.Binder.Test/ConfigurationCollectionBindingTests.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Framework.Configuration.Memory; +using Microsoft.Extensions.Configuration.Memory; using Xunit; -namespace Microsoft.Framework.Configuration.Binder.Test +namespace Microsoft.Extensions.Configuration.Binder.Test { public class ConfigurationCollectionBinding { diff --git a/test/Microsoft.Framework.Configuration.Binder.Test/Microsoft.Framework.Configuration.Binder.Test.xproj b/test/Microsoft.Extensions.Configuration.Binder.Test/Microsoft.Extensions.Configuration.Binder.Test.xproj similarity index 89% rename from test/Microsoft.Framework.Configuration.Binder.Test/Microsoft.Framework.Configuration.Binder.Test.xproj rename to test/Microsoft.Extensions.Configuration.Binder.Test/Microsoft.Extensions.Configuration.Binder.Test.xproj index 28de7b5e..a58e87a1 100644 --- a/test/Microsoft.Framework.Configuration.Binder.Test/Microsoft.Framework.Configuration.Binder.Test.xproj +++ b/test/Microsoft.Extensions.Configuration.Binder.Test/Microsoft.Extensions.Configuration.Binder.Test.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -7,7 +7,7 @@ ae6ffe9b-6378-4d57-aa24-7d257f18b235 - Microsoft.Framework.Configuration.ConfigurationBinder.Test + Microsoft.Extensions.Configuration.ConfigurationBinder.Test ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/Microsoft.Framework.Configuration.Binder.Test/project.json b/test/Microsoft.Extensions.Configuration.Binder.Test/project.json similarity index 59% rename from test/Microsoft.Framework.Configuration.Binder.Test/project.json rename to test/Microsoft.Extensions.Configuration.Binder.Test/project.json index 4798d103..3229f26c 100644 --- a/test/Microsoft.Framework.Configuration.Binder.Test/project.json +++ b/test/Microsoft.Extensions.Configuration.Binder.Test/project.json @@ -1,7 +1,7 @@ -{ +{ "dependencies": { - "Microsoft.Framework.Configuration.Binder": "1.0.0-*", - "Microsoft.Framework.Configuration.Test.Common": "1.0.0-*", + "Microsoft.Extensions.Configuration.Binder": "1.0.0-*", + "Microsoft.Extensions.Configuration.Test.Common": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "frameworks": { diff --git a/test/Microsoft.Framework.Configuration.CommandLine.Test/CommandLineTest.cs b/test/Microsoft.Extensions.Configuration.CommandLine.Test/CommandLineTest.cs similarity index 98% rename from test/Microsoft.Framework.Configuration.CommandLine.Test/CommandLineTest.cs rename to test/Microsoft.Extensions.Configuration.CommandLine.Test/CommandLineTest.cs index 7c2ccd70..4f4c99e6 100644 --- a/test/Microsoft.Framework.Configuration.CommandLine.Test/CommandLineTest.cs +++ b/test/Microsoft.Extensions.Configuration.CommandLine.Test/CommandLineTest.cs @@ -3,10 +3,10 @@ using System; using System.Collections.Generic; -using Microsoft.Framework.Configuration.Test; +using Microsoft.Extensions.Configuration.Test; using Xunit; -namespace Microsoft.Framework.Configuration.CommandLine.Test +namespace Microsoft.Extensions.Configuration.CommandLine.Test { public class CommandLineTest { diff --git a/test/Microsoft.Framework.Configuration.CommandLine.Test/Microsoft.Framework.Configuration.CommandLine.Test.xproj b/test/Microsoft.Extensions.Configuration.CommandLine.Test/Microsoft.Extensions.Configuration.CommandLine.Test.xproj similarity index 89% rename from test/Microsoft.Framework.Configuration.CommandLine.Test/Microsoft.Framework.Configuration.CommandLine.Test.xproj rename to test/Microsoft.Extensions.Configuration.CommandLine.Test/Microsoft.Extensions.Configuration.CommandLine.Test.xproj index a33d96d8..17233b0e 100644 --- a/test/Microsoft.Framework.Configuration.CommandLine.Test/Microsoft.Framework.Configuration.CommandLine.Test.xproj +++ b/test/Microsoft.Extensions.Configuration.CommandLine.Test/Microsoft.Extensions.Configuration.CommandLine.Test.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -7,7 +7,7 @@ ce9c8903-aa8a-40e6-b03d-32a08a4a39af - Microsoft.Framework.Configuration.CommandLine.Test + Microsoft.Extensions.Configuration.CommandLine.Test ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/Microsoft.Extensions.Configuration.CommandLine.Test/project.json b/test/Microsoft.Extensions.Configuration.CommandLine.Test/project.json new file mode 100644 index 00000000..e9c5c3dd --- /dev/null +++ b/test/Microsoft.Extensions.Configuration.CommandLine.Test/project.json @@ -0,0 +1,14 @@ +{ + "dependencies": { + "Microsoft.Extensions.Configuration.CommandLine": "1.0.0-*", + "Microsoft.Extensions.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.Configuration.EnvironmentVariables.Test/EnvironmentVariablesTest.cs b/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/EnvironmentVariablesTest.cs similarity index 98% rename from test/Microsoft.Framework.Configuration.EnvironmentVariables.Test/EnvironmentVariablesTest.cs rename to test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/EnvironmentVariablesTest.cs index 186b0096..62b00a0a 100644 --- a/test/Microsoft.Framework.Configuration.EnvironmentVariables.Test/EnvironmentVariablesTest.cs +++ b/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/EnvironmentVariablesTest.cs @@ -3,10 +3,10 @@ using System; using System.Collections; -using Microsoft.Framework.Configuration.Test; +using Microsoft.Extensions.Configuration.Test; using Xunit; -namespace Microsoft.Framework.Configuration.EnvironmentVariables.Test +namespace Microsoft.Extensions.Configuration.EnvironmentVariables.Test { public class EnvironmentVariablesTest { diff --git a/test/Microsoft.Framework.Configuration.EnvironmentVariables.Test/Microsoft.Framework.Configuration.EnvironmentVariables.Test.xproj b/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test.xproj similarity index 89% rename from test/Microsoft.Framework.Configuration.EnvironmentVariables.Test/Microsoft.Framework.Configuration.EnvironmentVariables.Test.xproj rename to test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test.xproj index b924ba4c..bd2e7f5f 100644 --- a/test/Microsoft.Framework.Configuration.EnvironmentVariables.Test/Microsoft.Framework.Configuration.EnvironmentVariables.Test.xproj +++ b/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -7,7 +7,7 @@ 7d0f805b-adff-4c47-a90c-24dd74416821 - Microsoft.Framework.Configuration.EnvironmentVariables.Test + Microsoft.Extensions.Configuration.EnvironmentVariables.Test ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/Microsoft.Framework.Configuration.EnvironmentVariables.Test/project.json b/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/project.json similarity index 65% rename from test/Microsoft.Framework.Configuration.EnvironmentVariables.Test/project.json rename to test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/project.json index 539b8c30..c9fc2ed2 100644 --- a/test/Microsoft.Framework.Configuration.EnvironmentVariables.Test/project.json +++ b/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/project.json @@ -1,7 +1,7 @@ -{ +{ "dependencies": { - "Microsoft.Framework.Configuration.EnvironmentVariables": "1.0.0-*", - "Microsoft.Framework.Configuration.Test.Common": "1.0.0-*", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*", + "Microsoft.Extensions.Configuration.Test.Common": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "frameworks": { diff --git a/test/Microsoft.Framework.Configuration.FileExtensions.Test/FileConfigurationBuilderExtensionsTest.cs b/test/Microsoft.Extensions.Configuration.FileExtensions.Test/FileConfigurationBuilderExtensionsTest.cs similarity index 97% rename from test/Microsoft.Framework.Configuration.FileExtensions.Test/FileConfigurationBuilderExtensionsTest.cs rename to test/Microsoft.Extensions.Configuration.FileExtensions.Test/FileConfigurationBuilderExtensionsTest.cs index e1b3ed1b..c348e2c7 100644 --- a/test/Microsoft.Framework.Configuration.FileExtensions.Test/FileConfigurationBuilderExtensionsTest.cs +++ b/test/Microsoft.Extensions.Configuration.FileExtensions.Test/FileConfigurationBuilderExtensionsTest.cs @@ -5,7 +5,7 @@ using System.IO; using Xunit; -namespace Microsoft.Framework.Configuration.Json +namespace Microsoft.Extensions.Configuration.Json { public class FileConfigurationBuilderExtensionsTest { diff --git a/test/Microsoft.Framework.Configuration.FileExtensions.Test/Microsoft.Framework.Configuration.FileExtensions.Test.xproj b/test/Microsoft.Extensions.Configuration.FileExtensions.Test/Microsoft.Extensions.Configuration.FileExtensions.Test.xproj similarity index 100% rename from test/Microsoft.Framework.Configuration.FileExtensions.Test/Microsoft.Framework.Configuration.FileExtensions.Test.xproj rename to test/Microsoft.Extensions.Configuration.FileExtensions.Test/Microsoft.Extensions.Configuration.FileExtensions.Test.xproj diff --git a/test/Microsoft.Framework.Configuration.FileExtensions.Test/project.json b/test/Microsoft.Extensions.Configuration.FileExtensions.Test/project.json similarity index 73% rename from test/Microsoft.Framework.Configuration.FileExtensions.Test/project.json rename to test/Microsoft.Extensions.Configuration.FileExtensions.Test/project.json index 42624a7a..a622cc57 100644 --- a/test/Microsoft.Framework.Configuration.FileExtensions.Test/project.json +++ b/test/Microsoft.Extensions.Configuration.FileExtensions.Test/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.Framework.Configuration.FileExtensions": "1.0.0-*", + "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "frameworks": { diff --git a/test/Microsoft.Framework.Configuration.FunctionalTests/ArrayTests.cs b/test/Microsoft.Extensions.Configuration.FunctionalTests/ArrayTests.cs similarity index 97% rename from test/Microsoft.Framework.Configuration.FunctionalTests/ArrayTests.cs rename to test/Microsoft.Extensions.Configuration.FunctionalTests/ArrayTests.cs index ae188ee6..a39894db 100644 --- a/test/Microsoft.Framework.Configuration.FunctionalTests/ArrayTests.cs +++ b/test/Microsoft.Extensions.Configuration.FunctionalTests/ArrayTests.cs @@ -4,10 +4,10 @@ using System; using System.IO; using System.Linq; -using Microsoft.Framework.Configuration.Ini; +using Microsoft.Extensions.Configuration.Ini; using Xunit; -namespace Microsoft.Framework.Configuration.FunctionalTests +namespace Microsoft.Extensions.Configuration.FunctionalTests { public class ArrayTests : IDisposable { diff --git a/test/Microsoft.Framework.Configuration.FunctionalTests/ConfigurationTests.cs b/test/Microsoft.Extensions.Configuration.FunctionalTests/ConfigurationTests.cs similarity index 99% rename from test/Microsoft.Framework.Configuration.FunctionalTests/ConfigurationTests.cs rename to test/Microsoft.Extensions.Configuration.FunctionalTests/ConfigurationTests.cs index 53c5a9e0..7df375ca 100644 --- a/test/Microsoft.Framework.Configuration.FunctionalTests/ConfigurationTests.cs +++ b/test/Microsoft.Extensions.Configuration.FunctionalTests/ConfigurationTests.cs @@ -6,7 +6,7 @@ using System.IO; using Xunit; -namespace Microsoft.Framework.Configuration.Test +namespace Microsoft.Extensions.Configuration.Test { public class ConfigurationTests : IDisposable { diff --git a/test/Microsoft.Framework.Configuration.FunctionalTests/Microsoft.Framework.Configuration.FunctionalTests.xproj b/test/Microsoft.Extensions.Configuration.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.xproj similarity index 100% rename from test/Microsoft.Framework.Configuration.FunctionalTests/Microsoft.Framework.Configuration.FunctionalTests.xproj rename to test/Microsoft.Extensions.Configuration.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.xproj diff --git a/test/Microsoft.Framework.Configuration.FunctionalTests/project.json b/test/Microsoft.Extensions.Configuration.FunctionalTests/project.json similarity index 53% rename from test/Microsoft.Framework.Configuration.FunctionalTests/project.json rename to test/Microsoft.Extensions.Configuration.FunctionalTests/project.json index 7f40f50d..65a86b91 100644 --- a/test/Microsoft.Framework.Configuration.FunctionalTests/project.json +++ b/test/Microsoft.Extensions.Configuration.FunctionalTests/project.json @@ -1,9 +1,9 @@ { "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-*", + "Microsoft.Extensions.Configuration.Ini": "1.0.0-*", + "Microsoft.Extensions.Configuration.Json": "1.0.0-*", + "Microsoft.Extensions.Configuration.Test.Common": "1.0.0-*", + "Microsoft.Extensions.Configuration.Xml": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "frameworks": { diff --git a/test/Microsoft.Framework.Configuration.Ini.Test/IniConfigurationExtensionsTest.cs b/test/Microsoft.Extensions.Configuration.Ini.Test/IniConfigurationExtensionsTest.cs similarity index 92% rename from test/Microsoft.Framework.Configuration.Ini.Test/IniConfigurationExtensionsTest.cs rename to test/Microsoft.Extensions.Configuration.Ini.Test/IniConfigurationExtensionsTest.cs index d41c9f36..ff9173bb 100644 --- a/test/Microsoft.Framework.Configuration.Ini.Test/IniConfigurationExtensionsTest.cs +++ b/test/Microsoft.Extensions.Configuration.Ini.Test/IniConfigurationExtensionsTest.cs @@ -1,11 +1,11 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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. using System; using System.IO; using Xunit; -namespace Microsoft.Framework.Configuration.Ini.Test +namespace Microsoft.Extensions.Configuration.Ini.Test { public class IniConfigurationExtensionsTest { diff --git a/test/Microsoft.Framework.Configuration.Ini.Test/IniConfigurationTest.cs b/test/Microsoft.Extensions.Configuration.Ini.Test/IniConfigurationTest.cs similarity index 98% rename from test/Microsoft.Framework.Configuration.Ini.Test/IniConfigurationTest.cs rename to test/Microsoft.Extensions.Configuration.Ini.Test/IniConfigurationTest.cs index dfbb16e9..7a80761a 100644 --- a/test/Microsoft.Framework.Configuration.Ini.Test/IniConfigurationTest.cs +++ b/test/Microsoft.Extensions.Configuration.Ini.Test/IniConfigurationTest.cs @@ -3,10 +3,10 @@ using System; using System.IO; -using Microsoft.Framework.Configuration.Test; +using Microsoft.Extensions.Configuration.Test; using Xunit; -namespace Microsoft.Framework.Configuration.Ini.Test +namespace Microsoft.Extensions.Configuration.Ini.Test { public class IniConfigurationTest { diff --git a/test/Microsoft.Framework.Configuration.Ini.Test/Microsoft.Framework.Configuration.Ini.Test.xproj b/test/Microsoft.Extensions.Configuration.Ini.Test/Microsoft.Extensions.Configuration.Ini.Test.xproj similarity index 90% rename from test/Microsoft.Framework.Configuration.Ini.Test/Microsoft.Framework.Configuration.Ini.Test.xproj rename to test/Microsoft.Extensions.Configuration.Ini.Test/Microsoft.Extensions.Configuration.Ini.Test.xproj index 6aaaa2e9..5e4f7910 100644 --- a/test/Microsoft.Framework.Configuration.Ini.Test/Microsoft.Framework.Configuration.Ini.Test.xproj +++ b/test/Microsoft.Extensions.Configuration.Ini.Test/Microsoft.Extensions.Configuration.Ini.Test.xproj @@ -1,4 +1,4 @@ - + 14.0 @@ -7,7 +7,7 @@ 80a8f10c-e9a6-4677-919d-fe5db320fedf - Microsoft.Framework.Configuration.Ini.Test + Microsoft.Extensions.Configuration.Ini.Test ..\..\artifacts\obj\$(MSBuildProjectName) ..\..\artifacts\bin\$(MSBuildProjectName)\ diff --git a/test/Microsoft.Framework.Configuration.Json.Test/project.json b/test/Microsoft.Extensions.Configuration.Ini.Test/project.json similarity index 60% rename from test/Microsoft.Framework.Configuration.Json.Test/project.json rename to test/Microsoft.Extensions.Configuration.Ini.Test/project.json index 9a6218b3..696227bc 100644 --- a/test/Microsoft.Framework.Configuration.Json.Test/project.json +++ b/test/Microsoft.Extensions.Configuration.Ini.Test/project.json @@ -1,7 +1,7 @@ { "dependencies": { - "Microsoft.Framework.Configuration.Json": "1.0.0-*", - "Microsoft.Framework.Configuration.Test.Common": "1.0.0-*", + "Microsoft.Extensions.Configuration.Ini": "1.0.0-*", + "Microsoft.Extensions.Configuration.Test.Common": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "frameworks": { diff --git a/test/Microsoft.Framework.Configuration.Json.Test/ArrayTest.cs b/test/Microsoft.Extensions.Configuration.Json.Test/ArrayTest.cs similarity index 98% rename from test/Microsoft.Framework.Configuration.Json.Test/ArrayTest.cs rename to test/Microsoft.Extensions.Configuration.Json.Test/ArrayTest.cs index 1a6623a8..bbf5f8ad 100644 --- a/test/Microsoft.Framework.Configuration.Json.Test/ArrayTest.cs +++ b/test/Microsoft.Extensions.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.Configuration.Test; +using Microsoft.Extensions.Configuration.Test; using Xunit; -namespace Microsoft.Framework.Configuration.Json.Test +namespace Microsoft.Extensions.Configuration.Json.Test { public class ArrayTest { diff --git a/test/Microsoft.Framework.Configuration.Json.Test/JsonConfigurationExtensionsTest.cs b/test/Microsoft.Extensions.Configuration.Json.Test/JsonConfigurationExtensionsTest.cs similarity index 96% rename from test/Microsoft.Framework.Configuration.Json.Test/JsonConfigurationExtensionsTest.cs rename to test/Microsoft.Extensions.Configuration.Json.Test/JsonConfigurationExtensionsTest.cs index 3dea118e..239483a7 100644 --- a/test/Microsoft.Framework.Configuration.Json.Test/JsonConfigurationExtensionsTest.cs +++ b/test/Microsoft.Extensions.Configuration.Json.Test/JsonConfigurationExtensionsTest.cs @@ -5,7 +5,7 @@ using System.IO; using Xunit; -namespace Microsoft.Framework.Configuration.Json +namespace Microsoft.Extensions.Configuration.Json { public class JsonConfigurationExtensionsTest { diff --git a/test/Microsoft.Framework.Configuration.Json.Test/JsonConfigurationTest.cs b/test/Microsoft.Extensions.Configuration.Json.Test/JsonConfigurationTest.cs similarity index 97% rename from test/Microsoft.Framework.Configuration.Json.Test/JsonConfigurationTest.cs rename to test/Microsoft.Extensions.Configuration.Json.Test/JsonConfigurationTest.cs index 0d4226a8..fb9e9f18 100644 --- a/test/Microsoft.Framework.Configuration.Json.Test/JsonConfigurationTest.cs +++ b/test/Microsoft.Extensions.Configuration.Json.Test/JsonConfigurationTest.cs @@ -3,12 +3,12 @@ using System; using System.IO; -using Microsoft.Framework.Configuration.Json; -using Microsoft.Framework.Configuration.Test; +using Microsoft.Extensions.Configuration.Json; +using Microsoft.Extensions.Configuration.Test; using Newtonsoft.Json; using Xunit; -namespace Microsoft.Framework.Configuration +namespace Microsoft.Extensions.Configuration { public class JsonConfigurationTest { diff --git a/test/Microsoft.Framework.Configuration.Json.Test/Microsoft.Framework.Configuration.Json.Test.xproj b/test/Microsoft.Extensions.Configuration.Json.Test/Microsoft.Extensions.Configuration.Json.Test.xproj similarity index 100% rename from test/Microsoft.Framework.Configuration.Json.Test/Microsoft.Framework.Configuration.Json.Test.xproj rename to test/Microsoft.Extensions.Configuration.Json.Test/Microsoft.Extensions.Configuration.Json.Test.xproj diff --git a/test/Microsoft.Framework.Configuration.Ini.Test/project.json b/test/Microsoft.Extensions.Configuration.Json.Test/project.json similarity index 60% rename from test/Microsoft.Framework.Configuration.Ini.Test/project.json rename to test/Microsoft.Extensions.Configuration.Json.Test/project.json index 4d9ad5b1..20e80358 100644 --- a/test/Microsoft.Framework.Configuration.Ini.Test/project.json +++ b/test/Microsoft.Extensions.Configuration.Json.Test/project.json @@ -1,7 +1,7 @@ -{ +{ "dependencies": { - "Microsoft.Framework.Configuration.Ini": "1.0.0-*", - "Microsoft.Framework.Configuration.Test.Common": "1.0.0-*", + "Microsoft.Extensions.Configuration.Json": "1.0.0-*", + "Microsoft.Extensions.Configuration.Test.Common": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "frameworks": { diff --git a/test/Microsoft.Framework.Configuration.Test.Common/ConfigurationProviderExtensions.cs b/test/Microsoft.Extensions.Configuration.Test.Common/ConfigurationProviderExtensions.cs similarity index 91% rename from test/Microsoft.Framework.Configuration.Test.Common/ConfigurationProviderExtensions.cs rename to test/Microsoft.Extensions.Configuration.Test.Common/ConfigurationProviderExtensions.cs index c5ab5d5e..b1298f6c 100644 --- a/test/Microsoft.Framework.Configuration.Test.Common/ConfigurationProviderExtensions.cs +++ b/test/Microsoft.Extensions.Configuration.Test.Common/ConfigurationProviderExtensions.cs @@ -3,7 +3,7 @@ using System; -namespace Microsoft.Framework.Configuration.Test +namespace Microsoft.Extensions.Configuration.Test { public static class ConfigurationProviderExtensions { diff --git a/test/Microsoft.Framework.Configuration.Test.Common/Microsoft.Framework.Configuration.Test.Common.xproj b/test/Microsoft.Extensions.Configuration.Test.Common/Microsoft.Extensions.Configuration.Test.Common.xproj similarity index 100% rename from test/Microsoft.Framework.Configuration.Test.Common/Microsoft.Framework.Configuration.Test.Common.xproj rename to test/Microsoft.Extensions.Configuration.Test.Common/Microsoft.Extensions.Configuration.Test.Common.xproj diff --git a/test/Microsoft.Framework.Configuration.Test.Common/TestStreamHelpers.cs b/test/Microsoft.Extensions.Configuration.Test.Common/TestStreamHelpers.cs similarity index 94% rename from test/Microsoft.Framework.Configuration.Test.Common/TestStreamHelpers.cs rename to test/Microsoft.Extensions.Configuration.Test.Common/TestStreamHelpers.cs index 620b468a..33574571 100644 --- a/test/Microsoft.Framework.Configuration.Test.Common/TestStreamHelpers.cs +++ b/test/Microsoft.Extensions.Configuration.Test.Common/TestStreamHelpers.cs @@ -3,7 +3,7 @@ using System.IO; -namespace Microsoft.Framework.Configuration.Test +namespace Microsoft.Extensions.Configuration.Test { public static class TestStreamHelpers { diff --git a/test/Microsoft.Framework.Configuration.Test.Common/project.json b/test/Microsoft.Extensions.Configuration.Test.Common/project.json similarity index 78% rename from test/Microsoft.Framework.Configuration.Test.Common/project.json rename to test/Microsoft.Extensions.Configuration.Test.Common/project.json index eb14f5fc..02548e17 100644 --- a/test/Microsoft.Framework.Configuration.Test.Common/project.json +++ b/test/Microsoft.Extensions.Configuration.Test.Common/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "Microsoft.Framework.Configuration": "1.0.0-*" + "Microsoft.Extensions.Configuration": "1.0.0-*" }, "frameworks": { "dnx451": { diff --git a/test/Microsoft.Framework.Configuration.Test/ConfigurationPathComparerTest.cs b/test/Microsoft.Extensions.Configuration.Test/ConfigurationPathComparerTest.cs similarity index 97% rename from test/Microsoft.Framework.Configuration.Test/ConfigurationPathComparerTest.cs rename to test/Microsoft.Extensions.Configuration.Test/ConfigurationPathComparerTest.cs index ef5b55aa..dfc215f1 100644 --- a/test/Microsoft.Framework.Configuration.Test/ConfigurationPathComparerTest.cs +++ b/test/Microsoft.Extensions.Configuration.Test/ConfigurationPathComparerTest.cs @@ -1,10 +1,10 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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. using System; using Xunit; -namespace Microsoft.Framework.Configuration.Test +namespace Microsoft.Extensions.Configuration.Test { public class ConfigurationPathComparerTest { diff --git a/test/Microsoft.Framework.Configuration.Test/ConfigurationTest.cs b/test/Microsoft.Extensions.Configuration.Test/ConfigurationTest.cs similarity index 99% rename from test/Microsoft.Framework.Configuration.Test/ConfigurationTest.cs rename to test/Microsoft.Extensions.Configuration.Test/ConfigurationTest.cs index 1255b688..f2bc606a 100644 --- a/test/Microsoft.Framework.Configuration.Test/ConfigurationTest.cs +++ b/test/Microsoft.Extensions.Configuration.Test/ConfigurationTest.cs @@ -4,10 +4,10 @@ using System; using System.Collections.Generic; using System.Linq; -using Microsoft.Framework.Configuration.Memory; +using Microsoft.Extensions.Configuration.Memory; using Xunit; -namespace Microsoft.Framework.Configuration.Test +namespace Microsoft.Extensions.Configuration.Test { public class ConfigurationTest { diff --git a/test/Microsoft.Framework.Configuration.Test/Microsoft.Framework.Configuration.Test.xproj b/test/Microsoft.Extensions.Configuration.Test/Microsoft.Extensions.Configuration.Test.xproj similarity index 100% rename from test/Microsoft.Framework.Configuration.Test/Microsoft.Framework.Configuration.Test.xproj rename to test/Microsoft.Extensions.Configuration.Test/Microsoft.Extensions.Configuration.Test.xproj diff --git a/test/Microsoft.Framework.Configuration.Test/project.json b/test/Microsoft.Extensions.Configuration.Test/project.json similarity index 67% rename from test/Microsoft.Framework.Configuration.Test/project.json rename to test/Microsoft.Extensions.Configuration.Test/project.json index 1b7ad354..af3ee72b 100644 --- a/test/Microsoft.Framework.Configuration.Test/project.json +++ b/test/Microsoft.Extensions.Configuration.Test/project.json @@ -3,9 +3,9 @@ "warningsAsErrors": true }, "dependencies": { - "Microsoft.Framework.Configuration": "1.0.0-*", - "Microsoft.Framework.Configuration.FileExtensions": "1.0.0-*", - "Microsoft.Framework.Configuration.Test.Common": "1.0.0-*", + "Microsoft.Extensions.Configuration": "1.0.0-*", + "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-*", + "Microsoft.Extensions.Configuration.Test.Common": "1.0.0-*", "xunit.runner.aspnet": "2.0.0-aspnet-*" }, "frameworks": { diff --git a/test/Microsoft.Framework.Configuration.Xml.Test/Microsoft.Framework.Configuration.Xml.Test.xproj b/test/Microsoft.Extensions.Configuration.Xml.Test/Microsoft.Extensions.Configuration.Xml.Test.xproj similarity index 100% rename from test/Microsoft.Framework.Configuration.Xml.Test/Microsoft.Framework.Configuration.Xml.Test.xproj rename to test/Microsoft.Extensions.Configuration.Xml.Test/Microsoft.Extensions.Configuration.Xml.Test.xproj diff --git a/test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationExtensionsTest.cs b/test/Microsoft.Extensions.Configuration.Xml.Test/XmlConfigurationExtensionsTest.cs similarity index 96% rename from test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationExtensionsTest.cs rename to test/Microsoft.Extensions.Configuration.Xml.Test/XmlConfigurationExtensionsTest.cs index fe0bbe7f..5e06176d 100644 --- a/test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationExtensionsTest.cs +++ b/test/Microsoft.Extensions.Configuration.Xml.Test/XmlConfigurationExtensionsTest.cs @@ -5,7 +5,7 @@ using System.IO; using Xunit; -namespace Microsoft.Framework.Configuration.Xml.Test +namespace Microsoft.Extensions.Configuration.Xml.Test { public class XmlConfigurationExtensionsTest { diff --git a/test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationTest.AspNet50.cs b/test/Microsoft.Extensions.Configuration.Xml.Test/XmlConfigurationTest.AspNet50.cs similarity index 96% rename from test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationTest.AspNet50.cs rename to test/Microsoft.Extensions.Configuration.Xml.Test/XmlConfigurationTest.AspNet50.cs index 18d0f794..d48f7b10 100644 --- a/test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationTest.AspNet50.cs +++ b/test/Microsoft.Extensions.Configuration.Xml.Test/XmlConfigurationTest.AspNet50.cs @@ -9,10 +9,10 @@ using System.Security.Cryptography.Xml; using System.Xml; using Microsoft.AspNet.Testing.xunit; -using Microsoft.Framework.Configuration.Test; +using Microsoft.Extensions.Configuration.Test; using Xunit; -namespace Microsoft.Framework.Configuration.Xml.Test +namespace Microsoft.Extensions.Configuration.Xml.Test { public partial class XmlConfigurationTest { diff --git a/test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationTest.AspNetCore50.cs b/test/Microsoft.Extensions.Configuration.Xml.Test/XmlConfigurationTest.AspNetCore50.cs similarity index 96% rename from test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationTest.AspNetCore50.cs rename to test/Microsoft.Extensions.Configuration.Xml.Test/XmlConfigurationTest.AspNetCore50.cs index 02c11903..321814c8 100644 --- a/test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationTest.AspNetCore50.cs +++ b/test/Microsoft.Extensions.Configuration.Xml.Test/XmlConfigurationTest.AspNetCore50.cs @@ -5,10 +5,10 @@ // These tests only run on Core CLR. using System; -using Microsoft.Framework.Configuration.Test; +using Microsoft.Extensions.Configuration.Test; using Xunit; -namespace Microsoft.Framework.Configuration.Xml.Test +namespace Microsoft.Extensions.Configuration.Xml.Test { public partial class XmlConfigurationTest { diff --git a/test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationTest.cs b/test/Microsoft.Extensions.Configuration.Xml.Test/XmlConfigurationTest.cs similarity index 99% rename from test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationTest.cs rename to test/Microsoft.Extensions.Configuration.Xml.Test/XmlConfigurationTest.cs index d09159af..c50b9d3c 100644 --- a/test/Microsoft.Framework.Configuration.Xml.Test/XmlConfigurationTest.cs +++ b/test/Microsoft.Extensions.Configuration.Xml.Test/XmlConfigurationTest.cs @@ -4,10 +4,10 @@ using System; using System.IO; using Microsoft.AspNet.Testing; -using Microsoft.Framework.Configuration.Test; +using Microsoft.Extensions.Configuration.Test; using Xunit; -namespace Microsoft.Framework.Configuration.Xml.Test +namespace Microsoft.Extensions.Configuration.Xml.Test { public partial class XmlConfigurationTest { diff --git a/test/Microsoft.Framework.Configuration.Xml.Test/project.json b/test/Microsoft.Extensions.Configuration.Xml.Test/project.json similarity index 65% rename from test/Microsoft.Framework.Configuration.Xml.Test/project.json rename to test/Microsoft.Extensions.Configuration.Xml.Test/project.json index aad37491..d2cec3ba 100644 --- a/test/Microsoft.Framework.Configuration.Xml.Test/project.json +++ b/test/Microsoft.Extensions.Configuration.Xml.Test/project.json @@ -1,7 +1,7 @@ { "dependencies": { - "Microsoft.Framework.Configuration.Xml": "1.0.0-*", - "Microsoft.Framework.Configuration.Test.Common": "1.0.0-*", + "Microsoft.Extensions.Configuration.Xml": "1.0.0-*", + "Microsoft.Extensions.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.Configuration.CommandLine.Test/project.json b/test/Microsoft.Framework.Configuration.CommandLine.Test/project.json deleted file mode 100644 index a333b8fc..00000000 --- a/test/Microsoft.Framework.Configuration.CommandLine.Test/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "dependencies": { - "Microsoft.Framework.Configuration.CommandLine": "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" - } -}