diff --git a/docfx.sln b/docfx.sln index aa9141320ba..c85092edcce 100644 --- a/docfx.sln +++ b/docfx.sln @@ -8,7 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6A65A769-DAC src\Directory.Build.props = src\Directory.Build.props EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{F922E543-9AD4-4031-8BD1-8A7AA9771D1E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{F922E543-9AD4-4031-8BD1-8A7AA9771D1E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataContracts", "DataContracts", "{C3023E7B-AA8B-469E-8333-5737093A9D60}" EndProject @@ -17,11 +17,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{926A0726-B test\Directory.Build.props = test\Directory.Build.props EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "plugins", "plugins", "{DF2BA00B-1742-4F84-A469-08D7F019498E}" - ProjectSection(SolutionItems) = preProject - plugins\Directory.Build.props = plugins\Directory.Build.props - EndProjectSection -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "docfx", "src\docfx\docfx.csproj", "{EF53214F-BA98-4026-BEED-CF771865C312}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Glob", "src\Docfx.Glob\Docfx.Glob.csproj", "{7E877810-DC13-4A6C-8DFC-184C00A20B7C}" @@ -34,18 +29,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Common", "src\Docfx.C EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.Common", "src\Docfx.Build.Common\Docfx.Build.Common.csproj", "{1A6D574B-5CA8-4976-B0F1-9CF338A3A930}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.ConceptualDocuments", "src\Docfx.Build.ConceptualDocuments\Docfx.Build.ConceptualDocuments.csproj", "{26428F7A-2BF3-4E4A-8161-C30EB0922CD8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.Engine", "src\Docfx.Build.Engine\Docfx.Build.Engine.csproj", "{A98C8639-61A5-444C-AAFB-B2CFBA66A550}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build", "src\Docfx.Build\Docfx.Build.csproj", "{A98C8639-61A5-444C-AAFB-B2CFBA66A550}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.ManagedReference", "src\Docfx.Build.ManagedReference\Docfx.Build.ManagedReference.csproj", "{C6459834-F6DE-4309-80AF-0E3CDB1FC14E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.ResourceFiles", "src\Docfx.Build.ResourceFiles\Docfx.Build.ResourceFiles.csproj", "{E43A398A-89B9-40E3-9BDD-F30E54EAA25A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.RestApi", "src\Docfx.Build.RestApi\Docfx.Build.RestApi.csproj", "{234FA4D1-75EF-48C6-8FB1-3D838173FD8C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.TableOfContents", "src\Docfx.Build.TableOfContents\Docfx.Build.TableOfContents.csproj", "{2F1EC9E3-4D01-4FF8-8891-FE2C44097FB8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.DataContracts.Common", "src\Docfx.DataContracts.Common\Docfx.DataContracts.Common.csproj", "{13E2771C-5C73-4B82-8911-55E1A70A3076}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.DataContracts.RestApi", "src\Docfx.DataContracts.RestApi\Docfx.DataContracts.RestApi.csproj", "{05D9D594-E6F6-4887-8ECD-0FFFF7C92E68}" @@ -54,13 +43,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "docfx.Tests", "test\docfx.T EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.Common.Tests", "test\Docfx.Build.Common.Tests\Docfx.Build.Common.Tests.csproj", "{7F6019A6-C1AB-4B5C-BD3C-E8D271F3469D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.ConceptualDocuments.Tests", "test\Docfx.Build.ConceptualDocuments.Tests\Docfx.Build.ConceptualDocuments.Tests.csproj", "{727C0798-F079-4CA5-85C8-289598EE9EEE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.Engine.Tests", "test\Docfx.Build.Engine.Tests\Docfx.Build.Engine.Tests.csproj", "{56BE5194-7881-4F22-9018-A79C3C4B958A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.RestApi.Tests", "test\Docfx.Build.RestApi.Tests\Docfx.Build.RestApi.Tests.csproj", "{DCD65A24-D8C0-4DD3-B42C-A1D878AF4DE4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.TableOfContents.Tests", "test\Docfx.Build.TableOfContents.Tests\Docfx.Build.TableOfContents.Tests.csproj", "{05A49D39-97F0-46AF-9EDC-76D1E19FE3AC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.Tests", "test\Docfx.Build.Tests\Docfx.Build.Tests.csproj", "{56BE5194-7881-4F22-9018-A79C3C4B958A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Common.Tests", "test\Docfx.Common.Tests\Docfx.Common.Tests.csproj", "{B2EEB5FE-CF39-4CC7-9650-5709E71D2BA9}" EndProject @@ -74,12 +57,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.HtmlToPdf", "src\Docf EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Tests.Common", "test\Docfx.Tests.Common\Docfx.Tests.Common.csproj", "{1D2D316B-4C70-4410-817A-DEDB5B0072A5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.TagLevelRestApi", "plugins\Docfx.Build.TagLevelRestApi\Docfx.Build.TagLevelRestApi.csproj", "{D10F65C3-5D5A-427A-91D1-A1061A988AA1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.RestApi.WithPlugins.Tests", "test\Docfx.Build.RestApi.WithPlugins.Tests\Docfx.Build.RestApi.WithPlugins.Tests.csproj", "{63266510-C4BF-44E0-AF76-B01BA47019B2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.OperationLevelRestApi", "plugins\Docfx.Build.OperationLevelRestApi\Docfx.Build.OperationLevelRestApi.csproj", "{CB8D3397-E338-4801-B3E7-42FE65F535AE}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.SchemaDriven", "src\Docfx.Build.SchemaDriven\Docfx.Build.SchemaDriven.csproj", "{2978E4CC-7D67-43DA-B6C9-09559C530EFC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.SchemaDriven.Tests", "test\Docfx.Build.SchemaDriven.Tests\Docfx.Build.SchemaDriven.Tests.csproj", "{298FBFBA-F535-4C29-AB70-A1041F50098C}" @@ -88,10 +67,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.UniversalRefere EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.DataContracts.UniversalReference", "src\Docfx.DataContracts.UniversalReference\Docfx.DataContracts.UniversalReference.csproj", "{8C31E8EB-0CCB-4442-9DDB-79822BB7D8C3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.OverwriteDocuments", "src\Docfx.Build.OverwriteDocuments\Docfx.Build.OverwriteDocuments.csproj", "{085AB724-DC2D-4133-AC0F-87BD1A1743F9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.OverwriteDocuments.Tests", "test\Docfx.Build.OverwriteDocuments.Tests\Docfx.Build.OverwriteDocuments.Tests.csproj", "{B3843152-55A6-4BF0-B774-18E05F0B99AF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.MarkdigEngine", "src\Docfx.MarkdigEngine\Docfx.MarkdigEngine.csproj", "{EA44B820-4C3A-476C-A514-C89CAA6A0F46}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.MarkdigEngine.Extensions", "src\Docfx.MarkdigEngine.Extensions\Docfx.MarkdigEngine.Extensions.csproj", "{FD0365CB-3F03-43B0-9FB2-FB50047BF3E5}" @@ -112,6 +87,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Dotnet.Tests", "test\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Dotnet", "src\Docfx.Dotnet\Docfx.Dotnet.csproj", "{B4EFC288-DC3B-4700-8F76-3F286FA80395}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.RestApi.Tests", "test\Docfx.Build.RestApi.Tests\Docfx.Build.RestApi.Tests.csproj", "{7EC2F02D-0D10-4BCF-84BC-26CA38412085}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.TagLevelRestApi", "src\Docfx.Build.TagLevelRestApi\Docfx.Build.TagLevelRestApi.csproj", "{375A8EDE-3921-4988-A1E9-5C2E45D872B9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.OperationLevelRestApi", "src\Docfx.Build.OperationLevelRestApi\Docfx.Build.OperationLevelRestApi.csproj", "{1A7BC32B-8283-423A-9D12-855FFFD6AAE1}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extensions", "Extensions", "{49A27FCE-C434-4318-8EEC-1E4CDC192778}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.OverwriteDocuments", "src\Docfx.Build.OverwriteDocuments\Docfx.Build.OverwriteDocuments.csproj", "{528A2D8B-4792-4202-987E-876E9D0EAF03}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Docfx.Build.OverwriteDocuments.Tests", "test\Docfx.Build.OverwriteDocuments.Tests\Docfx.Build.OverwriteDocuments.Tests.csproj", "{CAECA6C3-3317-4E6E-8927-9186857B23E8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -194,18 +181,6 @@ Global {1A6D574B-5CA8-4976-B0F1-9CF338A3A930}.Release|x64.Build.0 = Release|Any CPU {1A6D574B-5CA8-4976-B0F1-9CF338A3A930}.Release|x86.ActiveCfg = Release|Any CPU {1A6D574B-5CA8-4976-B0F1-9CF338A3A930}.Release|x86.Build.0 = Release|Any CPU - {26428F7A-2BF3-4E4A-8161-C30EB0922CD8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {26428F7A-2BF3-4E4A-8161-C30EB0922CD8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {26428F7A-2BF3-4E4A-8161-C30EB0922CD8}.Debug|x64.ActiveCfg = Debug|Any CPU - {26428F7A-2BF3-4E4A-8161-C30EB0922CD8}.Debug|x64.Build.0 = Debug|Any CPU - {26428F7A-2BF3-4E4A-8161-C30EB0922CD8}.Debug|x86.ActiveCfg = Debug|Any CPU - {26428F7A-2BF3-4E4A-8161-C30EB0922CD8}.Debug|x86.Build.0 = Debug|Any CPU - {26428F7A-2BF3-4E4A-8161-C30EB0922CD8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {26428F7A-2BF3-4E4A-8161-C30EB0922CD8}.Release|Any CPU.Build.0 = Release|Any CPU - {26428F7A-2BF3-4E4A-8161-C30EB0922CD8}.Release|x64.ActiveCfg = Release|Any CPU - {26428F7A-2BF3-4E4A-8161-C30EB0922CD8}.Release|x64.Build.0 = Release|Any CPU - {26428F7A-2BF3-4E4A-8161-C30EB0922CD8}.Release|x86.ActiveCfg = Release|Any CPU - {26428F7A-2BF3-4E4A-8161-C30EB0922CD8}.Release|x86.Build.0 = Release|Any CPU {A98C8639-61A5-444C-AAFB-B2CFBA66A550}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A98C8639-61A5-444C-AAFB-B2CFBA66A550}.Debug|Any CPU.Build.0 = Debug|Any CPU {A98C8639-61A5-444C-AAFB-B2CFBA66A550}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -230,18 +205,6 @@ Global {C6459834-F6DE-4309-80AF-0E3CDB1FC14E}.Release|x64.Build.0 = Release|Any CPU {C6459834-F6DE-4309-80AF-0E3CDB1FC14E}.Release|x86.ActiveCfg = Release|Any CPU {C6459834-F6DE-4309-80AF-0E3CDB1FC14E}.Release|x86.Build.0 = Release|Any CPU - {E43A398A-89B9-40E3-9BDD-F30E54EAA25A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E43A398A-89B9-40E3-9BDD-F30E54EAA25A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E43A398A-89B9-40E3-9BDD-F30E54EAA25A}.Debug|x64.ActiveCfg = Debug|Any CPU - {E43A398A-89B9-40E3-9BDD-F30E54EAA25A}.Debug|x64.Build.0 = Debug|Any CPU - {E43A398A-89B9-40E3-9BDD-F30E54EAA25A}.Debug|x86.ActiveCfg = Debug|Any CPU - {E43A398A-89B9-40E3-9BDD-F30E54EAA25A}.Debug|x86.Build.0 = Debug|Any CPU - {E43A398A-89B9-40E3-9BDD-F30E54EAA25A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E43A398A-89B9-40E3-9BDD-F30E54EAA25A}.Release|Any CPU.Build.0 = Release|Any CPU - {E43A398A-89B9-40E3-9BDD-F30E54EAA25A}.Release|x64.ActiveCfg = Release|Any CPU - {E43A398A-89B9-40E3-9BDD-F30E54EAA25A}.Release|x64.Build.0 = Release|Any CPU - {E43A398A-89B9-40E3-9BDD-F30E54EAA25A}.Release|x86.ActiveCfg = Release|Any CPU - {E43A398A-89B9-40E3-9BDD-F30E54EAA25A}.Release|x86.Build.0 = Release|Any CPU {234FA4D1-75EF-48C6-8FB1-3D838173FD8C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {234FA4D1-75EF-48C6-8FB1-3D838173FD8C}.Debug|Any CPU.Build.0 = Debug|Any CPU {234FA4D1-75EF-48C6-8FB1-3D838173FD8C}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -254,18 +217,6 @@ Global {234FA4D1-75EF-48C6-8FB1-3D838173FD8C}.Release|x64.Build.0 = Release|Any CPU {234FA4D1-75EF-48C6-8FB1-3D838173FD8C}.Release|x86.ActiveCfg = Release|Any CPU {234FA4D1-75EF-48C6-8FB1-3D838173FD8C}.Release|x86.Build.0 = Release|Any CPU - {2F1EC9E3-4D01-4FF8-8891-FE2C44097FB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F1EC9E3-4D01-4FF8-8891-FE2C44097FB8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F1EC9E3-4D01-4FF8-8891-FE2C44097FB8}.Debug|x64.ActiveCfg = Debug|Any CPU - {2F1EC9E3-4D01-4FF8-8891-FE2C44097FB8}.Debug|x64.Build.0 = Debug|Any CPU - {2F1EC9E3-4D01-4FF8-8891-FE2C44097FB8}.Debug|x86.ActiveCfg = Debug|Any CPU - {2F1EC9E3-4D01-4FF8-8891-FE2C44097FB8}.Debug|x86.Build.0 = Debug|Any CPU - {2F1EC9E3-4D01-4FF8-8891-FE2C44097FB8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F1EC9E3-4D01-4FF8-8891-FE2C44097FB8}.Release|Any CPU.Build.0 = Release|Any CPU - {2F1EC9E3-4D01-4FF8-8891-FE2C44097FB8}.Release|x64.ActiveCfg = Release|Any CPU - {2F1EC9E3-4D01-4FF8-8891-FE2C44097FB8}.Release|x64.Build.0 = Release|Any CPU - {2F1EC9E3-4D01-4FF8-8891-FE2C44097FB8}.Release|x86.ActiveCfg = Release|Any CPU - {2F1EC9E3-4D01-4FF8-8891-FE2C44097FB8}.Release|x86.Build.0 = Release|Any CPU {13E2771C-5C73-4B82-8911-55E1A70A3076}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {13E2771C-5C73-4B82-8911-55E1A70A3076}.Debug|Any CPU.Build.0 = Debug|Any CPU {13E2771C-5C73-4B82-8911-55E1A70A3076}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -314,18 +265,6 @@ Global {7F6019A6-C1AB-4B5C-BD3C-E8D271F3469D}.Release|x64.Build.0 = Release|Any CPU {7F6019A6-C1AB-4B5C-BD3C-E8D271F3469D}.Release|x86.ActiveCfg = Release|Any CPU {7F6019A6-C1AB-4B5C-BD3C-E8D271F3469D}.Release|x86.Build.0 = Release|Any CPU - {727C0798-F079-4CA5-85C8-289598EE9EEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {727C0798-F079-4CA5-85C8-289598EE9EEE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {727C0798-F079-4CA5-85C8-289598EE9EEE}.Debug|x64.ActiveCfg = Debug|Any CPU - {727C0798-F079-4CA5-85C8-289598EE9EEE}.Debug|x64.Build.0 = Debug|Any CPU - {727C0798-F079-4CA5-85C8-289598EE9EEE}.Debug|x86.ActiveCfg = Debug|Any CPU - {727C0798-F079-4CA5-85C8-289598EE9EEE}.Debug|x86.Build.0 = Debug|Any CPU - {727C0798-F079-4CA5-85C8-289598EE9EEE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {727C0798-F079-4CA5-85C8-289598EE9EEE}.Release|Any CPU.Build.0 = Release|Any CPU - {727C0798-F079-4CA5-85C8-289598EE9EEE}.Release|x64.ActiveCfg = Release|Any CPU - {727C0798-F079-4CA5-85C8-289598EE9EEE}.Release|x64.Build.0 = Release|Any CPU - {727C0798-F079-4CA5-85C8-289598EE9EEE}.Release|x86.ActiveCfg = Release|Any CPU - {727C0798-F079-4CA5-85C8-289598EE9EEE}.Release|x86.Build.0 = Release|Any CPU {56BE5194-7881-4F22-9018-A79C3C4B958A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {56BE5194-7881-4F22-9018-A79C3C4B958A}.Debug|Any CPU.Build.0 = Debug|Any CPU {56BE5194-7881-4F22-9018-A79C3C4B958A}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -338,30 +277,6 @@ Global {56BE5194-7881-4F22-9018-A79C3C4B958A}.Release|x64.Build.0 = Release|Any CPU {56BE5194-7881-4F22-9018-A79C3C4B958A}.Release|x86.ActiveCfg = Release|Any CPU {56BE5194-7881-4F22-9018-A79C3C4B958A}.Release|x86.Build.0 = Release|Any CPU - {DCD65A24-D8C0-4DD3-B42C-A1D878AF4DE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DCD65A24-D8C0-4DD3-B42C-A1D878AF4DE4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DCD65A24-D8C0-4DD3-B42C-A1D878AF4DE4}.Debug|x64.ActiveCfg = Debug|Any CPU - {DCD65A24-D8C0-4DD3-B42C-A1D878AF4DE4}.Debug|x64.Build.0 = Debug|Any CPU - {DCD65A24-D8C0-4DD3-B42C-A1D878AF4DE4}.Debug|x86.ActiveCfg = Debug|Any CPU - {DCD65A24-D8C0-4DD3-B42C-A1D878AF4DE4}.Debug|x86.Build.0 = Debug|Any CPU - {DCD65A24-D8C0-4DD3-B42C-A1D878AF4DE4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DCD65A24-D8C0-4DD3-B42C-A1D878AF4DE4}.Release|Any CPU.Build.0 = Release|Any CPU - {DCD65A24-D8C0-4DD3-B42C-A1D878AF4DE4}.Release|x64.ActiveCfg = Release|Any CPU - {DCD65A24-D8C0-4DD3-B42C-A1D878AF4DE4}.Release|x64.Build.0 = Release|Any CPU - {DCD65A24-D8C0-4DD3-B42C-A1D878AF4DE4}.Release|x86.ActiveCfg = Release|Any CPU - {DCD65A24-D8C0-4DD3-B42C-A1D878AF4DE4}.Release|x86.Build.0 = Release|Any CPU - {05A49D39-97F0-46AF-9EDC-76D1E19FE3AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {05A49D39-97F0-46AF-9EDC-76D1E19FE3AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {05A49D39-97F0-46AF-9EDC-76D1E19FE3AC}.Debug|x64.ActiveCfg = Debug|Any CPU - {05A49D39-97F0-46AF-9EDC-76D1E19FE3AC}.Debug|x64.Build.0 = Debug|Any CPU - {05A49D39-97F0-46AF-9EDC-76D1E19FE3AC}.Debug|x86.ActiveCfg = Debug|Any CPU - {05A49D39-97F0-46AF-9EDC-76D1E19FE3AC}.Debug|x86.Build.0 = Debug|Any CPU - {05A49D39-97F0-46AF-9EDC-76D1E19FE3AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {05A49D39-97F0-46AF-9EDC-76D1E19FE3AC}.Release|Any CPU.Build.0 = Release|Any CPU - {05A49D39-97F0-46AF-9EDC-76D1E19FE3AC}.Release|x64.ActiveCfg = Release|Any CPU - {05A49D39-97F0-46AF-9EDC-76D1E19FE3AC}.Release|x64.Build.0 = Release|Any CPU - {05A49D39-97F0-46AF-9EDC-76D1E19FE3AC}.Release|x86.ActiveCfg = Release|Any CPU - {05A49D39-97F0-46AF-9EDC-76D1E19FE3AC}.Release|x86.Build.0 = Release|Any CPU {B2EEB5FE-CF39-4CC7-9650-5709E71D2BA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B2EEB5FE-CF39-4CC7-9650-5709E71D2BA9}.Debug|Any CPU.Build.0 = Debug|Any CPU {B2EEB5FE-CF39-4CC7-9650-5709E71D2BA9}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -434,18 +349,6 @@ Global {1D2D316B-4C70-4410-817A-DEDB5B0072A5}.Release|x64.Build.0 = Release|Any CPU {1D2D316B-4C70-4410-817A-DEDB5B0072A5}.Release|x86.ActiveCfg = Release|Any CPU {1D2D316B-4C70-4410-817A-DEDB5B0072A5}.Release|x86.Build.0 = Release|Any CPU - {D10F65C3-5D5A-427A-91D1-A1061A988AA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D10F65C3-5D5A-427A-91D1-A1061A988AA1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D10F65C3-5D5A-427A-91D1-A1061A988AA1}.Debug|x64.ActiveCfg = Debug|Any CPU - {D10F65C3-5D5A-427A-91D1-A1061A988AA1}.Debug|x64.Build.0 = Debug|Any CPU - {D10F65C3-5D5A-427A-91D1-A1061A988AA1}.Debug|x86.ActiveCfg = Debug|Any CPU - {D10F65C3-5D5A-427A-91D1-A1061A988AA1}.Debug|x86.Build.0 = Debug|Any CPU - {D10F65C3-5D5A-427A-91D1-A1061A988AA1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D10F65C3-5D5A-427A-91D1-A1061A988AA1}.Release|Any CPU.Build.0 = Release|Any CPU - {D10F65C3-5D5A-427A-91D1-A1061A988AA1}.Release|x64.ActiveCfg = Release|Any CPU - {D10F65C3-5D5A-427A-91D1-A1061A988AA1}.Release|x64.Build.0 = Release|Any CPU - {D10F65C3-5D5A-427A-91D1-A1061A988AA1}.Release|x86.ActiveCfg = Release|Any CPU - {D10F65C3-5D5A-427A-91D1-A1061A988AA1}.Release|x86.Build.0 = Release|Any CPU {63266510-C4BF-44E0-AF76-B01BA47019B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {63266510-C4BF-44E0-AF76-B01BA47019B2}.Debug|Any CPU.Build.0 = Debug|Any CPU {63266510-C4BF-44E0-AF76-B01BA47019B2}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -458,18 +361,6 @@ Global {63266510-C4BF-44E0-AF76-B01BA47019B2}.Release|x64.Build.0 = Release|Any CPU {63266510-C4BF-44E0-AF76-B01BA47019B2}.Release|x86.ActiveCfg = Release|Any CPU {63266510-C4BF-44E0-AF76-B01BA47019B2}.Release|x86.Build.0 = Release|Any CPU - {CB8D3397-E338-4801-B3E7-42FE65F535AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CB8D3397-E338-4801-B3E7-42FE65F535AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CB8D3397-E338-4801-B3E7-42FE65F535AE}.Debug|x64.ActiveCfg = Debug|Any CPU - {CB8D3397-E338-4801-B3E7-42FE65F535AE}.Debug|x64.Build.0 = Debug|Any CPU - {CB8D3397-E338-4801-B3E7-42FE65F535AE}.Debug|x86.ActiveCfg = Debug|Any CPU - {CB8D3397-E338-4801-B3E7-42FE65F535AE}.Debug|x86.Build.0 = Debug|Any CPU - {CB8D3397-E338-4801-B3E7-42FE65F535AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CB8D3397-E338-4801-B3E7-42FE65F535AE}.Release|Any CPU.Build.0 = Release|Any CPU - {CB8D3397-E338-4801-B3E7-42FE65F535AE}.Release|x64.ActiveCfg = Release|Any CPU - {CB8D3397-E338-4801-B3E7-42FE65F535AE}.Release|x64.Build.0 = Release|Any CPU - {CB8D3397-E338-4801-B3E7-42FE65F535AE}.Release|x86.ActiveCfg = Release|Any CPU - {CB8D3397-E338-4801-B3E7-42FE65F535AE}.Release|x86.Build.0 = Release|Any CPU {2978E4CC-7D67-43DA-B6C9-09559C530EFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2978E4CC-7D67-43DA-B6C9-09559C530EFC}.Debug|Any CPU.Build.0 = Debug|Any CPU {2978E4CC-7D67-43DA-B6C9-09559C530EFC}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -518,30 +409,6 @@ Global {8C31E8EB-0CCB-4442-9DDB-79822BB7D8C3}.Release|x64.Build.0 = Release|Any CPU {8C31E8EB-0CCB-4442-9DDB-79822BB7D8C3}.Release|x86.ActiveCfg = Release|Any CPU {8C31E8EB-0CCB-4442-9DDB-79822BB7D8C3}.Release|x86.Build.0 = Release|Any CPU - {085AB724-DC2D-4133-AC0F-87BD1A1743F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {085AB724-DC2D-4133-AC0F-87BD1A1743F9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {085AB724-DC2D-4133-AC0F-87BD1A1743F9}.Debug|x64.ActiveCfg = Debug|Any CPU - {085AB724-DC2D-4133-AC0F-87BD1A1743F9}.Debug|x64.Build.0 = Debug|Any CPU - {085AB724-DC2D-4133-AC0F-87BD1A1743F9}.Debug|x86.ActiveCfg = Debug|Any CPU - {085AB724-DC2D-4133-AC0F-87BD1A1743F9}.Debug|x86.Build.0 = Debug|Any CPU - {085AB724-DC2D-4133-AC0F-87BD1A1743F9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {085AB724-DC2D-4133-AC0F-87BD1A1743F9}.Release|Any CPU.Build.0 = Release|Any CPU - {085AB724-DC2D-4133-AC0F-87BD1A1743F9}.Release|x64.ActiveCfg = Release|Any CPU - {085AB724-DC2D-4133-AC0F-87BD1A1743F9}.Release|x64.Build.0 = Release|Any CPU - {085AB724-DC2D-4133-AC0F-87BD1A1743F9}.Release|x86.ActiveCfg = Release|Any CPU - {085AB724-DC2D-4133-AC0F-87BD1A1743F9}.Release|x86.Build.0 = Release|Any CPU - {B3843152-55A6-4BF0-B774-18E05F0B99AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3843152-55A6-4BF0-B774-18E05F0B99AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3843152-55A6-4BF0-B774-18E05F0B99AF}.Debug|x64.ActiveCfg = Debug|Any CPU - {B3843152-55A6-4BF0-B774-18E05F0B99AF}.Debug|x64.Build.0 = Debug|Any CPU - {B3843152-55A6-4BF0-B774-18E05F0B99AF}.Debug|x86.ActiveCfg = Debug|Any CPU - {B3843152-55A6-4BF0-B774-18E05F0B99AF}.Debug|x86.Build.0 = Debug|Any CPU - {B3843152-55A6-4BF0-B774-18E05F0B99AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3843152-55A6-4BF0-B774-18E05F0B99AF}.Release|Any CPU.Build.0 = Release|Any CPU - {B3843152-55A6-4BF0-B774-18E05F0B99AF}.Release|x64.ActiveCfg = Release|Any CPU - {B3843152-55A6-4BF0-B774-18E05F0B99AF}.Release|x64.Build.0 = Release|Any CPU - {B3843152-55A6-4BF0-B774-18E05F0B99AF}.Release|x86.ActiveCfg = Release|Any CPU - {B3843152-55A6-4BF0-B774-18E05F0B99AF}.Release|x86.Build.0 = Release|Any CPU {EA44B820-4C3A-476C-A514-C89CAA6A0F46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EA44B820-4C3A-476C-A514-C89CAA6A0F46}.Debug|Any CPU.Build.0 = Debug|Any CPU {EA44B820-4C3A-476C-A514-C89CAA6A0F46}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -638,6 +505,66 @@ Global {B4EFC288-DC3B-4700-8F76-3F286FA80395}.Release|x64.Build.0 = Release|Any CPU {B4EFC288-DC3B-4700-8F76-3F286FA80395}.Release|x86.ActiveCfg = Release|Any CPU {B4EFC288-DC3B-4700-8F76-3F286FA80395}.Release|x86.Build.0 = Release|Any CPU + {7EC2F02D-0D10-4BCF-84BC-26CA38412085}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7EC2F02D-0D10-4BCF-84BC-26CA38412085}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7EC2F02D-0D10-4BCF-84BC-26CA38412085}.Debug|x64.ActiveCfg = Debug|Any CPU + {7EC2F02D-0D10-4BCF-84BC-26CA38412085}.Debug|x64.Build.0 = Debug|Any CPU + {7EC2F02D-0D10-4BCF-84BC-26CA38412085}.Debug|x86.ActiveCfg = Debug|Any CPU + {7EC2F02D-0D10-4BCF-84BC-26CA38412085}.Debug|x86.Build.0 = Debug|Any CPU + {7EC2F02D-0D10-4BCF-84BC-26CA38412085}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7EC2F02D-0D10-4BCF-84BC-26CA38412085}.Release|Any CPU.Build.0 = Release|Any CPU + {7EC2F02D-0D10-4BCF-84BC-26CA38412085}.Release|x64.ActiveCfg = Release|Any CPU + {7EC2F02D-0D10-4BCF-84BC-26CA38412085}.Release|x64.Build.0 = Release|Any CPU + {7EC2F02D-0D10-4BCF-84BC-26CA38412085}.Release|x86.ActiveCfg = Release|Any CPU + {7EC2F02D-0D10-4BCF-84BC-26CA38412085}.Release|x86.Build.0 = Release|Any CPU + {375A8EDE-3921-4988-A1E9-5C2E45D872B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {375A8EDE-3921-4988-A1E9-5C2E45D872B9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {375A8EDE-3921-4988-A1E9-5C2E45D872B9}.Debug|x64.ActiveCfg = Debug|Any CPU + {375A8EDE-3921-4988-A1E9-5C2E45D872B9}.Debug|x64.Build.0 = Debug|Any CPU + {375A8EDE-3921-4988-A1E9-5C2E45D872B9}.Debug|x86.ActiveCfg = Debug|Any CPU + {375A8EDE-3921-4988-A1E9-5C2E45D872B9}.Debug|x86.Build.0 = Debug|Any CPU + {375A8EDE-3921-4988-A1E9-5C2E45D872B9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {375A8EDE-3921-4988-A1E9-5C2E45D872B9}.Release|Any CPU.Build.0 = Release|Any CPU + {375A8EDE-3921-4988-A1E9-5C2E45D872B9}.Release|x64.ActiveCfg = Release|Any CPU + {375A8EDE-3921-4988-A1E9-5C2E45D872B9}.Release|x64.Build.0 = Release|Any CPU + {375A8EDE-3921-4988-A1E9-5C2E45D872B9}.Release|x86.ActiveCfg = Release|Any CPU + {375A8EDE-3921-4988-A1E9-5C2E45D872B9}.Release|x86.Build.0 = Release|Any CPU + {1A7BC32B-8283-423A-9D12-855FFFD6AAE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1A7BC32B-8283-423A-9D12-855FFFD6AAE1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1A7BC32B-8283-423A-9D12-855FFFD6AAE1}.Debug|x64.ActiveCfg = Debug|Any CPU + {1A7BC32B-8283-423A-9D12-855FFFD6AAE1}.Debug|x64.Build.0 = Debug|Any CPU + {1A7BC32B-8283-423A-9D12-855FFFD6AAE1}.Debug|x86.ActiveCfg = Debug|Any CPU + {1A7BC32B-8283-423A-9D12-855FFFD6AAE1}.Debug|x86.Build.0 = Debug|Any CPU + {1A7BC32B-8283-423A-9D12-855FFFD6AAE1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1A7BC32B-8283-423A-9D12-855FFFD6AAE1}.Release|Any CPU.Build.0 = Release|Any CPU + {1A7BC32B-8283-423A-9D12-855FFFD6AAE1}.Release|x64.ActiveCfg = Release|Any CPU + {1A7BC32B-8283-423A-9D12-855FFFD6AAE1}.Release|x64.Build.0 = Release|Any CPU + {1A7BC32B-8283-423A-9D12-855FFFD6AAE1}.Release|x86.ActiveCfg = Release|Any CPU + {1A7BC32B-8283-423A-9D12-855FFFD6AAE1}.Release|x86.Build.0 = Release|Any CPU + {528A2D8B-4792-4202-987E-876E9D0EAF03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {528A2D8B-4792-4202-987E-876E9D0EAF03}.Debug|Any CPU.Build.0 = Debug|Any CPU + {528A2D8B-4792-4202-987E-876E9D0EAF03}.Debug|x64.ActiveCfg = Debug|Any CPU + {528A2D8B-4792-4202-987E-876E9D0EAF03}.Debug|x64.Build.0 = Debug|Any CPU + {528A2D8B-4792-4202-987E-876E9D0EAF03}.Debug|x86.ActiveCfg = Debug|Any CPU + {528A2D8B-4792-4202-987E-876E9D0EAF03}.Debug|x86.Build.0 = Debug|Any CPU + {528A2D8B-4792-4202-987E-876E9D0EAF03}.Release|Any CPU.ActiveCfg = Release|Any CPU + {528A2D8B-4792-4202-987E-876E9D0EAF03}.Release|Any CPU.Build.0 = Release|Any CPU + {528A2D8B-4792-4202-987E-876E9D0EAF03}.Release|x64.ActiveCfg = Release|Any CPU + {528A2D8B-4792-4202-987E-876E9D0EAF03}.Release|x64.Build.0 = Release|Any CPU + {528A2D8B-4792-4202-987E-876E9D0EAF03}.Release|x86.ActiveCfg = Release|Any CPU + {528A2D8B-4792-4202-987E-876E9D0EAF03}.Release|x86.Build.0 = Release|Any CPU + {CAECA6C3-3317-4E6E-8927-9186857B23E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CAECA6C3-3317-4E6E-8927-9186857B23E8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CAECA6C3-3317-4E6E-8927-9186857B23E8}.Debug|x64.ActiveCfg = Debug|Any CPU + {CAECA6C3-3317-4E6E-8927-9186857B23E8}.Debug|x64.Build.0 = Debug|Any CPU + {CAECA6C3-3317-4E6E-8927-9186857B23E8}.Debug|x86.ActiveCfg = Debug|Any CPU + {CAECA6C3-3317-4E6E-8927-9186857B23E8}.Debug|x86.Build.0 = Debug|Any CPU + {CAECA6C3-3317-4E6E-8927-9186857B23E8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CAECA6C3-3317-4E6E-8927-9186857B23E8}.Release|Any CPU.Build.0 = Release|Any CPU + {CAECA6C3-3317-4E6E-8927-9186857B23E8}.Release|x64.ActiveCfg = Release|Any CPU + {CAECA6C3-3317-4E6E-8927-9186857B23E8}.Release|x64.Build.0 = Release|Any CPU + {CAECA6C3-3317-4E6E-8927-9186857B23E8}.Release|x86.ActiveCfg = Release|Any CPU + {CAECA6C3-3317-4E6E-8927-9186857B23E8}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -650,36 +577,26 @@ Global {B6B96738-C338-4904-B932-4C05DB7D4DDE} = {C533106C-5699-450C-A18C-249364CBF58B} {59CF2F0F-4D4D-4096-8D22-595856CCCF72} = {C533106C-5699-450C-A18C-249364CBF58B} {E1E085F6-67CD-4257-815C-F1DABF091BA4} = {C533106C-5699-450C-A18C-249364CBF58B} - {1A6D574B-5CA8-4976-B0F1-9CF338A3A930} = {F922E543-9AD4-4031-8BD1-8A7AA9771D1E} - {26428F7A-2BF3-4E4A-8161-C30EB0922CD8} = {F922E543-9AD4-4031-8BD1-8A7AA9771D1E} - {A98C8639-61A5-444C-AAFB-B2CFBA66A550} = {F922E543-9AD4-4031-8BD1-8A7AA9771D1E} + {1A6D574B-5CA8-4976-B0F1-9CF338A3A930} = {C533106C-5699-450C-A18C-249364CBF58B} + {A98C8639-61A5-444C-AAFB-B2CFBA66A550} = {6A65A769-DAC3-4E99-96F9-991F4CE8D164} {C6459834-F6DE-4309-80AF-0E3CDB1FC14E} = {F922E543-9AD4-4031-8BD1-8A7AA9771D1E} - {E43A398A-89B9-40E3-9BDD-F30E54EAA25A} = {F922E543-9AD4-4031-8BD1-8A7AA9771D1E} {234FA4D1-75EF-48C6-8FB1-3D838173FD8C} = {F922E543-9AD4-4031-8BD1-8A7AA9771D1E} - {2F1EC9E3-4D01-4FF8-8891-FE2C44097FB8} = {F922E543-9AD4-4031-8BD1-8A7AA9771D1E} {13E2771C-5C73-4B82-8911-55E1A70A3076} = {C3023E7B-AA8B-469E-8333-5737093A9D60} {05D9D594-E6F6-4887-8ECD-0FFFF7C92E68} = {C3023E7B-AA8B-469E-8333-5737093A9D60} {D1CF2A6C-AEB1-4A03-BE64-8A96FA5DEFE4} = {926A0726-B806-4215-82EF-AF8E22D0FACF} {7F6019A6-C1AB-4B5C-BD3C-E8D271F3469D} = {926A0726-B806-4215-82EF-AF8E22D0FACF} - {727C0798-F079-4CA5-85C8-289598EE9EEE} = {926A0726-B806-4215-82EF-AF8E22D0FACF} {56BE5194-7881-4F22-9018-A79C3C4B958A} = {926A0726-B806-4215-82EF-AF8E22D0FACF} - {DCD65A24-D8C0-4DD3-B42C-A1D878AF4DE4} = {926A0726-B806-4215-82EF-AF8E22D0FACF} - {05A49D39-97F0-46AF-9EDC-76D1E19FE3AC} = {926A0726-B806-4215-82EF-AF8E22D0FACF} {B2EEB5FE-CF39-4CC7-9650-5709E71D2BA9} = {926A0726-B806-4215-82EF-AF8E22D0FACF} {A95C5BAE-1D0D-44FD-A984-7CBF055A62E2} = {926A0726-B806-4215-82EF-AF8E22D0FACF} - {958DF90F-0528-4C50-9AC2-E86C60971B7D} = {926A0726-B806-4215-82EF-AF8E22D0FACF} - {E9795C9A-1F98-4716-A0FC-843C6B000BE5} = {926A0726-B806-4215-82EF-AF8E22D0FACF} + {958DF90F-0528-4C50-9AC2-E86C60971B7D} = {49A27FCE-C434-4318-8EEC-1E4CDC192778} + {E9795C9A-1F98-4716-A0FC-843C6B000BE5} = {49A27FCE-C434-4318-8EEC-1E4CDC192778} {FF8D61D0-01C9-44B9-98F9-37FCBF20CD72} = {6A65A769-DAC3-4E99-96F9-991F4CE8D164} {1D2D316B-4C70-4410-817A-DEDB5B0072A5} = {926A0726-B806-4215-82EF-AF8E22D0FACF} - {D10F65C3-5D5A-427A-91D1-A1061A988AA1} = {DF2BA00B-1742-4F84-A469-08D7F019498E} - {63266510-C4BF-44E0-AF76-B01BA47019B2} = {926A0726-B806-4215-82EF-AF8E22D0FACF} - {CB8D3397-E338-4801-B3E7-42FE65F535AE} = {DF2BA00B-1742-4F84-A469-08D7F019498E} + {63266510-C4BF-44E0-AF76-B01BA47019B2} = {49A27FCE-C434-4318-8EEC-1E4CDC192778} {2978E4CC-7D67-43DA-B6C9-09559C530EFC} = {F922E543-9AD4-4031-8BD1-8A7AA9771D1E} - {298FBFBA-F535-4C29-AB70-A1041F50098C} = {926A0726-B806-4215-82EF-AF8E22D0FACF} + {298FBFBA-F535-4C29-AB70-A1041F50098C} = {49A27FCE-C434-4318-8EEC-1E4CDC192778} {DF88D1C8-1139-4174-8325-DD8166D6C3A4} = {F922E543-9AD4-4031-8BD1-8A7AA9771D1E} {8C31E8EB-0CCB-4442-9DDB-79822BB7D8C3} = {C3023E7B-AA8B-469E-8333-5737093A9D60} - {085AB724-DC2D-4133-AC0F-87BD1A1743F9} = {F922E543-9AD4-4031-8BD1-8A7AA9771D1E} - {B3843152-55A6-4BF0-B774-18E05F0B99AF} = {926A0726-B806-4215-82EF-AF8E22D0FACF} {EA44B820-4C3A-476C-A514-C89CAA6A0F46} = {377A4748-C426-4D5E-9A25-6D1809A7B85C} {FD0365CB-3F03-43B0-9FB2-FB50047BF3E5} = {377A4748-C426-4D5E-9A25-6D1809A7B85C} {DD9736B2-8AA2-44AE-B0B3-57510FF0D634} = {926A0726-B806-4215-82EF-AF8E22D0FACF} @@ -690,6 +607,12 @@ Global {3AC4C0C1-AC55-4E2D-8FF6-CE04A90B00B7} = {926A0726-B806-4215-82EF-AF8E22D0FACF} {D6D2FA50-BFFA-4EAD-919B-5B58E8AE4DEB} = {926A0726-B806-4215-82EF-AF8E22D0FACF} {B4EFC288-DC3B-4700-8F76-3F286FA80395} = {6A65A769-DAC3-4E99-96F9-991F4CE8D164} + {7EC2F02D-0D10-4BCF-84BC-26CA38412085} = {49A27FCE-C434-4318-8EEC-1E4CDC192778} + {375A8EDE-3921-4988-A1E9-5C2E45D872B9} = {F922E543-9AD4-4031-8BD1-8A7AA9771D1E} + {1A7BC32B-8283-423A-9D12-855FFFD6AAE1} = {F922E543-9AD4-4031-8BD1-8A7AA9771D1E} + {49A27FCE-C434-4318-8EEC-1E4CDC192778} = {926A0726-B806-4215-82EF-AF8E22D0FACF} + {528A2D8B-4792-4202-987E-876E9D0EAF03} = {F922E543-9AD4-4031-8BD1-8A7AA9771D1E} + {CAECA6C3-3317-4E6E-8927-9186857B23E8} = {49A27FCE-C434-4318-8EEC-1E4CDC192778} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {6C12271F-8093-4D5D-8BEE-3318BFE40E23} diff --git a/plugins/Directory.Build.props b/plugins/Directory.Build.props deleted file mode 100644 index bf987b61ede..00000000000 --- a/plugins/Directory.Build.props +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/src/Docfx.App/Docfx.App.csproj b/src/Docfx.App/Docfx.App.csproj index 93a36fe6e2b..b205495fb36 100644 --- a/src/Docfx.App/Docfx.App.csproj +++ b/src/Docfx.App/Docfx.App.csproj @@ -6,7 +6,7 @@ - + @@ -20,13 +20,10 @@ - - + - - diff --git a/src/Docfx.Build.ConceptualDocuments/Docfx.Build.ConceptualDocuments.csproj b/src/Docfx.Build.ConceptualDocuments/Docfx.Build.ConceptualDocuments.csproj deleted file mode 100644 index af6b2a1155e..00000000000 --- a/src/Docfx.Build.ConceptualDocuments/Docfx.Build.ConceptualDocuments.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/Docfx.Build.Engine/Constants.cs b/src/Docfx.Build.Engine/Constants.cs deleted file mode 100644 index 11a1dd8a1d9..00000000000 --- a/src/Docfx.Build.Engine/Constants.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -namespace Docfx.Build.Engine; - -internal static class Constants -{ - /// - /// TODO: how to handle multi-language - /// - public const string DefaultLanguage = "csharp"; - - public const string ManifestFileName = "manifest.json"; - - public static class OPSEnvironmentVariable - { - public const string SystemMetadata = "_op_systemMetadata"; - public const string OpPublishTargetSiteHostName = "_op_publishTargetSiteHostName"; - } -} diff --git a/plugins/Docfx.Build.OperationLevelRestApi/Docfx.Build.OperationLevelRestApi.csproj b/src/Docfx.Build.OperationLevelRestApi/Docfx.Build.OperationLevelRestApi.csproj similarity index 100% rename from plugins/Docfx.Build.OperationLevelRestApi/Docfx.Build.OperationLevelRestApi.csproj rename to src/Docfx.Build.OperationLevelRestApi/Docfx.Build.OperationLevelRestApi.csproj diff --git a/plugins/Docfx.Build.OperationLevelRestApi/SplitRestApiToOperationLevel.cs b/src/Docfx.Build.OperationLevelRestApi/SplitRestApiToOperationLevel.cs similarity index 100% rename from plugins/Docfx.Build.OperationLevelRestApi/SplitRestApiToOperationLevel.cs rename to src/Docfx.Build.OperationLevelRestApi/SplitRestApiToOperationLevel.cs diff --git a/src/Docfx.Build.ResourceFiles/Docfx.Build.ResourceFiles.csproj b/src/Docfx.Build.ResourceFiles/Docfx.Build.ResourceFiles.csproj deleted file mode 100644 index af6b2a1155e..00000000000 --- a/src/Docfx.Build.ResourceFiles/Docfx.Build.ResourceFiles.csproj +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/Docfx.Build.TableOfContents/Docfx.Build.TableOfContents.csproj b/src/Docfx.Build.TableOfContents/Docfx.Build.TableOfContents.csproj deleted file mode 100644 index 488c55df5ce..00000000000 --- a/src/Docfx.Build.TableOfContents/Docfx.Build.TableOfContents.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/plugins/Docfx.Build.TagLevelRestApi/Docfx.Build.TagLevelRestApi.csproj b/src/Docfx.Build.TagLevelRestApi/Docfx.Build.TagLevelRestApi.csproj similarity index 100% rename from plugins/Docfx.Build.TagLevelRestApi/Docfx.Build.TagLevelRestApi.csproj rename to src/Docfx.Build.TagLevelRestApi/Docfx.Build.TagLevelRestApi.csproj diff --git a/plugins/Docfx.Build.TagLevelRestApi/SplitRestApiToTagLevel.cs b/src/Docfx.Build.TagLevelRestApi/SplitRestApiToTagLevel.cs similarity index 100% rename from plugins/Docfx.Build.TagLevelRestApi/SplitRestApiToTagLevel.cs rename to src/Docfx.Build.TagLevelRestApi/SplitRestApiToTagLevel.cs diff --git a/src/Docfx.Build.Engine/BuildPhaseUtility.cs b/src/Docfx.Build/BuildPhaseUtility.cs similarity index 100% rename from src/Docfx.Build.Engine/BuildPhaseUtility.cs rename to src/Docfx.Build/BuildPhaseUtility.cs diff --git a/src/Docfx.Build.Engine/CompilePhaseHandler.cs b/src/Docfx.Build/CompilePhaseHandler.cs similarity index 100% rename from src/Docfx.Build.Engine/CompilePhaseHandler.cs rename to src/Docfx.Build/CompilePhaseHandler.cs diff --git a/src/Docfx.Build.Engine/CompositionContainer.cs b/src/Docfx.Build/CompositionContainer.cs similarity index 100% rename from src/Docfx.Build.Engine/CompositionContainer.cs rename to src/Docfx.Build/CompositionContainer.cs diff --git a/src/Docfx.Build.ConceptualDocuments/BuildConceptualDocument.cs b/src/Docfx.Build/Conceptual/BuildConceptualDocument.cs similarity index 100% rename from src/Docfx.Build.ConceptualDocuments/BuildConceptualDocument.cs rename to src/Docfx.Build/Conceptual/BuildConceptualDocument.cs diff --git a/src/Docfx.Build.ConceptualDocuments/ConceptualDocumentProcessor.cs b/src/Docfx.Build/Conceptual/ConceptualDocumentProcessor.cs similarity index 100% rename from src/Docfx.Build.ConceptualDocuments/ConceptualDocumentProcessor.cs rename to src/Docfx.Build/Conceptual/ConceptualDocumentProcessor.cs diff --git a/src/Docfx.Build.ConceptualDocuments/CountWord.cs b/src/Docfx.Build/Conceptual/CountWord.cs similarity index 100% rename from src/Docfx.Build.ConceptualDocuments/CountWord.cs rename to src/Docfx.Build/Conceptual/CountWord.cs diff --git a/src/Docfx.Build.ConceptualDocuments/HtmlDocumentUtility.cs b/src/Docfx.Build/Conceptual/HtmlDocumentUtility.cs similarity index 100% rename from src/Docfx.Build.ConceptualDocuments/HtmlDocumentUtility.cs rename to src/Docfx.Build/Conceptual/HtmlDocumentUtility.cs diff --git a/src/Docfx.Build.ConceptualDocuments/SeparatedHtmlInfo.cs b/src/Docfx.Build/Conceptual/SeparatedHtmlInfo.cs similarity index 100% rename from src/Docfx.Build.ConceptualDocuments/SeparatedHtmlInfo.cs rename to src/Docfx.Build/Conceptual/SeparatedHtmlInfo.cs diff --git a/src/Docfx.Build.ConceptualDocuments/ValidateConceptualDocumentMetadata.cs b/src/Docfx.Build/Conceptual/ValidateConceptualDocumentMetadata.cs similarity index 100% rename from src/Docfx.Build.ConceptualDocuments/ValidateConceptualDocumentMetadata.cs rename to src/Docfx.Build/Conceptual/ValidateConceptualDocumentMetadata.cs diff --git a/src/Docfx.Build.Engine/Docfx.Build.Engine.csproj b/src/Docfx.Build/Docfx.Build.csproj similarity index 100% rename from src/Docfx.Build.Engine/Docfx.Build.Engine.csproj rename to src/Docfx.Build/Docfx.Build.csproj diff --git a/src/Docfx.Build.Engine/DocumentBuildContext.cs b/src/Docfx.Build/DocumentBuildContext.cs similarity index 100% rename from src/Docfx.Build.Engine/DocumentBuildContext.cs rename to src/Docfx.Build/DocumentBuildContext.cs diff --git a/src/Docfx.Build.Engine/DocumentBuildParameters.cs b/src/Docfx.Build/DocumentBuildParameters.cs similarity index 100% rename from src/Docfx.Build.Engine/DocumentBuildParameters.cs rename to src/Docfx.Build/DocumentBuildParameters.cs diff --git a/src/Docfx.Build.Engine/DocumentBuilder.cs b/src/Docfx.Build/DocumentBuilder.cs similarity index 93% rename from src/Docfx.Build.Engine/DocumentBuilder.cs rename to src/Docfx.Build/DocumentBuilder.cs index 5a0e0f47a41..97720840dfc 100644 --- a/src/Docfx.Build.Engine/DocumentBuilder.cs +++ b/src/Docfx.Build/DocumentBuilder.cs @@ -8,6 +8,7 @@ using System.Text; using Docfx.Build.SchemaDriven; using Docfx.Common; +using Docfx.DataContracts.Common; using Docfx.MarkdigEngine; using Docfx.Plugins; using Newtonsoft.Json; @@ -232,7 +233,6 @@ private List LoadSchemaDrivenDocumentProcessors(DocumentBuil return result; } - var siteHostName = TryGetPublishTargetSiteHostNameFromEnvironment(); var markdigMarkdownService = CreateMarkdigMarkdownService(parameter, resource); foreach (var pair in resource.GetResources(@"^schemas/.*\.schema\.json")) { @@ -244,8 +244,7 @@ private List LoadSchemaDrivenDocumentProcessors(DocumentBuil var sdp = new SchemaDrivenDocumentProcessor( schema, new CompositionContainer(CompositionContainer.DefaultContainer), - markdigMarkdownService, - siteHostName); + markdigMarkdownService); Logger.LogVerbose($"\t{sdp.Name} with build steps ({string.Join(", ", from bs in sdp.BuildSteps orderby bs.BuildOrder select bs.Name)})"); result.Add(sdp); } @@ -305,21 +304,6 @@ orderby assembly.FullName return result; } - private static string TryGetPublishTargetSiteHostNameFromEnvironment() - { - string metadataString = Environment.GetEnvironmentVariable(Constants.OPSEnvironmentVariable.SystemMetadata); - - if (metadataString != null) - { - var metadata = JsonUtility.FromJsonString>(metadataString)?.ToImmutableDictionary(); - if (metadata.TryGetValue(Constants.OPSEnvironmentVariable.OpPublishTargetSiteHostName, out object publishTargetSiteHostName)) - { - return (string)publishTargetSiteHostName; - } - } - return null; - } - public void Dispose() { _postProcessorsManager.Dispose(); diff --git a/src/Docfx.Build.Engine/FileCollection.cs b/src/Docfx.Build/FileCollection.cs similarity index 100% rename from src/Docfx.Build.Engine/FileCollection.cs rename to src/Docfx.Build/FileCollection.cs diff --git a/src/Docfx.Build.Engine/FileMetadata.cs b/src/Docfx.Build/FileMetadata.cs similarity index 100% rename from src/Docfx.Build.Engine/FileMetadata.cs rename to src/Docfx.Build/FileMetadata.cs diff --git a/src/Docfx.Build.Engine/FileMetadataConverter.cs b/src/Docfx.Build/FileMetadataConverter.cs similarity index 100% rename from src/Docfx.Build.Engine/FileMetadataConverter.cs rename to src/Docfx.Build/FileMetadataConverter.cs diff --git a/src/Docfx.Build.Engine/FileMetadataHelper.cs b/src/Docfx.Build/FileMetadataHelper.cs similarity index 100% rename from src/Docfx.Build.Engine/FileMetadataHelper.cs rename to src/Docfx.Build/FileMetadataHelper.cs diff --git a/src/Docfx.Build.Engine/FileMetadataItem.cs b/src/Docfx.Build/FileMetadataItem.cs similarity index 100% rename from src/Docfx.Build.Engine/FileMetadataItem.cs rename to src/Docfx.Build/FileMetadataItem.cs diff --git a/src/Docfx.Build.Engine/HostService.cs b/src/Docfx.Build/HostService.cs similarity index 100% rename from src/Docfx.Build.Engine/HostService.cs rename to src/Docfx.Build/HostService.cs diff --git a/src/Docfx.Build.Engine/HostServiceCreator.cs b/src/Docfx.Build/HostServiceCreator.cs similarity index 100% rename from src/Docfx.Build.Engine/HostServiceCreator.cs rename to src/Docfx.Build/HostServiceCreator.cs diff --git a/src/Docfx.Build.Engine/IHostServiceCreator.cs b/src/Docfx.Build/IHostServiceCreator.cs similarity index 100% rename from src/Docfx.Build.Engine/IHostServiceCreator.cs rename to src/Docfx.Build/IHostServiceCreator.cs diff --git a/src/Docfx.Build.Engine/IPhaseHandler.cs b/src/Docfx.Build/IPhaseHandler.cs similarity index 100% rename from src/Docfx.Build.Engine/IPhaseHandler.cs rename to src/Docfx.Build/IPhaseHandler.cs diff --git a/src/Docfx.Build.Engine/InternalManifestItem.cs b/src/Docfx.Build/InternalManifestItem.cs similarity index 100% rename from src/Docfx.Build.Engine/InternalManifestItem.cs rename to src/Docfx.Build/InternalManifestItem.cs diff --git a/src/Docfx.Build.Engine/InvalidCrossReferenceException.cs b/src/Docfx.Build/InvalidCrossReferenceException.cs similarity index 100% rename from src/Docfx.Build.Engine/InvalidCrossReferenceException.cs rename to src/Docfx.Build/InvalidCrossReferenceException.cs diff --git a/src/Docfx.Build.Engine/InvalidPreprocessorException.cs b/src/Docfx.Build/InvalidPreprocessorException.cs similarity index 100% rename from src/Docfx.Build.Engine/InvalidPreprocessorException.cs rename to src/Docfx.Build/InvalidPreprocessorException.cs diff --git a/src/Docfx.Build.Engine/LinkPhaseHandler.cs b/src/Docfx.Build/LinkPhaseHandler.cs similarity index 100% rename from src/Docfx.Build.Engine/LinkPhaseHandler.cs rename to src/Docfx.Build/LinkPhaseHandler.cs diff --git a/src/Docfx.Build.Engine/ManifestItemWithContext.cs b/src/Docfx.Build/ManifestItemWithContext.cs similarity index 100% rename from src/Docfx.Build.Engine/ManifestItemWithContext.cs rename to src/Docfx.Build/ManifestItemWithContext.cs diff --git a/src/Docfx.Build.Engine/ManifestProcessor.cs b/src/Docfx.Build/ManifestProcessor.cs similarity index 100% rename from src/Docfx.Build.Engine/ManifestProcessor.cs rename to src/Docfx.Build/ManifestProcessor.cs diff --git a/src/Docfx.Build.Engine/ManifestUtility.cs b/src/Docfx.Build/ManifestUtility.cs similarity index 100% rename from src/Docfx.Build.Engine/ManifestUtility.cs rename to src/Docfx.Build/ManifestUtility.cs diff --git a/src/Docfx.Build.Engine/MarkupResultUtility.cs b/src/Docfx.Build/MarkupResultUtility.cs similarity index 100% rename from src/Docfx.Build.Engine/MarkupResultUtility.cs rename to src/Docfx.Build/MarkupResultUtility.cs diff --git a/src/Docfx.Build.Engine/OSPlatformSensitiveDictionary.cs b/src/Docfx.Build/OSPlatformSensitiveDictionary.cs similarity index 100% rename from src/Docfx.Build.Engine/OSPlatformSensitiveDictionary.cs rename to src/Docfx.Build/OSPlatformSensitiveDictionary.cs diff --git a/src/Docfx.Build.Engine/PhaseProcessor.cs b/src/Docfx.Build/PhaseProcessor.cs similarity index 100% rename from src/Docfx.Build.Engine/PhaseProcessor.cs rename to src/Docfx.Build/PhaseProcessor.cs diff --git a/src/Docfx.Build.Engine/PostProcessors/ExtractSearchIndex.cs b/src/Docfx.Build/PostProcessors/ExtractSearchIndex.cs similarity index 100% rename from src/Docfx.Build.Engine/PostProcessors/ExtractSearchIndex.cs rename to src/Docfx.Build/PostProcessors/ExtractSearchIndex.cs diff --git a/src/Docfx.Build.Engine/PostProcessors/HtmlDocumentHandler.cs b/src/Docfx.Build/PostProcessors/HtmlDocumentHandler.cs similarity index 100% rename from src/Docfx.Build.Engine/PostProcessors/HtmlDocumentHandler.cs rename to src/Docfx.Build/PostProcessors/HtmlDocumentHandler.cs diff --git a/src/Docfx.Build.Engine/PostProcessors/HtmlPostProcessor.cs b/src/Docfx.Build/PostProcessors/HtmlPostProcessor.cs similarity index 100% rename from src/Docfx.Build.Engine/PostProcessors/HtmlPostProcessor.cs rename to src/Docfx.Build/PostProcessors/HtmlPostProcessor.cs diff --git a/src/Docfx.Build.Engine/PostProcessors/IHtmlDocumentHandler.cs b/src/Docfx.Build/PostProcessors/IHtmlDocumentHandler.cs similarity index 100% rename from src/Docfx.Build.Engine/PostProcessors/IHtmlDocumentHandler.cs rename to src/Docfx.Build/PostProcessors/IHtmlDocumentHandler.cs diff --git a/src/Docfx.Build.Engine/PostProcessors/IPostProcessorsHandler.cs b/src/Docfx.Build/PostProcessors/IPostProcessorsHandler.cs similarity index 100% rename from src/Docfx.Build.Engine/PostProcessors/IPostProcessorsHandler.cs rename to src/Docfx.Build/PostProcessors/IPostProcessorsHandler.cs diff --git a/src/Docfx.Build.Engine/PostProcessors/PostProcessor.cs b/src/Docfx.Build/PostProcessors/PostProcessor.cs similarity index 100% rename from src/Docfx.Build.Engine/PostProcessors/PostProcessor.cs rename to src/Docfx.Build/PostProcessors/PostProcessor.cs diff --git a/src/Docfx.Build.Engine/PostProcessors/PostProcessorsHandler.cs b/src/Docfx.Build/PostProcessors/PostProcessorsHandler.cs similarity index 100% rename from src/Docfx.Build.Engine/PostProcessors/PostProcessorsHandler.cs rename to src/Docfx.Build/PostProcessors/PostProcessorsHandler.cs diff --git a/src/Docfx.Build.Engine/PostProcessors/PostProcessorsManager.cs b/src/Docfx.Build/PostProcessors/PostProcessorsManager.cs similarity index 100% rename from src/Docfx.Build.Engine/PostProcessors/PostProcessorsManager.cs rename to src/Docfx.Build/PostProcessors/PostProcessorsManager.cs diff --git a/src/Docfx.Build.Engine/PostProcessors/RemoveDebugInfo.cs b/src/Docfx.Build/PostProcessors/RemoveDebugInfo.cs similarity index 100% rename from src/Docfx.Build.Engine/PostProcessors/RemoveDebugInfo.cs rename to src/Docfx.Build/PostProcessors/RemoveDebugInfo.cs diff --git a/src/Docfx.Build.Engine/PostProcessors/SearchIndexItem.cs b/src/Docfx.Build/PostProcessors/SearchIndexItem.cs similarity index 100% rename from src/Docfx.Build.Engine/PostProcessors/SearchIndexItem.cs rename to src/Docfx.Build/PostProcessors/SearchIndexItem.cs diff --git a/src/Docfx.Build.Engine/PostProcessors/SitemapGenerator.cs b/src/Docfx.Build/PostProcessors/SitemapGenerator.cs similarity index 100% rename from src/Docfx.Build.Engine/PostProcessors/SitemapGenerator.cs rename to src/Docfx.Build/PostProcessors/SitemapGenerator.cs diff --git a/src/Docfx.Build.Engine/PostProcessors/ValidateBookmark.cs b/src/Docfx.Build/PostProcessors/ValidateBookmark.cs similarity index 100% rename from src/Docfx.Build.Engine/PostProcessors/ValidateBookmark.cs rename to src/Docfx.Build/PostProcessors/ValidateBookmark.cs diff --git a/src/Docfx.Build.Engine/ResourceDirectoryExceedsMaxDepthException.cs b/src/Docfx.Build/ResourceDirectoryExceedsMaxDepthException.cs similarity index 100% rename from src/Docfx.Build.Engine/ResourceDirectoryExceedsMaxDepthException.cs rename to src/Docfx.Build/ResourceDirectoryExceedsMaxDepthException.cs diff --git a/src/Docfx.Build.Engine/ResourceFileReaders/ArchiveResourceReader.cs b/src/Docfx.Build/ResourceFileReaders/ArchiveResourceReader.cs similarity index 100% rename from src/Docfx.Build.Engine/ResourceFileReaders/ArchiveResourceReader.cs rename to src/Docfx.Build/ResourceFileReaders/ArchiveResourceReader.cs diff --git a/src/Docfx.Build.Engine/ResourceFileReaders/CompositeResourceReader.cs b/src/Docfx.Build/ResourceFileReaders/CompositeResourceReader.cs similarity index 100% rename from src/Docfx.Build.Engine/ResourceFileReaders/CompositeResourceReader.cs rename to src/Docfx.Build/ResourceFileReaders/CompositeResourceReader.cs diff --git a/src/Docfx.Build.Engine/ResourceFileReaders/EmptyResourceReader.cs b/src/Docfx.Build/ResourceFileReaders/EmptyResourceReader.cs similarity index 100% rename from src/Docfx.Build.Engine/ResourceFileReaders/EmptyResourceReader.cs rename to src/Docfx.Build/ResourceFileReaders/EmptyResourceReader.cs diff --git a/src/Docfx.Build.Engine/ResourceFileReaders/IResourceFileReader.cs b/src/Docfx.Build/ResourceFileReaders/IResourceFileReader.cs similarity index 100% rename from src/Docfx.Build.Engine/ResourceFileReaders/IResourceFileReader.cs rename to src/Docfx.Build/ResourceFileReaders/IResourceFileReader.cs diff --git a/src/Docfx.Build.Engine/ResourceFileReaders/LocalFileResourceReader.cs b/src/Docfx.Build/ResourceFileReaders/LocalFileResourceReader.cs similarity index 100% rename from src/Docfx.Build.Engine/ResourceFileReaders/LocalFileResourceReader.cs rename to src/Docfx.Build/ResourceFileReaders/LocalFileResourceReader.cs diff --git a/src/Docfx.Build.Engine/ResourceFileReaders/ResourceFileReader.cs b/src/Docfx.Build/ResourceFileReaders/ResourceFileReader.cs similarity index 100% rename from src/Docfx.Build.Engine/ResourceFileReaders/ResourceFileReader.cs rename to src/Docfx.Build/ResourceFileReaders/ResourceFileReader.cs diff --git a/src/Docfx.Build.Engine/ResourceFileReaders/ResourceInfo.cs b/src/Docfx.Build/ResourceFileReaders/ResourceInfo.cs similarity index 100% rename from src/Docfx.Build.Engine/ResourceFileReaders/ResourceInfo.cs rename to src/Docfx.Build/ResourceFileReaders/ResourceInfo.cs diff --git a/src/Docfx.Build.ResourceFiles/IResourceFileConfig.cs b/src/Docfx.Build/ResourceFiles/IResourceFileConfig.cs similarity index 100% rename from src/Docfx.Build.ResourceFiles/IResourceFileConfig.cs rename to src/Docfx.Build/ResourceFiles/IResourceFileConfig.cs diff --git a/src/Docfx.Build.ResourceFiles/ResourceDocumentProcessor.cs b/src/Docfx.Build/ResourceFiles/ResourceDocumentProcessor.cs similarity index 100% rename from src/Docfx.Build.ResourceFiles/ResourceDocumentProcessor.cs rename to src/Docfx.Build/ResourceFiles/ResourceDocumentProcessor.cs diff --git a/src/Docfx.Build.ResourceFiles/ValidateResourceMetadata.cs b/src/Docfx.Build/ResourceFiles/ValidateResourceMetadata.cs similarity index 100% rename from src/Docfx.Build.ResourceFiles/ValidateResourceMetadata.cs rename to src/Docfx.Build/ResourceFiles/ValidateResourceMetadata.cs diff --git a/src/Docfx.Build.Engine/Settings/ApplyTemplateOptions.cs b/src/Docfx.Build/Settings/ApplyTemplateOptions.cs similarity index 100% rename from src/Docfx.Build.Engine/Settings/ApplyTemplateOptions.cs rename to src/Docfx.Build/Settings/ApplyTemplateOptions.cs diff --git a/src/Docfx.Build.Engine/Settings/ApplyTemplateSettings.cs b/src/Docfx.Build/Settings/ApplyTemplateSettings.cs similarity index 100% rename from src/Docfx.Build.Engine/Settings/ApplyTemplateSettings.cs rename to src/Docfx.Build/Settings/ApplyTemplateSettings.cs diff --git a/src/Docfx.Build.Engine/Settings/ExportSettings.cs b/src/Docfx.Build/Settings/ExportSettings.cs similarity index 100% rename from src/Docfx.Build.Engine/Settings/ExportSettings.cs rename to src/Docfx.Build/Settings/ExportSettings.cs diff --git a/src/Docfx.Build.Engine/SingleDocumentBuilder.cs b/src/Docfx.Build/SingleDocumentBuilder.cs similarity index 100% rename from src/Docfx.Build.Engine/SingleDocumentBuilder.cs rename to src/Docfx.Build/SingleDocumentBuilder.cs diff --git a/src/Docfx.Build.Engine/SystemMetadata.cs b/src/Docfx.Build/SystemMetadata.cs similarity index 100% rename from src/Docfx.Build.Engine/SystemMetadata.cs rename to src/Docfx.Build/SystemMetadata.cs diff --git a/src/Docfx.Build.Engine/SystemMetadataGenerator.cs b/src/Docfx.Build/SystemMetadataGenerator.cs similarity index 100% rename from src/Docfx.Build.Engine/SystemMetadataGenerator.cs rename to src/Docfx.Build/SystemMetadataGenerator.cs diff --git a/src/Docfx.Build.TableOfContents/BuildTocDocument.cs b/src/Docfx.Build/TableOfContents/BuildTocDocument.cs similarity index 100% rename from src/Docfx.Build.TableOfContents/BuildTocDocument.cs rename to src/Docfx.Build/TableOfContents/BuildTocDocument.cs diff --git a/src/Docfx.Build.TableOfContents/BuildTocDocumentStepBase.cs b/src/Docfx.Build/TableOfContents/BuildTocDocumentStepBase.cs similarity index 100% rename from src/Docfx.Build.TableOfContents/BuildTocDocumentStepBase.cs rename to src/Docfx.Build/TableOfContents/BuildTocDocumentStepBase.cs diff --git a/src/Docfx.Build.TableOfContents/HrefType.cs b/src/Docfx.Build/TableOfContents/HrefType.cs similarity index 100% rename from src/Docfx.Build.TableOfContents/HrefType.cs rename to src/Docfx.Build/TableOfContents/HrefType.cs diff --git a/src/Docfx.Build.TableOfContents/MarkdownTocReader.cs b/src/Docfx.Build/TableOfContents/MarkdownTocReader.cs similarity index 100% rename from src/Docfx.Build.TableOfContents/MarkdownTocReader.cs rename to src/Docfx.Build/TableOfContents/MarkdownTocReader.cs diff --git a/src/Docfx.Build.TableOfContents/TocDocumentProcessor.cs b/src/Docfx.Build/TableOfContents/TocDocumentProcessor.cs similarity index 100% rename from src/Docfx.Build.TableOfContents/TocDocumentProcessor.cs rename to src/Docfx.Build/TableOfContents/TocDocumentProcessor.cs diff --git a/src/Docfx.Build.TableOfContents/TocDocumentProcessorBase.cs b/src/Docfx.Build/TableOfContents/TocDocumentProcessorBase.cs similarity index 100% rename from src/Docfx.Build.TableOfContents/TocDocumentProcessorBase.cs rename to src/Docfx.Build/TableOfContents/TocDocumentProcessorBase.cs diff --git a/src/Docfx.Build.TableOfContents/TocFileType.cs b/src/Docfx.Build/TableOfContents/TocFileType.cs similarity index 100% rename from src/Docfx.Build.TableOfContents/TocFileType.cs rename to src/Docfx.Build/TableOfContents/TocFileType.cs diff --git a/src/Docfx.Build.TableOfContents/TocHelper.cs b/src/Docfx.Build/TableOfContents/TocHelper.cs similarity index 100% rename from src/Docfx.Build.TableOfContents/TocHelper.cs rename to src/Docfx.Build/TableOfContents/TocHelper.cs diff --git a/src/Docfx.Build.TableOfContents/TocItemInfo.cs b/src/Docfx.Build/TableOfContents/TocItemInfo.cs similarity index 100% rename from src/Docfx.Build.TableOfContents/TocItemInfo.cs rename to src/Docfx.Build/TableOfContents/TocItemInfo.cs diff --git a/src/Docfx.Build.TableOfContents/TocResolver.cs b/src/Docfx.Build/TableOfContents/TocResolver.cs similarity index 100% rename from src/Docfx.Build.TableOfContents/TocResolver.cs rename to src/Docfx.Build/TableOfContents/TocResolver.cs diff --git a/src/Docfx.Build.TableOfContents/TocRestructureUtility.cs b/src/Docfx.Build/TableOfContents/TocRestructureUtility.cs similarity index 100% rename from src/Docfx.Build.TableOfContents/TocRestructureUtility.cs rename to src/Docfx.Build/TableOfContents/TocRestructureUtility.cs diff --git a/src/Docfx.Build.TableOfContents/Utility.cs b/src/Docfx.Build/TableOfContents/Utility.cs similarity index 100% rename from src/Docfx.Build.TableOfContents/Utility.cs rename to src/Docfx.Build/TableOfContents/Utility.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/Preprocessors/ITemplatePreprocessor.cs b/src/Docfx.Build/TemplateProcessors/Preprocessors/ITemplatePreprocessor.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/Preprocessors/ITemplatePreprocessor.cs rename to src/Docfx.Build/TemplateProcessors/Preprocessors/ITemplatePreprocessor.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/Preprocessors/JintProcessorHelper.cs b/src/Docfx.Build/TemplateProcessors/Preprocessors/JintProcessorHelper.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/Preprocessors/JintProcessorHelper.cs rename to src/Docfx.Build/TemplateProcessors/Preprocessors/JintProcessorHelper.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/Preprocessors/PreprocessorLoader.cs b/src/Docfx.Build/TemplateProcessors/Preprocessors/PreprocessorLoader.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/Preprocessors/PreprocessorLoader.cs rename to src/Docfx.Build/TemplateProcessors/Preprocessors/PreprocessorLoader.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/Preprocessors/PreprocessorWithResourcePool.cs b/src/Docfx.Build/TemplateProcessors/Preprocessors/PreprocessorWithResourcePool.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/Preprocessors/PreprocessorWithResourcePool.cs rename to src/Docfx.Build/TemplateProcessors/Preprocessors/PreprocessorWithResourcePool.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/Preprocessors/TemplateJintPreprocessor.cs b/src/Docfx.Build/TemplateProcessors/Preprocessors/TemplateJintPreprocessor.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/Preprocessors/TemplateJintPreprocessor.cs rename to src/Docfx.Build/TemplateProcessors/Preprocessors/TemplateJintPreprocessor.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/Preprocessors/TemplateUtility.cs b/src/Docfx.Build/TemplateProcessors/Preprocessors/TemplateUtility.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/Preprocessors/TemplateUtility.cs rename to src/Docfx.Build/TemplateProcessors/Preprocessors/TemplateUtility.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/Template.cs b/src/Docfx.Build/TemplateProcessors/Template.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/Template.cs rename to src/Docfx.Build/TemplateProcessors/Template.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/TemplateBundle.cs b/src/Docfx.Build/TemplateProcessors/TemplateBundle.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/TemplateBundle.cs rename to src/Docfx.Build/TemplateProcessors/TemplateBundle.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/TemplateCollection.cs b/src/Docfx.Build/TemplateProcessors/TemplateCollection.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/TemplateCollection.cs rename to src/Docfx.Build/TemplateProcessors/TemplateCollection.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/TemplateManager.cs b/src/Docfx.Build/TemplateProcessors/TemplateManager.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/TemplateManager.cs rename to src/Docfx.Build/TemplateProcessors/TemplateManager.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/TemplateModelTransformer.cs b/src/Docfx.Build/TemplateProcessors/TemplateModelTransformer.cs similarity index 99% rename from src/Docfx.Build.Engine/TemplateProcessors/TemplateModelTransformer.cs rename to src/Docfx.Build/TemplateProcessors/TemplateModelTransformer.cs index 95873f84d40..526fc03925c 100644 --- a/src/Docfx.Build.Engine/TemplateProcessors/TemplateModelTransformer.cs +++ b/src/Docfx.Build/TemplateProcessors/TemplateModelTransformer.cs @@ -325,7 +325,7 @@ private void TransformXrefInHtml(IDocumentBuildContext context, string sourceFil { foreach (var xref in xrefNodes) { - var (resolved, warn) = UpdateXref(xref, context, Constants.DefaultLanguage, out var xrefDetails); + var (resolved, warn) = UpdateXref(xref, context, "csharp", out var xrefDetails); if (warn) { unresolvedXRefs.Add(xrefDetails); diff --git a/src/Docfx.Build.Engine/TemplateProcessors/TemplatePageLoader.cs b/src/Docfx.Build/TemplateProcessors/TemplatePageLoader.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/TemplatePageLoader.cs rename to src/Docfx.Build/TemplateProcessors/TemplatePageLoader.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/TemplateProcessor.cs b/src/Docfx.Build/TemplateProcessors/TemplateProcessor.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/TemplateProcessor.cs rename to src/Docfx.Build/TemplateProcessors/TemplateProcessor.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/TemplateProcessorUtility.cs b/src/Docfx.Build/TemplateProcessors/TemplateProcessorUtility.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/TemplateProcessorUtility.cs rename to src/Docfx.Build/TemplateProcessors/TemplateProcessorUtility.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/TemplateResourceInfo.cs b/src/Docfx.Build/TemplateProcessors/TemplateResourceInfo.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/TemplateResourceInfo.cs rename to src/Docfx.Build/TemplateProcessors/TemplateResourceInfo.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/TemplateType.cs b/src/Docfx.Build/TemplateProcessors/TemplateType.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/TemplateType.cs rename to src/Docfx.Build/TemplateProcessors/TemplateType.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/ViewRenderers/ITemplateRenderer.cs b/src/Docfx.Build/TemplateProcessors/ViewRenderers/ITemplateRenderer.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/ViewRenderers/ITemplateRenderer.cs rename to src/Docfx.Build/TemplateProcessors/ViewRenderers/ITemplateRenderer.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/ViewRenderers/MustacheTemplateRenderer.cs b/src/Docfx.Build/TemplateProcessors/ViewRenderers/MustacheTemplateRenderer.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/ViewRenderers/MustacheTemplateRenderer.cs rename to src/Docfx.Build/TemplateProcessors/ViewRenderers/MustacheTemplateRenderer.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/ViewRenderers/ParseTemplateHelper.cs b/src/Docfx.Build/TemplateProcessors/ViewRenderers/ParseTemplateHelper.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/ViewRenderers/ParseTemplateHelper.cs rename to src/Docfx.Build/TemplateProcessors/ViewRenderers/ParseTemplateHelper.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/ViewRenderers/RendererLoader.cs b/src/Docfx.Build/TemplateProcessors/ViewRenderers/RendererLoader.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/ViewRenderers/RendererLoader.cs rename to src/Docfx.Build/TemplateProcessors/ViewRenderers/RendererLoader.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/ViewRenderers/RendererWithResourcePool.cs b/src/Docfx.Build/TemplateProcessors/ViewRenderers/RendererWithResourcePool.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/ViewRenderers/RendererWithResourcePool.cs rename to src/Docfx.Build/TemplateProcessors/ViewRenderers/RendererWithResourcePool.cs diff --git a/src/Docfx.Build.Engine/TemplateProcessors/ViewRenderers/ResourceTemplateLoader.cs b/src/Docfx.Build/TemplateProcessors/ViewRenderers/ResourceTemplateLoader.cs similarity index 100% rename from src/Docfx.Build.Engine/TemplateProcessors/ViewRenderers/ResourceTemplateLoader.cs rename to src/Docfx.Build/TemplateProcessors/ViewRenderers/ResourceTemplateLoader.cs diff --git a/src/Docfx.Build.Engine/TransformModelOptions.cs b/src/Docfx.Build/TransformModelOptions.cs similarity index 100% rename from src/Docfx.Build.Engine/TransformModelOptions.cs rename to src/Docfx.Build/TransformModelOptions.cs diff --git a/src/Docfx.Build.Engine/XRefMaps/BasicXRefMapReader.cs b/src/Docfx.Build/XRefMaps/BasicXRefMapReader.cs similarity index 100% rename from src/Docfx.Build.Engine/XRefMaps/BasicXRefMapReader.cs rename to src/Docfx.Build/XRefMaps/BasicXRefMapReader.cs diff --git a/src/Docfx.Build.Engine/XRefMaps/IXRefContainer.cs b/src/Docfx.Build/XRefMaps/IXRefContainer.cs similarity index 100% rename from src/Docfx.Build.Engine/XRefMaps/IXRefContainer.cs rename to src/Docfx.Build/XRefMaps/IXRefContainer.cs diff --git a/src/Docfx.Build.Engine/XRefMaps/IXRefContainerReader.cs b/src/Docfx.Build/XRefMaps/IXRefContainerReader.cs similarity index 100% rename from src/Docfx.Build.Engine/XRefMaps/IXRefContainerReader.cs rename to src/Docfx.Build/XRefMaps/IXRefContainerReader.cs diff --git a/src/Docfx.Build.Engine/XRefMaps/XRefArchive.cs b/src/Docfx.Build/XRefMaps/XRefArchive.cs similarity index 100% rename from src/Docfx.Build.Engine/XRefMaps/XRefArchive.cs rename to src/Docfx.Build/XRefMaps/XRefArchive.cs diff --git a/src/Docfx.Build.Engine/XRefMaps/XRefArchiveBuilder.cs b/src/Docfx.Build/XRefMaps/XRefArchiveBuilder.cs similarity index 100% rename from src/Docfx.Build.Engine/XRefMaps/XRefArchiveBuilder.cs rename to src/Docfx.Build/XRefMaps/XRefArchiveBuilder.cs diff --git a/src/Docfx.Build.Engine/XRefMaps/XRefArchiveMode.cs b/src/Docfx.Build/XRefMaps/XRefArchiveMode.cs similarity index 100% rename from src/Docfx.Build.Engine/XRefMaps/XRefArchiveMode.cs rename to src/Docfx.Build/XRefMaps/XRefArchiveMode.cs diff --git a/src/Docfx.Build.Engine/XRefMaps/XRefArchiveReader.cs b/src/Docfx.Build/XRefMaps/XRefArchiveReader.cs similarity index 100% rename from src/Docfx.Build.Engine/XRefMaps/XRefArchiveReader.cs rename to src/Docfx.Build/XRefMaps/XRefArchiveReader.cs diff --git a/src/Docfx.Build.Engine/XRefMaps/XRefCollection.cs b/src/Docfx.Build/XRefMaps/XRefCollection.cs similarity index 100% rename from src/Docfx.Build.Engine/XRefMaps/XRefCollection.cs rename to src/Docfx.Build/XRefMaps/XRefCollection.cs diff --git a/src/Docfx.Build.Engine/XRefMaps/XRefMap.cs b/src/Docfx.Build/XRefMaps/XRefMap.cs similarity index 100% rename from src/Docfx.Build.Engine/XRefMaps/XRefMap.cs rename to src/Docfx.Build/XRefMaps/XRefMap.cs diff --git a/src/Docfx.Build.Engine/XRefMaps/XRefMapDownloader.cs b/src/Docfx.Build/XRefMaps/XRefMapDownloader.cs similarity index 100% rename from src/Docfx.Build.Engine/XRefMaps/XRefMapDownloader.cs rename to src/Docfx.Build/XRefMaps/XRefMapDownloader.cs diff --git a/src/Docfx.Build.Engine/XRefMaps/XRefMapReader.cs b/src/Docfx.Build/XRefMaps/XRefMapReader.cs similarity index 100% rename from src/Docfx.Build.Engine/XRefMaps/XRefMapReader.cs rename to src/Docfx.Build/XRefMaps/XRefMapReader.cs diff --git a/src/Docfx.Build.Engine/XRefMaps/XRefMapRedirection.cs b/src/Docfx.Build/XRefMaps/XRefMapRedirection.cs similarity index 100% rename from src/Docfx.Build.Engine/XRefMaps/XRefMapRedirection.cs rename to src/Docfx.Build/XRefMaps/XRefMapRedirection.cs diff --git a/src/Docfx.Build.Engine/XRefMaps/XRefRedirectionReader.cs b/src/Docfx.Build/XRefMaps/XRefRedirectionReader.cs similarity index 100% rename from src/Docfx.Build.Engine/XRefMaps/XRefRedirectionReader.cs rename to src/Docfx.Build/XRefMaps/XRefRedirectionReader.cs diff --git a/src/Docfx.Build.Engine/XRefMaps/XRefSpecUidComparer.cs b/src/Docfx.Build/XRefMaps/XRefSpecUidComparer.cs similarity index 100% rename from src/Docfx.Build.Engine/XRefMaps/XRefSpecUidComparer.cs rename to src/Docfx.Build/XRefMaps/XRefSpecUidComparer.cs diff --git a/src/Docfx.Build.Engine/XrefDetails.cs b/src/Docfx.Build/XrefDetails.cs similarity index 100% rename from src/Docfx.Build.Engine/XrefDetails.cs rename to src/Docfx.Build/XrefDetails.cs diff --git a/src/Docfx.DataContracts.Common/Constants.cs b/src/Docfx.DataContracts.Common/Constants.cs index 741fd625f82..2752b97043e 100644 --- a/src/Docfx.DataContracts.Common/Constants.cs +++ b/src/Docfx.DataContracts.Common/Constants.cs @@ -10,6 +10,7 @@ namespace Docfx.DataContracts.Common; public static class Constants { public const string ConfigFileName = "docfx.json"; + public const string ManifestFileName = "manifest.json"; public const string YamlExtension = ".yml"; public const string ContentPlaceholder = "*content"; public const string PrefixSeparator = "."; diff --git a/test/Docfx.Build.Common.Tests/Docfx.Build.Common.Tests.csproj b/test/Docfx.Build.Common.Tests/Docfx.Build.Common.Tests.csproj index 341cbfcd7e5..1fa702a51c0 100644 --- a/test/Docfx.Build.Common.Tests/Docfx.Build.Common.Tests.csproj +++ b/test/Docfx.Build.Common.Tests/Docfx.Build.Common.Tests.csproj @@ -1,7 +1,7 @@  - + diff --git a/test/Docfx.Build.ConceptualDocuments.Tests/Docfx.Build.ConceptualDocuments.Tests.csproj b/test/Docfx.Build.ConceptualDocuments.Tests/Docfx.Build.ConceptualDocuments.Tests.csproj deleted file mode 100644 index 640b32a5adb..00000000000 --- a/test/Docfx.Build.ConceptualDocuments.Tests/Docfx.Build.ConceptualDocuments.Tests.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/test/Docfx.Build.ManagedReference.Tests/Docfx.Build.ManagedReference.Tests.csproj b/test/Docfx.Build.ManagedReference.Tests/Docfx.Build.ManagedReference.Tests.csproj index 2e6fc5693b2..d0e62ffdc09 100644 --- a/test/Docfx.Build.ManagedReference.Tests/Docfx.Build.ManagedReference.Tests.csproj +++ b/test/Docfx.Build.ManagedReference.Tests/Docfx.Build.ManagedReference.Tests.csproj @@ -1,6 +1,6 @@  - + diff --git a/test/Docfx.Build.RestApi.Tests/Docfx.Build.RestApi.Tests.csproj b/test/Docfx.Build.RestApi.Tests/Docfx.Build.RestApi.Tests.csproj index 98e701193c3..2364686c799 100644 --- a/test/Docfx.Build.RestApi.Tests/Docfx.Build.RestApi.Tests.csproj +++ b/test/Docfx.Build.RestApi.Tests/Docfx.Build.RestApi.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/test/Docfx.Build.RestApi.WithPlugins.Tests/Docfx.Build.RestApi.WithPlugins.Tests.csproj b/test/Docfx.Build.RestApi.WithPlugins.Tests/Docfx.Build.RestApi.WithPlugins.Tests.csproj index 6b3a87ddec7..ac834570ef9 100644 --- a/test/Docfx.Build.RestApi.WithPlugins.Tests/Docfx.Build.RestApi.WithPlugins.Tests.csproj +++ b/test/Docfx.Build.RestApi.WithPlugins.Tests/Docfx.Build.RestApi.WithPlugins.Tests.csproj @@ -1,11 +1,10 @@ - + - - + + - + - diff --git a/test/Docfx.Build.RestApi.WithPlugins.Tests/SplitRestApiToOperationLevelTest.cs b/test/Docfx.Build.RestApi.WithPlugins.Tests/SplitRestApiToOperationLevelTest.cs index 9616446b640..867a3a607bd 100644 --- a/test/Docfx.Build.RestApi.WithPlugins.Tests/SplitRestApiToOperationLevelTest.cs +++ b/test/Docfx.Build.RestApi.WithPlugins.Tests/SplitRestApiToOperationLevelTest.cs @@ -251,7 +251,6 @@ private void BuildDocument(FileCollection files, bool enableTagLevel = false) private static IEnumerable LoadAssemblies(bool enableTagLevel) { yield return typeof(RestApiDocumentProcessor).Assembly; - yield return typeof(TocDocumentProcessor).Assembly; yield return typeof(SplitRestApiToOperationLevel).Assembly; if (enableTagLevel) { diff --git a/test/Docfx.Build.RestApi.WithPlugins.Tests/SplitRestApiToTagLevelTest.cs b/test/Docfx.Build.RestApi.WithPlugins.Tests/SplitRestApiToTagLevelTest.cs index c2adbeed64e..3cf6ef13fcc 100644 --- a/test/Docfx.Build.RestApi.WithPlugins.Tests/SplitRestApiToTagLevelTest.cs +++ b/test/Docfx.Build.RestApi.WithPlugins.Tests/SplitRestApiToTagLevelTest.cs @@ -151,7 +151,6 @@ private void BuildDocument(FileCollection files) private static IEnumerable LoadAssemblies() { yield return typeof(RestApiDocumentProcessor).Assembly; - yield return typeof(TocDocumentProcessor).Assembly; yield return typeof(SplitRestApiToTagLevel).Assembly; } diff --git a/test/Docfx.Build.SchemaDriven.Tests/Docfx.Build.SchemaDriven.Tests.csproj b/test/Docfx.Build.SchemaDriven.Tests/Docfx.Build.SchemaDriven.Tests.csproj index 8cfa1d1ae6b..ef33cd35413 100644 --- a/test/Docfx.Build.SchemaDriven.Tests/Docfx.Build.SchemaDriven.Tests.csproj +++ b/test/Docfx.Build.SchemaDriven.Tests/Docfx.Build.SchemaDriven.Tests.csproj @@ -1,8 +1,7 @@  - - + diff --git a/test/Docfx.Build.SchemaDriven.Tests/SchemaDrivenProcessorTest.cs b/test/Docfx.Build.SchemaDriven.Tests/SchemaDrivenProcessorTest.cs index b1995fd3b3a..bd6d8be6bcd 100644 --- a/test/Docfx.Build.SchemaDriven.Tests/SchemaDrivenProcessorTest.cs +++ b/test/Docfx.Build.SchemaDriven.Tests/SchemaDrivenProcessorTest.cs @@ -47,84 +47,6 @@ public SchemaDrivenProcessorTest() _templateManager = new TemplateManager(new List { "template" }, null, _templateFolder); } - [Fact] - public void TestContextObjectSDP() - { - Environment.SetEnvironmentVariable("_op_systemMetadata", - JsonUtility.ToJsonString(new Dictionary { { "_op_publishTargetSiteHostName", "ppe.docs.microsoft.com" } })); - - using var listener = new TestListenerScope("TestContextObjectSDP"); - var schemaFile = CreateFile("template/schemas/contextobject.schema.json", File.ReadAllText("TestData/schemas/contextobject.test.schema.json"), _templateFolder); - var tocTemplate = CreateFile("template/toc.json.tmpl", "toc template", _templateFolder); - // var coTemplate = CreateFile("template/contextobject.json.tmpl", "{{file_include2}}", _templateFolder); - var inputFileName = "co/active.yml"; - var includeFile = CreateFile("a b/inc.md", @"[root](../co/active.yml)", _inputFolder); - var includeFile2 = CreateFile("c/d/inc.md", @"../../a b/toc.md", _inputFolder); - var inputFile = CreateFile(inputFileName, @"### YamlMime:ContextObject -breadcrumb_path: https://ppe.docs.microsoft.com/absolute/toc.json -toc_rel: ../a b/toc.md -file_include: ../a b/inc.md -file_include2: ../c/d/inc.md -uhfHeaderId: MSDocsHeader-DotNet -empty: -searchScope: - - .NET -", _inputFolder); - - var inputFileName2 = "co/active2.yml"; - var inputFile2 = CreateFile(inputFileName2, @"### YamlMime:ContextObject -breadcrumb_path: https://live.docs.microsoft.com/absolute/toc.json -", _inputFolder); - - FileCollection files = new(_defaultFiles); - files.Add(DocumentType.Article, new[] { inputFile, inputFile2 }, _inputFolder); - BuildDocument(files); - - Assert.Equal(5, listener.Items.Count); - Assert.Equal(2, listener.Items.Count(s => s.Message.StartsWith($"Invalid file link:(~/{_inputFolder}/a b/toc.md)."))); - Assert.NotNull(listener.Items.FirstOrDefault(s => s.Message.StartsWith("There is no template processing document type(s): ContextObject"))); - Assert.NotNull(listener.Items.FirstOrDefault(s => s.Message.StartsWith("Invalid file link"))); - listener.Items.Clear(); - - var rawModelFilePath = GetRawModelFilePath(inputFileName); - Assert.True(File.Exists(rawModelFilePath)); - var rawModel = JsonUtility.Deserialize(rawModelFilePath); - - Assert.Equal("Hello world!", rawModel["meta"].Value()); - Assert.Equal("/absolute/toc.json", rawModel["breadcrumb_path"].Value()); - Assert.Equal("../a b/toc.md", rawModel["toc_rel"].Value()); - Assert.Equal($"

root

\n", - rawModel["file_include"].Value()); - Assert.Equal("../../a b/toc.md", rawModel["file_include2"].Value()); - Assert.Equal("MSDocsHeader-DotNet", rawModel["uhfHeaderId"].Value()); - Assert.Equal(".NET", rawModel["searchScope"][0].Value()); - - var rawModelFilePath2 = GetRawModelFilePath(inputFileName2); - Assert.True(File.Exists(rawModelFilePath2)); - var rawModel2 = JsonUtility.Deserialize(rawModelFilePath2); - Assert.Equal("https://live.docs.microsoft.com/absolute/toc.json", rawModel2["breadcrumb_path"].Value()); - - files = new FileCollection(_defaultFiles); - files.Add(DocumentType.Article, new[] { inputFile }, _inputFolder); - var tocFile = CreateFile("a b/toc.md", "### hello", _inputFolder); - files.Add(DocumentType.Article, new[] { tocFile }, _inputFolder); - - BuildDocument(files); - - Assert.Equal(2, listener.Items.Count); - Assert.NotNull(listener.Items.FirstOrDefault(s => s.Message.StartsWith("There is no template processing document type(s): ContextObject"))); - - Assert.True(File.Exists(rawModelFilePath)); - rawModel = JsonUtility.Deserialize(rawModelFilePath); - - Assert.Equal("Hello world!", rawModel["meta"].Value()); - Assert.Equal("/absolute/toc.json", rawModel["breadcrumb_path"].Value()); - Assert.Equal("../a%20b/toc.json", rawModel["toc_rel"].Value()); - Assert.Equal("MSDocsHeader-DotNet", rawModel["uhfHeaderId"].Value()); - Assert.Equal(".NET", rawModel["searchScope"][0].Value()); - Assert.Equal("../a%20b/toc.json", rawModel["file_include2"].Value()); - } - [Fact] public void TestRef() { @@ -488,7 +410,6 @@ private void BuildDocument(FileCollection files, DocumentBuildParameters dbp = n private static IEnumerable LoadAssemblies() { yield return typeof(SchemaDrivenDocumentProcessor).Assembly; - yield return typeof(TocDocumentProcessor).Assembly; yield return typeof(SchemaDrivenProcessorTest).Assembly; } diff --git a/test/Docfx.Build.TableOfContents.Tests/Docfx.Build.TableOfContents.Tests.csproj b/test/Docfx.Build.TableOfContents.Tests/Docfx.Build.TableOfContents.Tests.csproj deleted file mode 100644 index 69979787ed4..00000000000 --- a/test/Docfx.Build.TableOfContents.Tests/Docfx.Build.TableOfContents.Tests.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/test/Docfx.Build.ConceptualDocuments.Tests/ConceptualDocumentProcessorTest.cs b/test/Docfx.Build.Tests/ConceptualDocumentProcessorTest.cs similarity index 98% rename from test/Docfx.Build.ConceptualDocuments.Tests/ConceptualDocumentProcessorTest.cs rename to test/Docfx.Build.Tests/ConceptualDocumentProcessorTest.cs index a4cc2da4f42..ba99d7b13a6 100644 --- a/test/Docfx.Build.ConceptualDocuments.Tests/ConceptualDocumentProcessorTest.cs +++ b/test/Docfx.Build.Tests/ConceptualDocumentProcessorTest.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Collections.Immutable; +using System.Reflection; using System.Web; using Docfx.Build.ConceptualDocuments; using Docfx.Build.Engine; @@ -418,15 +419,10 @@ private void BuildDocument(FileCollection files, Dictionary meta TemplateManager = _templateManager }; - using var builder = new DocumentBuilder(LoadAssemblies(), ImmutableArray.Empty); + using var builder = new DocumentBuilder(Array.Empty(), ImmutableArray.Empty); builder.Build(parameters); } - private static IEnumerable LoadAssemblies() - { - yield return typeof(ConceptualDocumentProcessor).Assembly; - } - private sealed class FileCreator { private readonly string _rootDir; diff --git a/test/Docfx.Build.Engine.Tests/Docfx.Build.Engine.Tests.csproj b/test/Docfx.Build.Tests/Docfx.Build.Tests.csproj similarity index 73% rename from test/Docfx.Build.Engine.Tests/Docfx.Build.Engine.Tests.csproj rename to test/Docfx.Build.Tests/Docfx.Build.Tests.csproj index e7973fad02f..a83813dcf9b 100644 --- a/test/Docfx.Build.Engine.Tests/Docfx.Build.Engine.Tests.csproj +++ b/test/Docfx.Build.Tests/Docfx.Build.Tests.csproj @@ -10,12 +10,9 @@ - - - - + diff --git a/test/Docfx.Build.Engine.Tests/DocumentBuilderTest.cs b/test/Docfx.Build.Tests/DocumentBuilderTest.cs similarity index 99% rename from test/Docfx.Build.Engine.Tests/DocumentBuilderTest.cs rename to test/Docfx.Build.Tests/DocumentBuilderTest.cs index 697db5f6c6d..36b68578d49 100644 --- a/test/Docfx.Build.Engine.Tests/DocumentBuilderTest.cs +++ b/test/Docfx.Build.Tests/DocumentBuilderTest.cs @@ -243,7 +243,7 @@ public void TestBuild() "", "

Test XRef: Hello World", "Test link: link text", - "Test link: link text 2", + "Test link: link text 2", "Test link style xref: link text 3", "Test link style xref with anchor: link text 4", "Test encoded link style xref with anchor: link text 5", @@ -771,10 +771,7 @@ private void BuildDocument( private static IEnumerable LoadAssemblies() { - yield return typeof(ConceptualDocumentProcessor).Assembly; yield return typeof(ManagedReferenceDocumentProcessor).Assembly; - yield return typeof(ResourceDocumentProcessor).Assembly; - yield return typeof(TocDocumentProcessor).Assembly; yield return typeof(DocumentBuilderTest).Assembly; } diff --git a/test/Docfx.Build.Engine.Tests/DocumentProcessors/YamlDocumentModel.cs b/test/Docfx.Build.Tests/DocumentProcessors/YamlDocumentModel.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/DocumentProcessors/YamlDocumentModel.cs rename to test/Docfx.Build.Tests/DocumentProcessors/YamlDocumentModel.cs diff --git a/test/Docfx.Build.Engine.Tests/DocumentProcessors/YamlDocumentProcessor.cs b/test/Docfx.Build.Tests/DocumentProcessors/YamlDocumentProcessor.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/DocumentProcessors/YamlDocumentProcessor.cs rename to test/Docfx.Build.Tests/DocumentProcessors/YamlDocumentProcessor.cs diff --git a/test/Docfx.Build.Engine.Tests/ExtractSearchIndexFromHtmlTest.cs b/test/Docfx.Build.Tests/ExtractSearchIndexFromHtmlTest.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/ExtractSearchIndexFromHtmlTest.cs rename to test/Docfx.Build.Tests/ExtractSearchIndexFromHtmlTest.cs diff --git a/test/Docfx.Build.Engine.Tests/FileMetadataHelperTest.cs b/test/Docfx.Build.Tests/FileMetadataHelperTest.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/FileMetadataHelperTest.cs rename to test/Docfx.Build.Tests/FileMetadataHelperTest.cs diff --git a/test/Docfx.Build.Engine.Tests/JintProcessorHelperTest.cs b/test/Docfx.Build.Tests/JintProcessorHelperTest.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/JintProcessorHelperTest.cs rename to test/Docfx.Build.Tests/JintProcessorHelperTest.cs diff --git a/test/Docfx.Build.Engine.Tests/JsonConverterTest.cs b/test/Docfx.Build.Tests/JsonConverterTest.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/JsonConverterTest.cs rename to test/Docfx.Build.Tests/JsonConverterTest.cs diff --git a/test/Docfx.Build.TableOfContents.Tests/MarkdownTocReaderTest.cs b/test/Docfx.Build.Tests/MarkdownTocReaderTest.cs similarity index 100% rename from test/Docfx.Build.TableOfContents.Tests/MarkdownTocReaderTest.cs rename to test/Docfx.Build.Tests/MarkdownTocReaderTest.cs diff --git a/test/Docfx.Build.Engine.Tests/PostProcessors/AppendStringPostProcessor.cs b/test/Docfx.Build.Tests/PostProcessors/AppendStringPostProcessor.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/PostProcessors/AppendStringPostProcessor.cs rename to test/Docfx.Build.Tests/PostProcessors/AppendStringPostProcessor.cs diff --git a/test/Docfx.Build.Engine.Tests/PostProcessors/Data/manifest_basic.json b/test/Docfx.Build.Tests/PostProcessors/Data/manifest_basic.json similarity index 100% rename from test/Docfx.Build.Engine.Tests/PostProcessors/Data/manifest_basic.json rename to test/Docfx.Build.Tests/PostProcessors/Data/manifest_basic.json diff --git a/test/Docfx.Build.Engine.Tests/PostProcessors/Data/manifest_incremental.json b/test/Docfx.Build.Tests/PostProcessors/Data/manifest_incremental.json similarity index 100% rename from test/Docfx.Build.Engine.Tests/PostProcessors/Data/manifest_incremental.json rename to test/Docfx.Build.Tests/PostProcessors/Data/manifest_incremental.json diff --git a/test/Docfx.Build.Engine.Tests/PostProcessors/Data/manifest_incremental_split_case.json b/test/Docfx.Build.Tests/PostProcessors/Data/manifest_incremental_split_case.json similarity index 100% rename from test/Docfx.Build.Engine.Tests/PostProcessors/Data/manifest_incremental_split_case.json rename to test/Docfx.Build.Tests/PostProcessors/Data/manifest_incremental_split_case.json diff --git a/test/Docfx.Build.Engine.Tests/PostProcessors/Data/manifest_incremental_with_directory.json b/test/Docfx.Build.Tests/PostProcessors/Data/manifest_incremental_with_directory.json similarity index 100% rename from test/Docfx.Build.Engine.Tests/PostProcessors/Data/manifest_incremental_with_directory.json rename to test/Docfx.Build.Tests/PostProcessors/Data/manifest_incremental_with_directory.json diff --git a/test/Docfx.Build.Engine.Tests/PostProcessors/PostProcessorsHandlerTest.cs b/test/Docfx.Build.Tests/PostProcessors/PostProcessorsHandlerTest.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/PostProcessors/PostProcessorsHandlerTest.cs rename to test/Docfx.Build.Tests/PostProcessors/PostProcessorsHandlerTest.cs diff --git a/test/Docfx.Build.Engine.Tests/PostProcessors/SitemapGeneratorTests.cs b/test/Docfx.Build.Tests/PostProcessors/SitemapGeneratorTests.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/PostProcessors/SitemapGeneratorTests.cs rename to test/Docfx.Build.Tests/PostProcessors/SitemapGeneratorTests.cs diff --git a/test/Docfx.Build.Engine.Tests/RemoveDebugInfoTest.cs b/test/Docfx.Build.Tests/RemoveDebugInfoTest.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/RemoveDebugInfoTest.cs rename to test/Docfx.Build.Tests/RemoveDebugInfoTest.cs diff --git a/test/Docfx.Build.Engine.Tests/TemplateManagerUnitTest.DotnetToolMode.cs b/test/Docfx.Build.Tests/TemplateManagerUnitTest.DotnetToolMode.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/TemplateManagerUnitTest.DotnetToolMode.cs rename to test/Docfx.Build.Tests/TemplateManagerUnitTest.DotnetToolMode.cs diff --git a/test/Docfx.Build.Engine.Tests/TemplateManagerUnitTest.cs b/test/Docfx.Build.Tests/TemplateManagerUnitTest.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/TemplateManagerUnitTest.cs rename to test/Docfx.Build.Tests/TemplateManagerUnitTest.cs diff --git a/test/Docfx.Build.Engine.Tests/TemplatePageLoaderUnitTest.cs b/test/Docfx.Build.Tests/TemplatePageLoaderUnitTest.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/TemplatePageLoaderUnitTest.cs rename to test/Docfx.Build.Tests/TemplatePageLoaderUnitTest.cs diff --git a/test/Docfx.Build.Engine.Tests/TemplatePreprocessorLoaderUnitTest.cs b/test/Docfx.Build.Tests/TemplatePreprocessorLoaderUnitTest.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/TemplatePreprocessorLoaderUnitTest.cs rename to test/Docfx.Build.Tests/TemplatePreprocessorLoaderUnitTest.cs diff --git a/test/Docfx.Build.Engine.Tests/TemplateProcessorUnitTest.cs b/test/Docfx.Build.Tests/TemplateProcessorUnitTest.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/TemplateProcessorUnitTest.cs rename to test/Docfx.Build.Tests/TemplateProcessorUnitTest.cs diff --git a/test/Docfx.Build.Engine.Tests/TemplateRendererLoaderUnitTest.cs b/test/Docfx.Build.Tests/TemplateRendererLoaderUnitTest.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/TemplateRendererLoaderUnitTest.cs rename to test/Docfx.Build.Tests/TemplateRendererLoaderUnitTest.cs diff --git a/test/Docfx.Build.Engine.Tests/TestData/System.Console.csyml b/test/Docfx.Build.Tests/TestData/System.Console.csyml similarity index 100% rename from test/Docfx.Build.Engine.Tests/TestData/System.Console.csyml rename to test/Docfx.Build.Tests/TestData/System.Console.csyml diff --git a/test/Docfx.Build.Engine.Tests/TestData/System.ConsoleColor.csyml b/test/Docfx.Build.Tests/TestData/System.ConsoleColor.csyml similarity index 100% rename from test/Docfx.Build.Engine.Tests/TestData/System.ConsoleColor.csyml rename to test/Docfx.Build.Tests/TestData/System.ConsoleColor.csyml diff --git a/test/Docfx.Build.Engine.Tests/TestData/snippets/dataflowdegreeofparallelism.cs b/test/Docfx.Build.Tests/TestData/snippets/dataflowdegreeofparallelism.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/TestData/snippets/dataflowdegreeofparallelism.cs rename to test/Docfx.Build.Tests/TestData/snippets/dataflowdegreeofparallelism.cs diff --git a/test/Docfx.Build.Engine.Tests/TestData/xrefmap.yml b/test/Docfx.Build.Tests/TestData/xrefmap.yml similarity index 100% rename from test/Docfx.Build.Engine.Tests/TestData/xrefmap.yml rename to test/Docfx.Build.Tests/TestData/xrefmap.yml diff --git a/test/Docfx.Build.TableOfContents.Tests/TocDocumentProcessorTest.cs b/test/Docfx.Build.Tests/TocDocumentProcessorTest.cs similarity index 99% rename from test/Docfx.Build.TableOfContents.Tests/TocDocumentProcessorTest.cs rename to test/Docfx.Build.Tests/TocDocumentProcessorTest.cs index 396c3d301d6..b270b231d97 100644 --- a/test/Docfx.Build.TableOfContents.Tests/TocDocumentProcessorTest.cs +++ b/test/Docfx.Build.Tests/TocDocumentProcessorTest.cs @@ -942,16 +942,10 @@ private void BuildDocument(FileCollection files) }.ToImmutableDictionary(), }; - using var builder = new DocumentBuilder(LoadAssemblies(), ImmutableArray.Empty); + using var builder = new DocumentBuilder(Array.Empty(), ImmutableArray.Empty); builder.Build(parameters); } - private static IEnumerable LoadAssemblies() - { - yield return typeof(ConceptualDocumentProcessor).Assembly; - yield return typeof(TocDocumentProcessor).Assembly; - } - private static void AssertTocEqual(TocItemViewModel expected, TocItemViewModel actual, bool noMetadata = true) { using var swForExpected = new StringWriter(); diff --git a/test/Docfx.Build.TableOfContents.Tests/TocRestructureTest.cs b/test/Docfx.Build.Tests/TocRestructureTest.cs similarity index 100% rename from test/Docfx.Build.TableOfContents.Tests/TocRestructureTest.cs rename to test/Docfx.Build.Tests/TocRestructureTest.cs diff --git a/test/Docfx.Build.Engine.Tests/ValidateBookmarkTest.cs b/test/Docfx.Build.Tests/ValidateBookmarkTest.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/ValidateBookmarkTest.cs rename to test/Docfx.Build.Tests/ValidateBookmarkTest.cs diff --git a/test/Docfx.Build.ConceptualDocuments.Tests/WordCounterUnitTest.cs b/test/Docfx.Build.Tests/WordCounterUnitTest.cs similarity index 100% rename from test/Docfx.Build.ConceptualDocuments.Tests/WordCounterUnitTest.cs rename to test/Docfx.Build.Tests/WordCounterUnitTest.cs diff --git a/test/Docfx.Build.Engine.Tests/XRefArchiveBuilderTest.cs b/test/Docfx.Build.Tests/XRefArchiveBuilderTest.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/XRefArchiveBuilderTest.cs rename to test/Docfx.Build.Tests/XRefArchiveBuilderTest.cs diff --git a/test/Docfx.Build.Engine.Tests/XRefMapDownloaderTest.cs b/test/Docfx.Build.Tests/XRefMapDownloaderTest.cs similarity index 100% rename from test/Docfx.Build.Engine.Tests/XRefMapDownloaderTest.cs rename to test/Docfx.Build.Tests/XRefMapDownloaderTest.cs diff --git a/test/Docfx.Build.Engine.Tests/tmpl/tmpl1/sub/file1 b/test/Docfx.Build.Tests/tmpl/tmpl1/sub/file1 similarity index 100% rename from test/Docfx.Build.Engine.Tests/tmpl/tmpl1/sub/file1 rename to test/Docfx.Build.Tests/tmpl/tmpl1/sub/file1 diff --git a/test/Docfx.Build.Engine.Tests/tmpl/tmpl1/tmpl1.dot.$ b/test/Docfx.Build.Tests/tmpl/tmpl1/tmpl1.dot.$ similarity index 100% rename from test/Docfx.Build.Engine.Tests/tmpl/tmpl1/tmpl1.dot.$ rename to test/Docfx.Build.Tests/tmpl/tmpl1/tmpl1.dot.$ diff --git a/test/Docfx.Build.UniversalReference.Tests/Docfx.Build.UniversalReference.Tests.csproj b/test/Docfx.Build.UniversalReference.Tests/Docfx.Build.UniversalReference.Tests.csproj index f859e44eec1..68825da8592 100644 --- a/test/Docfx.Build.UniversalReference.Tests/Docfx.Build.UniversalReference.Tests.csproj +++ b/test/Docfx.Build.UniversalReference.Tests/Docfx.Build.UniversalReference.Tests.csproj @@ -4,7 +4,7 @@ - + diff --git a/test/Docfx.MarkdigEngine.Tests/Docfx.MarkdigEngine.Tests.csproj b/test/Docfx.MarkdigEngine.Tests/Docfx.MarkdigEngine.Tests.csproj index da2f060531f..816e8a6a788 100644 --- a/test/Docfx.MarkdigEngine.Tests/Docfx.MarkdigEngine.Tests.csproj +++ b/test/Docfx.MarkdigEngine.Tests/Docfx.MarkdigEngine.Tests.csproj @@ -1,6 +1,6 @@  - +