diff --git a/BuildXL.Sandbox.sln b/BuildXL.Sandbox.sln index 97d77c0ab..caefbc22c 100644 --- a/BuildXL.Sandbox.sln +++ b/BuildXL.Sandbox.sln @@ -3,9 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.28010.2048 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.Utilities.Collections", "Src\Utilities\Collections\BuildXL.Utilities.Collections.csproj", "{6FD9CD40-99F8-4BE2-ADD3-6DAB1C0DCA0D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.Utilities.Collections", "src\Utilities\Collections\BuildXL.Utilities.Collections.csproj", "{6FD9CD40-99F8-4BE2-ADD3-6DAB1C0DCA0D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Src", "Src", "{ECC0573A-2013-42D3-B0C4-7AE4FD14AA22}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ECC0573A-2013-42D3-B0C4-7AE4FD14AA22}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{4F3521B8-03CA-4D7F-BE82-0C403F4A01D4}" EndProject @@ -13,7 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Collections", "Collections" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Configuration", "Configuration", "{38DFCC80-EC37-49B0-ADD9-3164D879BD87}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.Utilities.Configuration", "Src\Utilities\Configuration\BuildXL.Utilities.Configuration.csproj", "{0D26A071-8487-4C88-A11A-D422190B41DF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.Utilities.Configuration", "src\Utilities\Configuration\BuildXL.Utilities.Configuration.csproj", "{0D26A071-8487-4C88-A11A-D422190B41DF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{2E52D210-4F94-4EE0-B13E-1272127A8CDC}" EndProject @@ -23,43 +23,43 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Instrumentation", "Instrume EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{B5030396-AE64-4D1E-A420-73EB543CFE67}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.Utilities.Instrumentation.Common", "Src\Utilities\Instrumentation\Common\BuildXL.Utilities.Instrumentation.Common.csproj", "{351C38FF-C50C-4A5E-BF31-B0AF4EF04BD0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.Utilities.Instrumentation.Common", "src\Utilities\Instrumentation\Common\BuildXL.Utilities.Instrumentation.Common.csproj", "{351C38FF-C50C-4A5E-BF31-B0AF4EF04BD0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.Interop", "Src\Utilities\Interop\BuildXL.Interop.csproj", "{896289ED-6FD2-45E4-979C-1195B3C7D0EC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.Interop", "src\Utilities\Interop\BuildXL.Interop.csproj", "{896289ED-6FD2-45E4-979C-1195B3C7D0EC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Native", "Native", "{FD9BF43A-F49D-47D0-A04D-D6D33F51898C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.Native", "Src\Utilities\Native\BuildXL.Native.csproj", "{9EA0BD5E-4CAA-4733-9F2D-1C4C66272708}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.Native", "src\Utilities\Native\BuildXL.Native.csproj", "{9EA0BD5E-4CAA-4733-9F2D-1C4C66272708}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Storage", "Storage", "{8B493767-9616-4C51-B585-1F6850ED93AE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.Storage", "Src\Utilities\Storage\BuildXL.Storage.csproj", "{2E2824E0-5941-4FE4-A426-B098C0453441}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.Storage", "src\Utilities\Storage\BuildXL.Storage.csproj", "{2E2824E0-5941-4FE4-A426-B098C0453441}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "System.FormattableString", "System.FormattableString", "{533564FC-5C68-403F-A3A9-8F493040545C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.FormattableString", "Src\Utilities\System.FormattableString\System.FormattableString.csproj", "{1C3A8250-F4A4-4C83-862C-6932841FC296}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "System.FormattableString", "src\Utilities\System.FormattableString\System.FormattableString.csproj", "{1C3A8250-F4A4-4C83-862C-6932841FC296}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{4A9DF5D7-0C85-4B4B-83C9-487CF973D530}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Collections", "Collections", "{52B57B53-93F2-4281-A20E-604ADF4C0025}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.Utilities.Collections", "Src\Utilities\UnitTests\Collections\Test.BuildXL.Utilities.Collections.csproj", "{A77C8163-C3E2-445D-845E-AC0871CCDA57}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.Utilities.Collections", "src\Utilities\UnitTests\Collections\Test.BuildXL.Utilities.Collections.csproj", "{A77C8163-C3E2-445D-845E-AC0871CCDA57}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestUtilities", "TestUtilities", "{2E9F928E-9807-4DF1-93FC-04F4FAEB3654}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.TestUtilities", "Src\Utilities\UnitTests\TestUtilities\Test.BuildXL.TestUtilities.csproj", "{7D7B0DDE-5375-4241-AA28-39B4483E6616}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.TestUtilities", "src\Utilities\UnitTests\TestUtilities\Test.BuildXL.TestUtilities.csproj", "{7D7B0DDE-5375-4241-AA28-39B4483E6616}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestUtilities.XUnit", "TestUtilities.XUnit", "{27B0DC74-2248-4D8D-BDFF-13AEE7BFC1E3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.TestUtilities.XUnit", "Src\Utilities\UnitTests\TestUtilities.XUnit\Test.BuildXL.TestUtilities.XUnit.csproj", "{8C9755C1-E51F-49E0-80A8-843CDEAA2C95}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.TestUtilities.XUnit", "src\Utilities\UnitTests\TestUtilities.XUnit\Test.BuildXL.TestUtilities.XUnit.csproj", "{8C9755C1-E51F-49E0-80A8-843CDEAA2C95}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pips", "Pips", "{30FB09CF-CAB0-4474-B814-C6D934FC30BA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dll", "Dll", "{F07BBCF3-7234-4A5B-AC16-A260B6C7B8A4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.Pips", "Src\Pips\Dll\BuildXL.Pips.csproj", "{13228E1D-5679-46A9-B158-E05C9A9C762C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.Pips", "src\Pips\Dll\BuildXL.Pips.csproj", "{13228E1D-5679-46A9-B158-E05C9A9C762C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.Utilities", "Src\Utilities\Utilities\BuildXL.Utilities.csproj", "{A14871FC-6EC6-47DE-BA50-6B8755DC41B2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.Utilities", "src\Utilities\Utilities\BuildXL.Utilities.csproj", "{A14871FC-6EC6-47DE-BA50-6B8755DC41B2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9D3E624A-37FC-446C-B788-0DC245E62014}" ProjectSection(SolutionItems) = preProject @@ -70,7 +70,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Processes", "Processes", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Engine", "Engine", "{35426A9B-1CED-478D-AEAE-3D19880DEE1F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.Processes", "Src\Engine\Processes\BuildXL.Processes.csproj", "{FC78FB05-AC8C-4B77-B306-FEBBCB5AD625}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.Processes", "src\Engine\Processes\BuildXL.Processes.csproj", "{FC78FB05-AC8C-4B77-B306-FEBBCB5AD625}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sandbox", "Sandbox", "{BB07B9FE-2900-4BF0-822B-78391A0BCDF2}" EndProject @@ -86,49 +86,39 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DetoursTests", "DetoursTest EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lib", "Lib", "{ED789856-B6F7-4001-9B34-F5840959FFE3}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Detours", "Src\Sandbox\Windows\Detours\Lib\Detours.vcxproj", "{B17D7E79-6FE3-4D37-939E-3ECDD96E895D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DetoursServices", "src\Sandbox\Windows\DetoursServices\DetoursServices.vcxproj", "{49D106A3-292E-4CB5-BC4A-4FC3045B50DB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DetoursTests", "Src\Sandbox\Windows\DetoursTests\DetoursTests.vcxproj", "{1EAD2D2D-5FD8-4C48-91F9-22046165F9CF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DetoursTests", "src\Sandbox\Windows\DetoursTests\DetoursTests.vcxproj", "{1EAD2D2D-5FD8-4C48-91F9-22046165F9CF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{41605E96-37B9-49C3-A14F-B7373E01514D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IOSimulator", "Src\Sandbox\MacOs\tools\iosimulator\IOSimulator.csproj", "{C8429384-3792-4EE7-BEE8-017A2BE7CE5E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SimpleSandboxDemo", "SimpleSandboxDemo", "{DAB2973B-65C0-4394-B608-106C028588B5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SandboxDemo", "SandboxDemo", "{BE9401DD-7806-4458-9362-9B7B0FBB95BD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildXL.SandboxDemo", "Src\SandboxDemo\SimpleSandboxDemo\BuildXL.SandboxDemo.csproj", "{1CF37E9A-009F-49F9-B7CE-A798B70118C7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IOSimulator", "src\Sandbox\MacOs\tools\iosimulator\IOSimulator.csproj", "{C8429384-3792-4EE7-BEE8-017A2BE7CE5E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{DC3BFCF9-A401-4F4D-8D25-AEC47E4AB22C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.Utilities", "Src\Utilities\UnitTests\Utilities\Test.BuildXL.Utilities.csproj", "{D65979AA-696E-4410-AFDC-7F39FD539A43}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.Utilities", "src\Utilities\UnitTests\Utilities\Test.BuildXL.Utilities.csproj", "{D65979AA-696E-4410-AFDC-7F39FD539A43}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Storage.Untracked", "Storage.Untracked", "{D6CD5F23-03A1-4EE3-8D6E-8E23DD99B94A}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.Storage.Admin", "Src\Utilities\UnitTests\Storage.Untracked\Test.BuildXL.Storage.Admin.csproj", "{BAD900A8-168E-4F53-BD47-8AC2EE4FF2B4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.Storage.Admin", "src\Utilities\UnitTests\Storage.Untracked\Test.BuildXL.Storage.Admin.csproj", "{BAD900A8-168E-4F53-BD47-8AC2EE4FF2B4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Storage", "Storage", "{74D9091A-C94B-401D-9020-5E75ADF24522}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.Storage", "Src\Utilities\UnitTests\Storage\Test.BuildXL.Storage.csproj", "{1C1FD3D4-F352-47C4-9142-2E3BA9631FF4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.Storage", "src\Utilities\UnitTests\Storage\Test.BuildXL.Storage.csproj", "{1C1FD3D4-F352-47C4-9142-2E3BA9631FF4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Executables", "Executables", "{2D9B7E31-C018-4F5A-ACDC-B298871A5597}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DummyWaiter", "DummyWaiter", "{635094C7-7285-4ADD-BA58-4A26CF0CA8D9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.Executables.DummyWaiter", "Src\Utilities\UnitTests\Executables\DummyWaiter\Test.BuildXL.Executables.DummyWaiter.csproj", "{81F72C5A-AD34-4B95-8B08-1A277FF33BDD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.Executables.DummyWaiter", "src\Utilities\UnitTests\Executables\DummyWaiter\Test.BuildXL.Executables.DummyWaiter.csproj", "{81F72C5A-AD34-4B95-8B08-1A277FF33BDD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestProcess", "TestProcess", "{EF596D80-075F-41B6-A774-E53F174FA2BD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.Executables.TestProcess", "Src\Utilities\UnitTests\Executables\TestProcess\Test.BuildXL.Executables.TestProcess.csproj", "{27163FE5-C2C1-41FA-82DF-FAF9374B86C3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.Executables.TestProcess", "src\Utilities\UnitTests\Executables\TestProcess\Test.BuildXL.Executables.TestProcess.csproj", "{27163FE5-C2C1-41FA-82DF-FAF9374B86C3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{7F17C5C1-BB66-48D6-9FA6-857346D75144}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EngineTestUtilities", "EngineTestUtilities", "{A896E6BA-7AA4-47A0-98FF-5AD9D1C520E1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.EngineTestUtilities", "Src\Engine\UnitTests\EngineTestUtilities\Test.BuildXL.EngineTestUtilities.csproj", "{A19AECCF-D1AB-4A84-B6EA-9758D59AB624}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.EngineTestUtilities", "src\Engine\UnitTests\EngineTestUtilities\Test.BuildXL.EngineTestUtilities.csproj", "{A19AECCF-D1AB-4A84-B6EA-9758D59AB624}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Processes", "Processes", "{D9E23219-85A1-439A-B1A3-5AD48E75096C}" EndProject @@ -136,11 +126,31 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Processes.Detours", "Proces EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Processes.TestPrograms", "Processes.TestPrograms", "{81855DD1-709D-43AA-A6E3-1676E97BB659}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RemoteApi", "RemoteApi", "{9BDEDA0D-E868-4091-B537-4E8C878E34B3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.Processes", "src\Engine\UnitTests\Processes\Test.BuildXL.Processes.csproj", "{06FDC8CE-9145-4203-828A-83820F8DCE8D}" + ProjectSection(ProjectDependencies) = postProject + {F68E3177-2132-4579-A6E3-5E24E1D39A35} = {F68E3177-2132-4579-A6E3-5E24E1D39A35} + EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemoteApi", "Src\Engine\UnitTests\Processes.TestPrograms\RemoteApi\RemoteApi.vcxproj", "{C5C423D4-7136-409B-A51B-997C79CF465A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Test.BuildXL.Processes.Detours", "src\Engine\UnitTests\Processes.Detours\Test.BuildXL.Processes.Detours.csproj", "{930E8D8E-FAD9-4A2D-8CAB-576DB1509137}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildXLNative", "src\Sandbox\Windows\DetoursServices\BuildXLNative.vcxproj", "{F68E3177-2132-4579-A6E3-5E24E1D39A35}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuildXLNatives", "src\Sandbox\Windows\DetoursServices\BuildXLNatives.vcxproj", "{F68E3177-2132-4579-A6E3-5E24E1D39A35}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "include", "include", "{8955094C-8F67-4E35-8EB8-A63D51497D44}" + ProjectSection(SolutionItems) = preProject + src\Sandbox\Windows\Detours\include\detours.h = src\Sandbox\Windows\Detours\include\detours.h + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RemoteApi", "RemoteApi", "{3E9EEF91-D095-48D6-8748-3DF5464D9452}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Detours.x64", "src\Sandbox\Windows\Detours\Lib\Detours.x64.vcxproj", "{B17D7E79-6FE3-4D37-939E-3ECDD96E895D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Detours.x86", "src\Sandbox\Windows\Detours\Lib\Detours.x86.vcxproj", "{C3AFDE79-476E-4F9C-B793-786DDD827539}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RemoteApi", "src\Engine\UnitTests\Processes.TestPrograms\RemoteApi\RemoteApi.vcxproj", "{C5C423D4-7136-409B-A51B-997C79CF465A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DetoursServices.x64", "src\Sandbox\Windows\DetoursServices\DetoursServices.x64.vcxproj", "{2DFB7CE7-2007-4EDB-BCC7-77E181D0AF40}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DetoursServices.x86", "src\Sandbox\Windows\DetoursServices\DetoursServices.x86.vcxproj", "{49D106A3-292E-4CB5-BC4A-4FC3045B50DB}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -308,28 +318,6 @@ Global {FC78FB05-AC8C-4B77-B306-FEBBCB5AD625}.Release|x64.Build.0 = Release|Any CPU {FC78FB05-AC8C-4B77-B306-FEBBCB5AD625}.Release|x86.ActiveCfg = Release|Any CPU {FC78FB05-AC8C-4B77-B306-FEBBCB5AD625}.Release|x86.Build.0 = Release|Any CPU - {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Debug|Any CPU.ActiveCfg = Debug|x64 - {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Debug|Any CPU.Build.0 = Debug|x64 - {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Debug|x64.ActiveCfg = Debug|x64 - {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Debug|x64.Build.0 = Debug|x64 - {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Debug|x86.ActiveCfg = Debug|Win32 - {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Debug|x86.Build.0 = Debug|Win32 - {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Release|Any CPU.ActiveCfg = Release|x64 - {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Release|x64.ActiveCfg = Release|x64 - {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Release|x64.Build.0 = Release|x64 - {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Release|x86.ActiveCfg = Release|Win32 - {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Release|x86.Build.0 = Release|Win32 - {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Debug|Any CPU.ActiveCfg = Debug|x64 - {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Debug|Any CPU.Build.0 = Debug|x64 - {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Debug|x64.ActiveCfg = Debug|x64 - {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Debug|x64.Build.0 = Debug|x64 - {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Debug|x86.ActiveCfg = Debug|Win32 - {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Debug|x86.Build.0 = Debug|Win32 - {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Release|Any CPU.ActiveCfg = Release|x64 - {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Release|x64.ActiveCfg = Release|x64 - {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Release|x64.Build.0 = Release|x64 - {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Release|x86.ActiveCfg = Release|Win32 - {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Release|x86.Build.0 = Release|Win32 {1EAD2D2D-5FD8-4C48-91F9-22046165F9CF}.Debug|Any CPU.ActiveCfg = Debug|x64 {1EAD2D2D-5FD8-4C48-91F9-22046165F9CF}.Debug|Any CPU.Build.0 = Debug|x64 {1EAD2D2D-5FD8-4C48-91F9-22046165F9CF}.Debug|x64.ActiveCfg = Debug|x64 @@ -337,6 +325,7 @@ Global {1EAD2D2D-5FD8-4C48-91F9-22046165F9CF}.Debug|x86.ActiveCfg = Debug|Win32 {1EAD2D2D-5FD8-4C48-91F9-22046165F9CF}.Debug|x86.Build.0 = Debug|Win32 {1EAD2D2D-5FD8-4C48-91F9-22046165F9CF}.Release|Any CPU.ActiveCfg = Release|x64 + {1EAD2D2D-5FD8-4C48-91F9-22046165F9CF}.Release|Any CPU.Build.0 = Release|x64 {1EAD2D2D-5FD8-4C48-91F9-22046165F9CF}.Release|x64.ActiveCfg = Release|x64 {1EAD2D2D-5FD8-4C48-91F9-22046165F9CF}.Release|x64.Build.0 = Release|x64 {1EAD2D2D-5FD8-4C48-91F9-22046165F9CF}.Release|x86.ActiveCfg = Release|Win32 @@ -353,18 +342,6 @@ Global {C8429384-3792-4EE7-BEE8-017A2BE7CE5E}.Release|x64.Build.0 = Release|Any CPU {C8429384-3792-4EE7-BEE8-017A2BE7CE5E}.Release|x86.ActiveCfg = Release|Any CPU {C8429384-3792-4EE7-BEE8-017A2BE7CE5E}.Release|x86.Build.0 = Release|Any CPU - {1CF37E9A-009F-49F9-B7CE-A798B70118C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1CF37E9A-009F-49F9-B7CE-A798B70118C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1CF37E9A-009F-49F9-B7CE-A798B70118C7}.Debug|x64.ActiveCfg = Debug|Any CPU - {1CF37E9A-009F-49F9-B7CE-A798B70118C7}.Debug|x64.Build.0 = Debug|Any CPU - {1CF37E9A-009F-49F9-B7CE-A798B70118C7}.Debug|x86.ActiveCfg = Debug|Any CPU - {1CF37E9A-009F-49F9-B7CE-A798B70118C7}.Debug|x86.Build.0 = Debug|Any CPU - {1CF37E9A-009F-49F9-B7CE-A798B70118C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1CF37E9A-009F-49F9-B7CE-A798B70118C7}.Release|Any CPU.Build.0 = Release|Any CPU - {1CF37E9A-009F-49F9-B7CE-A798B70118C7}.Release|x64.ActiveCfg = Release|Any CPU - {1CF37E9A-009F-49F9-B7CE-A798B70118C7}.Release|x64.Build.0 = Release|Any CPU - {1CF37E9A-009F-49F9-B7CE-A798B70118C7}.Release|x86.ActiveCfg = Release|Any CPU - {1CF37E9A-009F-49F9-B7CE-A798B70118C7}.Release|x86.Build.0 = Release|Any CPU {D65979AA-696E-4410-AFDC-7F39FD539A43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D65979AA-696E-4410-AFDC-7F39FD539A43}.Debug|Any CPU.Build.0 = Debug|Any CPU {D65979AA-696E-4410-AFDC-7F39FD539A43}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -437,17 +414,30 @@ Global {A19AECCF-D1AB-4A84-B6EA-9758D59AB624}.Release|x64.Build.0 = Release|Any CPU {A19AECCF-D1AB-4A84-B6EA-9758D59AB624}.Release|x86.ActiveCfg = Release|Any CPU {A19AECCF-D1AB-4A84-B6EA-9758D59AB624}.Release|x86.Build.0 = Release|Any CPU - {C5C423D4-7136-409B-A51B-997C79CF465A}.Debug|Any CPU.ActiveCfg = Debug|x64 - {C5C423D4-7136-409B-A51B-997C79CF465A}.Debug|Any CPU.Build.0 = Debug|x64 - {C5C423D4-7136-409B-A51B-997C79CF465A}.Debug|x64.ActiveCfg = Debug|x64 - {C5C423D4-7136-409B-A51B-997C79CF465A}.Debug|x64.Build.0 = Debug|x64 - {C5C423D4-7136-409B-A51B-997C79CF465A}.Debug|x86.ActiveCfg = Debug|Win32 - {C5C423D4-7136-409B-A51B-997C79CF465A}.Debug|x86.Build.0 = Debug|Win32 - {C5C423D4-7136-409B-A51B-997C79CF465A}.Release|Any CPU.ActiveCfg = Release|x64 - {C5C423D4-7136-409B-A51B-997C79CF465A}.Release|x64.ActiveCfg = Release|x64 - {C5C423D4-7136-409B-A51B-997C79CF465A}.Release|x64.Build.0 = Release|x64 - {C5C423D4-7136-409B-A51B-997C79CF465A}.Release|x86.ActiveCfg = Release|Win32 - {C5C423D4-7136-409B-A51B-997C79CF465A}.Release|x86.Build.0 = Release|Win32 + {06FDC8CE-9145-4203-828A-83820F8DCE8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {06FDC8CE-9145-4203-828A-83820F8DCE8D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {06FDC8CE-9145-4203-828A-83820F8DCE8D}.Debug|x64.ActiveCfg = Debug|Any CPU + {06FDC8CE-9145-4203-828A-83820F8DCE8D}.Debug|x64.Build.0 = Debug|Any CPU + {06FDC8CE-9145-4203-828A-83820F8DCE8D}.Debug|x86.ActiveCfg = Debug|Any CPU + {06FDC8CE-9145-4203-828A-83820F8DCE8D}.Debug|x86.Build.0 = Debug|Any CPU + {06FDC8CE-9145-4203-828A-83820F8DCE8D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {06FDC8CE-9145-4203-828A-83820F8DCE8D}.Release|Any CPU.Build.0 = Release|Any CPU + {06FDC8CE-9145-4203-828A-83820F8DCE8D}.Release|x64.ActiveCfg = Release|Any CPU + {06FDC8CE-9145-4203-828A-83820F8DCE8D}.Release|x64.Build.0 = Release|Any CPU + {06FDC8CE-9145-4203-828A-83820F8DCE8D}.Release|x86.ActiveCfg = Release|Any CPU + {06FDC8CE-9145-4203-828A-83820F8DCE8D}.Release|x86.Build.0 = Release|Any CPU + {930E8D8E-FAD9-4A2D-8CAB-576DB1509137}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {930E8D8E-FAD9-4A2D-8CAB-576DB1509137}.Debug|Any CPU.Build.0 = Debug|Any CPU + {930E8D8E-FAD9-4A2D-8CAB-576DB1509137}.Debug|x64.ActiveCfg = Debug|Any CPU + {930E8D8E-FAD9-4A2D-8CAB-576DB1509137}.Debug|x64.Build.0 = Debug|Any CPU + {930E8D8E-FAD9-4A2D-8CAB-576DB1509137}.Debug|x86.ActiveCfg = Debug|Any CPU + {930E8D8E-FAD9-4A2D-8CAB-576DB1509137}.Debug|x86.Build.0 = Debug|Any CPU + {930E8D8E-FAD9-4A2D-8CAB-576DB1509137}.Release|Any CPU.ActiveCfg = Release|Any CPU + {930E8D8E-FAD9-4A2D-8CAB-576DB1509137}.Release|Any CPU.Build.0 = Release|Any CPU + {930E8D8E-FAD9-4A2D-8CAB-576DB1509137}.Release|x64.ActiveCfg = Release|Any CPU + {930E8D8E-FAD9-4A2D-8CAB-576DB1509137}.Release|x64.Build.0 = Release|Any CPU + {930E8D8E-FAD9-4A2D-8CAB-576DB1509137}.Release|x86.ActiveCfg = Release|Any CPU + {930E8D8E-FAD9-4A2D-8CAB-576DB1509137}.Release|x86.Build.0 = Release|Any CPU {F68E3177-2132-4579-A6E3-5E24E1D39A35}.Debug|Any CPU.ActiveCfg = Debug|x64 {F68E3177-2132-4579-A6E3-5E24E1D39A35}.Debug|Any CPU.Build.0 = Debug|x64 {F68E3177-2132-4579-A6E3-5E24E1D39A35}.Debug|x64.ActiveCfg = Debug|x64 @@ -455,10 +445,71 @@ Global {F68E3177-2132-4579-A6E3-5E24E1D39A35}.Debug|x86.ActiveCfg = Debug|Win32 {F68E3177-2132-4579-A6E3-5E24E1D39A35}.Debug|x86.Build.0 = Debug|Win32 {F68E3177-2132-4579-A6E3-5E24E1D39A35}.Release|Any CPU.ActiveCfg = Release|x64 + {F68E3177-2132-4579-A6E3-5E24E1D39A35}.Release|Any CPU.Build.0 = Release|x64 {F68E3177-2132-4579-A6E3-5E24E1D39A35}.Release|x64.ActiveCfg = Release|x64 {F68E3177-2132-4579-A6E3-5E24E1D39A35}.Release|x64.Build.0 = Release|x64 {F68E3177-2132-4579-A6E3-5E24E1D39A35}.Release|x86.ActiveCfg = Release|Win32 {F68E3177-2132-4579-A6E3-5E24E1D39A35}.Release|x86.Build.0 = Release|Win32 + {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Debug|Any CPU.ActiveCfg = Debug|x64 + {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Debug|Any CPU.Build.0 = Debug|x64 + {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Debug|x64.ActiveCfg = Debug|x64 + {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Debug|x64.Build.0 = Debug|x64 + {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Debug|x86.ActiveCfg = Debug|x64 + {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Debug|x86.Build.0 = Debug|x64 + {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Release|Any CPU.ActiveCfg = Release|x64 + {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Release|Any CPU.Build.0 = Release|x64 + {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Release|x64.ActiveCfg = Release|x64 + {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Release|x64.Build.0 = Release|x64 + {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Release|x86.ActiveCfg = Release|x64 + {B17D7E79-6FE3-4D37-939E-3ECDD96E895D}.Release|x86.Build.0 = Release|x64 + {C3AFDE79-476E-4F9C-B793-786DDD827539}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {C3AFDE79-476E-4F9C-B793-786DDD827539}.Debug|Any CPU.Build.0 = Debug|Win32 + {C3AFDE79-476E-4F9C-B793-786DDD827539}.Debug|x64.ActiveCfg = Debug|Win32 + {C3AFDE79-476E-4F9C-B793-786DDD827539}.Debug|x64.Build.0 = Debug|Win32 + {C3AFDE79-476E-4F9C-B793-786DDD827539}.Debug|x86.ActiveCfg = Debug|Win32 + {C3AFDE79-476E-4F9C-B793-786DDD827539}.Debug|x86.Build.0 = Debug|Win32 + {C3AFDE79-476E-4F9C-B793-786DDD827539}.Release|Any CPU.ActiveCfg = Release|Win32 + {C3AFDE79-476E-4F9C-B793-786DDD827539}.Release|Any CPU.Build.0 = Release|Win32 + {C3AFDE79-476E-4F9C-B793-786DDD827539}.Release|x64.ActiveCfg = Release|Win32 + {C3AFDE79-476E-4F9C-B793-786DDD827539}.Release|x64.Build.0 = Release|Win32 + {C3AFDE79-476E-4F9C-B793-786DDD827539}.Release|x86.ActiveCfg = Release|Win32 + {C3AFDE79-476E-4F9C-B793-786DDD827539}.Release|x86.Build.0 = Release|Win32 + {C5C423D4-7136-409B-A51B-997C79CF465A}.Debug|Any CPU.ActiveCfg = Debug|x64 + {C5C423D4-7136-409B-A51B-997C79CF465A}.Debug|Any CPU.Build.0 = Debug|x64 + {C5C423D4-7136-409B-A51B-997C79CF465A}.Debug|x64.ActiveCfg = Debug|x64 + {C5C423D4-7136-409B-A51B-997C79CF465A}.Debug|x64.Build.0 = Debug|x64 + {C5C423D4-7136-409B-A51B-997C79CF465A}.Debug|x86.ActiveCfg = Debug|x64 + {C5C423D4-7136-409B-A51B-997C79CF465A}.Debug|x86.Build.0 = Debug|x64 + {C5C423D4-7136-409B-A51B-997C79CF465A}.Release|Any CPU.ActiveCfg = Release|x64 + {C5C423D4-7136-409B-A51B-997C79CF465A}.Release|Any CPU.Build.0 = Release|x64 + {C5C423D4-7136-409B-A51B-997C79CF465A}.Release|x64.ActiveCfg = Release|x64 + {C5C423D4-7136-409B-A51B-997C79CF465A}.Release|x64.Build.0 = Release|x64 + {C5C423D4-7136-409B-A51B-997C79CF465A}.Release|x86.ActiveCfg = Release|x64 + {C5C423D4-7136-409B-A51B-997C79CF465A}.Release|x86.Build.0 = Release|x64 + {2DFB7CE7-2007-4EDB-BCC7-77E181D0AF40}.Debug|Any CPU.ActiveCfg = Debug|x64 + {2DFB7CE7-2007-4EDB-BCC7-77E181D0AF40}.Debug|Any CPU.Build.0 = Debug|x64 + {2DFB7CE7-2007-4EDB-BCC7-77E181D0AF40}.Debug|x64.ActiveCfg = Debug|x64 + {2DFB7CE7-2007-4EDB-BCC7-77E181D0AF40}.Debug|x64.Build.0 = Debug|x64 + {2DFB7CE7-2007-4EDB-BCC7-77E181D0AF40}.Debug|x86.ActiveCfg = Debug|x64 + {2DFB7CE7-2007-4EDB-BCC7-77E181D0AF40}.Debug|x86.Build.0 = Debug|x64 + {2DFB7CE7-2007-4EDB-BCC7-77E181D0AF40}.Release|Any CPU.ActiveCfg = Release|x64 + {2DFB7CE7-2007-4EDB-BCC7-77E181D0AF40}.Release|Any CPU.Build.0 = Release|x64 + {2DFB7CE7-2007-4EDB-BCC7-77E181D0AF40}.Release|x64.ActiveCfg = Release|x64 + {2DFB7CE7-2007-4EDB-BCC7-77E181D0AF40}.Release|x64.Build.0 = Release|x64 + {2DFB7CE7-2007-4EDB-BCC7-77E181D0AF40}.Release|x86.ActiveCfg = Release|x64 + {2DFB7CE7-2007-4EDB-BCC7-77E181D0AF40}.Release|x86.Build.0 = Release|x64 + {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Debug|Any CPU.Build.0 = Debug|Win32 + {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Debug|x64.ActiveCfg = Debug|Win32 + {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Debug|x64.Build.0 = Debug|Win32 + {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Debug|x86.ActiveCfg = Debug|Win32 + {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Debug|x86.Build.0 = Debug|Win32 + {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Release|Any CPU.ActiveCfg = Release|Win32 + {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Release|Any CPU.Build.0 = Release|Win32 + {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Release|x64.ActiveCfg = Release|Win32 + {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Release|x64.Build.0 = Release|Win32 + {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Release|x86.ActiveCfg = Release|Win32 + {49D106A3-292E-4CB5-BC4A-4FC3045B50DB}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -502,14 +553,9 @@ Global {10F02318-C0C4-4A9E-B626-3D303652745B} = {2FAF2F4A-C0CF-44B7-9B7C-DFCABEF9A7E0} {3A119B97-4694-46B6-AA6C-E31C26299A58} = {2FAF2F4A-C0CF-44B7-9B7C-DFCABEF9A7E0} {ED789856-B6F7-4001-9B34-F5840959FFE3} = {7A6965E1-C5DA-4548-B769-600B22DB9D5C} - {B17D7E79-6FE3-4D37-939E-3ECDD96E895D} = {ED789856-B6F7-4001-9B34-F5840959FFE3} - {49D106A3-292E-4CB5-BC4A-4FC3045B50DB} = {10F02318-C0C4-4A9E-B626-3D303652745B} {1EAD2D2D-5FD8-4C48-91F9-22046165F9CF} = {3A119B97-4694-46B6-AA6C-E31C26299A58} {41605E96-37B9-49C3-A14F-B7373E01514D} = {A542BDE9-96B9-4E93-81F6-6B09BC7AD0CC} {C8429384-3792-4EE7-BEE8-017A2BE7CE5E} = {41605E96-37B9-49C3-A14F-B7373E01514D} - {DAB2973B-65C0-4394-B608-106C028588B5} = {BE9401DD-7806-4458-9362-9B7B0FBB95BD} - {BE9401DD-7806-4458-9362-9B7B0FBB95BD} = {ECC0573A-2013-42D3-B0C4-7AE4FD14AA22} - {1CF37E9A-009F-49F9-B7CE-A798B70118C7} = {DAB2973B-65C0-4394-B608-106C028588B5} {DC3BFCF9-A401-4F4D-8D25-AEC47E4AB22C} = {4A9DF5D7-0C85-4B4B-83C9-487CF973D530} {D65979AA-696E-4410-AFDC-7F39FD539A43} = {DC3BFCF9-A401-4F4D-8D25-AEC47E4AB22C} {D6CD5F23-03A1-4EE3-8D6E-8E23DD99B94A} = {4A9DF5D7-0C85-4B4B-83C9-487CF973D530} @@ -527,9 +573,16 @@ Global {D9E23219-85A1-439A-B1A3-5AD48E75096C} = {7F17C5C1-BB66-48D6-9FA6-857346D75144} {585A042B-FFA5-4ED7-B81C-6A9E975BC9E8} = {7F17C5C1-BB66-48D6-9FA6-857346D75144} {81855DD1-709D-43AA-A6E3-1676E97BB659} = {7F17C5C1-BB66-48D6-9FA6-857346D75144} - {9BDEDA0D-E868-4091-B537-4E8C878E34B3} = {81855DD1-709D-43AA-A6E3-1676E97BB659} - {C5C423D4-7136-409B-A51B-997C79CF465A} = {9BDEDA0D-E868-4091-B537-4E8C878E34B3} + {06FDC8CE-9145-4203-828A-83820F8DCE8D} = {D9E23219-85A1-439A-B1A3-5AD48E75096C} + {930E8D8E-FAD9-4A2D-8CAB-576DB1509137} = {585A042B-FFA5-4ED7-B81C-6A9E975BC9E8} {F68E3177-2132-4579-A6E3-5E24E1D39A35} = {10F02318-C0C4-4A9E-B626-3D303652745B} + {8955094C-8F67-4E35-8EB8-A63D51497D44} = {7A6965E1-C5DA-4548-B769-600B22DB9D5C} + {3E9EEF91-D095-48D6-8748-3DF5464D9452} = {81855DD1-709D-43AA-A6E3-1676E97BB659} + {B17D7E79-6FE3-4D37-939E-3ECDD96E895D} = {ED789856-B6F7-4001-9B34-F5840959FFE3} + {C3AFDE79-476E-4F9C-B793-786DDD827539} = {ED789856-B6F7-4001-9B34-F5840959FFE3} + {C5C423D4-7136-409B-A51B-997C79CF465A} = {3E9EEF91-D095-48D6-8748-3DF5464D9452} + {2DFB7CE7-2007-4EDB-BCC7-77E181D0AF40} = {10F02318-C0C4-4A9E-B626-3D303652745B} + {49D106A3-292E-4CB5-BC4A-4FC3045B50DB} = {10F02318-C0C4-4A9E-B626-3D303652745B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {9F19E12C-5904-4A0A-9AD4-606F75694C7C} diff --git a/Directory.Build.props b/Directory.Build.props index 99a0416b0..42d4f5fb4 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,10 +1,14 @@ - $(SolutionDir)bin\$(Configuration)\ - $(OutputPath) - True - $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))/BuildXL.DevKey.snk - DISABLE_FEATURE_VISUALIZER;FEATURE_CORECLR;FEATURE_SAFE_PROCESS_HANDLE;DISABLE_FEATURE_MEMORYMAP_SECURITY;DISABLE_FEATURE_SYSTEM_MANAGEMENT;DISABLE_FEATURE_HTTPEXCEPTION;DISABLE_FEATURE_VSEXTENSION_INSTALL_CHECK;DISABLE_FEATURE_BOND_RPC;DISABLE_FEATURE_SECURITY_ATTRIBUTES;DISABLE_FEATURE_HTMLWRITER;DISABLE_FEATURE_DISTRIBUTION;DISABLE_FEATURE_FILES_SYSTEM_RIGHTS;DISABLE_FEATURE_EXTENDED_ENCODING + $(SolutionDir)bin\$(Configuration)\ + $(OutputPath) + True + $(SolutionDir)obj\$(MSBuildProjectName)\ + $([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))/BuildXL.DevKey.snk + DISABLE_FEATURE_VISUALIZER;FEATURE_CORECLR;FEATURE_SAFE_PROCESS_HANDLE;DISABLE_FEATURE_MEMORYMAP_SECURITY;DISABLE_FEATURE_SYSTEM_MANAGEMENT;DISABLE_FEATURE_HTTPEXCEPTION;DISABLE_FEATURE_VSEXTENSION_INSTALL_CHECK;DISABLE_FEATURE_BOND_RPC;DISABLE_FEATURE_SECURITY_ATTRIBUTES;DISABLE_FEATURE_HTMLWRITER;DISABLE_FEATURE_DISTRIBUTION;DISABLE_FEATURE_FILES_SYSTEM_RIGHTS;DISABLE_FEATURE_EXTENDED_ENCODING + 7.2 + true + false \ No newline at end of file diff --git a/src/Engine/Processes/BuildXL.Processes.csproj b/src/Engine/Processes/BuildXL.Processes.csproj index 07cfcdb90..a00505342 100644 --- a/src/Engine/Processes/BuildXL.Processes.csproj +++ b/src/Engine/Processes/BuildXL.Processes.csproj @@ -1,36 +1,9 @@  - Debug - AnyCPU - {FC78FB05-AC8C-4B77-B306-FEBBCB5AD625} Library - BuildXL.Processes netcoreapp2.0 - true - - - true - full - false - bin\Debug\ - TRACE;DEBUG;$(DefineConstants) - prompt - 4 true - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - BuildXL.Processes - 7.2 - diff --git a/src/Engine/UnitTests/EngineTestUtilities/Test.BuildXL.EngineTestUtilities.csproj b/src/Engine/UnitTests/EngineTestUtilities/Test.BuildXL.EngineTestUtilities.csproj index 387976474..7846cb262 100644 --- a/src/Engine/UnitTests/EngineTestUtilities/Test.BuildXL.EngineTestUtilities.csproj +++ b/src/Engine/UnitTests/EngineTestUtilities/Test.BuildXL.EngineTestUtilities.csproj @@ -1,35 +1,7 @@  - Debug - AnyCPU - {A19AECCF-D1AB-4A84-B6EA-9758D59AB624} Library - Test.BuildXL.EngineTestUtilities netcoreapp2.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(DefineConstants) - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - Test.BuildXL.EngineTestUtilities - 7.2 diff --git a/src/Engine/UnitTests/Processes.Detours/Test.BuildXL.Processes.Detours.csproj b/src/Engine/UnitTests/Processes.Detours/Test.BuildXL.Processes.Detours.csproj index bbb7dfdd8..ca5e09ac1 100644 --- a/src/Engine/UnitTests/Processes.Detours/Test.BuildXL.Processes.Detours.csproj +++ b/src/Engine/UnitTests/Processes.Detours/Test.BuildXL.Processes.Detours.csproj @@ -1,35 +1,7 @@  - Debug - AnyCPU - {930E8D8E-FAD9-4A2D-8CAB-576DB1509137} Library - Test.BuildXL.Processes.Detours netcoreapp2.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(DefineConstants) - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - Test.BuildXL.Processes.Detours - 7.2 @@ -42,5 +14,8 @@ + + false + \ No newline at end of file diff --git a/src/Engine/UnitTests/Processes.TestPrograms/RemoteApi/RemoteApi.vcxproj b/src/Engine/UnitTests/Processes.TestPrograms/RemoteApi/RemoteApi.vcxproj index 4f6af4809..9ccf969bf 100644 --- a/src/Engine/UnitTests/Processes.TestPrograms/RemoteApi/RemoteApi.vcxproj +++ b/src/Engine/UnitTests/Processes.TestPrograms/RemoteApi/RemoteApi.vcxproj @@ -3,30 +3,45 @@ {C5C423D4-7136-409B-A51B-997C79CF465A} + + + Debug + x64 + + + Debug + x64 + + + Release + x64 + + + Release + x64 + + Application $(DefaultPlatformToolset) 10.0.10240.0 + $(OutputPath)\x64\ + $(OutputPath) + false + $(BaseIntermediateOutputPath)x64\ _MBCS;_WINDOWS;_USRDLL;_WINDLL;_UNICODE;UNICODE;VERBOSE=0; _DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - true - /FS %(AdditionalOptions) - /FS %(AdditionalOptions) - /FS %(AdditionalOptions) - /FS %(AdditionalOptions) + MultiThreadedDebug + MultiThreaded ntdll.lib - - true - @@ -36,23 +51,5 @@ - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - \ No newline at end of file diff --git a/src/Engine/UnitTests/Processes/RemoteApi.cs b/src/Engine/UnitTests/Processes/RemoteApi.cs index 432b1e0aa..a5f2e034c 100644 --- a/src/Engine/UnitTests/Processes/RemoteApi.cs +++ b/src/Engine/UnitTests/Processes/RemoteApi.cs @@ -94,7 +94,6 @@ namespace Test.BuildXL.Processes private static string GetRemoteApiExeLocation() { string currentCodeFolder = Path.GetDirectoryName(AssemblyHelper.GetAssemblyLocation(Assembly.GetExecutingAssembly())); - currentCodeFolder = Path.Combine(currentCodeFolder, "DetoursCrossBitTests"); Contract.Assume(currentCodeFolder != null); return Path.GetFullPath(Path.Combine(currentCodeFolder, "x64", "RemoteApi.exe")); } diff --git a/src/Engine/UnitTests/Processes/Test.BuildXL.Processes.csproj b/src/Engine/UnitTests/Processes/Test.BuildXL.Processes.csproj index 85f132af4..c64322796 100644 --- a/src/Engine/UnitTests/Processes/Test.BuildXL.Processes.csproj +++ b/src/Engine/UnitTests/Processes/Test.BuildXL.Processes.csproj @@ -1,35 +1,7 @@ - + - Debug - AnyCPU - {06FDC8CE-9145-4203-828A-83820F8DCE8D} Library - Test.BuildXL.Processes netcoreapp2.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(DefineConstants) - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - Test.BuildXL.Processes - 7.2 @@ -42,5 +14,14 @@ + + false + + + false + + + false + \ No newline at end of file diff --git a/src/Pips/Dll/BuildXL.Pips.csproj b/src/Pips/Dll/BuildXL.Pips.csproj index 36b0fefcd..e141a2f25 100644 --- a/src/Pips/Dll/BuildXL.Pips.csproj +++ b/src/Pips/Dll/BuildXL.Pips.csproj @@ -1,35 +1,7 @@  - Debug - AnyCPU - {13228E1D-5679-46A9-B158-E05C9A9C762C} Library - BuildXL.Pips netcoreapp2.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(DefineConstants) - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - BuildXL.Pips - 7.2 diff --git a/src/Sandbox/MacOs/tools/iosimulator/IOSimulator.csproj b/src/Sandbox/MacOs/tools/iosimulator/IOSimulator.csproj index 00bb36042..fba99e3c6 100644 --- a/src/Sandbox/MacOs/tools/iosimulator/IOSimulator.csproj +++ b/src/Sandbox/MacOs/tools/iosimulator/IOSimulator.csproj @@ -5,6 +5,6 @@ netcoreapp2.0 - + diff --git a/src/Sandbox/Windows/Detours/Lib/Detours.x64.vcxproj b/src/Sandbox/Windows/Detours/Lib/Detours.x64.vcxproj new file mode 100644 index 000000000..57e05fbf5 --- /dev/null +++ b/src/Sandbox/Windows/Detours/Lib/Detours.x64.vcxproj @@ -0,0 +1,25 @@ + + + + {B17D7E79-6FE3-4D37-939E-3ECDD96E895D} + + + + Debug + x64 + + + Debug + x64 + + + Release + x64 + + + Release + x64 + + + + \ No newline at end of file diff --git a/src/Sandbox/Windows/Detours/Lib/Detours.vcxproj.filters b/src/Sandbox/Windows/Detours/Lib/Detours.x64.vcxproj.filters similarity index 100% rename from src/Sandbox/Windows/Detours/Lib/Detours.vcxproj.filters rename to src/Sandbox/Windows/Detours/Lib/Detours.x64.vcxproj.filters diff --git a/src/Sandbox/Windows/Detours/Lib/Detours.x86.vcxproj b/src/Sandbox/Windows/Detours/Lib/Detours.x86.vcxproj new file mode 100644 index 000000000..865202fe2 --- /dev/null +++ b/src/Sandbox/Windows/Detours/Lib/Detours.x86.vcxproj @@ -0,0 +1,25 @@ + + + + {C3AFDE79-476E-4F9C-B793-786DDD827539} + + + + Debug + Win32 + + + Debug + Win32 + + + Release + Win32 + + + Release + Win32 + + + + \ No newline at end of file diff --git a/src/Sandbox/Windows/Detours/Lib/Detours.x86.vcxproj.filters b/src/Sandbox/Windows/Detours/Lib/Detours.x86.vcxproj.filters new file mode 100644 index 000000000..2872a9fe5 --- /dev/null +++ b/src/Sandbox/Windows/Detours/Lib/Detours.x86.vcxproj.filters @@ -0,0 +1,45 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Header Files + + + Header Files + + + \ No newline at end of file diff --git a/src/Sandbox/Windows/Detours/Lib/DetoursCommon.targets b/src/Sandbox/Windows/Detours/Lib/DetoursCommon.targets new file mode 100644 index 000000000..86fa62dd8 --- /dev/null +++ b/src/Sandbox/Windows/Detours/Lib/DetoursCommon.targets @@ -0,0 +1,44 @@ + + + + + StaticLibrary + $(DefaultPlatformToolset) + 10.0.10240.0 + Detours + $(OutputPath)x64\ + $(OutputPath)x86\ + $(OutputPath) + false + $(BaseIntermediateOutputPath)x64\ + $(BaseIntermediateOutputPath)x86\ + + + + + DETOURS_X86_X64;_MBCS;_WINDOWS;_USRDLL;_WINDLL;_UNICODE;UNICODE;VERBOSE=0;%(PreprocessorDefinitions) + _DEBUG;%(PreprocessorDefinitions) + DETOURS_X64;DETOURS_64BIT;%(PreprocessorDefinitions) + DETOURS_X86;DETOURS_32BIT;%(PreprocessorDefinitions) + ..\include + MultiThreadedDebug + MultiThreaded + + + kernel32.lib;advapi32.lib;uuid.lib;ntdll.lib + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Sandbox/Windows/DetoursServices/BuildXLNatives.vcxproj b/src/Sandbox/Windows/DetoursServices/BuildXLNatives.vcxproj new file mode 100644 index 000000000..801f1f152 --- /dev/null +++ b/src/Sandbox/Windows/DetoursServices/BuildXLNatives.vcxproj @@ -0,0 +1,113 @@ + + + + {F68E3177-2132-4579-A6E3-5E24E1D39A35} + BuildXLNatives + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + DynamicLibrary + $(DefaultPlatformToolset) + 10.0.10240.0 + $(OutputPath)x64\ + $(OutputPath)x86\ + $(OutputPath) + false + $(BaseIntermediateOutputPath)x64\ + $(BaseIntermediateOutputPath)x86\ + + + + + + + + + + + + + DETOURS_X86_X64;_MBCS;_WINDOWS;_USRDLL;_WINDLL;_UNICODE;UNICODE;VERBOSE=0;DETOURSSERVICES_EXPORTS;BUILDXL_NATIVES_LIBRARY + _DEBUG;%(PreprocessorDefinitions) + DETOURS_X64;DETOURS_64BIT;%(PreprocessorDefinitions) + DETOURS_X86;DETOURS_32BIT;%(PreprocessorDefinitions) + ..\Detours\include + MultiThreadedDebug + MultiThreaded + + + kernel32.lib;advapi32.lib;uuid.lib;ntdll.lib + /EXPORT:DllMain /EXPORT:IsDetoursDebug /EXPORT:CreateDetachedProcess /EXPORT:FindFileAccessPolicyInTree /EXPORT:NormalizeAndHashPath /EXPORT:AreBuffersEqual /EXPORT:RemapDevices /EXPORT:CreateDetouredProcess /EXPORT:DetouredProcessInjector_Create /EXPORT:DetouredProcessInjector_Destroy /EXPORT:DetouredProcessInjector_Inject %(AdditionalOptions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {b17d7e79-6fe3-4d37-939e-3ecdd96e895d} + + + {c3afde79-476e-4f9c-b793-786ddd827539} + + + + \ No newline at end of file diff --git a/src/Sandbox/Windows/DetoursServices/BuildXLNatives.vcxproj.filters b/src/Sandbox/Windows/DetoursServices/BuildXLNatives.vcxproj.filters new file mode 100644 index 000000000..e40c1c34a --- /dev/null +++ b/src/Sandbox/Windows/DetoursServices/BuildXLNatives.vcxproj.filters @@ -0,0 +1,138 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FA} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFA} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD0A} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/Sandbox/Windows/DetoursServices/DetoursServices.x64.vcxproj b/src/Sandbox/Windows/DetoursServices/DetoursServices.x64.vcxproj new file mode 100644 index 000000000..98c24d7f1 --- /dev/null +++ b/src/Sandbox/Windows/DetoursServices/DetoursServices.x64.vcxproj @@ -0,0 +1,25 @@ + + + + {2DFB7CE7-2007-4EDB-BCC7-77E181D0AF40} + + + + Debug + x64 + + + Debug + x64 + + + Release + x64 + + + Release + x64 + + + + \ No newline at end of file diff --git a/src/Sandbox/Windows/DetoursServices/DetoursServices.vcxproj.filters b/src/Sandbox/Windows/DetoursServices/DetoursServices.x64.vcxproj.filters similarity index 100% rename from src/Sandbox/Windows/DetoursServices/DetoursServices.vcxproj.filters rename to src/Sandbox/Windows/DetoursServices/DetoursServices.x64.vcxproj.filters diff --git a/src/Sandbox/Windows/DetoursServices/DetoursServices.x86.vcxproj b/src/Sandbox/Windows/DetoursServices/DetoursServices.x86.vcxproj new file mode 100644 index 000000000..0583f9f42 --- /dev/null +++ b/src/Sandbox/Windows/DetoursServices/DetoursServices.x86.vcxproj @@ -0,0 +1,25 @@ + + + + {AA5A7776-F6F9-4F0E-885E-ACDDA15E4E91} + + + + Debug + Win32 + + + Debug + Win32 + + + Release + Win32 + + + Release + Win32 + + + + \ No newline at end of file diff --git a/src/Sandbox/Windows/DetoursServices/DetoursServices.x86.vcxproj.filters b/src/Sandbox/Windows/DetoursServices/DetoursServices.x86.vcxproj.filters new file mode 100644 index 000000000..a19b7f523 --- /dev/null +++ b/src/Sandbox/Windows/DetoursServices/DetoursServices.x86.vcxproj.filters @@ -0,0 +1,159 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + \ No newline at end of file diff --git a/src/Sandbox/Windows/DetoursServices/DetoursServicesCommon.targets b/src/Sandbox/Windows/DetoursServices/DetoursServicesCommon.targets new file mode 100644 index 000000000..0a6fbb35c --- /dev/null +++ b/src/Sandbox/Windows/DetoursServices/DetoursServicesCommon.targets @@ -0,0 +1,94 @@ + + + + {49D106A3-292E-4CB5-BC4A-4FC3045B50DB} + + + + DynamicLibrary + $(DefaultPlatformToolset) + 10.0.10240.0 + DetoursServices + $(OutputPath)x64\ + $(OutputPath)x86\ + $(OutputPath) + false + $(BaseIntermediateOutputPath)x64\ + $(BaseIntermediateOutputPath)x86\ + + + + + DETOURS_X86_X64;_MBCS;_WINDOWS;_USRDLL;_WINDLL;_UNICODE;UNICODE;VERBOSE=0;DETOURSSERVICES_EXPORTS;DETOURS_SERVICES_NATIVES_LIBRARY + _DEBUG;%(PreprocessorDefinitions) + DETOURS_X64;DETOURS_64BIT;%(PreprocessorDefinitions) + DETOURS_X86;DETOURS_32BIT;%(PreprocessorDefinitions) + ..\Detours\include + MultiThreadedDebug + MultiThreaded + + + kernel32.lib;advapi32.lib;uuid.lib;ntdll.lib + /EXPORT:DllMain /EXPORT:CreateDetouredProcess /EXPORT:DetouredProcessInjector_Create /EXPORT:DetouredProcessInjector_Destroy /EXPORT:DetouredProcessInjector_Inject %(AdditionalOptions) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {b17d7e79-6fe3-4d37-939e-3ecdd96e895d} + + + {c3afde79-476e-4f9c-b793-786ddd827539} + + + + \ No newline at end of file diff --git a/src/Sandbox/Windows/DetoursTests/DetoursTests.vcxproj b/src/Sandbox/Windows/DetoursTests/DetoursTests.vcxproj index 87520a4d7..1016cea2f 100644 --- a/src/Sandbox/Windows/DetoursTests/DetoursTests.vcxproj +++ b/src/Sandbox/Windows/DetoursTests/DetoursTests.vcxproj @@ -3,30 +3,44 @@ {1EAD2D2D-5FD8-4C48-91F9-22046165F9CF} + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + Application $(DefaultPlatformToolset) 10.0.10240.0 + $(OutputPath)x64\ + $(OutputPath)x86\ + $(OutputPath) _WINDOWS;_USRDLL;_WINDLL;_UNICODE;UNICODE;VERBOSE=0; - MultiThreadedDebug - true - /FS %(AdditionalOptions) - /FS %(AdditionalOptions) - /FS %(AdditionalOptions) - /FS %(AdditionalOptions) + MultiThreadedDebug + MultiThreaded kernel32.lib;advapi32.lib;uuid.lib;ntdll.lib - - true - @@ -48,23 +62,5 @@ - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - \ No newline at end of file diff --git a/src/Utilities/Collections/BuildXL.Utilities.Collections.csproj b/src/Utilities/Collections/BuildXL.Utilities.Collections.csproj index 7e7548751..f2974a39a 100644 --- a/src/Utilities/Collections/BuildXL.Utilities.Collections.csproj +++ b/src/Utilities/Collections/BuildXL.Utilities.Collections.csproj @@ -1,39 +1,12 @@  - Debug - AnyCPU - {6FD9CD40-99F8-4BE2-ADD3-6DAB1C0DCA0D} Library - BuildXL.Utilities.Collections netcoreapp2.0 - true + true - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(DefineConstants) - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - BuildXL.Utilities.Collections - 7.2 - diff --git a/src/Utilities/Configuration/BuildXL.Utilities.Configuration.csproj b/src/Utilities/Configuration/BuildXL.Utilities.Configuration.csproj index 5716c9de6..da31a7a09 100644 --- a/src/Utilities/Configuration/BuildXL.Utilities.Configuration.csproj +++ b/src/Utilities/Configuration/BuildXL.Utilities.Configuration.csproj @@ -1,35 +1,7 @@  - Debug - AnyCPU - {0D26A071-8487-4C88-A11A-D422190B41DF} Library - BuildXL.Utilities.Configuration netcoreapp2.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(DefineConstants) - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - BuildXL.Utilities.Configuration - 7.2 diff --git a/src/Utilities/Instrumentation/Common/BuildXL.Utilities.Instrumentation.Common.csproj b/src/Utilities/Instrumentation/Common/BuildXL.Utilities.Instrumentation.Common.csproj index 50aab3e3f..84f9ce8f3 100644 --- a/src/Utilities/Instrumentation/Common/BuildXL.Utilities.Instrumentation.Common.csproj +++ b/src/Utilities/Instrumentation/Common/BuildXL.Utilities.Instrumentation.Common.csproj @@ -1,37 +1,9 @@  - Debug - AnyCPU - {351C38FF-C50C-4A5E-BF31-B0AF4EF04BD0} Library - BuildXL.Utilities.Instrumentation.Common netcoreapp2.0 - true - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(DefineConstants) - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - BuildXL.Utilities.Instrumentation.Common - 7.2 - \ No newline at end of file diff --git a/src/Utilities/Interop/BuildXL.Interop.csproj b/src/Utilities/Interop/BuildXL.Interop.csproj index cfec60b4d..5cf816a42 100644 --- a/src/Utilities/Interop/BuildXL.Interop.csproj +++ b/src/Utilities/Interop/BuildXL.Interop.csproj @@ -1,34 +1,8 @@  - Debug - AnyCPU {896289ED-6FD2-45E4-979C-1195B3C7D0EC} Library - BuildXL.Interop netcoreapp2.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(DefineConstants) - prompt - 4 true - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - BuildXL.Interop - 7.2 - \ No newline at end of file diff --git a/src/Utilities/Native/BuildXL.Native.csproj b/src/Utilities/Native/BuildXL.Native.csproj index 995db2e82..fde7e1d47 100644 --- a/src/Utilities/Native/BuildXL.Native.csproj +++ b/src/Utilities/Native/BuildXL.Native.csproj @@ -1,41 +1,14 @@  - Debug - AnyCPU - {9EA0BD5E-4CAA-4733-9F2D-1C4C66272708} Library - BuildXL.Native netcoreapp2.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(DefineConstants) - prompt - 4 true - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - BuildXL.Native - 7.2 - - + - + diff --git a/src/Utilities/Storage/BuildXL.Storage.csproj b/src/Utilities/Storage/BuildXL.Storage.csproj index b06e075c7..804b7c73b 100644 --- a/src/Utilities/Storage/BuildXL.Storage.csproj +++ b/src/Utilities/Storage/BuildXL.Storage.csproj @@ -1,35 +1,7 @@  - Debug - AnyCPU - {2E2824E0-5941-4FE4-A426-B098C0453441} Library - BuildXL.Storage netcoreapp2.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(DefineConstants) - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - BuildXL.Storage - 7.2 diff --git a/src/Utilities/System.FormattableString/System.FormattableString.csproj b/src/Utilities/System.FormattableString/System.FormattableString.csproj index 81d7b794d..4fa8a805d 100644 --- a/src/Utilities/System.FormattableString/System.FormattableString.csproj +++ b/src/Utilities/System.FormattableString/System.FormattableString.csproj @@ -1,34 +1,6 @@  - Debug - AnyCPU - {1C3A8250-F4A4-4C83-862C-6932841FC296} Library - System.FormattableString netcoreapp2.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(DefineConstants) - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - System.FormattableString - 7.2 \ No newline at end of file diff --git a/src/Utilities/UnitTests/Collections/Test.BuildXL.Utilities.Collections.csproj b/src/Utilities/UnitTests/Collections/Test.BuildXL.Utilities.Collections.csproj index 2b6b8321d..e4f39c755 100644 --- a/src/Utilities/UnitTests/Collections/Test.BuildXL.Utilities.Collections.csproj +++ b/src/Utilities/UnitTests/Collections/Test.BuildXL.Utilities.Collections.csproj @@ -1,42 +1,14 @@  - Debug - AnyCPU - {A77C8163-C3E2-445D-845E-AC0871CCDA57} Library - Test.BuildXL.Utilities.Collections netcoreapp2.0 - true - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(DefineConstants) - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - Test.BuildXL.Utilities.Collections - 7.2 - - - - - all - runtime; build; native; contentfiles; analyzers - + + + + all + runtime; build; native; contentfiles; analyzers + diff --git a/src/Utilities/UnitTests/Executables/DummyWaiter/Test.BuildXL.Executables.DummyWaiter.csproj b/src/Utilities/UnitTests/Executables/DummyWaiter/Test.BuildXL.Executables.DummyWaiter.csproj index 0533724d1..40d078e7d 100644 --- a/src/Utilities/UnitTests/Executables/DummyWaiter/Test.BuildXL.Executables.DummyWaiter.csproj +++ b/src/Utilities/UnitTests/Executables/DummyWaiter/Test.BuildXL.Executables.DummyWaiter.csproj @@ -1,36 +1,6 @@  - Debug - AnyCPU - {81F72C5A-AD34-4B95-8B08-1A277FF33BDD} Exe - Test.BuildXL.Executables.DummyWaiter netcoreapp2.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(DefineConstants) - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - Test.BuildXL.Executables.DummyWaiter - 7.2 - - \ No newline at end of file diff --git a/src/Utilities/UnitTests/Executables/TestProcess/Test.BuildXL.Executables.TestProcess.csproj b/src/Utilities/UnitTests/Executables/TestProcess/Test.BuildXL.Executables.TestProcess.csproj index 97de5aa65..5cb613f39 100644 --- a/src/Utilities/UnitTests/Executables/TestProcess/Test.BuildXL.Executables.TestProcess.csproj +++ b/src/Utilities/UnitTests/Executables/TestProcess/Test.BuildXL.Executables.TestProcess.csproj @@ -1,39 +1,15 @@  - Debug - AnyCPU - {27163FE5-C2C1-41FA-82DF-FAF9374B86C3} Exe - Test.BuildXL.Executables.TestProcess netcoreapp2.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(DefineConstants) - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - Test.BuildXL.Executables.TestProcess - 7.2 - - + + + + + + \ No newline at end of file diff --git a/src/Utilities/UnitTests/Storage.Untracked/Test.BuildXL.Storage.Admin.csproj b/src/Utilities/UnitTests/Storage.Untracked/Test.BuildXL.Storage.Admin.csproj index af8c70ba6..8a764e797 100644 --- a/src/Utilities/UnitTests/Storage.Untracked/Test.BuildXL.Storage.Admin.csproj +++ b/src/Utilities/UnitTests/Storage.Untracked/Test.BuildXL.Storage.Admin.csproj @@ -1,35 +1,7 @@  - Debug - AnyCPU - {BAD900A8-168E-4F53-BD47-8AC2EE4FF2B4} Library - Test.BuildXL.Storage.Admin netcoreapp2.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(DefineConstants) - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - Test.BuildXL.Storage.Admin - 7.2 diff --git a/src/Utilities/UnitTests/Storage/Test.BuildXL.Storage.csproj b/src/Utilities/UnitTests/Storage/Test.BuildXL.Storage.csproj index 95ad2a2bb..08393c36e 100644 --- a/src/Utilities/UnitTests/Storage/Test.BuildXL.Storage.csproj +++ b/src/Utilities/UnitTests/Storage/Test.BuildXL.Storage.csproj @@ -1,36 +1,9 @@  - Debug - AnyCPU - {1C1FD3D4-F352-47C4-9142-2E3BA9631FF4} Library - Test.BuildXL.Storage netcoreapp2.0 - true - - - true - full - false - bin\Debug\ - TRACE;DEBUG;DISABLE_FEATURE_MEMORYMAP_SECURITY;$(DefineConstants) - prompt - 4 true - - pdbonly - true - bin\Release\ - TRACE;DISABLE_FEATURE_MEMORYMAP_SECURITY;$(DefineConstants) - prompt - 4 - true - - - Test.BuildXL.Storage - 7.2 - diff --git a/src/Utilities/UnitTests/TestUtilities.XUnit/Test.BuildXL.TestUtilities.XUnit.csproj b/src/Utilities/UnitTests/TestUtilities.XUnit/Test.BuildXL.TestUtilities.XUnit.csproj index b6c607688..9a922a4a5 100644 --- a/src/Utilities/UnitTests/TestUtilities.XUnit/Test.BuildXL.TestUtilities.XUnit.csproj +++ b/src/Utilities/UnitTests/TestUtilities.XUnit/Test.BuildXL.TestUtilities.XUnit.csproj @@ -1,40 +1,13 @@  - Debug - AnyCPU - {8C9755C1-E51F-49E0-80A8-843CDEAA2C95} Library - Test.BuildXL.TestUtilities.XUnit netcoreapp2.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE;DISABLE_FEATURE_XUNIT_PRETTYSTACKTRACE;$(DefineConstants) - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE;DISABLE_FEATURE_XUNIT_PRETTYSTACKTRACE;$(DefineConstants) - prompt - 4 - true - - - Test.BuildXL.TestUtilities.XUnit - 7.2 - - + + + all runtime; build; native; contentfiles; analyzers diff --git a/src/Utilities/UnitTests/TestUtilities/Test.BuildXL.TestUtilities.csproj b/src/Utilities/UnitTests/TestUtilities/Test.BuildXL.TestUtilities.csproj index 0d1cdc497..3ff99a3e7 100644 --- a/src/Utilities/UnitTests/TestUtilities/Test.BuildXL.TestUtilities.csproj +++ b/src/Utilities/UnitTests/TestUtilities/Test.BuildXL.TestUtilities.csproj @@ -1,35 +1,7 @@  - Debug - AnyCPU - {7D7B0DDE-5375-4241-AA28-39B4483E6616} Library - Test.BuildXL.TestUtilities netcoreapp2.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(DefineConstants) - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - Test.BuildXL.TestUtilities - 7.2 diff --git a/src/Utilities/UnitTests/Utilities/TaskSourceSlimTests.cs b/src/Utilities/UnitTests/Utilities/TaskSourceSlimTests.cs index 86272ba6c..d9ac462dc 100644 --- a/src/Utilities/UnitTests/Utilities/TaskSourceSlimTests.cs +++ b/src/Utilities/UnitTests/Utilities/TaskSourceSlimTests.cs @@ -166,7 +166,7 @@ namespace Test.BuildXL.Utilities await runTask; } - [Fact(Skip = "Ignore this failing test for now, so that we can submit the rest for review")] + [Fact] public void SetResultShouldImmediatelyChangeStateToFinal() { var tcs = TaskSourceSlim.Create(); diff --git a/src/Utilities/UnitTests/Utilities/Test.BuildXL.Utilities.csproj b/src/Utilities/UnitTests/Utilities/Test.BuildXL.Utilities.csproj index 2f891f4c4..766353d4e 100644 --- a/src/Utilities/UnitTests/Utilities/Test.BuildXL.Utilities.csproj +++ b/src/Utilities/UnitTests/Utilities/Test.BuildXL.Utilities.csproj @@ -1,35 +1,7 @@  - Debug - AnyCPU - {D65979AA-696E-4410-AFDC-7F39FD539A43} Library - Test.BuildXL.Utilities netcoreapp2.0 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(DefineConstants) - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - Test.BuildXL.Utilities - 7.2 diff --git a/src/Utilities/Utilities/BuildXL.Utilities.csproj b/src/Utilities/Utilities/BuildXL.Utilities.csproj index 5769adcb6..dfe18d5f5 100644 --- a/src/Utilities/Utilities/BuildXL.Utilities.csproj +++ b/src/Utilities/Utilities/BuildXL.Utilities.csproj @@ -1,49 +1,16 @@  - Debug - AnyCPU - {A14871FC-6EC6-47DE-BA50-6B8755DC41B2} Library - BuildXL.Utilities netcoreapp2.0 - true + true - - - - true - full - false - bin\Debug\ - DEBUG;TRACE;$(DefineConstants) - prompt - 4 - true - - - pdbonly - true - bin\Release\ - TRACE;$(DefineConstants) - prompt - 4 - true - - - BuildXL.Utilities - 7.2 - - - + - - - \ No newline at end of file diff --git a/src/Utilities/Utilities/Tasks/TaskSourceSlim.cs b/src/Utilities/Utilities/Tasks/TaskSourceSlim.cs index e9ce0fa2f..67a209933 100644 --- a/src/Utilities/Utilities/Tasks/TaskSourceSlim.cs +++ b/src/Utilities/Utilities/Tasks/TaskSourceSlim.cs @@ -28,7 +28,6 @@ namespace BuildXL.Utilities.Tasks internal TaskSourceSlim(bool runContinuationsAsynchronously) : this() { -#if NET461Plus TaskCreationOptions flags = runContinuationsAsynchronously ? TaskCreationOptions.RunContinuationsAsynchronously : TaskCreationOptions.None; @@ -36,10 +35,6 @@ namespace BuildXL.Utilities.Tasks // When a task completion source is constructed with RunContinuationsAsynchronously flag, // then it makes no sense to SetResult from a separate thread. m_setResultAsynchonously = false; -#else - m_tcs = new TaskCompletionSource(); - m_setResultAsynchonously = runContinuationsAsynchronously; -#endif } ///