diff --git a/Documentation/developer-guide.md b/Documentation/developer-guide.md index 481e1f6f7..b54710319 100644 --- a/Documentation/developer-guide.md +++ b/Documentation/developer-guide.md @@ -48,8 +48,8 @@ The dotnet CLI considers any executable on the path named `dotnet-{commandName}` 5. Add the project to the packaging scripts. #### Add a new command project -Start by copying an existing command, like /src/Microsoft.DotNet.Tools.Init. Change the last part of the project name, .Init in this case, to the name of your command. -Update the Name property in project.json as well, but use the `dotnet-{command}` syntax here. +Start by copying an existing command, like /src/dotnet-new. +Update the Name property in project.json as well, and use the `dotnet-{command}` syntax here. Make sure to use the System.CommandLine parser so behavior is consistant across commands. #### Add a Readme.md diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln index f8b02d20a..1501e300f 100644 --- a/Microsoft.DotNet.Cli.sln +++ b/Microsoft.DotNet.Cli.sln @@ -1,10 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Cli", "src\Microsoft.DotNet.Cli\Microsoft.DotNet.Cli.xproj", "{60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5A29E8E3-A0FC-4C57-81DD-297B56D1A119}" @@ -15,60 +13,30 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Cli.Utils", "src\Microsoft.DotNet.Cli.Utils\Microsoft.DotNet.Cli.Utils.xproj", "{61B7C351-C77D-43F7-B56F-BB1440178E10}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Compiler", "src\Microsoft.DotNet.Tools.Compiler\Microsoft.DotNet.Tools.Compiler.xproj", "{0A309227-A9D8-4DDF-88DD-326B57B04378}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Publish", "src\Microsoft.DotNet.Tools.Publish\Microsoft.DotNet.Tools.Publish.xproj", "{391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Compiler.Csc", "src\Microsoft.DotNet.Tools.Compiler.Csc\Microsoft.DotNet.Tools.Compiler.Csc.xproj", "{B559378C-FC03-45FA-893C-71784F28E0A2}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Repl", "src\Microsoft.DotNet.Tools.Repl\Microsoft.DotNet.Tools.Repl.xproj", "{B317356C-99DE-499E-8B4D-D6BEC5DA57D5}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Repl.Csi", "src\Microsoft.DotNet.Tools.Repl.Csi\Microsoft.DotNet.Tools.Repl.Csi.xproj", "{717A4ED9-8897-492F-BD0C-230FCAEA9237}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Resgen", "src\Microsoft.DotNet.Tools.Resgen\Microsoft.DotNet.Tools.Resgen.xproj", "{585FC6F6-48E0-4EA5-8015-0264614E97C0}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.ProjectModel", "src\Microsoft.DotNet.ProjectModel\Microsoft.DotNet.ProjectModel.xproj", "{303677D5-7312-4C3F-BAEE-BEB1A9BD9FE6}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Run", "src\Microsoft.DotNet.Tools.Run\Microsoft.DotNet.Tools.Run.xproj", "{1C16108C-C786-482D-BB0A-36BDAFE109ED}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Compiler.Common", "src\Microsoft.DotNet.Compiler.Common\Microsoft.DotNet.Compiler.Common.xproj", "{A16958E1-24C7-4F1E-B317-204AD91625DD}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Compiler.Native", "src\Microsoft.DotNet.Tools.Compiler.Native\Microsoft.DotNet.Tools.Compiler.Native.xproj", "{172485DD-B94E-4F3E-851E-CF23908FF960}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Pack", "src\Microsoft.DotNet.Tools.Pack\Microsoft.DotNet.Tools.Pack.xproj", "{0F480791-4BA0-44E3-8CC4-C71656664175}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.ProjectModel.Workspaces", "src\Microsoft.DotNet.ProjectModel.Workspaces\Microsoft.DotNet.ProjectModel.Workspaces.xproj", "{BD7833F8-3209-4682-BF75-B4BCA883E279}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Runtime", "src\Microsoft.DotNet.Runtime\Microsoft.DotNet.Runtime.xproj", "{DB29F219-DC92-4AF7-A2EE-E89FFBB3F5F0}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.Testing.Abstractions", "src\Microsoft.Extensions.Testing.Abstractions\Microsoft.Extensions.Testing.Abstractions.xproj", "{DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Test", "src\Microsoft.DotNet.Tools.Test\Microsoft.DotNet.Tools.Test.xproj", "{F003F228-2AE2-4E9D-877B-93EB773B5061}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.ProjectModel.Loader", "src\Microsoft.DotNet.ProjectModel.Loader\Microsoft.DotNet.ProjectModel.Loader.xproj", "{C7AF0290-EF0D-44DC-9EDC-600803B664F8}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "LoadContextTest", "test\LoadContextTest\LoadContextTest.xproj", "{7A75ACC4-3C2F-44E1-B492-0EC08704E9FF}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.New", "src\Microsoft.DotNet.Tools.New\Microsoft.DotNet.Tools.New.xproj", "{BC765FBF-AD7A-4A99-9902-5540C5A74181}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{0722D325-24C8-4E83-B5AF-0A083E7F0749}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-restore", "src\dotnet-restore\dotnet-restore.xproj", "{79620410-4EC7-4A38-A8C3-EE81243F818E}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MultiProjectValidator", "tools\MultiProjectValidator\MultiProjectValidator.xproj", "{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.ProjectModel.Server", "src\Microsoft.DotNet.ProjectModel.Server\Microsoft.DotNet.ProjectModel.Server.xproj", "{1EA9AF94-5494-40DD-A05B-9D564572CCFC}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.ProjectModel.Server.Tests", "test\Microsoft.DotNet.ProjectModel.Server.Tests\Microsoft.DotNet.ProjectModel.Server.Tests.xproj", "{11C77123-E4DA-499F-8900-80C88C2C69F2}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Builder", "src\Microsoft.DotNet.Tools.Builder\Microsoft.DotNet.Tools.Builder.xproj", "{0A309227-A9D8-4DDF-88DD-326B57B04379}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.DependencyModel", "src\Microsoft.Extensions.DependencyModel\Microsoft.Extensions.DependencyModel.xproj", "{688870C8-9843-4F9E-8576-D39290AD0F25}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Compiler.Fsc", "src\Microsoft.DotNet.Tools.Compiler.Fsc\Microsoft.DotNet.Tools.Compiler.Fsc.xproj", "{74F25188-BF63-4BF3-879B-B6CDB11ED608}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "E2E", "test\E2E\E2E.xproj", "{65741CB1-8AEE-4C66-8198-10A7EA0E4258}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Test.Utilities", "test\Microsoft.DotNet.Tools.Tests.Utilities\Microsoft.DotNet.Tools.Test.Utilities.xproj", "{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C}" @@ -81,16 +49,48 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestAppWithArgs", "test\Tes EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestAppWithContents", "test\TestProjects\TestAppWithContents\TestAppWithContents.xproj", "{0138CB8F-4AA9-4029-A21E-C07C30F425BA}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Compiler.Tests", "test\Microsoft.DotNet.Tools.Compiler.Tests\Microsoft.DotNet.Tools.Compiler.Tests.xproj", "{833FFEE1-7EED-4F51-8DFD-946D48893D6E}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Publish.Tests", "test\Microsoft.DotNet.Tools.Publish.Tests\Microsoft.DotNet.Tools.Publish.Tests.xproj", "{386D412C-003C-47B1-8258-0E35865CB7C4}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestLibrary", "test\TestProjects\TestLibrary\TestLibrary.xproj", "{947DD232-8D9B-4B78-9C6A-94F807D2DD58}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.Tools.Builder.Tests", "test\Microsoft.DotNet.Tools.Builder.Tests\Microsoft.DotNet.Tools.Builder.Tests.xproj", "{833FFEE1-7EED-4F51-8DFD-946D48833333}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestProjectToProjectDependencies", "test\TestProjects\TestProjectToProjectDependencies\TestProjectToProjectDependencies.xproj", "{947DD232-8D9B-4B78-9C6A-94F807D22222}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet", "src\dotnet\dotnet.xproj", "{60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-build", "src\dotnet-build\dotnet-build.xproj", "{0A309227-A9D8-4DDF-88DD-326B57B04379}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-compile", "src\dotnet-compile\dotnet-compile.xproj", "{0A309227-A9D8-4DDF-88DD-326B57B04378}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-compile-csc", "src\dotnet-compile-csc\dotnet-compile-csc.xproj", "{B559378C-FC03-45FA-893C-71784F28E0A2}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-compile-fsc", "src\dotnet-compile-fsc\dotnet-compile-fsc.xproj", "{74F25188-BF63-4BF3-879B-B6CDB11ED608}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-compile-native", "src\dotnet-compile-native\dotnet-compile-native.xproj", "{172485DD-B94E-4F3E-851E-CF23908FF960}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-new", "src\dotnet-new\dotnet-new.xproj", "{BC765FBF-AD7A-4A99-9902-5540C5A74181}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-pack", "src\dotnet-pack\dotnet-pack.xproj", "{0F480791-4BA0-44E3-8CC4-C71656664175}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-publish", "src\dotnet-publish\dotnet-publish.xproj", "{391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-repl", "src\dotnet-repl\dotnet-repl.xproj", "{B317356C-99DE-499E-8B4D-D6BEC5DA57D5}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-repl-csi", "src\dotnet-repl-csi\dotnet-repl-csi.xproj", "{717A4ED9-8897-492F-BD0C-230FCAEA9237}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-resgen", "src\dotnet-resgen\dotnet-resgen.xproj", "{585FC6F6-48E0-4EA5-8015-0264614E97C0}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-run", "src\dotnet-run\dotnet-run.xproj", "{1C16108C-C786-482D-BB0A-36BDAFE109ED}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-test", "src\dotnet-test\dotnet-test.xproj", "{F003F228-2AE2-4E9D-877B-93EB773B5061}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-build.Tests", "test\dotnet-build.Tests\dotnet-build.Tests.xproj", "{833FFEE1-7EED-4F51-8DFD-946D48833333}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-compile.Tests", "test\dotnet-compile.Tests\dotnet-compile.Tests.xproj", "{833FFEE1-7EED-4F51-8DFD-946D48893D6E}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-publish.Tests", "test\dotnet-publish.Tests\dotnet-publish.Tests.xproj", "{386D412C-003C-47B1-8258-0E35865CB7C4}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-projectmodel-server", "src\dotnet-projectmodel-server\dotnet-projectmodel-server.xproj", "{1EA9AF94-5494-40DD-A05B-9D564572CCFC}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-projectmodel-server.Tests", "test\dotnet-projectmodel-server.Tests\dotnet-projectmodel-server.Tests.xproj", "{11C77123-E4DA-499F-8900-80C88C2C69F2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -103,22 +103,6 @@ Global RelWithDebInfo|x64 = RelWithDebInfo|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Debug|x64.ActiveCfg = Debug|Any CPU - {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Debug|x64.Build.0 = Debug|Any CPU - {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU - {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU - {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.MinSizeRel|x64.ActiveCfg = Release|Any CPU - {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.MinSizeRel|x64.Build.0 = Release|Any CPU - {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Release|Any CPU.Build.0 = Release|Any CPU - {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Release|x64.ActiveCfg = Release|Any CPU - {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Release|x64.Build.0 = Release|Any CPU - {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {61B7C351-C77D-43F7-B56F-BB1440178E10}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {61B7C351-C77D-43F7-B56F-BB1440178E10}.Debug|Any CPU.Build.0 = Debug|Any CPU {61B7C351-C77D-43F7-B56F-BB1440178E10}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -135,102 +119,6 @@ Global {61B7C351-C77D-43F7-B56F-BB1440178E10}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU {61B7C351-C77D-43F7-B56F-BB1440178E10}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU {61B7C351-C77D-43F7-B56F-BB1440178E10}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04378}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04378}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04378}.Debug|x64.ActiveCfg = Debug|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04378}.Debug|x64.Build.0 = Debug|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04378}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04378}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04378}.MinSizeRel|x64.ActiveCfg = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04378}.MinSizeRel|x64.Build.0 = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04378}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04378}.Release|Any CPU.Build.0 = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04378}.Release|x64.ActiveCfg = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04378}.Release|x64.Build.0 = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04378}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04378}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04378}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04378}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Debug|x64.ActiveCfg = Debug|Any CPU - {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Debug|x64.Build.0 = Debug|Any CPU - {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU - {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU - {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.MinSizeRel|x64.ActiveCfg = Release|Any CPU - {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.MinSizeRel|x64.Build.0 = Release|Any CPU - {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Release|Any CPU.Build.0 = Release|Any CPU - {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Release|x64.ActiveCfg = Release|Any CPU - {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Release|x64.Build.0 = Release|Any CPU - {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {B559378C-FC03-45FA-893C-71784F28E0A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B559378C-FC03-45FA-893C-71784F28E0A2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B559378C-FC03-45FA-893C-71784F28E0A2}.Debug|x64.ActiveCfg = Debug|Any CPU - {B559378C-FC03-45FA-893C-71784F28E0A2}.Debug|x64.Build.0 = Debug|Any CPU - {B559378C-FC03-45FA-893C-71784F28E0A2}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU - {B559378C-FC03-45FA-893C-71784F28E0A2}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU - {B559378C-FC03-45FA-893C-71784F28E0A2}.MinSizeRel|x64.ActiveCfg = Release|Any CPU - {B559378C-FC03-45FA-893C-71784F28E0A2}.MinSizeRel|x64.Build.0 = Release|Any CPU - {B559378C-FC03-45FA-893C-71784F28E0A2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B559378C-FC03-45FA-893C-71784F28E0A2}.Release|Any CPU.Build.0 = Release|Any CPU - {B559378C-FC03-45FA-893C-71784F28E0A2}.Release|x64.ActiveCfg = Release|Any CPU - {B559378C-FC03-45FA-893C-71784F28E0A2}.Release|x64.Build.0 = Release|Any CPU - {B559378C-FC03-45FA-893C-71784F28E0A2}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {B559378C-FC03-45FA-893C-71784F28E0A2}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {B559378C-FC03-45FA-893C-71784F28E0A2}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {B559378C-FC03-45FA-893C-71784F28E0A2}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.Debug|x64.ActiveCfg = Debug|Any CPU - {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.Debug|x64.Build.0 = Debug|Any CPU - {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU - {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU - {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.MinSizeRel|x64.ActiveCfg = Release|Any CPU - {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.MinSizeRel|x64.Build.0 = Release|Any CPU - {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.Release|Any CPU.Build.0 = Release|Any CPU - {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.Release|x64.ActiveCfg = Release|Any CPU - {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.Release|x64.Build.0 = Release|Any CPU - {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {717A4ED9-8897-492F-BD0C-230FCAEA9237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {717A4ED9-8897-492F-BD0C-230FCAEA9237}.Debug|Any CPU.Build.0 = Debug|Any CPU - {717A4ED9-8897-492F-BD0C-230FCAEA9237}.Debug|x64.ActiveCfg = Debug|Any CPU - {717A4ED9-8897-492F-BD0C-230FCAEA9237}.Debug|x64.Build.0 = Debug|Any CPU - {717A4ED9-8897-492F-BD0C-230FCAEA9237}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {717A4ED9-8897-492F-BD0C-230FCAEA9237}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {717A4ED9-8897-492F-BD0C-230FCAEA9237}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {717A4ED9-8897-492F-BD0C-230FCAEA9237}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {717A4ED9-8897-492F-BD0C-230FCAEA9237}.Release|Any CPU.ActiveCfg = Release|Any CPU - {717A4ED9-8897-492F-BD0C-230FCAEA9237}.Release|Any CPU.Build.0 = Release|Any CPU - {717A4ED9-8897-492F-BD0C-230FCAEA9237}.Release|x64.ActiveCfg = Release|Any CPU - {717A4ED9-8897-492F-BD0C-230FCAEA9237}.Release|x64.Build.0 = Release|Any CPU - {717A4ED9-8897-492F-BD0C-230FCAEA9237}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {717A4ED9-8897-492F-BD0C-230FCAEA9237}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {717A4ED9-8897-492F-BD0C-230FCAEA9237}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {717A4ED9-8897-492F-BD0C-230FCAEA9237}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {585FC6F6-48E0-4EA5-8015-0264614E97C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {585FC6F6-48E0-4EA5-8015-0264614E97C0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {585FC6F6-48E0-4EA5-8015-0264614E97C0}.Debug|x64.ActiveCfg = Debug|Any CPU - {585FC6F6-48E0-4EA5-8015-0264614E97C0}.Debug|x64.Build.0 = Debug|Any CPU - {585FC6F6-48E0-4EA5-8015-0264614E97C0}.MinSizeRel|Any CPU.ActiveCfg = Release|Any CPU - {585FC6F6-48E0-4EA5-8015-0264614E97C0}.MinSizeRel|Any CPU.Build.0 = Release|Any CPU - {585FC6F6-48E0-4EA5-8015-0264614E97C0}.MinSizeRel|x64.ActiveCfg = Release|Any CPU - {585FC6F6-48E0-4EA5-8015-0264614E97C0}.MinSizeRel|x64.Build.0 = Release|Any CPU - {585FC6F6-48E0-4EA5-8015-0264614E97C0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {585FC6F6-48E0-4EA5-8015-0264614E97C0}.Release|Any CPU.Build.0 = Release|Any CPU - {585FC6F6-48E0-4EA5-8015-0264614E97C0}.Release|x64.ActiveCfg = Release|Any CPU - {585FC6F6-48E0-4EA5-8015-0264614E97C0}.Release|x64.Build.0 = Release|Any CPU - {585FC6F6-48E0-4EA5-8015-0264614E97C0}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {585FC6F6-48E0-4EA5-8015-0264614E97C0}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {585FC6F6-48E0-4EA5-8015-0264614E97C0}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {585FC6F6-48E0-4EA5-8015-0264614E97C0}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {303677D5-7312-4C3F-BAEE-BEB1A9BD9FE6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {303677D5-7312-4C3F-BAEE-BEB1A9BD9FE6}.Debug|Any CPU.Build.0 = Debug|Any CPU {303677D5-7312-4C3F-BAEE-BEB1A9BD9FE6}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -247,22 +135,6 @@ Global {303677D5-7312-4C3F-BAEE-BEB1A9BD9FE6}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU {303677D5-7312-4C3F-BAEE-BEB1A9BD9FE6}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU {303677D5-7312-4C3F-BAEE-BEB1A9BD9FE6}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {1C16108C-C786-482D-BB0A-36BDAFE109ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1C16108C-C786-482D-BB0A-36BDAFE109ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1C16108C-C786-482D-BB0A-36BDAFE109ED}.Debug|x64.ActiveCfg = Debug|Any CPU - {1C16108C-C786-482D-BB0A-36BDAFE109ED}.Debug|x64.Build.0 = Debug|Any CPU - {1C16108C-C786-482D-BB0A-36BDAFE109ED}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {1C16108C-C786-482D-BB0A-36BDAFE109ED}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {1C16108C-C786-482D-BB0A-36BDAFE109ED}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {1C16108C-C786-482D-BB0A-36BDAFE109ED}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {1C16108C-C786-482D-BB0A-36BDAFE109ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1C16108C-C786-482D-BB0A-36BDAFE109ED}.Release|Any CPU.Build.0 = Release|Any CPU - {1C16108C-C786-482D-BB0A-36BDAFE109ED}.Release|x64.ActiveCfg = Release|Any CPU - {1C16108C-C786-482D-BB0A-36BDAFE109ED}.Release|x64.Build.0 = Release|Any CPU - {1C16108C-C786-482D-BB0A-36BDAFE109ED}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {1C16108C-C786-482D-BB0A-36BDAFE109ED}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {1C16108C-C786-482D-BB0A-36BDAFE109ED}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {1C16108C-C786-482D-BB0A-36BDAFE109ED}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {A16958E1-24C7-4F1E-B317-204AD91625DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A16958E1-24C7-4F1E-B317-204AD91625DD}.Debug|Any CPU.Build.0 = Debug|Any CPU {A16958E1-24C7-4F1E-B317-204AD91625DD}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -279,38 +151,6 @@ Global {A16958E1-24C7-4F1E-B317-204AD91625DD}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU {A16958E1-24C7-4F1E-B317-204AD91625DD}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU {A16958E1-24C7-4F1E-B317-204AD91625DD}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {172485DD-B94E-4F3E-851E-CF23908FF960}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {172485DD-B94E-4F3E-851E-CF23908FF960}.Debug|Any CPU.Build.0 = Debug|Any CPU - {172485DD-B94E-4F3E-851E-CF23908FF960}.Debug|x64.ActiveCfg = Debug|Any CPU - {172485DD-B94E-4F3E-851E-CF23908FF960}.Debug|x64.Build.0 = Debug|Any CPU - {172485DD-B94E-4F3E-851E-CF23908FF960}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {172485DD-B94E-4F3E-851E-CF23908FF960}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {172485DD-B94E-4F3E-851E-CF23908FF960}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {172485DD-B94E-4F3E-851E-CF23908FF960}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {172485DD-B94E-4F3E-851E-CF23908FF960}.Release|Any CPU.ActiveCfg = Release|Any CPU - {172485DD-B94E-4F3E-851E-CF23908FF960}.Release|Any CPU.Build.0 = Release|Any CPU - {172485DD-B94E-4F3E-851E-CF23908FF960}.Release|x64.ActiveCfg = Release|Any CPU - {172485DD-B94E-4F3E-851E-CF23908FF960}.Release|x64.Build.0 = Release|Any CPU - {172485DD-B94E-4F3E-851E-CF23908FF960}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {172485DD-B94E-4F3E-851E-CF23908FF960}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {172485DD-B94E-4F3E-851E-CF23908FF960}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {172485DD-B94E-4F3E-851E-CF23908FF960}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {0F480791-4BA0-44E3-8CC4-C71656664175}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F480791-4BA0-44E3-8CC4-C71656664175}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F480791-4BA0-44E3-8CC4-C71656664175}.Debug|x64.ActiveCfg = Debug|Any CPU - {0F480791-4BA0-44E3-8CC4-C71656664175}.Debug|x64.Build.0 = Debug|Any CPU - {0F480791-4BA0-44E3-8CC4-C71656664175}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {0F480791-4BA0-44E3-8CC4-C71656664175}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {0F480791-4BA0-44E3-8CC4-C71656664175}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {0F480791-4BA0-44E3-8CC4-C71656664175}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {0F480791-4BA0-44E3-8CC4-C71656664175}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F480791-4BA0-44E3-8CC4-C71656664175}.Release|Any CPU.Build.0 = Release|Any CPU - {0F480791-4BA0-44E3-8CC4-C71656664175}.Release|x64.ActiveCfg = Release|Any CPU - {0F480791-4BA0-44E3-8CC4-C71656664175}.Release|x64.Build.0 = Release|Any CPU - {0F480791-4BA0-44E3-8CC4-C71656664175}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {0F480791-4BA0-44E3-8CC4-C71656664175}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {0F480791-4BA0-44E3-8CC4-C71656664175}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {0F480791-4BA0-44E3-8CC4-C71656664175}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {BD7833F8-3209-4682-BF75-B4BCA883E279}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BD7833F8-3209-4682-BF75-B4BCA883E279}.Debug|Any CPU.Build.0 = Debug|Any CPU {BD7833F8-3209-4682-BF75-B4BCA883E279}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -359,22 +199,6 @@ Global {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {F003F228-2AE2-4E9D-877B-93EB773B5061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F003F228-2AE2-4E9D-877B-93EB773B5061}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F003F228-2AE2-4E9D-877B-93EB773B5061}.Debug|x64.ActiveCfg = Debug|Any CPU - {F003F228-2AE2-4E9D-877B-93EB773B5061}.Debug|x64.Build.0 = Debug|Any CPU - {F003F228-2AE2-4E9D-877B-93EB773B5061}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {F003F228-2AE2-4E9D-877B-93EB773B5061}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {F003F228-2AE2-4E9D-877B-93EB773B5061}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {F003F228-2AE2-4E9D-877B-93EB773B5061}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {F003F228-2AE2-4E9D-877B-93EB773B5061}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F003F228-2AE2-4E9D-877B-93EB773B5061}.Release|Any CPU.Build.0 = Release|Any CPU - {F003F228-2AE2-4E9D-877B-93EB773B5061}.Release|x64.ActiveCfg = Release|Any CPU - {F003F228-2AE2-4E9D-877B-93EB773B5061}.Release|x64.Build.0 = Release|Any CPU - {F003F228-2AE2-4E9D-877B-93EB773B5061}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {F003F228-2AE2-4E9D-877B-93EB773B5061}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {F003F228-2AE2-4E9D-877B-93EB773B5061}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {F003F228-2AE2-4E9D-877B-93EB773B5061}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.Debug|Any CPU.Build.0 = Debug|Any CPU {C7AF0290-EF0D-44DC-9EDC-600803B664F8}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -407,22 +231,6 @@ Global {7A75ACC4-3C2F-44E1-B492-0EC08704E9FF}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU {7A75ACC4-3C2F-44E1-B492-0EC08704E9FF}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU {7A75ACC4-3C2F-44E1-B492-0EC08704E9FF}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {BC765FBF-AD7A-4A99-9902-5540C5A74181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BC765FBF-AD7A-4A99-9902-5540C5A74181}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BC765FBF-AD7A-4A99-9902-5540C5A74181}.Debug|x64.ActiveCfg = Debug|Any CPU - {BC765FBF-AD7A-4A99-9902-5540C5A74181}.Debug|x64.Build.0 = Debug|Any CPU - {BC765FBF-AD7A-4A99-9902-5540C5A74181}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {BC765FBF-AD7A-4A99-9902-5540C5A74181}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {BC765FBF-AD7A-4A99-9902-5540C5A74181}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {BC765FBF-AD7A-4A99-9902-5540C5A74181}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {BC765FBF-AD7A-4A99-9902-5540C5A74181}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BC765FBF-AD7A-4A99-9902-5540C5A74181}.Release|Any CPU.Build.0 = Release|Any CPU - {BC765FBF-AD7A-4A99-9902-5540C5A74181}.Release|x64.ActiveCfg = Release|Any CPU - {BC765FBF-AD7A-4A99-9902-5540C5A74181}.Release|x64.Build.0 = Release|Any CPU - {BC765FBF-AD7A-4A99-9902-5540C5A74181}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {BC765FBF-AD7A-4A99-9902-5540C5A74181}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {BC765FBF-AD7A-4A99-9902-5540C5A74181}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {BC765FBF-AD7A-4A99-9902-5540C5A74181}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {79620410-4EC7-4A38-A8C3-EE81243F818E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {79620410-4EC7-4A38-A8C3-EE81243F818E}.Debug|Any CPU.Build.0 = Debug|Any CPU {79620410-4EC7-4A38-A8C3-EE81243F818E}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -455,54 +263,6 @@ Global {08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU {08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU {08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Debug|x64.ActiveCfg = Debug|Any CPU - {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Debug|x64.Build.0 = Debug|Any CPU - {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Release|Any CPU.Build.0 = Release|Any CPU - {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Release|x64.ActiveCfg = Release|Any CPU - {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Release|x64.Build.0 = Release|Any CPU - {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|x64.ActiveCfg = Debug|Any CPU - {11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|x64.Build.0 = Debug|Any CPU - {11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|Any CPU.Build.0 = Release|Any CPU - {11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|x64.ActiveCfg = Release|Any CPU - {11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|x64.Build.0 = Release|Any CPU - {11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04379}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04379}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04379}.Debug|x64.ActiveCfg = Debug|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04379}.Debug|x64.Build.0 = Debug|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04379}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04379}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04379}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04379}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04379}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04379}.Release|Any CPU.Build.0 = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04379}.Release|x64.ActiveCfg = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04379}.Release|x64.Build.0 = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04379}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04379}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04379}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {0A309227-A9D8-4DDF-88DD-326B57B04379}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {688870C8-9843-4F9E-8576-D39290AD0F25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {688870C8-9843-4F9E-8576-D39290AD0F25}.Debug|Any CPU.Build.0 = Debug|Any CPU {688870C8-9843-4F9E-8576-D39290AD0F25}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -519,22 +279,6 @@ Global {688870C8-9843-4F9E-8576-D39290AD0F25}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU {688870C8-9843-4F9E-8576-D39290AD0F25}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU {688870C8-9843-4F9E-8576-D39290AD0F25}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {74F25188-BF63-4BF3-879B-B6CDB11ED608}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {74F25188-BF63-4BF3-879B-B6CDB11ED608}.Debug|Any CPU.Build.0 = Debug|Any CPU - {74F25188-BF63-4BF3-879B-B6CDB11ED608}.Debug|x64.ActiveCfg = Debug|Any CPU - {74F25188-BF63-4BF3-879B-B6CDB11ED608}.Debug|x64.Build.0 = Debug|Any CPU - {74F25188-BF63-4BF3-879B-B6CDB11ED608}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {74F25188-BF63-4BF3-879B-B6CDB11ED608}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {74F25188-BF63-4BF3-879B-B6CDB11ED608}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {74F25188-BF63-4BF3-879B-B6CDB11ED608}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {74F25188-BF63-4BF3-879B-B6CDB11ED608}.Release|Any CPU.ActiveCfg = Release|Any CPU - {74F25188-BF63-4BF3-879B-B6CDB11ED608}.Release|Any CPU.Build.0 = Release|Any CPU - {74F25188-BF63-4BF3-879B-B6CDB11ED608}.Release|x64.ActiveCfg = Release|Any CPU - {74F25188-BF63-4BF3-879B-B6CDB11ED608}.Release|x64.Build.0 = Release|Any CPU - {74F25188-BF63-4BF3-879B-B6CDB11ED608}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {74F25188-BF63-4BF3-879B-B6CDB11ED608}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {74F25188-BF63-4BF3-879B-B6CDB11ED608}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {74F25188-BF63-4BF3-879B-B6CDB11ED608}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {65741CB1-8AEE-4C66-8198-10A7EA0E4258}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {65741CB1-8AEE-4C66-8198-10A7EA0E4258}.Debug|Any CPU.Build.0 = Debug|Any CPU {65741CB1-8AEE-4C66-8198-10A7EA0E4258}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -615,6 +359,278 @@ Global {0138CB8F-4AA9-4029-A21E-C07C30F425BA}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU {0138CB8F-4AA9-4029-A21E-C07C30F425BA}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU {0138CB8F-4AA9-4029-A21E-C07C30F425BA}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.Debug|Any CPU.Build.0 = Debug|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.Debug|x64.ActiveCfg = Debug|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.Debug|x64.Build.0 = Debug|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.Release|Any CPU.ActiveCfg = Release|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.Release|Any CPU.Build.0 = Release|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.Release|x64.ActiveCfg = Release|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.Release|x64.Build.0 = Release|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D22222}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D22222}.Debug|Any CPU.Build.0 = Debug|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D22222}.Debug|x64.ActiveCfg = Debug|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D22222}.Debug|x64.Build.0 = Debug|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D22222}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D22222}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D22222}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D22222}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D22222}.Release|Any CPU.ActiveCfg = Release|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D22222}.Release|Any CPU.Build.0 = Release|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D22222}.Release|x64.ActiveCfg = Release|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D22222}.Release|x64.Build.0 = Release|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D22222}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D22222}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D22222}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {947DD232-8D9B-4B78-9C6A-94F807D22222}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Debug|x64.ActiveCfg = Debug|Any CPU + {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Debug|x64.Build.0 = Debug|Any CPU + {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Release|Any CPU.Build.0 = Release|Any CPU + {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Release|x64.ActiveCfg = Release|Any CPU + {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.Release|x64.Build.0 = Release|Any CPU + {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04379}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04379}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04379}.Debug|x64.ActiveCfg = Debug|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04379}.Debug|x64.Build.0 = Debug|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04379}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04379}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04379}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04379}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04379}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04379}.Release|Any CPU.Build.0 = Release|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04379}.Release|x64.ActiveCfg = Release|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04379}.Release|x64.Build.0 = Release|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04379}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04379}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04379}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04379}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04378}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04378}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04378}.Debug|x64.ActiveCfg = Debug|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04378}.Debug|x64.Build.0 = Debug|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04378}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04378}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04378}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04378}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04378}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04378}.Release|Any CPU.Build.0 = Release|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04378}.Release|x64.ActiveCfg = Release|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04378}.Release|x64.Build.0 = Release|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04378}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04378}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04378}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {0A309227-A9D8-4DDF-88DD-326B57B04378}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {B559378C-FC03-45FA-893C-71784F28E0A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B559378C-FC03-45FA-893C-71784F28E0A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B559378C-FC03-45FA-893C-71784F28E0A2}.Debug|x64.ActiveCfg = Debug|Any CPU + {B559378C-FC03-45FA-893C-71784F28E0A2}.Debug|x64.Build.0 = Debug|Any CPU + {B559378C-FC03-45FA-893C-71784F28E0A2}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {B559378C-FC03-45FA-893C-71784F28E0A2}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {B559378C-FC03-45FA-893C-71784F28E0A2}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {B559378C-FC03-45FA-893C-71784F28E0A2}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {B559378C-FC03-45FA-893C-71784F28E0A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B559378C-FC03-45FA-893C-71784F28E0A2}.Release|Any CPU.Build.0 = Release|Any CPU + {B559378C-FC03-45FA-893C-71784F28E0A2}.Release|x64.ActiveCfg = Release|Any CPU + {B559378C-FC03-45FA-893C-71784F28E0A2}.Release|x64.Build.0 = Release|Any CPU + {B559378C-FC03-45FA-893C-71784F28E0A2}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {B559378C-FC03-45FA-893C-71784F28E0A2}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {B559378C-FC03-45FA-893C-71784F28E0A2}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {B559378C-FC03-45FA-893C-71784F28E0A2}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {74F25188-BF63-4BF3-879B-B6CDB11ED608}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {74F25188-BF63-4BF3-879B-B6CDB11ED608}.Debug|Any CPU.Build.0 = Debug|Any CPU + {74F25188-BF63-4BF3-879B-B6CDB11ED608}.Debug|x64.ActiveCfg = Debug|Any CPU + {74F25188-BF63-4BF3-879B-B6CDB11ED608}.Debug|x64.Build.0 = Debug|Any CPU + {74F25188-BF63-4BF3-879B-B6CDB11ED608}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {74F25188-BF63-4BF3-879B-B6CDB11ED608}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {74F25188-BF63-4BF3-879B-B6CDB11ED608}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {74F25188-BF63-4BF3-879B-B6CDB11ED608}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {74F25188-BF63-4BF3-879B-B6CDB11ED608}.Release|Any CPU.ActiveCfg = Release|Any CPU + {74F25188-BF63-4BF3-879B-B6CDB11ED608}.Release|Any CPU.Build.0 = Release|Any CPU + {74F25188-BF63-4BF3-879B-B6CDB11ED608}.Release|x64.ActiveCfg = Release|Any CPU + {74F25188-BF63-4BF3-879B-B6CDB11ED608}.Release|x64.Build.0 = Release|Any CPU + {74F25188-BF63-4BF3-879B-B6CDB11ED608}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {74F25188-BF63-4BF3-879B-B6CDB11ED608}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {74F25188-BF63-4BF3-879B-B6CDB11ED608}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {74F25188-BF63-4BF3-879B-B6CDB11ED608}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {172485DD-B94E-4F3E-851E-CF23908FF960}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {172485DD-B94E-4F3E-851E-CF23908FF960}.Debug|Any CPU.Build.0 = Debug|Any CPU + {172485DD-B94E-4F3E-851E-CF23908FF960}.Debug|x64.ActiveCfg = Debug|Any CPU + {172485DD-B94E-4F3E-851E-CF23908FF960}.Debug|x64.Build.0 = Debug|Any CPU + {172485DD-B94E-4F3E-851E-CF23908FF960}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {172485DD-B94E-4F3E-851E-CF23908FF960}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {172485DD-B94E-4F3E-851E-CF23908FF960}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {172485DD-B94E-4F3E-851E-CF23908FF960}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {172485DD-B94E-4F3E-851E-CF23908FF960}.Release|Any CPU.ActiveCfg = Release|Any CPU + {172485DD-B94E-4F3E-851E-CF23908FF960}.Release|Any CPU.Build.0 = Release|Any CPU + {172485DD-B94E-4F3E-851E-CF23908FF960}.Release|x64.ActiveCfg = Release|Any CPU + {172485DD-B94E-4F3E-851E-CF23908FF960}.Release|x64.Build.0 = Release|Any CPU + {172485DD-B94E-4F3E-851E-CF23908FF960}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {172485DD-B94E-4F3E-851E-CF23908FF960}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {172485DD-B94E-4F3E-851E-CF23908FF960}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {172485DD-B94E-4F3E-851E-CF23908FF960}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {BC765FBF-AD7A-4A99-9902-5540C5A74181}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BC765FBF-AD7A-4A99-9902-5540C5A74181}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BC765FBF-AD7A-4A99-9902-5540C5A74181}.Debug|x64.ActiveCfg = Debug|Any CPU + {BC765FBF-AD7A-4A99-9902-5540C5A74181}.Debug|x64.Build.0 = Debug|Any CPU + {BC765FBF-AD7A-4A99-9902-5540C5A74181}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {BC765FBF-AD7A-4A99-9902-5540C5A74181}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {BC765FBF-AD7A-4A99-9902-5540C5A74181}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {BC765FBF-AD7A-4A99-9902-5540C5A74181}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {BC765FBF-AD7A-4A99-9902-5540C5A74181}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BC765FBF-AD7A-4A99-9902-5540C5A74181}.Release|Any CPU.Build.0 = Release|Any CPU + {BC765FBF-AD7A-4A99-9902-5540C5A74181}.Release|x64.ActiveCfg = Release|Any CPU + {BC765FBF-AD7A-4A99-9902-5540C5A74181}.Release|x64.Build.0 = Release|Any CPU + {BC765FBF-AD7A-4A99-9902-5540C5A74181}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {BC765FBF-AD7A-4A99-9902-5540C5A74181}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {BC765FBF-AD7A-4A99-9902-5540C5A74181}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {BC765FBF-AD7A-4A99-9902-5540C5A74181}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {0F480791-4BA0-44E3-8CC4-C71656664175}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0F480791-4BA0-44E3-8CC4-C71656664175}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0F480791-4BA0-44E3-8CC4-C71656664175}.Debug|x64.ActiveCfg = Debug|Any CPU + {0F480791-4BA0-44E3-8CC4-C71656664175}.Debug|x64.Build.0 = Debug|Any CPU + {0F480791-4BA0-44E3-8CC4-C71656664175}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {0F480791-4BA0-44E3-8CC4-C71656664175}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {0F480791-4BA0-44E3-8CC4-C71656664175}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {0F480791-4BA0-44E3-8CC4-C71656664175}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {0F480791-4BA0-44E3-8CC4-C71656664175}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0F480791-4BA0-44E3-8CC4-C71656664175}.Release|Any CPU.Build.0 = Release|Any CPU + {0F480791-4BA0-44E3-8CC4-C71656664175}.Release|x64.ActiveCfg = Release|Any CPU + {0F480791-4BA0-44E3-8CC4-C71656664175}.Release|x64.Build.0 = Release|Any CPU + {0F480791-4BA0-44E3-8CC4-C71656664175}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {0F480791-4BA0-44E3-8CC4-C71656664175}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {0F480791-4BA0-44E3-8CC4-C71656664175}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {0F480791-4BA0-44E3-8CC4-C71656664175}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Debug|x64.ActiveCfg = Debug|Any CPU + {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Debug|x64.Build.0 = Debug|Any CPU + {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Release|Any CPU.Build.0 = Release|Any CPU + {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Release|x64.ActiveCfg = Release|Any CPU + {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.Release|x64.Build.0 = Release|Any CPU + {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.Debug|x64.ActiveCfg = Debug|Any CPU + {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.Debug|x64.Build.0 = Debug|Any CPU + {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.Release|Any CPU.Build.0 = Release|Any CPU + {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.Release|x64.ActiveCfg = Release|Any CPU + {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.Release|x64.Build.0 = Release|Any CPU + {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {B317356C-99DE-499E-8B4D-D6BEC5DA57D5}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {717A4ED9-8897-492F-BD0C-230FCAEA9237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {717A4ED9-8897-492F-BD0C-230FCAEA9237}.Debug|Any CPU.Build.0 = Debug|Any CPU + {717A4ED9-8897-492F-BD0C-230FCAEA9237}.Debug|x64.ActiveCfg = Debug|Any CPU + {717A4ED9-8897-492F-BD0C-230FCAEA9237}.Debug|x64.Build.0 = Debug|Any CPU + {717A4ED9-8897-492F-BD0C-230FCAEA9237}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {717A4ED9-8897-492F-BD0C-230FCAEA9237}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {717A4ED9-8897-492F-BD0C-230FCAEA9237}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {717A4ED9-8897-492F-BD0C-230FCAEA9237}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {717A4ED9-8897-492F-BD0C-230FCAEA9237}.Release|Any CPU.ActiveCfg = Release|Any CPU + {717A4ED9-8897-492F-BD0C-230FCAEA9237}.Release|Any CPU.Build.0 = Release|Any CPU + {717A4ED9-8897-492F-BD0C-230FCAEA9237}.Release|x64.ActiveCfg = Release|Any CPU + {717A4ED9-8897-492F-BD0C-230FCAEA9237}.Release|x64.Build.0 = Release|Any CPU + {717A4ED9-8897-492F-BD0C-230FCAEA9237}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {717A4ED9-8897-492F-BD0C-230FCAEA9237}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {717A4ED9-8897-492F-BD0C-230FCAEA9237}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {717A4ED9-8897-492F-BD0C-230FCAEA9237}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {585FC6F6-48E0-4EA5-8015-0264614E97C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {585FC6F6-48E0-4EA5-8015-0264614E97C0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {585FC6F6-48E0-4EA5-8015-0264614E97C0}.Debug|x64.ActiveCfg = Debug|Any CPU + {585FC6F6-48E0-4EA5-8015-0264614E97C0}.Debug|x64.Build.0 = Debug|Any CPU + {585FC6F6-48E0-4EA5-8015-0264614E97C0}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {585FC6F6-48E0-4EA5-8015-0264614E97C0}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {585FC6F6-48E0-4EA5-8015-0264614E97C0}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {585FC6F6-48E0-4EA5-8015-0264614E97C0}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {585FC6F6-48E0-4EA5-8015-0264614E97C0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {585FC6F6-48E0-4EA5-8015-0264614E97C0}.Release|Any CPU.Build.0 = Release|Any CPU + {585FC6F6-48E0-4EA5-8015-0264614E97C0}.Release|x64.ActiveCfg = Release|Any CPU + {585FC6F6-48E0-4EA5-8015-0264614E97C0}.Release|x64.Build.0 = Release|Any CPU + {585FC6F6-48E0-4EA5-8015-0264614E97C0}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {585FC6F6-48E0-4EA5-8015-0264614E97C0}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {585FC6F6-48E0-4EA5-8015-0264614E97C0}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {585FC6F6-48E0-4EA5-8015-0264614E97C0}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {1C16108C-C786-482D-BB0A-36BDAFE109ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1C16108C-C786-482D-BB0A-36BDAFE109ED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1C16108C-C786-482D-BB0A-36BDAFE109ED}.Debug|x64.ActiveCfg = Debug|Any CPU + {1C16108C-C786-482D-BB0A-36BDAFE109ED}.Debug|x64.Build.0 = Debug|Any CPU + {1C16108C-C786-482D-BB0A-36BDAFE109ED}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {1C16108C-C786-482D-BB0A-36BDAFE109ED}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {1C16108C-C786-482D-BB0A-36BDAFE109ED}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {1C16108C-C786-482D-BB0A-36BDAFE109ED}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {1C16108C-C786-482D-BB0A-36BDAFE109ED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1C16108C-C786-482D-BB0A-36BDAFE109ED}.Release|Any CPU.Build.0 = Release|Any CPU + {1C16108C-C786-482D-BB0A-36BDAFE109ED}.Release|x64.ActiveCfg = Release|Any CPU + {1C16108C-C786-482D-BB0A-36BDAFE109ED}.Release|x64.Build.0 = Release|Any CPU + {1C16108C-C786-482D-BB0A-36BDAFE109ED}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {1C16108C-C786-482D-BB0A-36BDAFE109ED}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {1C16108C-C786-482D-BB0A-36BDAFE109ED}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {1C16108C-C786-482D-BB0A-36BDAFE109ED}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Debug|x64.ActiveCfg = Debug|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Debug|x64.Build.0 = Debug|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Release|Any CPU.Build.0 = Release|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Release|x64.ActiveCfg = Release|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.Release|x64.Build.0 = Release|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {F003F228-2AE2-4E9D-877B-93EB773B5061}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {833FFEE1-7EED-4F51-8DFD-946D48833333}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {833FFEE1-7EED-4F51-8DFD-946D48833333}.Debug|Any CPU.Build.0 = Debug|Any CPU + {833FFEE1-7EED-4F51-8DFD-946D48833333}.Debug|x64.ActiveCfg = Debug|Any CPU + {833FFEE1-7EED-4F51-8DFD-946D48833333}.Debug|x64.Build.0 = Debug|Any CPU + {833FFEE1-7EED-4F51-8DFD-946D48833333}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {833FFEE1-7EED-4F51-8DFD-946D48833333}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {833FFEE1-7EED-4F51-8DFD-946D48833333}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {833FFEE1-7EED-4F51-8DFD-946D48833333}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {833FFEE1-7EED-4F51-8DFD-946D48833333}.Release|Any CPU.ActiveCfg = Release|Any CPU + {833FFEE1-7EED-4F51-8DFD-946D48833333}.Release|Any CPU.Build.0 = Release|Any CPU + {833FFEE1-7EED-4F51-8DFD-946D48833333}.Release|x64.ActiveCfg = Release|Any CPU + {833FFEE1-7EED-4F51-8DFD-946D48833333}.Release|x64.Build.0 = Release|Any CPU + {833FFEE1-7EED-4F51-8DFD-946D48833333}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {833FFEE1-7EED-4F51-8DFD-946D48833333}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {833FFEE1-7EED-4F51-8DFD-946D48833333}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {833FFEE1-7EED-4F51-8DFD-946D48833333}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {833FFEE1-7EED-4F51-8DFD-946D48893D6E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {833FFEE1-7EED-4F51-8DFD-946D48893D6E}.Debug|Any CPU.Build.0 = Debug|Any CPU {833FFEE1-7EED-4F51-8DFD-946D48893D6E}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -647,96 +663,80 @@ Global {386D412C-003C-47B1-8258-0E35865CB7C4}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU {386D412C-003C-47B1-8258-0E35865CB7C4}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU {386D412C-003C-47B1-8258-0E35865CB7C4}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.Debug|Any CPU.Build.0 = Debug|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.Debug|x64.ActiveCfg = Debug|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.Debug|x64.Build.0 = Debug|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.Release|Any CPU.ActiveCfg = Release|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.Release|Any CPU.Build.0 = Release|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.Release|x64.ActiveCfg = Release|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.Release|x64.Build.0 = Release|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D2DD58}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {833FFEE1-7EED-4F51-8DFD-946D48833333}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {833FFEE1-7EED-4F51-8DFD-946D48833333}.Debug|Any CPU.Build.0 = Debug|Any CPU - {833FFEE1-7EED-4F51-8DFD-946D48833333}.Debug|x64.ActiveCfg = Debug|Any CPU - {833FFEE1-7EED-4F51-8DFD-946D48833333}.Debug|x64.Build.0 = Debug|Any CPU - {833FFEE1-7EED-4F51-8DFD-946D48833333}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {833FFEE1-7EED-4F51-8DFD-946D48833333}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {833FFEE1-7EED-4F51-8DFD-946D48833333}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {833FFEE1-7EED-4F51-8DFD-946D48833333}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {833FFEE1-7EED-4F51-8DFD-946D48833333}.Release|Any CPU.ActiveCfg = Release|Any CPU - {833FFEE1-7EED-4F51-8DFD-946D48833333}.Release|Any CPU.Build.0 = Release|Any CPU - {833FFEE1-7EED-4F51-8DFD-946D48833333}.Release|x64.ActiveCfg = Release|Any CPU - {833FFEE1-7EED-4F51-8DFD-946D48833333}.Release|x64.Build.0 = Release|Any CPU - {833FFEE1-7EED-4F51-8DFD-946D48833333}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {833FFEE1-7EED-4F51-8DFD-946D48833333}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {833FFEE1-7EED-4F51-8DFD-946D48833333}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {833FFEE1-7EED-4F51-8DFD-946D48833333}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D22222}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D22222}.Debug|Any CPU.Build.0 = Debug|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D22222}.Debug|x64.ActiveCfg = Debug|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D22222}.Debug|x64.Build.0 = Debug|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D22222}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D22222}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D22222}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D22222}.MinSizeRel|x64.Build.0 = Debug|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D22222}.Release|Any CPU.ActiveCfg = Release|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D22222}.Release|Any CPU.Build.0 = Release|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D22222}.Release|x64.ActiveCfg = Release|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D22222}.Release|x64.Build.0 = Release|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D22222}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D22222}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D22222}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {947DD232-8D9B-4B78-9C6A-94F807D22222}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Debug|x64.ActiveCfg = Debug|Any CPU + {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Debug|x64.Build.0 = Debug|Any CPU + {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Release|Any CPU.Build.0 = Release|Any CPU + {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Release|x64.ActiveCfg = Release|Any CPU + {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Release|x64.Build.0 = Release|Any CPU + {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {1EA9AF94-5494-40DD-A05B-9D564572CCFC}.RelWithDebInfo|x64.Build.0 = Release|Any CPU + {11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|x64.ActiveCfg = Debug|Any CPU + {11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|x64.Build.0 = Debug|Any CPU + {11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU + {11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU + {11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU + {11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|x64.Build.0 = Debug|Any CPU + {11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|Any CPU.Build.0 = Release|Any CPU + {11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|x64.ActiveCfg = Release|Any CPU + {11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|x64.Build.0 = Release|Any CPU + {11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU + {11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU + {11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU + {11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {61B7C351-C77D-43F7-B56F-BB1440178E10} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} - {0A309227-A9D8-4DDF-88DD-326B57B04378} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} - {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} - {B559378C-FC03-45FA-893C-71784F28E0A2} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} - {B317356C-99DE-499E-8B4D-D6BEC5DA57D5} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} - {717A4ED9-8897-492F-BD0C-230FCAEA9237} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} - {585FC6F6-48E0-4EA5-8015-0264614E97C0} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {303677D5-7312-4C3F-BAEE-BEB1A9BD9FE6} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} - {1C16108C-C786-482D-BB0A-36BDAFE109ED} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {A16958E1-24C7-4F1E-B317-204AD91625DD} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} - {172485DD-B94E-4F3E-851E-CF23908FF960} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} - {0F480791-4BA0-44E3-8CC4-C71656664175} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {BD7833F8-3209-4682-BF75-B4BCA883E279} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {DB29F219-DC92-4AF7-A2EE-E89FFBB3F5F0} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {DCDFE282-03DE-4DBC-B90C-CC3CE3EC8162} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} - {F003F228-2AE2-4E9D-877B-93EB773B5061} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {C7AF0290-EF0D-44DC-9EDC-600803B664F8} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {7A75ACC4-3C2F-44E1-B492-0EC08704E9FF} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} - {BC765FBF-AD7A-4A99-9902-5540C5A74181} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {79620410-4EC7-4A38-A8C3-EE81243F818E} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {08A68C6A-86F6-4ED2-89A7-B166D33E9F85} = {0722D325-24C8-4E83-B5AF-0A083E7F0749} - {1EA9AF94-5494-40DD-A05B-9D564572CCFC} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} - {11C77123-E4DA-499F-8900-80C88C2C69F2} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} - {0A309227-A9D8-4DDF-88DD-326B57B04379} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {688870C8-9843-4F9E-8576-D39290AD0F25} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} - {74F25188-BF63-4BF3-879B-B6CDB11ED608} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {65741CB1-8AEE-4C66-8198-10A7EA0E4258} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {713CBFBB-5392-438D-B766-A9A585EF1BB8} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {58808BBC-371E-47D6-A3D0-4902145EDA4E} = {713CBFBB-5392-438D-B766-A9A585EF1BB8} {DA8E0E9E-A6D6-4583-864C-8F40465E3A48} = {713CBFBB-5392-438D-B766-A9A585EF1BB8} {0138CB8F-4AA9-4029-A21E-C07C30F425BA} = {713CBFBB-5392-438D-B766-A9A585EF1BB8} + {947DD232-8D9B-4B78-9C6A-94F807D2DD58} = {713CBFBB-5392-438D-B766-A9A585EF1BB8} + {947DD232-8D9B-4B78-9C6A-94F807D22222} = {713CBFBB-5392-438D-B766-A9A585EF1BB8} + {60CF7E6C-D6C8-439D-B7B7-D8A27E29BE2C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {0A309227-A9D8-4DDF-88DD-326B57B04379} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {0A309227-A9D8-4DDF-88DD-326B57B04378} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {B559378C-FC03-45FA-893C-71784F28E0A2} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {74F25188-BF63-4BF3-879B-B6CDB11ED608} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {172485DD-B94E-4F3E-851E-CF23908FF960} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {BC765FBF-AD7A-4A99-9902-5540C5A74181} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {0F480791-4BA0-44E3-8CC4-C71656664175} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {391D6AD6-0FD5-4E1E-A4C8-6B5439D197B5} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {B317356C-99DE-499E-8B4D-D6BEC5DA57D5} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {717A4ED9-8897-492F-BD0C-230FCAEA9237} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {585FC6F6-48E0-4EA5-8015-0264614E97C0} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {1C16108C-C786-482D-BB0A-36BDAFE109ED} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {F003F228-2AE2-4E9D-877B-93EB773B5061} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {833FFEE1-7EED-4F51-8DFD-946D48833333} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {833FFEE1-7EED-4F51-8DFD-946D48893D6E} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {386D412C-003C-47B1-8258-0E35865CB7C4} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} - {947DD232-8D9B-4B78-9C6A-94F807D2DD58} = {713CBFBB-5392-438D-B766-A9A585EF1BB8} - {833FFEE1-7EED-4F51-8DFD-946D48833333} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} - {947DD232-8D9B-4B78-9C6A-94F807D22222} = {713CBFBB-5392-438D-B766-A9A585EF1BB8} + {1EA9AF94-5494-40DD-A05B-9D564572CCFC} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} + {11C77123-E4DA-499F-8900-80C88C2C69F2} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} EndGlobalSection EndGlobal diff --git a/scripts/build/build_appdeps.cmd b/scripts/build/build_appdeps.cmd deleted file mode 100644 index 9d023d3df..000000000 --- a/scripts/build/build_appdeps.cmd +++ /dev/null @@ -1,33 +0,0 @@ -REM TEMPORARILY disable @echo off to debug CI. -REM @echo off - -REM This file encapsulates the temporary steps to build the dotnet-compile-native command successfully -REM The AppDepSDK package is a temporary artifact until we have CoreRT assemblies published to Nuget - -set __ScriptDir=%~dp0 -set __RepoRoot=%__ScriptDir%..\.. -set __AppDepsProjectDir=%__RepoRoot%\src\Microsoft.DotNet.Tools.Compiler.Native\appdep - -REM Get absolute path -pushd %1 -set __OutputPath=%__RepoRoot%\artifacts\win7-x64\stage2\bin -popd - - -pushd %__AppDepsProjectDir% -rmdir /S /Q packages -mkdir packages -dotnet restore --packages %__AppDepsProjectDir%\packages -set __AppDepSDK=%__AppDepsProjectDir%\packages\toolchain*\ -popd - -mkdir %__OutputPath%\appdepsdk -cd %__AppDepSDK% -FOR /D %%a IN (*) DO ( - CD %%a - TREE - GOTO :Copy -) - -:Copy -xcopy /S/E/H/Y * %__OutputPath%\appdepsdk diff --git a/scripts/build/build_appdeps.ps1 b/scripts/build/build_appdeps.ps1 new file mode 100644 index 000000000..f4fb7e1df --- /dev/null +++ b/scripts/build/build_appdeps.ps1 @@ -0,0 +1,26 @@ +# +# Copyright (c) .NET Foundation and contributors. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. +# +param( + [Parameter(Mandatory=$true)][string]$RepoRoot, + [Parameter(Mandatory=$true)][string]$OutputDir) + +$intermediateDir = "$RepoRoot\artifacts\appdepssdk\packages" +$appdepBinDir = "$OutputDir\bin\appdepsdk" + +If (Test-Path $intermediateDir){ + rmdir -Force -Rec $intermediateDir +} +mkdir $intermediateDir +& dotnet restore --packages "$intermediateDir" "$RepoRoot\src\dotnet-compile-native\appdep\project.json" + + +If (Test-Path $appdepBinDir){ + rmdir -Force -Rec $appdepBinDir +} +mkdir -Force "$appdepBinDir" + +ls "$intermediateDir\toolchain*\*\*" | foreach { + copy -Rec $_ "$appdepBinDir" +} \ No newline at end of file diff --git a/scripts/build/build_appdeps.sh b/scripts/build/build_appdeps.sh index a4b7d8d18..92da1179e 100755 --- a/scripts/build/build_appdeps.sh +++ b/scripts/build/build_appdeps.sh @@ -16,7 +16,7 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" source "$DIR/../common/_common.sh" -APPDEPS_PROJECT_DIR="$REPOROOT/src/Microsoft.DotNet.Tools.Compiler.Native/appdep" +APPDEPS_PROJECT_DIR="$REPOROOT/src/dotnet-compile-native/appdep" # Get Absolute Output Dir pushd $1 diff --git a/scripts/compile/compile-stage.ps1 b/scripts/compile/compile-stage.ps1 index c86d630be..f2760edd8 100644 --- a/scripts/compile/compile-stage.ps1 +++ b/scripts/compile/compile-stage.ps1 @@ -15,25 +15,25 @@ param( . $REPOROOT\scripts\package\projectsToPack.ps1 $Projects = @( - "Microsoft.DotNet.Cli", + "dotnet", + "dotnet-build", + "dotnet-compile", + "dotnet-compile-csc", + "dotnet-compile-fsc", + "dotnet-compile-native", + "dotnet-new", + "dotnet-pack", + "dotnet-projectmodel-server", + "dotnet-publish", + "dotnet-restore", + "dotnet-repl", + "dotnet-repl-csi", + "dotnet-resgen", + "dotnet-run", + "dotnet-test", "Microsoft.DotNet.Cli.Utils", "Microsoft.DotNet.ProjectModel.Loader", - "Microsoft.DotNet.ProjectModel.Server", "Microsoft.DotNet.ProjectModel.Workspaces", - "Microsoft.DotNet.Tools.Builder", - "Microsoft.DotNet.Tools.Compiler", - "Microsoft.DotNet.Tools.Compiler.Csc", - "Microsoft.DotNet.Tools.Compiler.Fsc", - "Microsoft.DotNet.Tools.Compiler.Native", - "Microsoft.DotNet.Tools.New", - "Microsoft.DotNet.Tools.Pack", - "Microsoft.DotNet.Tools.Publish", - "dotnet-restore", - "Microsoft.DotNet.Tools.Repl", - "Microsoft.DotNet.Tools.Repl.Csi", - "Microsoft.DotNet.Tools.Resgen", - "Microsoft.DotNet.Tools.Run", - "Microsoft.DotNet.Tools.Test", "Microsoft.Extensions.Testing.Abstractions" ) @@ -136,8 +136,6 @@ $BinariesForCoreHost | ForEach-Object { #} # Copy in AppDeps -if (-not (Test-Path "$OutputDir\bin\appdepsdk\")) { - $env:PATH = "$OutputDir\bin;$StartPath" - header "Acquiring Native App Dependencies" - _cmd "$RepoRoot\scripts\build\build_appdeps.cmd ""$OutputDir""" -} +header "Acquiring Native App Dependencies" +_ "$RepoRoot\scripts\build\build_appdeps.ps1" @("$RepoRoot", "$OutputDir") + diff --git a/scripts/compile/compile-stage.sh b/scripts/compile/compile-stage.sh index 55b997073..1bfedb30e 100755 --- a/scripts/compile/compile-stage.sh +++ b/scripts/compile/compile-stage.sh @@ -24,22 +24,22 @@ source "$DIR/../common/_common.sh" [ ! -z "$COMPILATION_OUTPUT_DIR" ] || die "Missing required environment variable COMPILATION_OUTPUT_DIR" PROJECTS=( \ - Microsoft.DotNet.Cli \ - Microsoft.DotNet.ProjectModel.Server \ - Microsoft.DotNet.Tools.Builder \ - Microsoft.DotNet.Tools.Compiler \ - Microsoft.DotNet.Tools.Compiler.Csc \ - Microsoft.DotNet.Tools.Compiler.Fsc \ - Microsoft.DotNet.Tools.Compiler.Native \ - Microsoft.DotNet.Tools.New \ - Microsoft.DotNet.Tools.Pack \ - Microsoft.DotNet.Tools.Publish \ - Microsoft.DotNet.Tools.Repl \ - Microsoft.DotNet.Tools.Repl.Csi \ + dotnet \ + dotnet-build \ + dotnet-compile \ + dotnet-compile-csc \ + dotnet-compile-fsc \ + dotnet-compile-native \ + dotnet-new \ + dotnet-pack \ + dotnet-projectmodel-server \ + dotnet-publish \ + dotnet-repl \ + dotnet-repl-csi \ dotnet-restore \ - Microsoft.DotNet.Tools.Resgen \ - Microsoft.DotNet.Tools.Run \ - Microsoft.DotNet.Tools.Test \ + dotnet-resgen \ + dotnet-run \ + dotnet-test \ ) BINARIES_FOR_COREHOST=( \ diff --git a/scripts/test/runtests.ps1 b/scripts/test/runtests.ps1 index cee774e8b..904fea10d 100644 --- a/scripts/test/runtests.ps1 +++ b/scripts/test/runtests.ps1 @@ -12,9 +12,9 @@ $TestBinRoot = "$RepoRoot\artifacts\tests" $TestProjects = @( "E2E", "StreamForwarderTests", - "Microsoft.DotNet.Tools.Publish.Tests", - "Microsoft.DotNet.Tools.Compiler.Tests", - "Microsoft.DotNet.Tools.Builder.Tests" + "dotnet-publish.Tests", + "dotnet-compile.Tests", + "dotnet-build.Tests" ) $TestScripts = @( diff --git a/scripts/test/runtests.sh b/scripts/test/runtests.sh index 82b713d20..942c277ce 100755 --- a/scripts/test/runtests.sh +++ b/scripts/test/runtests.sh @@ -22,9 +22,9 @@ TestBinRoot="$REPOROOT/artifacts/tests" TestProjects=( \ E2E \ StreamForwarderTests \ - Microsoft.DotNet.Tools.Publish.Tests \ - Microsoft.DotNet.Tools.Compiler.Tests \ - Microsoft.DotNet.Tools.Builder.Tests \ + dotnet-publish.Tests \ + dotnet-compile.Tests \ + dotnet-build.Tests \ ) TestScripts=( \ diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index edfd3e80d..9d1b1c97d 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -14,7 +14,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 6b03b0196..d49d39f1f 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -7,14 +7,14 @@ "dependencies": { "NETStandard.Library": "1.0.0-rc3-23727", - "System.CommandLine": "0.1.0-*", + "System.CommandLine": "0.1.0-e160119-1", "Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160108-01", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*" }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 5a95c997c..88b640a61 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -10,7 +10,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index 70e516ce4..0c12863b1 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -11,7 +11,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index b610be491..e0c97adfd 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -31,7 +31,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.Runtime/project.json b/src/Microsoft.DotNet.Runtime/project.json index 23437be75..e54d71da9 100644 --- a/src/Microsoft.DotNet.Runtime/project.json +++ b/src/Microsoft.DotNet.Runtime/project.json @@ -10,7 +10,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index fa1ab0e05..84f379afb 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -16,7 +16,7 @@ "net451": { }, "dotnet5.4": { "imports": "portable-net451+win8", - "dependencies": { + "dependencies": { "System.IO.FileSystem": "4.0.1-rc3-23727", "System.Linq": "4.0.1-rc3-23727", "System.Runtime": "4.0.21-rc3-23727", @@ -25,12 +25,9 @@ } }, "dnxcore50": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1-rc3-23727", - "System.IO.FileSystem": "4.0.1-rc3-23727", - "System.Linq": "4.0.1-rc3-23727", - "System.Runtime": "4.0.21-rc3-23727", - "System.Reflection": "4.1.0-rc3-23727", + "imports": "portable-net45+win8", + "dependencies": { + "NETStandard.Library": "1.0.0-rc3-23727", "System.Dynamic.Runtime": "4.0.11-rc3-23727" } } diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 37eebbce4..ccca188af 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -19,7 +19,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.Tools.Builder/BuilderCommandApp.cs b/src/dotnet-build/BuilderCommandApp.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Builder/BuilderCommandApp.cs rename to src/dotnet-build/BuilderCommandApp.cs diff --git a/src/Microsoft.DotNet.Tools.Builder/CompileContext.cs b/src/dotnet-build/CompileContext.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Builder/CompileContext.cs rename to src/dotnet-build/CompileContext.cs diff --git a/src/Microsoft.DotNet.Tools.Builder/IncrementalPreconditions.cs b/src/dotnet-build/IncrementalPreconditions.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Builder/IncrementalPreconditions.cs rename to src/dotnet-build/IncrementalPreconditions.cs diff --git a/src/Microsoft.DotNet.Tools.Builder/Program.cs b/src/dotnet-build/Program.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Builder/Program.cs rename to src/dotnet-build/Program.cs diff --git a/src/Microsoft.DotNet.Tools.Builder/ProjectDependenciesFacade.cs b/src/dotnet-build/ProjectDependenciesFacade.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Builder/ProjectDependenciesFacade.cs rename to src/dotnet-build/ProjectDependenciesFacade.cs diff --git a/src/Microsoft.DotNet.Tools.Builder/README.md b/src/dotnet-build/README.md similarity index 100% rename from src/Microsoft.DotNet.Tools.Builder/README.md rename to src/dotnet-build/README.md diff --git a/src/Microsoft.DotNet.Tools.Builder/Microsoft.DotNet.Tools.Builder.xproj b/src/dotnet-build/dotnet-build.xproj similarity index 100% rename from src/Microsoft.DotNet.Tools.Builder/Microsoft.DotNet.Tools.Builder.xproj rename to src/dotnet-build/dotnet-build.xproj diff --git a/src/Microsoft.DotNet.Tools.Builder/project.json b/src/dotnet-build/project.json similarity index 80% rename from src/Microsoft.DotNet.Tools.Builder/project.json rename to src/dotnet-build/project.json index 687b6ddf9..7ab26920e 100644 --- a/src/Microsoft.DotNet.Tools.Builder/project.json +++ b/src/dotnet-build/project.json @@ -1,5 +1,4 @@ { - "name": "dotnet-build", "version": "1.0.0-*", "compilationOptions": { "emitEntryPoint": true @@ -8,7 +7,7 @@ "NETStandard.Library": "1.0.0-rc3-23727", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Compiler.Common": "1.0.0-*", - "Microsoft.DotNet.Tools.Compiler": "1.0.0-*", + "dotnet-compile": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*", "Microsoft.Extensions.CommandLineUtils.Sources": { "type": "build", @@ -17,7 +16,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.Tools.Compiler.Csc/Program.cs b/src/dotnet-compile-csc/Program.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Csc/Program.cs rename to src/dotnet-compile-csc/Program.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Csc/Properties/AssemblyInfo.cs b/src/dotnet-compile-csc/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Csc/Properties/AssemblyInfo.cs rename to src/dotnet-compile-csc/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Csc/README.md b/src/dotnet-compile-csc/README.md similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Csc/README.md rename to src/dotnet-compile-csc/README.md diff --git a/src/Microsoft.DotNet.Tools.Compiler.Csc/Microsoft.DotNet.Tools.Compiler.Csc.xproj b/src/dotnet-compile-csc/dotnet-compile-csc.xproj similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Csc/Microsoft.DotNet.Tools.Compiler.Csc.xproj rename to src/dotnet-compile-csc/dotnet-compile-csc.xproj diff --git a/src/Microsoft.DotNet.Tools.Compiler.Csc/project.json b/src/dotnet-compile-csc/project.json similarity index 88% rename from src/Microsoft.DotNet.Tools.Compiler.Csc/project.json rename to src/dotnet-compile-csc/project.json index 9753ebb1f..9c0c64c4d 100644 --- a/src/Microsoft.DotNet.Tools.Compiler.Csc/project.json +++ b/src/dotnet-compile-csc/project.json @@ -1,5 +1,4 @@ { - "name": "dotnet-compile-csc", "version": "1.0.0-*", "compilationOptions": { "emitEntryPoint": true @@ -19,7 +18,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.Tools.Compiler.Fsc/Program.cs b/src/dotnet-compile-fsc/Program.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Fsc/Program.cs rename to src/dotnet-compile-fsc/Program.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Fsc/Microsoft.DotNet.Tools.Compiler.Fsc.xproj b/src/dotnet-compile-fsc/dotnet-compile-fsc.xproj similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Fsc/Microsoft.DotNet.Tools.Compiler.Fsc.xproj rename to src/dotnet-compile-fsc/dotnet-compile-fsc.xproj diff --git a/src/Microsoft.DotNet.Tools.Compiler.Fsc/project.json b/src/dotnet-compile-fsc/project.json similarity index 87% rename from src/Microsoft.DotNet.Tools.Compiler.Fsc/project.json rename to src/dotnet-compile-fsc/project.json index 073b2173f..02051bf1b 100644 --- a/src/Microsoft.DotNet.Tools.Compiler.Fsc/project.json +++ b/src/dotnet-compile-fsc/project.json @@ -1,5 +1,4 @@ { - "name": "dotnet-compile-fsc", "version": "1.0.0-*", "compilationOptions": { "emitEntryPoint": true @@ -18,7 +17,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/ArgValues.cs b/src/dotnet-compile-native/ArgValues.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/ArgValues.cs rename to src/dotnet-compile-native/ArgValues.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/ArgumentsParser.cs b/src/dotnet-compile-native/ArgumentsParser.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/ArgumentsParser.cs rename to src/dotnet-compile-native/ArgumentsParser.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/DirectoryExtensions.cs b/src/dotnet-compile-native/DirectoryExtensions.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/DirectoryExtensions.cs rename to src/dotnet-compile-native/DirectoryExtensions.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/EnumExtensions.cs b/src/dotnet-compile-native/EnumExtensions.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/EnumExtensions.cs rename to src/dotnet-compile-native/EnumExtensions.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/ILCompilerInvoker.cs b/src/dotnet-compile-native/ILCompilerInvoker.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/ILCompilerInvoker.cs rename to src/dotnet-compile-native/ILCompilerInvoker.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/IPlatformNativeStep.cs b/src/dotnet-compile-native/IntermediateCompilation/IPlatformNativeStep.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/IPlatformNativeStep.cs rename to src/dotnet-compile-native/IntermediateCompilation/IPlatformNativeStep.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/IntermediateCompiler.cs b/src/dotnet-compile-native/IntermediateCompilation/IntermediateCompiler.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/IntermediateCompiler.cs rename to src/dotnet-compile-native/IntermediateCompilation/IntermediateCompiler.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Linux/LinuxCppCompileStep.cs b/src/dotnet-compile-native/IntermediateCompilation/Linux/LinuxCppCompileStep.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Linux/LinuxCppCompileStep.cs rename to src/dotnet-compile-native/IntermediateCompilation/Linux/LinuxCppCompileStep.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Linux/LinuxRyuJitCompileStep.cs b/src/dotnet-compile-native/IntermediateCompilation/Linux/LinuxRyuJitCompileStep.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Linux/LinuxRyuJitCompileStep.cs rename to src/dotnet-compile-native/IntermediateCompilation/Linux/LinuxRyuJitCompileStep.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Mac/MacCppCompileStep.cs b/src/dotnet-compile-native/IntermediateCompilation/Mac/MacCppCompileStep.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Mac/MacCppCompileStep.cs rename to src/dotnet-compile-native/IntermediateCompilation/Mac/MacCppCompileStep.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Mac/MacRyuJitCompileStep.cs b/src/dotnet-compile-native/IntermediateCompilation/Mac/MacRyuJitCompileStep.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Mac/MacRyuJitCompileStep.cs rename to src/dotnet-compile-native/IntermediateCompilation/Mac/MacRyuJitCompileStep.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsCommon.cs b/src/dotnet-compile-native/IntermediateCompilation/Windows/WindowsCommon.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsCommon.cs rename to src/dotnet-compile-native/IntermediateCompilation/Windows/WindowsCommon.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs b/src/dotnet-compile-native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs rename to src/dotnet-compile-native/IntermediateCompilation/Windows/WindowsCppCompileStep.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsLinkStep.cs b/src/dotnet-compile-native/IntermediateCompilation/Windows/WindowsLinkStep.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/IntermediateCompilation/Windows/WindowsLinkStep.cs rename to src/dotnet-compile-native/IntermediateCompilation/Windows/WindowsLinkStep.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/NativeCompileSettings.cs b/src/dotnet-compile-native/NativeCompileSettings.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/NativeCompileSettings.cs rename to src/dotnet-compile-native/NativeCompileSettings.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/NativeCompiler.cs b/src/dotnet-compile-native/NativeCompiler.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/NativeCompiler.cs rename to src/dotnet-compile-native/NativeCompiler.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/Program.cs b/src/dotnet-compile-native/Program.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/Program.cs rename to src/dotnet-compile-native/Program.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/README.md b/src/dotnet-compile-native/README.md similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/README.md rename to src/dotnet-compile-native/README.md diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/RuntimeExtensions.cs b/src/dotnet-compile-native/RuntimeExtensions.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/RuntimeExtensions.cs rename to src/dotnet-compile-native/RuntimeExtensions.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/RuntimeInformationExtensions.cs b/src/dotnet-compile-native/RuntimeInformationExtensions.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/RuntimeInformationExtensions.cs rename to src/dotnet-compile-native/RuntimeInformationExtensions.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/appdep/project.json b/src/dotnet-compile-native/appdep/project.json similarity index 91% rename from src/Microsoft.DotNet.Tools.Compiler.Native/appdep/project.json rename to src/dotnet-compile-native/appdep/project.json index db26122bb..187e4a8a3 100644 --- a/src/Microsoft.DotNet.Tools.Compiler.Native/appdep/project.json +++ b/src/dotnet-compile-native/appdep/project.json @@ -1,5 +1,4 @@ { - "name": "appdepsdk", "version": "1.0.0-*", "compilationOptions": { "emitEntryPoint": true diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/Microsoft.DotNet.Tools.Compiler.Native.xproj b/src/dotnet-compile-native/dotnet-compile-native.xproj similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/Microsoft.DotNet.Tools.Compiler.Native.xproj rename to src/dotnet-compile-native/dotnet-compile-native.xproj diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/enums/ArchitectureMode.cs b/src/dotnet-compile-native/enums/ArchitectureMode.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/enums/ArchitectureMode.cs rename to src/dotnet-compile-native/enums/ArchitectureMode.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/enums/BuildConfiguration.cs b/src/dotnet-compile-native/enums/BuildConfiguration.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/enums/BuildConfiguration.cs rename to src/dotnet-compile-native/enums/BuildConfiguration.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/enums/NativeIntermediateMode.cs b/src/dotnet-compile-native/enums/NativeIntermediateMode.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/enums/NativeIntermediateMode.cs rename to src/dotnet-compile-native/enums/NativeIntermediateMode.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/enums/OSMode.cs b/src/dotnet-compile-native/enums/OSMode.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler.Native/enums/OSMode.cs rename to src/dotnet-compile-native/enums/OSMode.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler.Native/project.json b/src/dotnet-compile-native/project.json similarity index 87% rename from src/Microsoft.DotNet.Tools.Compiler.Native/project.json rename to src/dotnet-compile-native/project.json index f86c5c895..a1c1631f8 100644 --- a/src/Microsoft.DotNet.Tools.Compiler.Native/project.json +++ b/src/dotnet-compile-native/project.json @@ -1,5 +1,4 @@ { - "name": "dotnet-compile-native", "version": "1.0.0-*", "compilationOptions": { "emitEntryPoint": true @@ -18,7 +17,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.Tools.Compiler/CanonicalError.cs b/src/dotnet-compile/CanonicalError.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler/CanonicalError.cs rename to src/dotnet-compile/CanonicalError.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler/CompilerCommandApp.cs b/src/dotnet-compile/CompilerCommandApp.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler/CompilerCommandApp.cs rename to src/dotnet-compile/CompilerCommandApp.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler/CompilerUtil.cs b/src/dotnet-compile/CompilerUtil.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler/CompilerUtil.cs rename to src/dotnet-compile/CompilerUtil.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler/Program.cs b/src/dotnet-compile/Program.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler/Program.cs rename to src/dotnet-compile/Program.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler/README.md b/src/dotnet-compile/README.md similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler/README.md rename to src/dotnet-compile/README.md diff --git a/src/Microsoft.DotNet.Tools.Compiler/ResourceManifestName.cs b/src/dotnet-compile/ResourceManifestName.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler/ResourceManifestName.cs rename to src/dotnet-compile/ResourceManifestName.cs diff --git a/src/Microsoft.DotNet.Tools.Compiler/Microsoft.DotNet.Tools.Compiler.xproj b/src/dotnet-compile/dotnet-compile.xproj similarity index 100% rename from src/Microsoft.DotNet.Tools.Compiler/Microsoft.DotNet.Tools.Compiler.xproj rename to src/dotnet-compile/dotnet-compile.xproj diff --git a/src/Microsoft.DotNet.Tools.Compiler/project.json b/src/dotnet-compile/project.json similarity index 90% rename from src/Microsoft.DotNet.Tools.Compiler/project.json rename to src/dotnet-compile/project.json index 9f0b99015..13803f2c0 100644 --- a/src/Microsoft.DotNet.Tools.Compiler/project.json +++ b/src/dotnet-compile/project.json @@ -1,5 +1,4 @@ { - "name": "dotnet-compile", "version": "1.0.0-*", "compilationOptions": { "emitEntryPoint": true @@ -22,7 +21,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.Tools.New/CSharp_Console/NuGet.Config b/src/dotnet-new/CSharp_Console/NuGet.Config similarity index 100% rename from src/Microsoft.DotNet.Tools.New/CSharp_Console/NuGet.Config rename to src/dotnet-new/CSharp_Console/NuGet.Config diff --git a/src/Microsoft.DotNet.Tools.New/CSharp_Console/Program.cs b/src/dotnet-new/CSharp_Console/Program.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.New/CSharp_Console/Program.cs rename to src/dotnet-new/CSharp_Console/Program.cs diff --git a/src/Microsoft.DotNet.Tools.New/CSharp_Console/project.json b/src/dotnet-new/CSharp_Console/project.json similarity index 100% rename from src/Microsoft.DotNet.Tools.New/CSharp_Console/project.json rename to src/dotnet-new/CSharp_Console/project.json diff --git a/src/Microsoft.DotNet.Tools.New/FSharp_Console/NuGet.Config b/src/dotnet-new/FSharp_Console/NuGet.Config similarity index 100% rename from src/Microsoft.DotNet.Tools.New/FSharp_Console/NuGet.Config rename to src/dotnet-new/FSharp_Console/NuGet.Config diff --git a/src/Microsoft.DotNet.Tools.New/FSharp_Console/Program.fs b/src/dotnet-new/FSharp_Console/Program.fs similarity index 100% rename from src/Microsoft.DotNet.Tools.New/FSharp_Console/Program.fs rename to src/dotnet-new/FSharp_Console/Program.fs diff --git a/src/Microsoft.DotNet.Tools.New/FSharp_Console/project.json b/src/dotnet-new/FSharp_Console/project.json similarity index 100% rename from src/Microsoft.DotNet.Tools.New/FSharp_Console/project.json rename to src/dotnet-new/FSharp_Console/project.json diff --git a/src/Microsoft.DotNet.Tools.New/Program.cs b/src/dotnet-new/Program.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.New/Program.cs rename to src/dotnet-new/Program.cs diff --git a/src/Microsoft.DotNet.Tools.New/README.md b/src/dotnet-new/README.md similarity index 100% rename from src/Microsoft.DotNet.Tools.New/README.md rename to src/dotnet-new/README.md diff --git a/src/Microsoft.DotNet.Tools.New/Microsoft.DotNet.Tools.New.xproj b/src/dotnet-new/dotnet-new.xproj similarity index 100% rename from src/Microsoft.DotNet.Tools.New/Microsoft.DotNet.Tools.New.xproj rename to src/dotnet-new/dotnet-new.xproj diff --git a/src/Microsoft.DotNet.Tools.New/project.json b/src/dotnet-new/project.json similarity index 91% rename from src/Microsoft.DotNet.Tools.New/project.json rename to src/dotnet-new/project.json index d374caafc..5d1929840 100644 --- a/src/Microsoft.DotNet.Tools.New/project.json +++ b/src/dotnet-new/project.json @@ -1,5 +1,4 @@ { - "name": "dotnet-new", "version": "1.0.0-*", "compilationOptions": { "emitEntryPoint": true @@ -18,7 +17,7 @@ "resource": [ "CSharp_Console/NuGet.Config", "CSharp_Console/Program.cs", "CSharp_Console/project.json", "FSharp_Console/NuGet.config", "FSharp_Console/Program.fs", "FSharp_Console/project.json"], "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.Tools.Pack/ArtifactPathsCalculator.cs b/src/dotnet-pack/ArtifactPathsCalculator.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/ArtifactPathsCalculator.cs rename to src/dotnet-pack/ArtifactPathsCalculator.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/BuildProjectCommand.cs b/src/dotnet-pack/BuildProjectCommand.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/BuildProjectCommand.cs rename to src/dotnet-pack/BuildProjectCommand.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/Constants.cs b/src/dotnet-pack/NuGet/Constants.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/Constants.cs rename to src/dotnet-pack/NuGet/Constants.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/EmptyFrameworkFolderFile.cs b/src/dotnet-pack/NuGet/EmptyFrameworkFolderFile.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/EmptyFrameworkFolderFile.cs rename to src/dotnet-pack/NuGet/EmptyFrameworkFolderFile.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/FrameworkAssemblyReference.cs b/src/dotnet-pack/NuGet/FrameworkAssemblyReference.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/FrameworkAssemblyReference.cs rename to src/dotnet-pack/NuGet/FrameworkAssemblyReference.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/IPackageFile.cs b/src/dotnet-pack/NuGet/IPackageFile.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/IPackageFile.cs rename to src/dotnet-pack/NuGet/IPackageFile.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/Manifest.cs b/src/dotnet-pack/NuGet/Manifest.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/Manifest.cs rename to src/dotnet-pack/NuGet/Manifest.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/ManifestContentFiles.cs b/src/dotnet-pack/NuGet/ManifestContentFiles.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/ManifestContentFiles.cs rename to src/dotnet-pack/NuGet/ManifestContentFiles.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/ManifestFile.cs b/src/dotnet-pack/NuGet/ManifestFile.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/ManifestFile.cs rename to src/dotnet-pack/NuGet/ManifestFile.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/ManifestMetadata.cs b/src/dotnet-pack/NuGet/ManifestMetadata.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/ManifestMetadata.cs rename to src/dotnet-pack/NuGet/ManifestMetadata.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/ManifestReader.cs b/src/dotnet-pack/NuGet/ManifestReader.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/ManifestReader.cs rename to src/dotnet-pack/NuGet/ManifestReader.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/ManifestSchemaUtility.cs b/src/dotnet-pack/NuGet/ManifestSchemaUtility.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/ManifestSchemaUtility.cs rename to src/dotnet-pack/NuGet/ManifestSchemaUtility.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/ManifestVersionAttribute.cs b/src/dotnet-pack/NuGet/ManifestVersionAttribute.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/ManifestVersionAttribute.cs rename to src/dotnet-pack/NuGet/ManifestVersionAttribute.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/ManifestVersionUtility.cs b/src/dotnet-pack/NuGet/ManifestVersionUtility.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/ManifestVersionUtility.cs rename to src/dotnet-pack/NuGet/ManifestVersionUtility.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/PackageBuilder.cs b/src/dotnet-pack/NuGet/PackageBuilder.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/PackageBuilder.cs rename to src/dotnet-pack/NuGet/PackageBuilder.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/PackageDependencySet.cs b/src/dotnet-pack/NuGet/PackageDependencySet.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/PackageDependencySet.cs rename to src/dotnet-pack/NuGet/PackageDependencySet.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/PackageIdValidator.cs b/src/dotnet-pack/NuGet/PackageIdValidator.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/PackageIdValidator.cs rename to src/dotnet-pack/NuGet/PackageIdValidator.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/PackageMetadataXmlExtensions.cs b/src/dotnet-pack/NuGet/PackageMetadataXmlExtensions.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/PackageMetadataXmlExtensions.cs rename to src/dotnet-pack/NuGet/PackageMetadataXmlExtensions.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/PackageReferenceSet.cs b/src/dotnet-pack/NuGet/PackageReferenceSet.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/PackageReferenceSet.cs rename to src/dotnet-pack/NuGet/PackageReferenceSet.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/PathResolver.cs b/src/dotnet-pack/NuGet/PathResolver.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/PathResolver.cs rename to src/dotnet-pack/NuGet/PathResolver.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/PathUtility.cs b/src/dotnet-pack/NuGet/PathUtility.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/PathUtility.cs rename to src/dotnet-pack/NuGet/PathUtility.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/NuGet/PhysicalPackageFile.cs b/src/dotnet-pack/NuGet/PhysicalPackageFile.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/NuGet/PhysicalPackageFile.cs rename to src/dotnet-pack/NuGet/PhysicalPackageFile.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/PackageGenerator.cs b/src/dotnet-pack/PackageGenerator.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/PackageGenerator.cs rename to src/dotnet-pack/PackageGenerator.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/PackagesGenerator.cs b/src/dotnet-pack/PackagesGenerator.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/PackagesGenerator.cs rename to src/dotnet-pack/PackagesGenerator.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/Program.cs b/src/dotnet-pack/Program.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/Program.cs rename to src/dotnet-pack/Program.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/Properties/launchSettings.json b/src/dotnet-pack/Properties/launchSettings.json similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/Properties/launchSettings.json rename to src/dotnet-pack/Properties/launchSettings.json diff --git a/src/Microsoft.DotNet.Tools.Pack/SymbolPackageGenerator.cs b/src/dotnet-pack/SymbolPackageGenerator.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/SymbolPackageGenerator.cs rename to src/dotnet-pack/SymbolPackageGenerator.cs diff --git a/src/Microsoft.DotNet.Tools.Pack/Microsoft.DotNet.Tools.Pack.xproj b/src/dotnet-pack/dotnet-pack.xproj similarity index 100% rename from src/Microsoft.DotNet.Tools.Pack/Microsoft.DotNet.Tools.Pack.xproj rename to src/dotnet-pack/dotnet-pack.xproj diff --git a/src/Microsoft.DotNet.Tools.Pack/project.json b/src/dotnet-pack/project.json similarity index 89% rename from src/Microsoft.DotNet.Tools.Pack/project.json rename to src/dotnet-pack/project.json index 4f9cef8f9..e2e9e093d 100644 --- a/src/Microsoft.DotNet.Tools.Pack/project.json +++ b/src/dotnet-pack/project.json @@ -1,5 +1,4 @@ { - "name": "dotnet-pack", "version": "1.0.0-*", "compilationOptions": { "emitEntryPoint": true @@ -18,7 +17,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.ProjectModel.Server/ConnectionContext.cs b/src/dotnet-projectmodel-server/ConnectionContext.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/ConnectionContext.cs rename to src/dotnet-projectmodel-server/ConnectionContext.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Helpers/DependencyTypeChangeFinder.cs b/src/dotnet-projectmodel-server/Helpers/DependencyTypeChangeFinder.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Helpers/DependencyTypeChangeFinder.cs rename to src/dotnet-projectmodel-server/Helpers/DependencyTypeChangeFinder.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Helpers/JTokenExtensions.cs b/src/dotnet-projectmodel-server/Helpers/JTokenExtensions.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Helpers/JTokenExtensions.cs rename to src/dotnet-projectmodel-server/Helpers/JTokenExtensions.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Helpers/LibraryExtensions.cs b/src/dotnet-projectmodel-server/Helpers/LibraryExtensions.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Helpers/LibraryExtensions.cs rename to src/dotnet-projectmodel-server/Helpers/LibraryExtensions.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Helpers/NuGetFrameworkExtensions.cs b/src/dotnet-projectmodel-server/Helpers/NuGetFrameworkExtensions.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Helpers/NuGetFrameworkExtensions.cs rename to src/dotnet-projectmodel-server/Helpers/NuGetFrameworkExtensions.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Helpers/ProjectExtensions.cs b/src/dotnet-projectmodel-server/Helpers/ProjectExtensions.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Helpers/ProjectExtensions.cs rename to src/dotnet-projectmodel-server/Helpers/ProjectExtensions.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/InternalModels/ProjectContextSnapshot.cs b/src/dotnet-projectmodel-server/InternalModels/ProjectContextSnapshot.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/InternalModels/ProjectContextSnapshot.cs rename to src/dotnet-projectmodel-server/InternalModels/ProjectContextSnapshot.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/InternalModels/ProjectSnapshot.cs b/src/dotnet-projectmodel-server/InternalModels/ProjectSnapshot.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/InternalModels/ProjectSnapshot.cs rename to src/dotnet-projectmodel-server/InternalModels/ProjectSnapshot.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/MessageTypes.cs b/src/dotnet-projectmodel-server/MessageTypes.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/MessageTypes.cs rename to src/dotnet-projectmodel-server/MessageTypes.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Messengers/CompilerOptionsMessenger.cs b/src/dotnet-projectmodel-server/Messengers/CompilerOptionsMessenger.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Messengers/CompilerOptionsMessenger.cs rename to src/dotnet-projectmodel-server/Messengers/CompilerOptionsMessenger.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Messengers/DependenciesMessenger.cs b/src/dotnet-projectmodel-server/Messengers/DependenciesMessenger.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Messengers/DependenciesMessenger.cs rename to src/dotnet-projectmodel-server/Messengers/DependenciesMessenger.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Messengers/DependencyDiagnosticsMessenger.cs b/src/dotnet-projectmodel-server/Messengers/DependencyDiagnosticsMessenger.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Messengers/DependencyDiagnosticsMessenger.cs rename to src/dotnet-projectmodel-server/Messengers/DependencyDiagnosticsMessenger.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Messengers/GlobalErrorMessenger.cs b/src/dotnet-projectmodel-server/Messengers/GlobalErrorMessenger.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Messengers/GlobalErrorMessenger.cs rename to src/dotnet-projectmodel-server/Messengers/GlobalErrorMessenger.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Messengers/Messenger.cs b/src/dotnet-projectmodel-server/Messengers/Messenger.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Messengers/Messenger.cs rename to src/dotnet-projectmodel-server/Messengers/Messenger.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Messengers/ProjectDiagnosticsMessenger.cs b/src/dotnet-projectmodel-server/Messengers/ProjectDiagnosticsMessenger.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Messengers/ProjectDiagnosticsMessenger.cs rename to src/dotnet-projectmodel-server/Messengers/ProjectDiagnosticsMessenger.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Messengers/ProjectInformationMessenger.cs b/src/dotnet-projectmodel-server/Messengers/ProjectInformationMessenger.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Messengers/ProjectInformationMessenger.cs rename to src/dotnet-projectmodel-server/Messengers/ProjectInformationMessenger.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Messengers/ReferencesMessenger.cs b/src/dotnet-projectmodel-server/Messengers/ReferencesMessenger.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Messengers/ReferencesMessenger.cs rename to src/dotnet-projectmodel-server/Messengers/ReferencesMessenger.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Messengers/SourcesMessenger.cs b/src/dotnet-projectmodel-server/Messengers/SourcesMessenger.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Messengers/SourcesMessenger.cs rename to src/dotnet-projectmodel-server/Messengers/SourcesMessenger.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Models/DependencyDescription.cs b/src/dotnet-projectmodel-server/Models/DependencyDescription.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Models/DependencyDescription.cs rename to src/dotnet-projectmodel-server/Models/DependencyDescription.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Models/DependencyItem.cs b/src/dotnet-projectmodel-server/Models/DependencyItem.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Models/DependencyItem.cs rename to src/dotnet-projectmodel-server/Models/DependencyItem.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Models/DiagnosticMessageGroup.cs b/src/dotnet-projectmodel-server/Models/DiagnosticMessageGroup.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Models/DiagnosticMessageGroup.cs rename to src/dotnet-projectmodel-server/Models/DiagnosticMessageGroup.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Models/DiagnosticMessageView.cs b/src/dotnet-projectmodel-server/Models/DiagnosticMessageView.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Models/DiagnosticMessageView.cs rename to src/dotnet-projectmodel-server/Models/DiagnosticMessageView.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Models/DiagnosticsListMessage.cs b/src/dotnet-projectmodel-server/Models/DiagnosticsListMessage.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Models/DiagnosticsListMessage.cs rename to src/dotnet-projectmodel-server/Models/DiagnosticsListMessage.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Models/ErrorMessage.cs b/src/dotnet-projectmodel-server/Models/ErrorMessage.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Models/ErrorMessage.cs rename to src/dotnet-projectmodel-server/Models/ErrorMessage.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Models/FrameworkData.cs b/src/dotnet-projectmodel-server/Models/FrameworkData.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Models/FrameworkData.cs rename to src/dotnet-projectmodel-server/Models/FrameworkData.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Models/Message.cs b/src/dotnet-projectmodel-server/Models/Message.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Models/Message.cs rename to src/dotnet-projectmodel-server/Models/Message.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Models/ProjectReferenceDescription.cs b/src/dotnet-projectmodel-server/Models/ProjectReferenceDescription.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Models/ProjectReferenceDescription.cs rename to src/dotnet-projectmodel-server/Models/ProjectReferenceDescription.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/ProcessingQueue.cs b/src/dotnet-projectmodel-server/ProcessingQueue.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/ProcessingQueue.cs rename to src/dotnet-projectmodel-server/ProcessingQueue.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Program.cs b/src/dotnet-projectmodel-server/Program.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Program.cs rename to src/dotnet-projectmodel-server/Program.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/ProjectManager.cs b/src/dotnet-projectmodel-server/ProjectManager.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/ProjectManager.cs rename to src/dotnet-projectmodel-server/ProjectManager.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/ProtocolManager.cs b/src/dotnet-projectmodel-server/ProtocolManager.cs similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/ProtocolManager.cs rename to src/dotnet-projectmodel-server/ProtocolManager.cs diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Microsoft.DotNet.ProjectModel.Server.xproj b/src/dotnet-projectmodel-server/dotnet-projectmodel-server.xproj similarity index 100% rename from src/Microsoft.DotNet.ProjectModel.Server/Microsoft.DotNet.ProjectModel.Server.xproj rename to src/dotnet-projectmodel-server/dotnet-projectmodel-server.xproj diff --git a/src/Microsoft.DotNet.ProjectModel.Server/project.json b/src/dotnet-projectmodel-server/project.json similarity index 89% rename from src/Microsoft.DotNet.ProjectModel.Server/project.json rename to src/dotnet-projectmodel-server/project.json index c7935fefb..247b9cc97 100644 --- a/src/Microsoft.DotNet.ProjectModel.Server/project.json +++ b/src/dotnet-projectmodel-server/project.json @@ -1,5 +1,4 @@ { - "name": "dotnet-projectmodel-server", "version": "1.0.0-*", "compilationOptions": { "emitEntryPoint": true @@ -20,7 +19,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.Tools.Publish/Program.cs b/src/dotnet-publish/Program.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Publish/Program.cs rename to src/dotnet-publish/Program.cs diff --git a/src/Microsoft.DotNet.Tools.Publish/PublishCommand.cs b/src/dotnet-publish/PublishCommand.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Publish/PublishCommand.cs rename to src/dotnet-publish/PublishCommand.cs diff --git a/src/Microsoft.DotNet.Tools.Publish/README.md b/src/dotnet-publish/README.md similarity index 100% rename from src/Microsoft.DotNet.Tools.Publish/README.md rename to src/dotnet-publish/README.md diff --git a/src/Microsoft.DotNet.Tools.Publish/Microsoft.DotNet.Tools.Publish.xproj b/src/dotnet-publish/dotnet-publish.xproj similarity index 100% rename from src/Microsoft.DotNet.Tools.Publish/Microsoft.DotNet.Tools.Publish.xproj rename to src/dotnet-publish/dotnet-publish.xproj diff --git a/src/Microsoft.DotNet.Tools.Repl/project.json b/src/dotnet-publish/project.json similarity index 87% rename from src/Microsoft.DotNet.Tools.Repl/project.json rename to src/dotnet-publish/project.json index 8976bc86a..b3bbc2523 100644 --- a/src/Microsoft.DotNet.Tools.Repl/project.json +++ b/src/dotnet-publish/project.json @@ -1,5 +1,4 @@ { - "name": "dotnet-repl", "version": "1.0.0-*", "compilationOptions": { "emitEntryPoint": true @@ -16,7 +15,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.Tools.Repl.Csi/Program.cs b/src/dotnet-repl-csi/Program.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Repl.Csi/Program.cs rename to src/dotnet-repl-csi/Program.cs diff --git a/src/Microsoft.DotNet.Tools.Repl.Csi/Microsoft.DotNet.Tools.Repl.Csi.xproj b/src/dotnet-repl-csi/dotnet-repl-csi.xproj similarity index 100% rename from src/Microsoft.DotNet.Tools.Repl.Csi/Microsoft.DotNet.Tools.Repl.Csi.xproj rename to src/dotnet-repl-csi/dotnet-repl-csi.xproj diff --git a/src/Microsoft.DotNet.Tools.Repl.Csi/project.json b/src/dotnet-repl-csi/project.json similarity index 87% rename from src/Microsoft.DotNet.Tools.Repl.Csi/project.json rename to src/dotnet-repl-csi/project.json index d8e16cdfd..3bd7c1db4 100644 --- a/src/Microsoft.DotNet.Tools.Repl.Csi/project.json +++ b/src/dotnet-repl-csi/project.json @@ -1,5 +1,4 @@ { - "name": "dotnet-repl-csi", "version": "1.0.0-*", "compilationOptions": { "emitEntryPoint": true @@ -17,7 +16,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.Tools.Repl/Program.cs b/src/dotnet-repl/Program.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Repl/Program.cs rename to src/dotnet-repl/Program.cs diff --git a/src/Microsoft.DotNet.Tools.Repl/Microsoft.DotNet.Tools.Repl.xproj b/src/dotnet-repl/dotnet-repl.xproj similarity index 100% rename from src/Microsoft.DotNet.Tools.Repl/Microsoft.DotNet.Tools.Repl.xproj rename to src/dotnet-repl/dotnet-repl.xproj diff --git a/src/Microsoft.DotNet.Tools.Publish/project.json b/src/dotnet-repl/project.json similarity index 86% rename from src/Microsoft.DotNet.Tools.Publish/project.json rename to src/dotnet-repl/project.json index ac69731ed..b3bbc2523 100644 --- a/src/Microsoft.DotNet.Tools.Publish/project.json +++ b/src/dotnet-repl/project.json @@ -1,5 +1,4 @@ { - "name": "dotnet-publish", "version": "1.0.0-*", "compilationOptions": { "emitEntryPoint": true @@ -16,7 +15,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.Tools.Resgen/Program.cs b/src/dotnet-resgen/Program.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Resgen/Program.cs rename to src/dotnet-resgen/Program.cs diff --git a/src/Microsoft.DotNet.Tools.Resgen/Properties/AssemblyInfo.cs b/src/dotnet-resgen/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Resgen/Properties/AssemblyInfo.cs rename to src/dotnet-resgen/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.DotNet.Tools.Resgen/ResourceAssemblyGenerator.cs b/src/dotnet-resgen/ResourceAssemblyGenerator.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Resgen/ResourceAssemblyGenerator.cs rename to src/dotnet-resgen/ResourceAssemblyGenerator.cs diff --git a/src/Microsoft.DotNet.Tools.Resgen/ResourceFile.cs b/src/dotnet-resgen/ResourceFile.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Resgen/ResourceFile.cs rename to src/dotnet-resgen/ResourceFile.cs diff --git a/src/Microsoft.DotNet.Tools.Resgen/ResourceFileType.cs b/src/dotnet-resgen/ResourceFileType.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Resgen/ResourceFileType.cs rename to src/dotnet-resgen/ResourceFileType.cs diff --git a/src/Microsoft.DotNet.Tools.Resgen/ResourceSource.cs b/src/dotnet-resgen/ResourceSource.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Resgen/ResourceSource.cs rename to src/dotnet-resgen/ResourceSource.cs diff --git a/src/Microsoft.DotNet.Tools.Resgen/ResourcesFileGenerator.cs b/src/dotnet-resgen/ResourcesFileGenerator.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Resgen/ResourcesFileGenerator.cs rename to src/dotnet-resgen/ResourcesFileGenerator.cs diff --git a/src/Microsoft.DotNet.Tools.Resgen/Microsoft.DotNet.Tools.Resgen.xproj b/src/dotnet-resgen/dotnet-resgen.xproj similarity index 100% rename from src/Microsoft.DotNet.Tools.Resgen/Microsoft.DotNet.Tools.Resgen.xproj rename to src/dotnet-resgen/dotnet-resgen.xproj diff --git a/src/Microsoft.DotNet.Tools.Resgen/project.json b/src/dotnet-resgen/project.json similarity index 90% rename from src/Microsoft.DotNet.Tools.Resgen/project.json rename to src/dotnet-resgen/project.json index 293b66d3b..1dfbb0b6e 100644 --- a/src/Microsoft.DotNet.Tools.Resgen/project.json +++ b/src/dotnet-resgen/project.json @@ -1,5 +1,4 @@ { - "name": "dotnet-resgen", "version": "1.0.0-*", "compilationOptions": { "emitEntryPoint": true @@ -19,7 +18,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/dotnet-restore/project.json b/src/dotnet-restore/project.json index 27d7e048d..b0e599344 100644 --- a/src/dotnet-restore/project.json +++ b/src/dotnet-restore/project.json @@ -1,5 +1,4 @@ { - "name": "dotnet-restore", "description": "Restore packages specified in project.json (project file)", "version": "1.0.0-*", "repository": { @@ -31,7 +30,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.Tools.Run/Program.cs b/src/dotnet-run/Program.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Run/Program.cs rename to src/dotnet-run/Program.cs diff --git a/src/Microsoft.DotNet.Tools.Run/README.md b/src/dotnet-run/README.md similarity index 100% rename from src/Microsoft.DotNet.Tools.Run/README.md rename to src/dotnet-run/README.md diff --git a/src/Microsoft.DotNet.Tools.Run/RunCommand.cs b/src/dotnet-run/RunCommand.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Run/RunCommand.cs rename to src/dotnet-run/RunCommand.cs diff --git a/src/Microsoft.DotNet.Tools.Run/Microsoft.DotNet.Tools.Run.xproj b/src/dotnet-run/dotnet-run.xproj similarity index 100% rename from src/Microsoft.DotNet.Tools.Run/Microsoft.DotNet.Tools.Run.xproj rename to src/dotnet-run/dotnet-run.xproj diff --git a/src/Microsoft.DotNet.Tools.Run/project.json b/src/dotnet-run/project.json similarity index 79% rename from src/Microsoft.DotNet.Tools.Run/project.json rename to src/dotnet-run/project.json index bbbaabe98..928dbfd04 100644 --- a/src/Microsoft.DotNet.Tools.Run/project.json +++ b/src/dotnet-run/project.json @@ -1,5 +1,4 @@ { - "name": "dotnet-run", "version": "1.0.0-*", "compilationOptions": { "emitEntryPoint": true @@ -9,14 +8,14 @@ "Microsoft.Net.Compilers.netcore": "1.2.0-beta1-20160108-01", "System.Net.Sockets": "4.1.0-rc3-23727", - "System.CommandLine" : "0.1.0-d111815-3", + "System.CommandLine" : "0.1.0-e160119-1", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*" }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/src/Microsoft.DotNet.Tools.Test/Program.cs b/src/dotnet-test/Program.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Test/Program.cs rename to src/dotnet-test/Program.cs diff --git a/src/Microsoft.DotNet.Tools.Test/Properties/AssemblyInfo.cs b/src/dotnet-test/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Test/Properties/AssemblyInfo.cs rename to src/dotnet-test/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.DotNet.Tools.Test/ReportingChannel.cs b/src/dotnet-test/ReportingChannel.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Test/ReportingChannel.cs rename to src/dotnet-test/ReportingChannel.cs diff --git a/src/Microsoft.DotNet.Tools.Test/TestHostTracing.cs b/src/dotnet-test/TestHostTracing.cs similarity index 100% rename from src/Microsoft.DotNet.Tools.Test/TestHostTracing.cs rename to src/dotnet-test/TestHostTracing.cs diff --git a/src/Microsoft.DotNet.Tools.Test/Microsoft.DotNet.Tools.Test.xproj b/src/dotnet-test/dotnet-test.xproj similarity index 100% rename from src/Microsoft.DotNet.Tools.Test/Microsoft.DotNet.Tools.Test.xproj rename to src/dotnet-test/dotnet-test.xproj diff --git a/src/Microsoft.DotNet.Tools.Test/project.json b/src/dotnet-test/project.json similarity index 98% rename from src/Microsoft.DotNet.Tools.Test/project.json rename to src/dotnet-test/project.json index 52c5ac97b..e8849386d 100644 --- a/src/Microsoft.DotNet.Tools.Test/project.json +++ b/src/dotnet-test/project.json @@ -1,5 +1,4 @@ { - "name": "dotnet-test", "description": "Test host for discovering and running unit tests at design time, such as in Visual Studio.", "version": "1.0.0-*", "repository": { diff --git a/src/Microsoft.DotNet.Cli/Program.cs b/src/dotnet/Program.cs similarity index 100% rename from src/Microsoft.DotNet.Cli/Program.cs rename to src/dotnet/Program.cs diff --git a/src/Microsoft.DotNet.Cli/README.md b/src/dotnet/README.md similarity index 100% rename from src/Microsoft.DotNet.Cli/README.md rename to src/dotnet/README.md diff --git a/src/Microsoft.DotNet.Cli/Microsoft.DotNet.Cli.xproj b/src/dotnet/dotnet.xproj similarity index 100% rename from src/Microsoft.DotNet.Cli/Microsoft.DotNet.Cli.xproj rename to src/dotnet/dotnet.xproj diff --git a/src/Microsoft.DotNet.Cli/project.json b/src/dotnet/project.json similarity index 86% rename from src/Microsoft.DotNet.Cli/project.json rename to src/dotnet/project.json index 5d048f721..fa20bd53e 100644 --- a/src/Microsoft.DotNet.Cli/project.json +++ b/src/dotnet/project.json @@ -1,5 +1,4 @@ { - "name": "dotnet", "version": "1.0.0-*", "compilationOptions": { "emitEntryPoint": true @@ -15,7 +14,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "scripts": { diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json index 5db3ecda4..8d79d3893 100644 --- a/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json @@ -20,7 +20,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/ArgumentForwardingTests/Reflector/project.json b/test/ArgumentForwardingTests/Reflector/project.json index 5db3ecda4..8d79d3893 100644 --- a/test/ArgumentForwardingTests/Reflector/project.json +++ b/test/ArgumentForwardingTests/Reflector/project.json @@ -20,7 +20,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/E2E/project.json b/test/E2E/project.json index 52adcd14d..a9bb12beb 100644 --- a/test/E2E/project.json +++ b/test/E2E/project.json @@ -19,7 +19,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/FSharpTestProjects/CompileFail/project.json b/test/FSharpTestProjects/CompileFail/project.json index db6b68b23..8b6e2f469 100644 --- a/test/FSharpTestProjects/CompileFail/project.json +++ b/test/FSharpTestProjects/CompileFail/project.json @@ -14,7 +14,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/FSharpTestProjects/TestApp/project.json b/test/FSharpTestProjects/TestApp/project.json index 5903c54e3..a29600c91 100644 --- a/test/FSharpTestProjects/TestApp/project.json +++ b/test/FSharpTestProjects/TestApp/project.json @@ -15,7 +15,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/FSharpTestProjects/TestAppWithArgs/project.json b/test/FSharpTestProjects/TestAppWithArgs/project.json index db6b68b23..8b6e2f469 100644 --- a/test/FSharpTestProjects/TestAppWithArgs/project.json +++ b/test/FSharpTestProjects/TestAppWithArgs/project.json @@ -14,7 +14,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/FSharpTestProjects/TestLibrary/project.json b/test/FSharpTestProjects/TestLibrary/project.json index eea2ee21a..264a89118 100644 --- a/test/FSharpTestProjects/TestLibrary/project.json +++ b/test/FSharpTestProjects/TestLibrary/project.json @@ -11,7 +11,7 @@ ], "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/LoadContextTest/project.json b/test/LoadContextTest/project.json index ba068d375..20b61407d 100644 --- a/test/LoadContextTest/project.json +++ b/test/LoadContextTest/project.json @@ -14,7 +14,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json index 4073df718..fc10bf3b8 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json @@ -15,7 +15,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/StreamForwarderTests/project.json b/test/StreamForwarderTests/project.json index d25aac09c..9c94c162c 100644 --- a/test/StreamForwarderTests/project.json +++ b/test/StreamForwarderTests/project.json @@ -20,7 +20,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/Microsoft.DotNet.Tools.Builder.Tests/BuildProjectToProjectTests.cs b/test/dotnet-build.Tests/BuildProjectToProjectTests.cs similarity index 100% rename from test/Microsoft.DotNet.Tools.Builder.Tests/BuildProjectToProjectTests.cs rename to test/dotnet-build.Tests/BuildProjectToProjectTests.cs diff --git a/test/Microsoft.DotNet.Tools.Builder.Tests/IncrementalTestBase.cs b/test/dotnet-build.Tests/IncrementalTestBase.cs similarity index 100% rename from test/Microsoft.DotNet.Tools.Builder.Tests/IncrementalTestBase.cs rename to test/dotnet-build.Tests/IncrementalTestBase.cs diff --git a/test/Microsoft.DotNet.Tools.Builder.Tests/IncrementalTests.cs b/test/dotnet-build.Tests/IncrementalTests.cs similarity index 100% rename from test/Microsoft.DotNet.Tools.Builder.Tests/IncrementalTests.cs rename to test/dotnet-build.Tests/IncrementalTests.cs diff --git a/test/Microsoft.DotNet.Tools.Builder.Tests/Microsoft.DotNet.Tools.Builder.Tests.xproj b/test/dotnet-build.Tests/dotnet-build.Tests.xproj similarity index 100% rename from test/Microsoft.DotNet.Tools.Builder.Tests/Microsoft.DotNet.Tools.Builder.Tests.xproj rename to test/dotnet-build.Tests/dotnet-build.Tests.xproj diff --git a/test/Microsoft.DotNet.Tools.Builder.Tests/project.json b/test/dotnet-build.Tests/project.json similarity index 92% rename from test/Microsoft.DotNet.Tools.Builder.Tests/project.json rename to test/dotnet-build.Tests/project.json index 61a30cebb..9196c66c7 100644 --- a/test/Microsoft.DotNet.Tools.Builder.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -19,7 +19,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/Microsoft.DotNet.Tools.Compiler.Tests/CompilerTests.cs b/test/dotnet-compile.Tests/CompilerTests.cs similarity index 100% rename from test/Microsoft.DotNet.Tools.Compiler.Tests/CompilerTests.cs rename to test/dotnet-compile.Tests/CompilerTests.cs diff --git a/test/Microsoft.DotNet.Tools.Compiler.Tests/Microsoft.DotNet.Tools.Compiler.Tests.xproj b/test/dotnet-compile.Tests/dotnet-compile.Tests.xproj similarity index 100% rename from test/Microsoft.DotNet.Tools.Compiler.Tests/Microsoft.DotNet.Tools.Compiler.Tests.xproj rename to test/dotnet-compile.Tests/dotnet-compile.Tests.xproj diff --git a/test/Microsoft.DotNet.Tools.Compiler.Tests/project.json b/test/dotnet-compile.Tests/project.json similarity index 92% rename from test/Microsoft.DotNet.Tools.Compiler.Tests/project.json rename to test/dotnet-compile.Tests/project.json index a4a94e111..c8019c355 100644 --- a/test/Microsoft.DotNet.Tools.Compiler.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -19,7 +19,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/DthTestClient.cs b/test/dotnet-projectmodel-server.Tests/DthTestClient.cs similarity index 100% rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/DthTestClient.cs rename to test/dotnet-projectmodel-server.Tests/DthTestClient.cs diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/DthTestServer.cs b/test/dotnet-projectmodel-server.Tests/DthTestServer.cs similarity index 100% rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/DthTestServer.cs rename to test/dotnet-projectmodel-server.Tests/DthTestServer.cs diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/DthTests.cs b/test/dotnet-projectmodel-server.Tests/DthTests.cs similarity index 100% rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/DthTests.cs rename to test/dotnet-projectmodel-server.Tests/DthTests.cs diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/DthMessage.cs b/test/dotnet-projectmodel-server.Tests/Helpers/DthMessage.cs similarity index 100% rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/DthMessage.cs rename to test/dotnet-projectmodel-server.Tests/Helpers/DthMessage.cs diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/DthMessageCollectionExtension.cs b/test/dotnet-projectmodel-server.Tests/Helpers/DthMessageCollectionExtension.cs similarity index 100% rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/DthMessageCollectionExtension.cs rename to test/dotnet-projectmodel-server.Tests/Helpers/DthMessageCollectionExtension.cs diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/DthMessageExtension.cs b/test/dotnet-projectmodel-server.Tests/Helpers/DthMessageExtension.cs similarity index 100% rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/DthMessageExtension.cs rename to test/dotnet-projectmodel-server.Tests/Helpers/DthMessageExtension.cs diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/JArrayExtensions.cs b/test/dotnet-projectmodel-server.Tests/Helpers/JArrayExtensions.cs similarity index 100% rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/JArrayExtensions.cs rename to test/dotnet-projectmodel-server.Tests/Helpers/JArrayExtensions.cs diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/JObjectExtensions.cs b/test/dotnet-projectmodel-server.Tests/Helpers/JObjectExtensions.cs similarity index 100% rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/JObjectExtensions.cs rename to test/dotnet-projectmodel-server.Tests/Helpers/JObjectExtensions.cs diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/TestHelper.cs b/test/dotnet-projectmodel-server.Tests/Helpers/TestHelper.cs similarity index 100% rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/TestHelper.cs rename to test/dotnet-projectmodel-server.Tests/Helpers/TestHelper.cs diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/Microsoft.DotNet.ProjectModel.Server.Tests.xproj b/test/dotnet-projectmodel-server.Tests/dotnet-projectmodel-server.Tests.xproj similarity index 100% rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/Microsoft.DotNet.ProjectModel.Server.Tests.xproj rename to test/dotnet-projectmodel-server.Tests/dotnet-projectmodel-server.Tests.xproj diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json similarity index 77% rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/project.json rename to test/dotnet-projectmodel-server.Tests/project.json index 281ff7567..8a1cdc437 100644 --- a/test/Microsoft.DotNet.ProjectModel.Server.Tests/project.json +++ b/test/dotnet-projectmodel-server.Tests/project.json @@ -2,13 +2,13 @@ "dependencies": { "Microsoft.NETCore.Platforms": "1.0.1-rc3-23727", "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "Microsoft.DotNet.ProjectModel.Server": "1.0.0-*", + "dotnet-projectmodel-server": "1.0.0-*", "Newtonsoft.Json": "7.0.1", "xunit.runner.aspnet": "2.0.0-aspnet-rc2-16068" }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } }, "commands": { diff --git a/test/Microsoft.DotNet.Tools.Publish.Tests/Microsoft.DotNet.Tools.Publish.Tests.cs b/test/dotnet-publish.Tests/Microsoft.DotNet.Tools.Publish.Tests.cs similarity index 100% rename from test/Microsoft.DotNet.Tools.Publish.Tests/Microsoft.DotNet.Tools.Publish.Tests.cs rename to test/dotnet-publish.Tests/Microsoft.DotNet.Tools.Publish.Tests.cs diff --git a/test/Microsoft.DotNet.Tools.Publish.Tests/Microsoft.DotNet.Tools.Publish.Tests.xproj b/test/dotnet-publish.Tests/dotnet-publish.Tests.xproj similarity index 100% rename from test/Microsoft.DotNet.Tools.Publish.Tests/Microsoft.DotNet.Tools.Publish.Tests.xproj rename to test/dotnet-publish.Tests/dotnet-publish.Tests.xproj diff --git a/test/Microsoft.DotNet.Tools.Publish.Tests/project.json b/test/dotnet-publish.Tests/project.json similarity index 92% rename from test/Microsoft.DotNet.Tools.Publish.Tests/project.json rename to test/dotnet-publish.Tests/project.json index feb47b09c..22ea2fd01 100644 --- a/test/Microsoft.DotNet.Tools.Publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -19,7 +19,7 @@ "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } } diff --git a/testapp/DthTestProjects/src/IncompatiblePackageSample/project.json b/testapp/DthTestProjects/src/IncompatiblePackageSample/project.json index 8064d1e3a..12d737ef1 100644 --- a/testapp/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/testapp/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -4,7 +4,7 @@ }, "frameworks": { "dnxcore50": { - "imports": "portable-net451+win8" + "imports": "portable-net45+win8" } } }