From 8bbf4637411a2e62d31f7ba16f5ee895b7d5e897 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 4 Jan 2017 14:34:47 -0800 Subject: [PATCH 1/3] Upgrade to VS 2017 --- Configuration.sln | 52 ++++++++-------- build.ps1 | 2 +- build.sh | 2 +- {tools => build}/Key.snk | Bin build/common.props | 20 ++++++ global.json | 8 --- makefile.shade | 7 --- samples/KeyVaultSample/KeyVaultSample.csproj | 51 +++++++++++++++ samples/KeyVaultSample/KeyVaultSample.xproj | 19 ------ samples/KeyVaultSample/project.json | 15 ----- ...tensions.Configuration.Abstractions.csproj | 28 +++++++++ ...xtensions.Configuration.Abstractions.xproj | 17 ----- .../Properties/AssemblyInfo.cs | 11 ---- .../project.json | 25 -------- ...ensions.Configuration.AzureKeyVault.csproj | 42 +++++++++++++ ...tensions.Configuration.AzureKeyVault.xproj | 18 ------ .../Properties/AssemblyInfo.cs | 8 +-- .../project.json | 44 ------------- ...oft.Extensions.Configuration.Binder.csproj | 32 ++++++++++ ...soft.Extensions.Configuration.Binder.xproj | 17 ----- .../Properties/AssemblyInfo.cs | 8 +-- .../project.json | 31 ---------- ...xtensions.Configuration.CommandLine.csproj | 28 +++++++++ ...Extensions.Configuration.CommandLine.xproj | 17 ----- .../Properties/AssemblyInfo.cs | 8 +-- .../project.json | 28 --------- ....Configuration.EnvironmentVariables.csproj | 34 ++++++++++ ...s.Configuration.EnvironmentVariables.xproj | 17 ----- .../Properties/AssemblyInfo.cs | 8 +-- .../project.json | 36 ----------- ...nsions.Configuration.FileExtensions.csproj | 39 ++++++++++++ ...ensions.Configuration.FileExtensions.xproj | 17 ----- .../Properties/AssemblyInfo.cs | 8 +-- .../project.json | 39 ------------ ...rosoft.Extensions.Configuration.Ini.csproj | 38 ++++++++++++ ...crosoft.Extensions.Configuration.Ini.xproj | 17 ----- .../Properties/AssemblyInfo.cs | 8 +-- .../project.json | 38 ------------ ...osoft.Extensions.Configuration.Json.csproj | 44 +++++++++++++ ...rosoft.Extensions.Configuration.Json.xproj | 17 ----- .../Properties/AssemblyInfo.cs | 8 +-- .../project.json | 44 ------------- ...xtensions.Configuration.UserSecrets.csproj | 47 ++++++++++++++ ...Extensions.Configuration.UserSecrets.xproj | 17 ----- .../Properties/AssemblyInfo.cs | 8 +-- .../project.json | 36 ----------- ...rosoft.Extensions.Configuration.Xml.csproj | 45 ++++++++++++++ ...crosoft.Extensions.Configuration.Xml.xproj | 17 ----- .../Properties/AssemblyInfo.cs | 8 +-- .../project.json | 49 --------------- .../Microsoft.Extensions.Configuration.csproj | 25 ++++++++ .../Microsoft.Extensions.Configuration.xproj | 17 ----- .../Properties/AssemblyInfo.cs | 8 +-- .../project.json | 27 -------- ...ns.Configuration.AzureKeyVault.Test.csproj | 50 +++++++++++++++ ...ons.Configuration.AzureKeyVault.Test.xproj | 21 ------- .../project.json | 20 ------ ...xtensions.Configuration.Binder.Test.csproj | 40 ++++++++++++ ...Extensions.Configuration.Binder.Test.xproj | 20 ------ .../project.json | 26 -------- ...ions.Configuration.CommandLine.Test.csproj | 40 ++++++++++++ ...sions.Configuration.CommandLine.Test.xproj | 20 ------ .../project.json | 26 -------- ...iguration.EnvironmentVariables.Test.csproj | 44 +++++++++++++ ...figuration.EnvironmentVariables.Test.xproj | 20 ------ .../project.json | 27 -------- ...s.Configuration.FileExtensions.Test.csproj | 42 +++++++++++++ ...ns.Configuration.FileExtensions.Test.xproj | 20 ------ .../project.json | 23 ------- ...sions.Configuration.FunctionalTests.csproj | 58 ++++++++++++++++++ ...nsions.Configuration.FunctionalTests.xproj | 20 ------ .../project.json | 25 -------- ...t.Extensions.Configuration.Ini.Test.csproj | 49 +++++++++++++++ ...ft.Extensions.Configuration.Ini.Test.xproj | 20 ------ .../project.json | 26 -------- ....Extensions.Configuration.Json.Test.csproj | 49 +++++++++++++++ ...t.Extensions.Configuration.Json.Test.xproj | 20 ------ .../project.json | 26 -------- .../.notest | 0 ...xtensions.Configuration.Test.Common.csproj | 31 ++++++++++ ...Extensions.Configuration.Test.Common.xproj | 17 ----- .../project.json | 15 ----- ...osoft.Extensions.Configuration.Test.csproj | 43 +++++++++++++ ...rosoft.Extensions.Configuration.Test.xproj | 20 ------ .../project.json | 26 -------- ...ions.Configuration.UserSecrets.Test.csproj | 49 +++++++++++++++ ...sions.Configuration.UserSecrets.Test.xproj | 21 ------- .../MsBuildTargetTest.cs | 57 ++++++++--------- .../project.json | 22 ------- ...t.Extensions.Configuration.Xml.Test.csproj | 56 +++++++++++++++++ ...ft.Extensions.Configuration.Xml.Test.xproj | 20 ------ .../project.json | 36 ----------- version.props | 7 +++ 93 files changed, 1094 insertions(+), 1312 deletions(-) rename {tools => build}/Key.snk (100%) create mode 100644 build/common.props delete mode 100644 global.json delete mode 100644 makefile.shade create mode 100644 samples/KeyVaultSample/KeyVaultSample.csproj delete mode 100644 samples/KeyVaultSample/KeyVaultSample.xproj delete mode 100644 samples/KeyVaultSample/project.json create mode 100644 src/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.csproj delete mode 100644 src/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.xproj delete mode 100644 src/Microsoft.Extensions.Configuration.Abstractions/Properties/AssemblyInfo.cs delete mode 100644 src/Microsoft.Extensions.Configuration.Abstractions/project.json create mode 100644 src/Microsoft.Extensions.Configuration.AzureKeyVault/Microsoft.Extensions.Configuration.AzureKeyVault.csproj delete mode 100644 src/Microsoft.Extensions.Configuration.AzureKeyVault/Microsoft.Extensions.Configuration.AzureKeyVault.xproj delete mode 100644 src/Microsoft.Extensions.Configuration.AzureKeyVault/project.json create mode 100644 src/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.csproj delete mode 100644 src/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.xproj delete mode 100644 src/Microsoft.Extensions.Configuration.Binder/project.json create mode 100644 src/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.csproj delete mode 100644 src/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.xproj delete mode 100644 src/Microsoft.Extensions.Configuration.CommandLine/project.json create mode 100644 src/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj delete mode 100644 src/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.xproj delete mode 100644 src/Microsoft.Extensions.Configuration.EnvironmentVariables/project.json create mode 100644 src/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.csproj delete mode 100644 src/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.xproj delete mode 100644 src/Microsoft.Extensions.Configuration.FileExtensions/project.json create mode 100644 src/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.csproj delete mode 100644 src/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.xproj delete mode 100644 src/Microsoft.Extensions.Configuration.Ini/project.json create mode 100644 src/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.csproj delete mode 100644 src/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.xproj delete mode 100644 src/Microsoft.Extensions.Configuration.Json/project.json create mode 100644 src/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.csproj delete mode 100644 src/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.xproj delete mode 100644 src/Microsoft.Extensions.Configuration.UserSecrets/project.json create mode 100644 src/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.csproj delete mode 100644 src/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.xproj delete mode 100644 src/Microsoft.Extensions.Configuration.Xml/project.json create mode 100644 src/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.csproj delete mode 100644 src/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.xproj delete mode 100644 src/Microsoft.Extensions.Configuration/project.json create mode 100644 test/Microsoft.Extensions.Configuration.AzureKeyVault.Test/Microsoft.Extensions.Configuration.AzureKeyVault.Test.csproj delete mode 100644 test/Microsoft.Extensions.Configuration.AzureKeyVault.Test/Microsoft.Extensions.Configuration.AzureKeyVault.Test.xproj delete mode 100644 test/Microsoft.Extensions.Configuration.AzureKeyVault.Test/project.json create mode 100644 test/Microsoft.Extensions.Configuration.Binder.Test/Microsoft.Extensions.Configuration.Binder.Test.csproj delete mode 100644 test/Microsoft.Extensions.Configuration.Binder.Test/Microsoft.Extensions.Configuration.Binder.Test.xproj delete mode 100644 test/Microsoft.Extensions.Configuration.Binder.Test/project.json create mode 100644 test/Microsoft.Extensions.Configuration.CommandLine.Test/Microsoft.Extensions.Configuration.CommandLine.Test.csproj delete mode 100644 test/Microsoft.Extensions.Configuration.CommandLine.Test/Microsoft.Extensions.Configuration.CommandLine.Test.xproj delete mode 100644 test/Microsoft.Extensions.Configuration.CommandLine.Test/project.json create mode 100644 test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test.csproj delete mode 100644 test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test.xproj delete mode 100644 test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/project.json create mode 100644 test/Microsoft.Extensions.Configuration.FileExtensions.Test/Microsoft.Extensions.Configuration.FileExtensions.Test.csproj delete mode 100644 test/Microsoft.Extensions.Configuration.FileExtensions.Test/Microsoft.Extensions.Configuration.FileExtensions.Test.xproj delete mode 100644 test/Microsoft.Extensions.Configuration.FileExtensions.Test/project.json create mode 100644 test/Microsoft.Extensions.Configuration.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.csproj delete mode 100644 test/Microsoft.Extensions.Configuration.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.xproj delete mode 100644 test/Microsoft.Extensions.Configuration.FunctionalTests/project.json create mode 100644 test/Microsoft.Extensions.Configuration.Ini.Test/Microsoft.Extensions.Configuration.Ini.Test.csproj delete mode 100644 test/Microsoft.Extensions.Configuration.Ini.Test/Microsoft.Extensions.Configuration.Ini.Test.xproj delete mode 100644 test/Microsoft.Extensions.Configuration.Ini.Test/project.json create mode 100644 test/Microsoft.Extensions.Configuration.Json.Test/Microsoft.Extensions.Configuration.Json.Test.csproj delete mode 100644 test/Microsoft.Extensions.Configuration.Json.Test/Microsoft.Extensions.Configuration.Json.Test.xproj delete mode 100644 test/Microsoft.Extensions.Configuration.Json.Test/project.json create mode 100644 test/Microsoft.Extensions.Configuration.Test.Common/.notest create mode 100644 test/Microsoft.Extensions.Configuration.Test.Common/Microsoft.Extensions.Configuration.Test.Common.csproj delete mode 100644 test/Microsoft.Extensions.Configuration.Test.Common/Microsoft.Extensions.Configuration.Test.Common.xproj delete mode 100644 test/Microsoft.Extensions.Configuration.Test.Common/project.json create mode 100644 test/Microsoft.Extensions.Configuration.Test/Microsoft.Extensions.Configuration.Test.csproj delete mode 100644 test/Microsoft.Extensions.Configuration.Test/Microsoft.Extensions.Configuration.Test.xproj delete mode 100644 test/Microsoft.Extensions.Configuration.Test/project.json create mode 100644 test/Microsoft.Extensions.Configuration.UserSecrets.Test/Microsoft.Extensions.Configuration.UserSecrets.Test.csproj delete mode 100644 test/Microsoft.Extensions.Configuration.UserSecrets.Test/Microsoft.Extensions.Configuration.UserSecrets.Test.xproj delete mode 100644 test/Microsoft.Extensions.Configuration.UserSecrets.Test/project.json create mode 100644 test/Microsoft.Extensions.Configuration.Xml.Test/Microsoft.Extensions.Configuration.Xml.Test.csproj delete mode 100644 test/Microsoft.Extensions.Configuration.Xml.Test/Microsoft.Extensions.Configuration.Xml.Test.xproj delete mode 100644 test/Microsoft.Extensions.Configuration.Xml.Test/project.json create mode 100644 version.props diff --git a/Configuration.sln b/Configuration.sln index 13a470b0..880f4115 100644 --- a/Configuration.sln +++ b/Configuration.sln @@ -1,60 +1,60 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26014.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{F141E2D0-F9B8-4ADB-A19A-7B6FF4CA19A1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{B54371FF-B920-46C8-8D55-6B19DBB43EBF}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Json", "src\Microsoft.Extensions.Configuration.Json\Microsoft.Extensions.Configuration.Json.csproj", "{4C4CD1BC-4411-4AFD-9D04-147053F0E259}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Xml", "src\Microsoft.Extensions.Configuration.Xml\Microsoft.Extensions.Configuration.Xml.csproj", "{1BEC97C1-56B9-4B2B-A95A-C0DF72F1E96A}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Json.Test", "test\Microsoft.Extensions.Configuration.Json.Test\Microsoft.Extensions.Configuration.Json.Test.csproj", "{AE8F8C20-9ED9-4A16-9565-27DF77683789}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Xml.Test", "test\Microsoft.Extensions.Configuration.Xml.Test\Microsoft.Extensions.Configuration.Xml.Test.csproj", "{0786C785-944A-4423-96A6-4E7BFDB4A1B0}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Test", "test\Microsoft.Extensions.Configuration.Test\Microsoft.Extensions.Configuration.Test.csproj", "{8777C77E-CA2A-42C1-90CD-2EA9CBF28937}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration", "src\Microsoft.Extensions.Configuration\Microsoft.Extensions.Configuration.xproj", "{62BD48B5-BB0C-4C2C-9C4B-04CF75CDCCF1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration", "src\Microsoft.Extensions.Configuration\Microsoft.Extensions.Configuration.csproj", "{62BD48B5-BB0C-4C2C-9C4B-04CF75CDCCF1}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.FunctionalTests", "test\Microsoft.Extensions.Configuration.FunctionalTests\Microsoft.Extensions.Configuration.FunctionalTests.csproj", "{EAC77F15-F12E-496B-9184-1B1DA89BFFE9}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Abstractions", "src\Microsoft.Extensions.Configuration.Abstractions\Microsoft.Extensions.Configuration.Abstractions.csproj", "{3F1CB08E-9FBD-4CAE-A78A-4AC43F24FC49}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Test.Common", "test\Microsoft.Extensions.Configuration.Test.Common\Microsoft.Extensions.Configuration.Test.Common.csproj", "{29C120E5-F682-4BFB-826B-040A594802CA}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.CommandLine", "src\Microsoft.Extensions.Configuration.CommandLine\Microsoft.Extensions.Configuration.CommandLine.csproj", "{D4B7CF9B-4229-44DC-800F-CC39150CEAB2}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Ini", "src\Microsoft.Extensions.Configuration.Ini\Microsoft.Extensions.Configuration.Ini.csproj", "{C555C5D5-BF4A-451E-AB43-EBF4DE885EC7}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.EnvironmentVariables", "src\Microsoft.Extensions.Configuration.EnvironmentVariables\Microsoft.Extensions.Configuration.EnvironmentVariables.csproj", "{A6A2C665-E5A4-4FD3-AD0C-E33E6CFFCB88}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.CommandLine.Test", "test\Microsoft.Extensions.Configuration.CommandLine.Test\Microsoft.Extensions.Configuration.CommandLine.Test.csproj", "{CE9C8903-AA8A-40E6-B03D-32A08A4A39AF}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Ini.Test", "test\Microsoft.Extensions.Configuration.Ini.Test\Microsoft.Extensions.Configuration.Ini.Test.csproj", "{80A8F10C-E9A6-4677-919D-FE5DB320FEDF}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.EnvironmentVariables.Test", "test\Microsoft.Extensions.Configuration.EnvironmentVariables.Test\Microsoft.Extensions.Configuration.EnvironmentVariables.Test.csproj", "{7D0F805B-ADFF-4C47-A90C-24DD74416821}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Binder", "src\Microsoft.Extensions.Configuration.Binder\Microsoft.Extensions.Configuration.Binder.csproj", "{D506FD2F-59A0-4A26-AA6D-E81998B58B34}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Binder.Test", "test\Microsoft.Extensions.Configuration.Binder.Test\Microsoft.Extensions.Configuration.Binder.Test.csproj", "{AE6FFE9B-6378-4D57-AA24-7D257F18B235}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.FileExtensions", "src\Microsoft.Extensions.Configuration.FileExtensions\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{881E7CBC-492C-47C5-98A6-61DD1C753EE6}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.FileExtensions.Test", "test\Microsoft.Extensions.Configuration.FileExtensions.Test\Microsoft.Extensions.Configuration.FileExtensions.Test.csproj", "{F7932F19-EB68-4C52-9CD1-3B51E48C2337}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.AzureKeyVault", "src\Microsoft.Extensions.Configuration.AzureKeyVault\Microsoft.Extensions.Configuration.AzureKeyVault.xproj", "{A538F609-E902-40CE-8459-4248F9F63558}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.AzureKeyVault", "src\Microsoft.Extensions.Configuration.AzureKeyVault\Microsoft.Extensions.Configuration.AzureKeyVault.csproj", "{A538F609-E902-40CE-8459-4248F9F63558}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.AzureKeyVault.Test", "test\Microsoft.Extensions.Configuration.AzureKeyVault.Test\Microsoft.Extensions.Configuration.AzureKeyVault.Test.xproj", "{DA9C1F35-3F92-4F3A-B3B1-A62CCE626D48}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.AzureKeyVault.Test", "test\Microsoft.Extensions.Configuration.AzureKeyVault.Test\Microsoft.Extensions.Configuration.AzureKeyVault.Test.csproj", "{DA9C1F35-3F92-4F3A-B3B1-A62CCE626D48}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{AB015580-541D-4E2D-B904-E71F8582CC68}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "KeyVaultSample", "samples\KeyVaultSample\KeyVaultSample.xproj", "{7AAC49A7-939A-40B1-A86A-705464B4667D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "KeyVaultSample", "samples\KeyVaultSample\KeyVaultSample.csproj", "{7AAC49A7-939A-40B1-A86A-705464B4667D}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.UserSecrets", "src\Microsoft.Extensions.Configuration.UserSecrets\Microsoft.Extensions.Configuration.UserSecrets.xproj", "{58B6443B-1278-4DF9-B7BB-DDF3BFFCF868}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.UserSecrets", "src\Microsoft.Extensions.Configuration.UserSecrets\Microsoft.Extensions.Configuration.UserSecrets.csproj", "{58B6443B-1278-4DF9-B7BB-DDF3BFFCF868}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Configuration.UserSecrets.Test", "test\Microsoft.Extensions.Configuration.UserSecrets.Test\Microsoft.Extensions.Configuration.UserSecrets.Test.xproj", "{AC7FAD2A-5763-404D-B0FC-3CCA81A16B0A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.UserSecrets.Test", "test\Microsoft.Extensions.Configuration.UserSecrets.Test\Microsoft.Extensions.Configuration.UserSecrets.Test.csproj", "{AC7FAD2A-5763-404D-B0FC-3CCA81A16B0A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/build.ps1 b/build.ps1 index 8f2f9969..0605b59c 100644 --- a/build.ps1 +++ b/build.ps1 @@ -33,7 +33,7 @@ cd $PSScriptRoot $repoFolder = $PSScriptRoot $env:REPO_FOLDER = $repoFolder -$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" +$koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip" if ($env:KOREBUILD_ZIP) { $koreBuildZip=$env:KOREBUILD_ZIP diff --git a/build.sh b/build.sh index 4fd7ede7..07997d6c 100755 --- a/build.sh +++ b/build.sh @@ -2,7 +2,7 @@ repoFolder="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cd $repoFolder -koreBuildZip="https://github.com/aspnet/KoreBuild/archive/dev.zip" +koreBuildZip="https://github.com/aspnet/KoreBuild/archive/feature/msbuild.zip" if [ ! -z $KOREBUILD_ZIP ]; then koreBuildZip=$KOREBUILD_ZIP fi diff --git a/tools/Key.snk b/build/Key.snk similarity index 100% rename from tools/Key.snk rename to build/Key.snk diff --git a/build/common.props b/build/common.props new file mode 100644 index 00000000..6fb16edd --- /dev/null +++ b/build/common.props @@ -0,0 +1,20 @@ + + + + + + https://github.com/aspnet/Configuration + git + $(MSBuildThisFileDirectory)Key.snk + true + true + Microsoft .NET Extensions + + + + + + \ No newline at end of file diff --git a/global.json b/global.json deleted file mode 100644 index 0ad1995d..00000000 --- a/global.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "projects": [ - "src" - ], - "sdk": { - "version": "1.0.0-preview2-1-003180" - } -} \ No newline at end of file diff --git a/makefile.shade b/makefile.shade deleted file mode 100644 index 562494d1..00000000 --- a/makefile.shade +++ /dev/null @@ -1,7 +0,0 @@ - -var VERSION='0.1' -var FULL_VERSION='0.1' -var AUTHORS='Microsoft Open Technologies, Inc.' - -use-standard-lifecycle -k-standard-goals diff --git a/samples/KeyVaultSample/KeyVaultSample.csproj b/samples/KeyVaultSample/KeyVaultSample.csproj new file mode 100644 index 00000000..4146c099 --- /dev/null +++ b/samples/KeyVaultSample/KeyVaultSample.csproj @@ -0,0 +1,51 @@ + + + + net451 + portable + Exe + + win7-x64 + + + + + + + PreserveNewest + + + + + + + + true + + + true + + + true + + + + + + true + + + true + + + true + + + + + + + + + + diff --git a/samples/KeyVaultSample/KeyVaultSample.xproj b/samples/KeyVaultSample/KeyVaultSample.xproj deleted file mode 100644 index 274302b9..00000000 --- a/samples/KeyVaultSample/KeyVaultSample.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 7aac49a7-939a-40b1-a86a-705464b4667d - KeyVaultSample - .\obj - .\bin\ - - - - 2.0 - - - \ No newline at end of file diff --git a/samples/KeyVaultSample/project.json b/samples/KeyVaultSample/project.json deleted file mode 100644 index 1a552051..00000000 --- a/samples/KeyVaultSample/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "buildOptions": { - "debugType": "portable", - "emitEntryPoint": true, - "copyToOutput": "settings.json" - }, - "dependencies": { - "Microsoft.Extensions.Configuration.AzureKeyVault": "1.1.0-*", - "Microsoft.Extensions.Configuration.Json": "1.2.0-*", - "NETStandard.Library": "1.6.2-*" - }, - "frameworks": { - "net451": {} - } -} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.csproj b/src/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.csproj new file mode 100644 index 00000000..3ca17556 --- /dev/null +++ b/src/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.csproj @@ -0,0 +1,28 @@ + + + + + + Abstractions of key-value pair based configuration. +Commonly used types: +Microsoft.Extensions.Configuration.IConfiguration +Microsoft.Extensions.Configuration.IConfigurationBuilder +Microsoft.Extensions.Configuration.IConfigurationProvider +Microsoft.Extensions.Configuration.IConfigurationRoot +Microsoft.Extensions.Configuration.IConfigurationSection + netstandard1.0 + true + configuration + + + + + + + + + + + + + diff --git a/src/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.xproj b/src/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.xproj deleted file mode 100644 index 889a936f..00000000 --- a/src/Microsoft.Extensions.Configuration.Abstractions/Microsoft.Extensions.Configuration.Abstractions.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 3f1cb08e-9fbd-4cae-a78a-4ac43f24fc49 - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.Abstractions/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration.Abstractions/Properties/AssemblyInfo.cs deleted file mode 100644 index 6719e357..00000000 --- a/src/Microsoft.Extensions.Configuration.Abstractions/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,11 +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; - -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-US")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft .NET Extensions")] diff --git a/src/Microsoft.Extensions.Configuration.Abstractions/project.json b/src/Microsoft.Extensions.Configuration.Abstractions/project.json deleted file mode 100644 index e82c0b95..00000000 --- a/src/Microsoft.Extensions.Configuration.Abstractions/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "version": "1.2.0-*", - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "xmlDoc": true - }, - "description": "Abstractions of key-value pair based configuration.\r\nCommonly used types:\r\nMicrosoft.Extensions.Configuration.IConfiguration\r\nMicrosoft.Extensions.Configuration.IConfigurationBuilder\r\nMicrosoft.Extensions.Configuration.IConfigurationProvider\r\nMicrosoft.Extensions.Configuration.IConfigurationRoot\r\nMicrosoft.Extensions.Configuration.IConfigurationSection", - "packOptions": { - "repository": { - "type": "git", - "url": "https://github.com/aspnet/configuration" - }, - "tags": [ - "configuration" - ] - }, - "dependencies": { - "Microsoft.Extensions.Primitives": "1.2.0-*", - "NETStandard.Library": "1.6.2-*" - }, - "frameworks": { - "netstandard1.0": {} - } -} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.AzureKeyVault/Microsoft.Extensions.Configuration.AzureKeyVault.csproj b/src/Microsoft.Extensions.Configuration.AzureKeyVault/Microsoft.Extensions.Configuration.AzureKeyVault.csproj new file mode 100644 index 00000000..7627db77 --- /dev/null +++ b/src/Microsoft.Extensions.Configuration.AzureKeyVault/Microsoft.Extensions.Configuration.AzureKeyVault.csproj @@ -0,0 +1,42 @@ + + + + + + Azure KeyVault configuration provider implementation for Microsoft.Extensions.Configuration. + 1.1.0 + netstandard1.5;net451 + true + configuration;azure;keyvault + + + + + + + + + + + + true + + + + + + true + + + + + + + + + + + + + + diff --git a/src/Microsoft.Extensions.Configuration.AzureKeyVault/Microsoft.Extensions.Configuration.AzureKeyVault.xproj b/src/Microsoft.Extensions.Configuration.AzureKeyVault/Microsoft.Extensions.Configuration.AzureKeyVault.xproj deleted file mode 100644 index 5790be3d..00000000 --- a/src/Microsoft.Extensions.Configuration.AzureKeyVault/Microsoft.Extensions.Configuration.AzureKeyVault.xproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - a538f609-e902-40ce-8459-4248f9f63558 - Microsoft.Extensions.Configuration.AzureKeyVault - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.AzureKeyVault/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration.AzureKeyVault/Properties/AssemblyInfo.cs index 6d22637e..7cb475e0 100644 --- a/src/Microsoft.Extensions.Configuration.AzureKeyVault/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Extensions.Configuration.AzureKeyVault/Properties/AssemblyInfo.cs @@ -1,14 +1,8 @@ // 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.AzureKeyVault.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-US")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft .NET Extensions")] + diff --git a/src/Microsoft.Extensions.Configuration.AzureKeyVault/project.json b/src/Microsoft.Extensions.Configuration.AzureKeyVault/project.json deleted file mode 100644 index b6113274..00000000 --- a/src/Microsoft.Extensions.Configuration.AzureKeyVault/project.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "version": "1.1.0-*", - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "xmlDoc": true - }, - "description": "Azure KeyVault configuration provider implementation for Microsoft.Extensions.Configuration.", - "packOptions": { - "repository": { - "type": "git", - "url": "https://github.com/aspnet/configuration" - }, - "tags": [ - "configuration", - "azure", - "keyvault" - ] - }, - "dependencies": { - "Microsoft.IdentityModel.Clients.ActiveDirectory": "3.13.5", - "Microsoft.Azure.KeyVault": "2.0.6", - "Microsoft.Extensions.Configuration": { - "target": "project" - }, - "Microsoft.Extensions.Configuration.FileExtensions": { - "target": "project" - }, - "NETStandard.Library": "1.6.2-*" - }, - "frameworks": { - "netstandard1.5": {}, - "net451": { - "frameworkAssemblies": { - "System.Threading.Tasks": { - "type": "build" - }, - "System.Runtime": { - "type": "build" - } - } - } - } -} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.csproj b/src/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.csproj new file mode 100644 index 00000000..a63350f0 --- /dev/null +++ b/src/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.csproj @@ -0,0 +1,32 @@ + + + + + + Functionality to bind an object to data in configuration providers for Microsoft.Extensions.Configuration. + netstandard1.1 + true + configuration + + + + + + + + + + + true + + + + + + + + + + + + diff --git a/src/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.xproj b/src/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.xproj deleted file mode 100644 index 32c9ab00..00000000 --- a/src/Microsoft.Extensions.Configuration.Binder/Microsoft.Extensions.Configuration.Binder.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - d506fd2f-59a0-4a26-aa6d-e81998b58b34 - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.Binder/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration.Binder/Properties/AssemblyInfo.cs index b283c269..7efaf72c 100644 --- a/src/Microsoft.Extensions.Configuration.Binder/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Extensions.Configuration.Binder/Properties/AssemblyInfo.cs @@ -1,13 +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. -using System.Reflection; -using System.Resources; using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Binder.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-US")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft .NET Extensions")] + diff --git a/src/Microsoft.Extensions.Configuration.Binder/project.json b/src/Microsoft.Extensions.Configuration.Binder/project.json deleted file mode 100644 index e2804f69..00000000 --- a/src/Microsoft.Extensions.Configuration.Binder/project.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "version": "1.2.0-*", - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "xmlDoc": true - }, - "description": "Functionality to bind an object to data in configuration providers for Microsoft.Extensions.Configuration.", - "packOptions": { - "repository": { - "type": "git", - "url": "https://github.com/aspnet/configuration" - }, - "tags": [ - "configuration" - ] - }, - "dependencies": { - "Microsoft.Extensions.Configuration": { - "target": "project" - }, - "NETStandard.Library": "1.6.2-*" - }, - "frameworks": { - "netstandard1.1": { - "dependencies": { - "System.ComponentModel.TypeConverter": "4.4.0-*" - } - } - } -} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.csproj b/src/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.csproj new file mode 100644 index 00000000..41ccfd46 --- /dev/null +++ b/src/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.csproj @@ -0,0 +1,28 @@ + + + + + + Command line configuration provider implementation for Microsoft.Extensions.Configuration. + netstandard1.1 + true + configuration;commandline + + + + + + + + + + + true + + + + + + + + diff --git a/src/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.xproj b/src/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.xproj deleted file mode 100644 index 12528f13..00000000 --- a/src/Microsoft.Extensions.Configuration.CommandLine/Microsoft.Extensions.Configuration.CommandLine.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - d4b7cf9b-4229-44dc-800f-cc39150ceab2 - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.CommandLine/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration.CommandLine/Properties/AssemblyInfo.cs index c8d994da..6471345d 100644 --- a/src/Microsoft.Extensions.Configuration.CommandLine/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Extensions.Configuration.CommandLine/Properties/AssemblyInfo.cs @@ -1,13 +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. -using System.Reflection; -using System.Resources; using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.CommandLine.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-US")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft .NET Extensions")] + diff --git a/src/Microsoft.Extensions.Configuration.CommandLine/project.json b/src/Microsoft.Extensions.Configuration.CommandLine/project.json deleted file mode 100644 index 74f77137..00000000 --- a/src/Microsoft.Extensions.Configuration.CommandLine/project.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "version": "1.2.0-*", - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "xmlDoc": true - }, - "description": "Command line configuration provider implementation for Microsoft.Extensions.Configuration.", - "packOptions": { - "repository": { - "type": "git", - "url": "https://github.com/aspnet/configuration" - }, - "tags": [ - "configuration", - "commandline" - ] - }, - "dependencies": { - "Microsoft.Extensions.Configuration": { - "target": "project" - }, - "NETStandard.Library": "1.6.2-*" - }, - "frameworks": { - "netstandard1.1": {} - } -} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj b/src/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj new file mode 100644 index 00000000..dc9c58f2 --- /dev/null +++ b/src/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.csproj @@ -0,0 +1,34 @@ + + + + + + Environment variables configuration provider implementation for Microsoft.Extensions.Configuration. + net451;netstandard1.3 + true + configuration;envvar;environmentvariable + + + + + + + + + + + true + + + + + + + + + + + + + + diff --git a/src/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.xproj b/src/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.xproj deleted file mode 100644 index 456f5671..00000000 --- a/src/Microsoft.Extensions.Configuration.EnvironmentVariables/Microsoft.Extensions.Configuration.EnvironmentVariables.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - a6a2c665-e5a4-4fd3-ad0c-e33e6cffcb88 - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.EnvironmentVariables/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration.EnvironmentVariables/Properties/AssemblyInfo.cs index 517bac13..7cb08162 100644 --- a/src/Microsoft.Extensions.Configuration.EnvironmentVariables/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Extensions.Configuration.EnvironmentVariables/Properties/AssemblyInfo.cs @@ -1,13 +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. -using System.Reflection; -using System.Resources; using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.EnvironmentVariables.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-US")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft .NET Extensions")] + diff --git a/src/Microsoft.Extensions.Configuration.EnvironmentVariables/project.json b/src/Microsoft.Extensions.Configuration.EnvironmentVariables/project.json deleted file mode 100644 index f4f7ffa6..00000000 --- a/src/Microsoft.Extensions.Configuration.EnvironmentVariables/project.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "version": "1.2.0-*", - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "xmlDoc": true - }, - "description": "Environment variables configuration provider implementation for Microsoft.Extensions.Configuration.", - "packOptions": { - "repository": { - "type": "git", - "url": "https://github.com/aspnet/configuration" - }, - "tags": [ - "configuration", - "envvar", - "environmentvariable" - ] - }, - "dependencies": { - "Microsoft.Extensions.Configuration": { - "target": "project" - }, - "NETStandard.Library": "1.6.2-*" - }, - "frameworks": { - "net451": { - "frameworkAssemblies": { - "System.Runtime": { - "type": "build" - } - } - }, - "netstandard1.3": {} - } -} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.csproj b/src/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.csproj new file mode 100644 index 00000000..9486cfab --- /dev/null +++ b/src/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.csproj @@ -0,0 +1,39 @@ + + + + + + Extension methods for configuring file-based configuration providers for Microsoft.Extensions.Configuration. + net451;netstandard1.3 + true + configuration + + + + + + + + + + + true + + + + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.xproj b/src/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.xproj deleted file mode 100644 index 407c6104..00000000 --- a/src/Microsoft.Extensions.Configuration.FileExtensions/Microsoft.Extensions.Configuration.FileExtensions.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 881e7cbc-492c-47c5-98a6-61dd1c753ee6 - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.FileExtensions/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration.FileExtensions/Properties/AssemblyInfo.cs index da58bde8..92619744 100644 --- a/src/Microsoft.Extensions.Configuration.FileExtensions/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Extensions.Configuration.FileExtensions/Properties/AssemblyInfo.cs @@ -1,13 +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. -using System.Reflection; -using System.Resources; using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.FileExtensions.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-US")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft .NET Extensions")] + diff --git a/src/Microsoft.Extensions.Configuration.FileExtensions/project.json b/src/Microsoft.Extensions.Configuration.FileExtensions/project.json deleted file mode 100644 index f530f889..00000000 --- a/src/Microsoft.Extensions.Configuration.FileExtensions/project.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "version": "1.2.0-*", - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "xmlDoc": true - }, - "description": "Extension methods for configuring file-based configuration providers for Microsoft.Extensions.Configuration.", - "packOptions": { - "repository": { - "type": "git", - "url": "https://github.com/aspnet/configuration" - }, - "tags": [ - "configuration" - ] - }, - "dependencies": { - "Microsoft.Extensions.Configuration": { - "target": "project" - }, - "Microsoft.Extensions.FileProviders.Physical": "1.2.0-*", - "NETStandard.Library": "1.6.2-*" - }, - "frameworks": { - "net451": { - "frameworkAssemblies": { - "System.Collections": { - "type": "build" - } - } - }, - "netstandard1.3": { - "dependencies": { - "System.Threading.Thread": "4.4.0-*" - } - } - } -} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.csproj b/src/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.csproj new file mode 100644 index 00000000..7f9ecb5d --- /dev/null +++ b/src/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.csproj @@ -0,0 +1,38 @@ + + + + + + INI configuration provider implementation for Microsoft.Extensions.Configuration. + net451;netstandard1.3 + true + configuration;ini + + + + + + + + + + + + true + + + + + + true + + + + + + + + + + + diff --git a/src/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.xproj b/src/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.xproj deleted file mode 100644 index 269096f4..00000000 --- a/src/Microsoft.Extensions.Configuration.Ini/Microsoft.Extensions.Configuration.Ini.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - c555c5d5-bf4a-451e-ab43-ebf4de885ec7 - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.Ini/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration.Ini/Properties/AssemblyInfo.cs index 3b07cadf..1cc88fca 100644 --- a/src/Microsoft.Extensions.Configuration.Ini/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Extensions.Configuration.Ini/Properties/AssemblyInfo.cs @@ -1,13 +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. -using System.Reflection; -using System.Resources; using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Ini.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-US")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft .NET Extensions")] + diff --git a/src/Microsoft.Extensions.Configuration.Ini/project.json b/src/Microsoft.Extensions.Configuration.Ini/project.json deleted file mode 100644 index 6a769325..00000000 --- a/src/Microsoft.Extensions.Configuration.Ini/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": "1.2.0-*", - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "xmlDoc": true - }, - "description": "INI configuration provider implementation for Microsoft.Extensions.Configuration.", - "packOptions": { - "repository": { - "type": "git", - "url": "https://github.com/aspnet/configuration" - }, - "tags": [ - "configuration", - "ini" - ] - }, - "dependencies": { - "Microsoft.Extensions.Configuration": { - "target": "project" - }, - "Microsoft.Extensions.Configuration.FileExtensions": { - "target": "project" - }, - "NETStandard.Library": "1.6.2-*" - }, - "frameworks": { - "net451": { - "frameworkAssemblies": { - "System.Runtime": { - "type": "build" - } - } - }, - "netstandard1.3": {} - } -} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.csproj b/src/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.csproj new file mode 100644 index 00000000..affbe65b --- /dev/null +++ b/src/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.csproj @@ -0,0 +1,44 @@ + + + + + + JSON configuration provider implementation for Microsoft.Extensions.Configuration. + net451;netstandard1.3 + true + configuration;json + + + + + + + + + + + + true + + + + + + true + + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.xproj b/src/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.xproj deleted file mode 100644 index 971e40fd..00000000 --- a/src/Microsoft.Extensions.Configuration.Json/Microsoft.Extensions.Configuration.Json.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 4c4cd1bc-4411-4afd-9d04-147053f0e259 - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.Json/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration.Json/Properties/AssemblyInfo.cs index 1e91bc8a..f4806a8b 100644 --- a/src/Microsoft.Extensions.Configuration.Json/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Extensions.Configuration.Json/Properties/AssemblyInfo.cs @@ -1,13 +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. -using System.Reflection; -using System.Resources; using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Json.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-US")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft .NET Extensions")] + diff --git a/src/Microsoft.Extensions.Configuration.Json/project.json b/src/Microsoft.Extensions.Configuration.Json/project.json deleted file mode 100644 index 4a7c94d9..00000000 --- a/src/Microsoft.Extensions.Configuration.Json/project.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "version": "1.2.0-*", - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "xmlDoc": true - }, - "description": "JSON configuration provider implementation for Microsoft.Extensions.Configuration.", - "packOptions": { - "repository": { - "type": "git", - "url": "https://github.com/aspnet/configuration" - }, - "tags": [ - "configuration", - "json" - ] - }, - "dependencies": { - "Microsoft.Extensions.Configuration": { - "target": "project" - }, - "Microsoft.Extensions.Configuration.FileExtensions": { - "target": "project" - }, - "NETStandard.Library": "1.6.2-*", - "Newtonsoft.Json": "9.0.1" - }, - "frameworks": { - "net451": { - "frameworkAssemblies": { - "System.Runtime": { - "type": "build" - } - } - }, - "netstandard1.3": { - "dependencies": { - "System.Dynamic.Runtime": "4.4.0-*", - "System.Runtime.Serialization.Primitives": "4.4.0-*" - } - } - } -} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.csproj b/src/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.csproj new file mode 100644 index 00000000..264a5e52 --- /dev/null +++ b/src/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.csproj @@ -0,0 +1,47 @@ + + + + + + User secrets configuration provider implementation for Microsoft.Extensions.Configuration. + net451;netstandard1.5 + $(NoWarn);CS1591 + true + configuration;secrets;usersecrets + + + + + + + + + + + + true + + + true + + + true + + + + + + true + + + true + + + + + + + + + + diff --git a/src/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.xproj b/src/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.xproj deleted file mode 100644 index a36fdcf5..00000000 --- a/src/Microsoft.Extensions.Configuration.UserSecrets/Microsoft.Extensions.Configuration.UserSecrets.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 58b6443b-1278-4df9-b7bb-ddf3bffcf868 - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.UserSecrets/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration.UserSecrets/Properties/AssemblyInfo.cs index 1f6a701e..b8185015 100644 --- a/src/Microsoft.Extensions.Configuration.UserSecrets/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Extensions.Configuration.UserSecrets/Properties/AssemblyInfo.cs @@ -1,13 +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. -using System.Reflection; -using System.Resources; using System.Runtime.CompilerServices; -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-us")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft .NET Extensions")] + [assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.UserSecrets.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] diff --git a/src/Microsoft.Extensions.Configuration.UserSecrets/project.json b/src/Microsoft.Extensions.Configuration.UserSecrets/project.json deleted file mode 100644 index a71ae0ff..00000000 --- a/src/Microsoft.Extensions.Configuration.UserSecrets/project.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "version": "1.2.0-*", - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "nowarn": [ - "CS1591" - ], - "xmlDoc": true - }, - "description": "User secrets configuration provider implementation for Microsoft.Extensions.Configuration.", - "packOptions": { - "repository": { - "type": "git", - "url": "https://github.com/aspnet/Configuration" - }, - "tags": [ - "configuration", - "secrets", - "usersecrets" - ], - "files": { - "include": "build/**/*" - } - }, - "dependencies": { - "Microsoft.Extensions.Configuration.Json": { - "target": "project" - }, - "NETStandard.Library": "1.6.2-*" - }, - "frameworks": { - "net451": {}, - "netstandard1.5": {} - } -} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.csproj b/src/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.csproj new file mode 100644 index 00000000..e1ab947b --- /dev/null +++ b/src/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.csproj @@ -0,0 +1,45 @@ + + + + + + XML configuration provider implementation for Microsoft.Extensions.Configuration. + net451;netstandard1.3 + true + configuration;xml + + + + + + + + + + + + true + + + + + + true + + + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.xproj b/src/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.xproj deleted file mode 100644 index f4b942b7..00000000 --- a/src/Microsoft.Extensions.Configuration.Xml/Microsoft.Extensions.Configuration.Xml.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 1bec97c1-56b9-4b2b-a95a-c0df72f1e96a - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration.Xml/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration.Xml/Properties/AssemblyInfo.cs index 04847cde..8d081910 100644 --- a/src/Microsoft.Extensions.Configuration.Xml/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Extensions.Configuration.Xml/Properties/AssemblyInfo.cs @@ -1,13 +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. -using System.Reflection; -using System.Resources; using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Xml.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-US")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft .NET Extensions")] + diff --git a/src/Microsoft.Extensions.Configuration.Xml/project.json b/src/Microsoft.Extensions.Configuration.Xml/project.json deleted file mode 100644 index 9ee02a06..00000000 --- a/src/Microsoft.Extensions.Configuration.Xml/project.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "version": "1.2.0-*", - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "xmlDoc": true - }, - "description": "XML configuration provider implementation for Microsoft.Extensions.Configuration.", - "packOptions": { - "repository": { - "type": "git", - "url": "https://github.com/aspnet/configuration" - }, - "tags": [ - "configuration", - "xml" - ] - }, - "dependencies": { - "Microsoft.Extensions.Configuration": { - "target": "project" - }, - "Microsoft.Extensions.Configuration.FileExtensions": { - "target": "project" - }, - "NETStandard.Library": "1.6.2-*" - }, - "frameworks": { - "net451": { - "frameworkAssemblies": { - "System.Runtime": { - "type": "build" - }, - "System.Security": { - "type": "build" - }, - "System.Xml": { - "type": "build" - } - } - }, - "netstandard1.3": { - "dependencies": { - "System.Xml.XmlDocument": "4.4.0-*", - "System.Xml.XmlSerializer": "4.4.0-*" - } - } - } -} \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.csproj b/src/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.csproj new file mode 100644 index 00000000..527bf95c --- /dev/null +++ b/src/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.csproj @@ -0,0 +1,25 @@ + + + + + + Implementation of key-value pair based configuration for Microsoft.Extensions.Configuration. Includes the memory configuration provider. + netstandard1.1 + true + configuration + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.xproj b/src/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.xproj deleted file mode 100644 index 1f83bba0..00000000 --- a/src/Microsoft.Extensions.Configuration/Microsoft.Extensions.Configuration.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 62bd48b5-bb0c-4c2c-9c4b-04cf75cdccf1 - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.Extensions.Configuration/Properties/AssemblyInfo.cs b/src/Microsoft.Extensions.Configuration/Properties/AssemblyInfo.cs index d8613ae1..44209468 100644 --- a/src/Microsoft.Extensions.Configuration/Properties/AssemblyInfo.cs +++ b/src/Microsoft.Extensions.Configuration/Properties/AssemblyInfo.cs @@ -1,13 +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. -using System.Reflection; -using System.Resources; using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("Microsoft.Extensions.Configuration.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] -[assembly: AssemblyMetadata("Serviceable", "True")] -[assembly: NeutralResourcesLanguage("en-US")] -[assembly: AssemblyCompany("Microsoft Corporation.")] -[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")] -[assembly: AssemblyProduct("Microsoft .NET Extensions")] + diff --git a/src/Microsoft.Extensions.Configuration/project.json b/src/Microsoft.Extensions.Configuration/project.json deleted file mode 100644 index aaed0b52..00000000 --- a/src/Microsoft.Extensions.Configuration/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "version": "1.2.0-*", - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk", - "xmlDoc": true - }, - "description": "Implementation of key-value pair based configuration for Microsoft.Extensions.Configuration. Includes the memory configuration provider.", - "dependencies": { - "Microsoft.Extensions.Configuration.Abstractions": { - "target": "project" - }, - "NETStandard.Library": "1.6.2-*" - }, - "packOptions": { - "repository": { - "type": "git", - "url": "https://github.com/aspnet/configuration" - }, - "tags": [ - "configuration" - ] - }, - "frameworks": { - "netstandard1.1": {} - } -} \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.AzureKeyVault.Test/Microsoft.Extensions.Configuration.AzureKeyVault.Test.csproj b/test/Microsoft.Extensions.Configuration.AzureKeyVault.Test/Microsoft.Extensions.Configuration.AzureKeyVault.Test.csproj new file mode 100644 index 00000000..f2174250 --- /dev/null +++ b/test/Microsoft.Extensions.Configuration.AzureKeyVault.Test/Microsoft.Extensions.Configuration.AzureKeyVault.Test.csproj @@ -0,0 +1,50 @@ + + + + + + net451 + + + + + + + + + + + + true + + + true + + + true + + + + + + true + + + true + + + true + + + + + + + + + + + + + + diff --git a/test/Microsoft.Extensions.Configuration.AzureKeyVault.Test/Microsoft.Extensions.Configuration.AzureKeyVault.Test.xproj b/test/Microsoft.Extensions.Configuration.AzureKeyVault.Test/Microsoft.Extensions.Configuration.AzureKeyVault.Test.xproj deleted file mode 100644 index 4aa2c5f3..00000000 --- a/test/Microsoft.Extensions.Configuration.AzureKeyVault.Test/Microsoft.Extensions.Configuration.AzureKeyVault.Test.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - da9c1f35-3f92-4f3a-b3b1-a62cce626d48 - Microsoft.Extensions.Configuration.AzureKeyVault.Test - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.AzureKeyVault.Test/project.json b/test/Microsoft.Extensions.Configuration.AzureKeyVault.Test/project.json deleted file mode 100644 index 5a7a5418..00000000 --- a/test/Microsoft.Extensions.Configuration.AzureKeyVault.Test/project.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.Extensions.Configuration.AzureKeyVault": "1.1.0-*", - "Microsoft.Extensions.Configuration.Test.Common": { - "target": "project" - }, - "Moq": "4.6.36-*", - "NETStandard.Library": "1.6.2-*", - "xunit": "2.2.0-*" - }, - "frameworks": { - "net451": {} - }, - "testRunner": "xunit" -} \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.Binder.Test/Microsoft.Extensions.Configuration.Binder.Test.csproj b/test/Microsoft.Extensions.Configuration.Binder.Test/Microsoft.Extensions.Configuration.Binder.Test.csproj new file mode 100644 index 00000000..2a2ae51a --- /dev/null +++ b/test/Microsoft.Extensions.Configuration.Binder.Test/Microsoft.Extensions.Configuration.Binder.Test.csproj @@ -0,0 +1,40 @@ + + + + + + netcoreapp1.1;net451 + + + + + + + + + + + + true + + + true + + + + + + + + + + + + + + + + + + + diff --git a/test/Microsoft.Extensions.Configuration.Binder.Test/Microsoft.Extensions.Configuration.Binder.Test.xproj b/test/Microsoft.Extensions.Configuration.Binder.Test/Microsoft.Extensions.Configuration.Binder.Test.xproj deleted file mode 100644 index 61b17e9d..00000000 --- a/test/Microsoft.Extensions.Configuration.Binder.Test/Microsoft.Extensions.Configuration.Binder.Test.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - ae6ffe9b-6378-4d57-aa24-7d257f18b235 - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.Binder.Test/project.json b/test/Microsoft.Extensions.Configuration.Binder.Test/project.json deleted file mode 100644 index a0f87d23..00000000 --- a/test/Microsoft.Extensions.Configuration.Binder.Test/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.Extensions.Configuration.Binder": "1.2.0-*", - "Microsoft.Extensions.Configuration.Test.Common": { - "target": "project" - }, - "xunit": "2.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - }, - "net451": {} - }, - "testRunner": "xunit" -} \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.CommandLine.Test/Microsoft.Extensions.Configuration.CommandLine.Test.csproj b/test/Microsoft.Extensions.Configuration.CommandLine.Test/Microsoft.Extensions.Configuration.CommandLine.Test.csproj new file mode 100644 index 00000000..d382575a --- /dev/null +++ b/test/Microsoft.Extensions.Configuration.CommandLine.Test/Microsoft.Extensions.Configuration.CommandLine.Test.csproj @@ -0,0 +1,40 @@ + + + + + + netcoreapp1.1;net451 + + + + + + + + + + + + true + + + true + + + + + + + + + + + + + + + + + + + diff --git a/test/Microsoft.Extensions.Configuration.CommandLine.Test/Microsoft.Extensions.Configuration.CommandLine.Test.xproj b/test/Microsoft.Extensions.Configuration.CommandLine.Test/Microsoft.Extensions.Configuration.CommandLine.Test.xproj deleted file mode 100644 index 730e0b90..00000000 --- a/test/Microsoft.Extensions.Configuration.CommandLine.Test/Microsoft.Extensions.Configuration.CommandLine.Test.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - ce9c8903-aa8a-40e6-b03d-32a08a4a39af - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.CommandLine.Test/project.json b/test/Microsoft.Extensions.Configuration.CommandLine.Test/project.json deleted file mode 100644 index e15899ad..00000000 --- a/test/Microsoft.Extensions.Configuration.CommandLine.Test/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.Extensions.Configuration.CommandLine": "1.2.0-*", - "Microsoft.Extensions.Configuration.Test.Common": { - "target": "project" - }, - "xunit": "2.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - }, - "net451": {} - }, - "testRunner": "xunit" -} \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test.csproj b/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test.csproj new file mode 100644 index 00000000..4a1f3fec --- /dev/null +++ b/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test.csproj @@ -0,0 +1,44 @@ + + + + + + netcoreapp1.1;net451 + + + + + + + + + + + + true + + + true + + + + + + true + + + + + + + + + + + + + + + + + diff --git a/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test.xproj b/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test.xproj deleted file mode 100644 index f458ad6a..00000000 --- a/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 7d0f805b-adff-4c47-a90c-24dd74416821 - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/project.json b/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/project.json deleted file mode 100644 index 6a148a73..00000000 --- a/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.2.0-*", - "Microsoft.Extensions.Configuration.Test.Common": { - "target": "project" - }, - "xunit": "2.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - }, - "System.Collections.NonGeneric": "4.4.0-*" - } - }, - "net451": {} - }, - "testRunner": "xunit" -} \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.FileExtensions.Test/Microsoft.Extensions.Configuration.FileExtensions.Test.csproj b/test/Microsoft.Extensions.Configuration.FileExtensions.Test/Microsoft.Extensions.Configuration.FileExtensions.Test.csproj new file mode 100644 index 00000000..86d237b4 --- /dev/null +++ b/test/Microsoft.Extensions.Configuration.FileExtensions.Test/Microsoft.Extensions.Configuration.FileExtensions.Test.csproj @@ -0,0 +1,42 @@ + + + + + + netcoreapp1.1;net451 + + + + + + + + + + + true + + + true + + + + + + true + + + + + + + + + + + + + + + + diff --git a/test/Microsoft.Extensions.Configuration.FileExtensions.Test/Microsoft.Extensions.Configuration.FileExtensions.Test.xproj b/test/Microsoft.Extensions.Configuration.FileExtensions.Test/Microsoft.Extensions.Configuration.FileExtensions.Test.xproj deleted file mode 100644 index 2b74fcff..00000000 --- a/test/Microsoft.Extensions.Configuration.FileExtensions.Test/Microsoft.Extensions.Configuration.FileExtensions.Test.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - f7932f19-eb68-4c52-9cd1-3b51e48c2337 - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.FileExtensions.Test/project.json b/test/Microsoft.Extensions.Configuration.FileExtensions.Test/project.json deleted file mode 100644 index 454961bf..00000000 --- a/test/Microsoft.Extensions.Configuration.FileExtensions.Test/project.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.Extensions.Configuration.FileExtensions": "1.2.0-*", - "xunit": "2.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - }, - "net451": {} - }, - "testRunner": "xunit" -} \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.csproj b/test/Microsoft.Extensions.Configuration.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.csproj new file mode 100644 index 00000000..f27747b8 --- /dev/null +++ b/test/Microsoft.Extensions.Configuration.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.csproj @@ -0,0 +1,58 @@ + + + + + + netcoreapp1.1;net451 + + + + + + + + + + + + + + true + + + true + + + true + + + + + + true + + + true + + + true + + + true + + + + + + + + + + + + + + + + + diff --git a/test/Microsoft.Extensions.Configuration.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.xproj b/test/Microsoft.Extensions.Configuration.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.xproj deleted file mode 100644 index 21059795..00000000 --- a/test/Microsoft.Extensions.Configuration.FunctionalTests/Microsoft.Extensions.Configuration.FunctionalTests.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - eac77f15-f12e-496b-9184-1b1da89bffe9 - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.FunctionalTests/project.json b/test/Microsoft.Extensions.Configuration.FunctionalTests/project.json deleted file mode 100644 index 2a6aa012..00000000 --- a/test/Microsoft.Extensions.Configuration.FunctionalTests/project.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.Testing": "1.2.0-*", - "Microsoft.Extensions.Configuration.Ini": "1.2.0-*", - "Microsoft.Extensions.Configuration.Json": "1.2.0-*", - "Microsoft.Extensions.Configuration.Test.Common": { - "target": "project" - }, - "Microsoft.Extensions.Configuration.Xml": "1.2.0-*", - "xunit": "2.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - }, - "net451": {} - }, - "testRunner": "xunit" -} \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.Ini.Test/Microsoft.Extensions.Configuration.Ini.Test.csproj b/test/Microsoft.Extensions.Configuration.Ini.Test/Microsoft.Extensions.Configuration.Ini.Test.csproj new file mode 100644 index 00000000..050b02a8 --- /dev/null +++ b/test/Microsoft.Extensions.Configuration.Ini.Test/Microsoft.Extensions.Configuration.Ini.Test.csproj @@ -0,0 +1,49 @@ + + + + + + netcoreapp1.1;net451 + + + + + + + + + + + + true + + + true + + + true + + + + + + true + + + true + + + + + + + + + + + + + + + + diff --git a/test/Microsoft.Extensions.Configuration.Ini.Test/Microsoft.Extensions.Configuration.Ini.Test.xproj b/test/Microsoft.Extensions.Configuration.Ini.Test/Microsoft.Extensions.Configuration.Ini.Test.xproj deleted file mode 100644 index fad9444a..00000000 --- a/test/Microsoft.Extensions.Configuration.Ini.Test/Microsoft.Extensions.Configuration.Ini.Test.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 80a8f10c-e9a6-4677-919d-fe5db320fedf - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.Ini.Test/project.json b/test/Microsoft.Extensions.Configuration.Ini.Test/project.json deleted file mode 100644 index 637f938b..00000000 --- a/test/Microsoft.Extensions.Configuration.Ini.Test/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.Extensions.Configuration.Ini": "1.2.0-*", - "Microsoft.Extensions.Configuration.Test.Common": { - "target": "project" - }, - "xunit": "2.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - }, - "net451": {} - }, - "testRunner": "xunit" -} \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.Json.Test/Microsoft.Extensions.Configuration.Json.Test.csproj b/test/Microsoft.Extensions.Configuration.Json.Test/Microsoft.Extensions.Configuration.Json.Test.csproj new file mode 100644 index 00000000..87e76221 --- /dev/null +++ b/test/Microsoft.Extensions.Configuration.Json.Test/Microsoft.Extensions.Configuration.Json.Test.csproj @@ -0,0 +1,49 @@ + + + + + + netcoreapp1.1;net451 + + + + + + + + + + + + true + + + true + + + true + + + + + + true + + + true + + + + + + + + + + + + + + + + diff --git a/test/Microsoft.Extensions.Configuration.Json.Test/Microsoft.Extensions.Configuration.Json.Test.xproj b/test/Microsoft.Extensions.Configuration.Json.Test/Microsoft.Extensions.Configuration.Json.Test.xproj deleted file mode 100644 index 938c16de..00000000 --- a/test/Microsoft.Extensions.Configuration.Json.Test/Microsoft.Extensions.Configuration.Json.Test.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - ae8f8c20-9ed9-4a16-9565-27df77683789 - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.Json.Test/project.json b/test/Microsoft.Extensions.Configuration.Json.Test/project.json deleted file mode 100644 index a44c2ac4..00000000 --- a/test/Microsoft.Extensions.Configuration.Json.Test/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.Extensions.Configuration.Json": "1.2.0-*", - "Microsoft.Extensions.Configuration.Test.Common": { - "target": "project" - }, - "xunit": "2.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - }, - "net451": {} - }, - "testRunner": "xunit" -} \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.Test.Common/.notest b/test/Microsoft.Extensions.Configuration.Test.Common/.notest new file mode 100644 index 00000000..e69de29b diff --git a/test/Microsoft.Extensions.Configuration.Test.Common/Microsoft.Extensions.Configuration.Test.Common.csproj b/test/Microsoft.Extensions.Configuration.Test.Common/Microsoft.Extensions.Configuration.Test.Common.csproj new file mode 100644 index 00000000..18097326 --- /dev/null +++ b/test/Microsoft.Extensions.Configuration.Test.Common/Microsoft.Extensions.Configuration.Test.Common.csproj @@ -0,0 +1,31 @@ + + + + + + net451;netstandard1.5 + + + + + + + + + + + true + + + + + + + + + + + + + + diff --git a/test/Microsoft.Extensions.Configuration.Test.Common/Microsoft.Extensions.Configuration.Test.Common.xproj b/test/Microsoft.Extensions.Configuration.Test.Common/Microsoft.Extensions.Configuration.Test.Common.xproj deleted file mode 100644 index 35e236b0..00000000 --- a/test/Microsoft.Extensions.Configuration.Test.Common/Microsoft.Extensions.Configuration.Test.Common.xproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 29c120e5-f682-4bfb-826b-040a594802ca - .\obj - .\bin\ - - - 2.0 - - - \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.Test.Common/project.json b/test/Microsoft.Extensions.Configuration.Test.Common/project.json deleted file mode 100644 index 48ab3ec1..00000000 --- a/test/Microsoft.Extensions.Configuration.Test.Common/project.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "Microsoft.Extensions.Configuration": "1.2.0-*", - "Microsoft.Extensions.FileProviders.Physical": "1.2.0-*", - "NETStandard.Library": "1.6.2-*" - }, - "frameworks": { - "net451": {}, - "netstandard1.5": {} - } -} \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.Test/Microsoft.Extensions.Configuration.Test.csproj b/test/Microsoft.Extensions.Configuration.Test/Microsoft.Extensions.Configuration.Test.csproj new file mode 100644 index 00000000..33a277bc --- /dev/null +++ b/test/Microsoft.Extensions.Configuration.Test/Microsoft.Extensions.Configuration.Test.csproj @@ -0,0 +1,43 @@ + + + + + + netcoreapp1.1;net451 + + + + + + + + + + + + true + + + true + + + + + + true + + + + + + + + + + + + + + + + diff --git a/test/Microsoft.Extensions.Configuration.Test/Microsoft.Extensions.Configuration.Test.xproj b/test/Microsoft.Extensions.Configuration.Test/Microsoft.Extensions.Configuration.Test.xproj deleted file mode 100644 index 6d07d692..00000000 --- a/test/Microsoft.Extensions.Configuration.Test/Microsoft.Extensions.Configuration.Test.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 8777c77e-ca2a-42c1-90cd-2ea9cbf28937 - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.Test/project.json b/test/Microsoft.Extensions.Configuration.Test/project.json deleted file mode 100644 index 9590a7e7..00000000 --- a/test/Microsoft.Extensions.Configuration.Test/project.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.Extensions.Configuration.FileExtensions": "1.2.0-*", - "Microsoft.Extensions.Configuration.Test.Common": { - "target": "project" - }, - "xunit": "2.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - }, - "net451": {} - }, - "testRunner": "xunit" -} \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.UserSecrets.Test/Microsoft.Extensions.Configuration.UserSecrets.Test.csproj b/test/Microsoft.Extensions.Configuration.UserSecrets.Test/Microsoft.Extensions.Configuration.UserSecrets.Test.csproj new file mode 100644 index 00000000..afd2d340 --- /dev/null +++ b/test/Microsoft.Extensions.Configuration.UserSecrets.Test/Microsoft.Extensions.Configuration.UserSecrets.Test.csproj @@ -0,0 +1,49 @@ + + + + + + netcoreapp1.1 + + + + + + + + + + + true + + + true + + + true + + + true + + + + + + true + + + true + + + + + + + + + + + + + + diff --git a/test/Microsoft.Extensions.Configuration.UserSecrets.Test/Microsoft.Extensions.Configuration.UserSecrets.Test.xproj b/test/Microsoft.Extensions.Configuration.UserSecrets.Test/Microsoft.Extensions.Configuration.UserSecrets.Test.xproj deleted file mode 100644 index 292e03d8..00000000 --- a/test/Microsoft.Extensions.Configuration.UserSecrets.Test/Microsoft.Extensions.Configuration.UserSecrets.Test.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0.25420 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - ac7fad2a-5763-404d-b0fc-3cca81a16b0a - Microsoft.Extensions.Configuration.UserSecrets.Tests - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.UserSecrets.Test/MsBuildTargetTest.cs b/test/Microsoft.Extensions.Configuration.UserSecrets.Test/MsBuildTargetTest.cs index c3608305..8cb737ab 100644 --- a/test/Microsoft.Extensions.Configuration.UserSecrets.Test/MsBuildTargetTest.cs +++ b/test/Microsoft.Extensions.Configuration.UserSecrets.Test/MsBuildTargetTest.cs @@ -5,24 +5,26 @@ using System.Diagnostics; using System.IO; using Xunit; +using Xunit.Abstractions; namespace Microsoft.Extensions.Configuration.UserSecrets { public class MsBuildTargetTest : IDisposable { - private const string SkipReason = "Not safe to run on CI. MSBuild and SDK not available yet."; private readonly string _tempDir; private readonly DirectoryInfo _solutionRoot; + private readonly ITestOutputHelper _output; - public MsBuildTargetTest() + public MsBuildTargetTest(ITestOutputHelper output) { - _tempDir = Path.Combine(Path.GetTempPath(), "usersecrettest", Guid.NewGuid().ToString()); + _output = output; + _tempDir = Path.Combine(Path.GetTempPath(), "usersecretstest", Guid.NewGuid().ToString()); Directory.CreateDirectory(_tempDir); _solutionRoot = new DirectoryInfo(AppContext.BaseDirectory); while (_solutionRoot != null) { - if (File.Exists(Path.Combine(_solutionRoot.FullName, "global.json"))) + if (File.Exists(Path.Combine(_solutionRoot.FullName, "NuGet.config"))) { break; } @@ -31,7 +33,7 @@ public MsBuildTargetTest() } } - [Fact(Skip = SkipReason)] + [Fact] public void GeneratesAssemblyAttributeFile() { if (_solutionRoot == null) @@ -39,40 +41,33 @@ public void GeneratesAssemblyAttributeFile() Assert.True(false, "Could not identify solution root"); } var target = Path.Combine(_solutionRoot.FullName, "src", "Microsoft.Extensions.Configuration.UserSecrets", "build", "netstandard1.0", "Microsoft.Extensions.Configuration.UserSecrets.targets"); + Directory.CreateDirectory(Path.Combine(_tempDir, "obj")); + File.Copy(target, Path.Combine(_tempDir, "obj", "test.csproj.usersecretstest.targets")); // imitates how NuGet will import thsi target var testProj = Path.Combine(_tempDir, "test.csproj"); // should represent a 'dotnet new' project File.WriteAllText(testProj, @" - - + - Exe> + Exe xyz123 - netcoreapp1.0 + netcoreapp1.0 - - 1.0.1 - - - 1.0.0-* - All - + - - - - "); + _output.WriteLine($"Tempdir = {_tempDir}"); File.WriteAllText(Path.Combine(_tempDir, "Program.cs"), "public class Program { public static void Main(){}}"); var assemblyInfoFile = Path.Combine(_tempDir, "obj/Debug/netcoreapp1.0/UserSecretsAssemblyInfo.cs"); var restoreInfo = new ProcessStartInfo { FileName = "dotnet", - Arguments = $"restore3 \"{testProj}\" -s https://dotnet.myget.org/F/dotnet-core/api/v3/index.json /nologo /v:m", - UseShellExecute = false + Arguments = "restore", + UseShellExecute = false, + WorkingDirectory = _tempDir }; var restore = Process.Start(restoreInfo); restore.WaitForExit(); @@ -80,26 +75,24 @@ public void GeneratesAssemblyAttributeFile() Assert.False(File.Exists(assemblyInfoFile)); - // TODO actually build a project var buildInfo = new ProcessStartInfo { FileName = "dotnet", - Arguments = $"msbuild \"{testProj}\" /nologo /v:m \"/p:TestTarget={target}\" /p:TargetFramework=netcoreapp1.0 /t:GenerateUserSecretsAttribute", - UseShellExecute = false + Arguments = "build", + UseShellExecute = false, + WorkingDirectory = _tempDir }; - var build = Process.Start(buildInfo); - build.WaitForExit(); - Assert.Equal(0, build.ExitCode); + Process.Start(buildInfo).WaitForExit(); + // build will fail because the test proj doesn't reference UserSecrets.dll + // but that's okay. We just want to verify the target generates code correctly Assert.True(File.Exists(assemblyInfoFile)); var contents = File.ReadAllText(assemblyInfoFile); Assert.Contains("[assembly: Microsoft.Extensions.Configuration.UserSecrets.UserSecretsIdAttribute(\"xyz123\")]", contents); var lastWrite = new FileInfo(assemblyInfoFile).LastWriteTimeUtc; - build = Process.Start(buildInfo); - build.WaitForExit(); - Assert.Equal(0, build.ExitCode); - // assert that the target doesn't re-generate assembly file. Important for incremental build. + Process.Start(buildInfo).WaitForExit(); + // asserts that the target doesn't re-generate assembly file. Important for incremental build. Assert.Equal(lastWrite, new FileInfo(assemblyInfoFile).LastWriteTimeUtc); } diff --git a/test/Microsoft.Extensions.Configuration.UserSecrets.Test/project.json b/test/Microsoft.Extensions.Configuration.UserSecrets.Test/project.json deleted file mode 100644 index dd43b2fc..00000000 --- a/test/Microsoft.Extensions.Configuration.UserSecrets.Test/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.Extensions.Configuration.UserSecrets": "1.2.0-*", - "xunit": "2.2.0-*" - }, - "testRunner": "xunit", - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - } - } -} \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.Xml.Test/Microsoft.Extensions.Configuration.Xml.Test.csproj b/test/Microsoft.Extensions.Configuration.Xml.Test/Microsoft.Extensions.Configuration.Xml.Test.csproj new file mode 100644 index 00000000..6a4c5496 --- /dev/null +++ b/test/Microsoft.Extensions.Configuration.Xml.Test/Microsoft.Extensions.Configuration.Xml.Test.csproj @@ -0,0 +1,56 @@ + + + + + + netcoreapp1.1;net451 + + + + + + + + + + + + true + + + true + + + true + + + + + + true + + + true + + + true + + + true + + + + + + + + + + + + + + + + + diff --git a/test/Microsoft.Extensions.Configuration.Xml.Test/Microsoft.Extensions.Configuration.Xml.Test.xproj b/test/Microsoft.Extensions.Configuration.Xml.Test/Microsoft.Extensions.Configuration.Xml.Test.xproj deleted file mode 100644 index fac3f2c2..00000000 --- a/test/Microsoft.Extensions.Configuration.Xml.Test/Microsoft.Extensions.Configuration.Xml.Test.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0786c785-944a-4423-96a6-4e7bfdb4a1b0 - .\obj - .\bin\ - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.Extensions.Configuration.Xml.Test/project.json b/test/Microsoft.Extensions.Configuration.Xml.Test/project.json deleted file mode 100644 index c74ea315..00000000 --- a/test/Microsoft.Extensions.Configuration.Xml.Test/project.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "buildOptions": { - "warningsAsErrors": true, - "keyFile": "../../tools/Key.snk" - }, - "dependencies": { - "dotnet-test-xunit": "2.2.0-*", - "Microsoft.AspNetCore.Testing": "1.2.0-*", - "Microsoft.Extensions.Configuration.Test.Common": { - "target": "project" - }, - "Microsoft.Extensions.Configuration.Xml": "1.2.0-*", - "xunit": "2.2.0-*" - }, - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.2.0-*", - "type": "platform" - } - } - }, - "net451": { - "frameworkAssemblies": { - "System.Security": { - "type": "build" - }, - "System.Xml": { - "type": "build" - } - } - } - }, - "testRunner": "xunit" -} \ No newline at end of file diff --git a/version.props b/version.props new file mode 100644 index 00000000..e77c8d9c --- /dev/null +++ b/version.props @@ -0,0 +1,7 @@ + + + + 1.2.0 + preview1 + + \ No newline at end of file From 32edd3c779e419a55e95cfab1218c6a38fa57955 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 4 Jan 2017 16:51:02 -0800 Subject: [PATCH 2/3] Fix typo in sln file --- Configuration.sln | 48 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Configuration.sln b/Configuration.sln index 880f4115..4f211d31 100644 --- a/Configuration.sln +++ b/Configuration.sln @@ -6,55 +6,55 @@ 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Json", "src\Microsoft.Extensions.Configuration.Json\Microsoft.Extensions.Configuration.Json.csproj", "{4C4CD1BC-4411-4AFD-9D04-147053F0E259}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Json", "src\Microsoft.Extensions.Configuration.Json\Microsoft.Extensions.Configuration.Json.csproj", "{4C4CD1BC-4411-4AFD-9D04-147053F0E259}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Xml", "src\Microsoft.Extensions.Configuration.Xml\Microsoft.Extensions.Configuration.Xml.csproj", "{1BEC97C1-56B9-4B2B-A95A-C0DF72F1E96A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Xml", "src\Microsoft.Extensions.Configuration.Xml\Microsoft.Extensions.Configuration.Xml.csproj", "{1BEC97C1-56B9-4B2B-A95A-C0DF72F1E96A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Json.Test", "test\Microsoft.Extensions.Configuration.Json.Test\Microsoft.Extensions.Configuration.Json.Test.csproj", "{AE8F8C20-9ED9-4A16-9565-27DF77683789}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Json.Test", "test\Microsoft.Extensions.Configuration.Json.Test\Microsoft.Extensions.Configuration.Json.Test.csproj", "{AE8F8C20-9ED9-4A16-9565-27DF77683789}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Xml.Test", "test\Microsoft.Extensions.Configuration.Xml.Test\Microsoft.Extensions.Configuration.Xml.Test.csproj", "{0786C785-944A-4423-96A6-4E7BFDB4A1B0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Xml.Test", "test\Microsoft.Extensions.Configuration.Xml.Test\Microsoft.Extensions.Configuration.Xml.Test.csproj", "{0786C785-944A-4423-96A6-4E7BFDB4A1B0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Test", "test\Microsoft.Extensions.Configuration.Test\Microsoft.Extensions.Configuration.Test.csproj", "{8777C77E-CA2A-42C1-90CD-2EA9CBF28937}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Test", "test\Microsoft.Extensions.Configuration.Test\Microsoft.Extensions.Configuration.Test.csproj", "{8777C77E-CA2A-42C1-90CD-2EA9CBF28937}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration", "src\Microsoft.Extensions.Configuration\Microsoft.Extensions.Configuration.csproj", "{62BD48B5-BB0C-4C2C-9C4B-04CF75CDCCF1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration", "src\Microsoft.Extensions.Configuration\Microsoft.Extensions.Configuration.csproj", "{62BD48B5-BB0C-4C2C-9C4B-04CF75CDCCF1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.FunctionalTests", "test\Microsoft.Extensions.Configuration.FunctionalTests\Microsoft.Extensions.Configuration.FunctionalTests.csproj", "{EAC77F15-F12E-496B-9184-1B1DA89BFFE9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FunctionalTests", "test\Microsoft.Extensions.Configuration.FunctionalTests\Microsoft.Extensions.Configuration.FunctionalTests.csproj", "{EAC77F15-F12E-496B-9184-1B1DA89BFFE9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Abstractions", "src\Microsoft.Extensions.Configuration.Abstractions\Microsoft.Extensions.Configuration.Abstractions.csproj", "{3F1CB08E-9FBD-4CAE-A78A-4AC43F24FC49}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Abstractions", "src\Microsoft.Extensions.Configuration.Abstractions\Microsoft.Extensions.Configuration.Abstractions.csproj", "{3F1CB08E-9FBD-4CAE-A78A-4AC43F24FC49}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Test.Common", "test\Microsoft.Extensions.Configuration.Test.Common\Microsoft.Extensions.Configuration.Test.Common.csproj", "{29C120E5-F682-4BFB-826B-040A594802CA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Test.Common", "test\Microsoft.Extensions.Configuration.Test.Common\Microsoft.Extensions.Configuration.Test.Common.csproj", "{29C120E5-F682-4BFB-826B-040A594802CA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.CommandLine", "src\Microsoft.Extensions.Configuration.CommandLine\Microsoft.Extensions.Configuration.CommandLine.csproj", "{D4B7CF9B-4229-44DC-800F-CC39150CEAB2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.CommandLine", "src\Microsoft.Extensions.Configuration.CommandLine\Microsoft.Extensions.Configuration.CommandLine.csproj", "{D4B7CF9B-4229-44DC-800F-CC39150CEAB2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Ini", "src\Microsoft.Extensions.Configuration.Ini\Microsoft.Extensions.Configuration.Ini.csproj", "{C555C5D5-BF4A-451E-AB43-EBF4DE885EC7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Ini", "src\Microsoft.Extensions.Configuration.Ini\Microsoft.Extensions.Configuration.Ini.csproj", "{C555C5D5-BF4A-451E-AB43-EBF4DE885EC7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.EnvironmentVariables", "src\Microsoft.Extensions.Configuration.EnvironmentVariables\Microsoft.Extensions.Configuration.EnvironmentVariables.csproj", "{A6A2C665-E5A4-4FD3-AD0C-E33E6CFFCB88}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.EnvironmentVariables", "src\Microsoft.Extensions.Configuration.EnvironmentVariables\Microsoft.Extensions.Configuration.EnvironmentVariables.csproj", "{A6A2C665-E5A4-4FD3-AD0C-E33E6CFFCB88}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.CommandLine.Test", "test\Microsoft.Extensions.Configuration.CommandLine.Test\Microsoft.Extensions.Configuration.CommandLine.Test.csproj", "{CE9C8903-AA8A-40E6-B03D-32A08A4A39AF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.CommandLine.Test", "test\Microsoft.Extensions.Configuration.CommandLine.Test\Microsoft.Extensions.Configuration.CommandLine.Test.csproj", "{CE9C8903-AA8A-40E6-B03D-32A08A4A39AF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Ini.Test", "test\Microsoft.Extensions.Configuration.Ini.Test\Microsoft.Extensions.Configuration.Ini.Test.csproj", "{80A8F10C-E9A6-4677-919D-FE5DB320FEDF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Ini.Test", "test\Microsoft.Extensions.Configuration.Ini.Test\Microsoft.Extensions.Configuration.Ini.Test.csproj", "{80A8F10C-E9A6-4677-919D-FE5DB320FEDF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.EnvironmentVariables.Test", "test\Microsoft.Extensions.Configuration.EnvironmentVariables.Test\Microsoft.Extensions.Configuration.EnvironmentVariables.Test.csproj", "{7D0F805B-ADFF-4C47-A90C-24DD74416821}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.EnvironmentVariables.Test", "test\Microsoft.Extensions.Configuration.EnvironmentVariables.Test\Microsoft.Extensions.Configuration.EnvironmentVariables.Test.csproj", "{7D0F805B-ADFF-4C47-A90C-24DD74416821}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Binder", "src\Microsoft.Extensions.Configuration.Binder\Microsoft.Extensions.Configuration.Binder.csproj", "{D506FD2F-59A0-4A26-AA6D-E81998B58B34}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder", "src\Microsoft.Extensions.Configuration.Binder\Microsoft.Extensions.Configuration.Binder.csproj", "{D506FD2F-59A0-4A26-AA6D-E81998B58B34}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.Binder.Test", "test\Microsoft.Extensions.Configuration.Binder.Test\Microsoft.Extensions.Configuration.Binder.Test.csproj", "{AE6FFE9B-6378-4D57-AA24-7D257F18B235}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.Binder.Test", "test\Microsoft.Extensions.Configuration.Binder.Test\Microsoft.Extensions.Configuration.Binder.Test.csproj", "{AE6FFE9B-6378-4D57-AA24-7D257F18B235}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.FileExtensions", "src\Microsoft.Extensions.Configuration.FileExtensions\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{881E7CBC-492C-47C5-98A6-61DD1C753EE6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions", "src\Microsoft.Extensions.Configuration.FileExtensions\Microsoft.Extensions.Configuration.FileExtensions.csproj", "{881E7CBC-492C-47C5-98A6-61DD1C753EE6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.FileExtensions.Test", "test\Microsoft.Extensions.Configuration.FileExtensions.Test\Microsoft.Extensions.Configuration.FileExtensions.Test.csproj", "{F7932F19-EB68-4C52-9CD1-3B51E48C2337}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.FileExtensions.Test", "test\Microsoft.Extensions.Configuration.FileExtensions.Test\Microsoft.Extensions.Configuration.FileExtensions.Test.csproj", "{F7932F19-EB68-4C52-9CD1-3B51E48C2337}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.AzureKeyVault", "src\Microsoft.Extensions.Configuration.AzureKeyVault\Microsoft.Extensions.Configuration.AzureKeyVault.csproj", "{A538F609-E902-40CE-8459-4248F9F63558}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.AzureKeyVault", "src\Microsoft.Extensions.Configuration.AzureKeyVault\Microsoft.Extensions.Configuration.AzureKeyVault.csproj", "{A538F609-E902-40CE-8459-4248F9F63558}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.AzureKeyVault.Test", "test\Microsoft.Extensions.Configuration.AzureKeyVault.Test\Microsoft.Extensions.Configuration.AzureKeyVault.Test.csproj", "{DA9C1F35-3F92-4F3A-B3B1-A62CCE626D48}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.AzureKeyVault.Test", "test\Microsoft.Extensions.Configuration.AzureKeyVault.Test\Microsoft.Extensions.Configuration.AzureKeyVault.Test.csproj", "{DA9C1F35-3F92-4F3A-B3B1-A62CCE626D48}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{AB015580-541D-4E2D-B904-E71F8582CC68}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "KeyVaultSample", "samples\KeyVaultSample\KeyVaultSample.csproj", "{7AAC49A7-939A-40B1-A86A-705464B4667D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "KeyVaultSample", "samples\KeyVaultSample\KeyVaultSample.csproj", "{7AAC49A7-939A-40B1-A86A-705464B4667D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.UserSecrets", "src\Microsoft.Extensions.Configuration.UserSecrets\Microsoft.Extensions.Configuration.UserSecrets.csproj", "{58B6443B-1278-4DF9-B7BB-DDF3BFFCF868}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.UserSecrets", "src\Microsoft.Extensions.Configuration.UserSecrets\Microsoft.Extensions.Configuration.UserSecrets.csproj", "{58B6443B-1278-4DF9-B7BB-DDF3BFFCF868}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}}") = "Microsoft.Extensions.Configuration.UserSecrets.Test", "test\Microsoft.Extensions.Configuration.UserSecrets.Test\Microsoft.Extensions.Configuration.UserSecrets.Test.csproj", "{AC7FAD2A-5763-404D-B0FC-3CCA81A16B0A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Extensions.Configuration.UserSecrets.Test", "test\Microsoft.Extensions.Configuration.UserSecrets.Test\Microsoft.Extensions.Configuration.UserSecrets.Test.csproj", "{AC7FAD2A-5763-404D-B0FC-3CCA81A16B0A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution From da4f547cb7f90992de530ac2aa0d90ddf5e75add Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 5 Jan 2017 12:19:53 -0800 Subject: [PATCH 3/3] Fix typo --- .../MsBuildTargetTest.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Microsoft.Extensions.Configuration.UserSecrets.Test/MsBuildTargetTest.cs b/test/Microsoft.Extensions.Configuration.UserSecrets.Test/MsBuildTargetTest.cs index 8cb737ab..5f92d504 100644 --- a/test/Microsoft.Extensions.Configuration.UserSecrets.Test/MsBuildTargetTest.cs +++ b/test/Microsoft.Extensions.Configuration.UserSecrets.Test/MsBuildTargetTest.cs @@ -42,7 +42,7 @@ public void GeneratesAssemblyAttributeFile() } var target = Path.Combine(_solutionRoot.FullName, "src", "Microsoft.Extensions.Configuration.UserSecrets", "build", "netstandard1.0", "Microsoft.Extensions.Configuration.UserSecrets.targets"); Directory.CreateDirectory(Path.Combine(_tempDir, "obj")); - File.Copy(target, Path.Combine(_tempDir, "obj", "test.csproj.usersecretstest.targets")); // imitates how NuGet will import thsi target + File.Copy(target, Path.Combine(_tempDir, "obj", "test.csproj.usersecretstest.targets")); // imitates how NuGet will import this target var testProj = Path.Combine(_tempDir, "test.csproj"); // should represent a 'dotnet new' project File.WriteAllText(testProj, @" @@ -82,7 +82,7 @@ public void GeneratesAssemblyAttributeFile() UseShellExecute = false, WorkingDirectory = _tempDir }; - Process.Start(buildInfo).WaitForExit(); + Process.Start(buildInfo).WaitForExit(); // build will fail because the test proj doesn't reference UserSecrets.dll // but that's okay. We just want to verify the target generates code correctly