From 8186c59590168507de0ef07d2d7f30bb9874f620 Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Fri, 25 Apr 2025 18:09:19 -0700 Subject: [PATCH 01/17] Move tests and test debuggees to repo root 'tests' directory --- CMakeLists.txt | 1 + THIRD-PARTY-NOTICES.TXT | 2 +- debuggees.sln | 254 ++++++++++++++++-- diagnostics.sln | 209 ++------------ src/SOS/CMakeLists.txt | 7 - .../WebApp3/Properties/launchSettings.json | 29 -- .../Debuggees/Directory.Build.props | 4 - .../DotnetCounters.UnitTests.csproj | 17 -- .../dotnet-trace/DotnetTrace.UnitTests.csproj | 12 - tests/CMakeLists.txt | 8 + .../CommonTestRunner/CommonTestRunner.csproj | 2 +- .../Unix/Debugger.Tests.Config.txt | 0 .../Windows/Debugger.Tests.Config.txt | 0 .../CommonTestRunner/DiagnosticPortsHelper.cs | 0 .../CommonTestRunner/TestRunner.cs | 0 .../CommonTestRunner/TestRunnerUtilities.cs | 0 .../DacCompareNativeTypes.csproj | 0 .../DacCompareNativeTypes/DwarfParse.cs | 0 .../DacCompareNativeTypes/Member.cs | 0 .../DacCompareNativeTypes/PdbParser.cs | 0 .../DacCompareNativeTypes/Program.cs | 0 .../DacCompareNativeTypes/Readme.md | 0 .../DacCompareNativeTypes/Type.cs | 0 .../DacCompareNativeTypes/Whitespace.cs | 0 .../Unix/Debugger.Tests.Config.txt | 2 +- .../Windows/Debugger.Tests.Config.txt | 2 +- .../DbgShim.UnitTests.csproj | 4 +- .../DbgShim.UnitTests/DbgShimAPI.cs | 0 .../DbgShim.UnitTests/DbgShimTests.cs | 0 .../DbgShim.UnitTests/DebuggeeInfo.cs | 0 .../DbgShim.UnitTests/ICLRDebugging.cs | 0 .../DbgShim.UnitTests/ICorDebug.cs | 0 .../DbgShim.UnitTests/ICorDebugController.cs | 0 .../LibraryProviderWrapper.cs | 0 .../ManagedCallbackWrapper.cs | 0 .../Debuggees/Directory.Build.props | 3 +- .../Debuggees/DivZero/DivZero.cs | 0 .../Debuggees/DivZero/DivZero.csproj | 0 .../DotnetDumpCommands.csproj | 0 .../Debuggees/DotnetDumpCommands/Program.cs | 0 .../DynamicMethod/DynamicMethod.csproj | 0 .../Debuggees/DynamicMethod/Program.cs | 0 .../EventPipeTracee/CustomMetrics.cs | 0 .../EventPipeTracee/DuplicateNameMetrics.cs | 0 .../EventPipeTracee/EventPipeTracee.csproj | 2 +- .../Debuggees}/EventPipeTracee/Program.cs | 0 .../ExitCodeTracee/ExitCodeTracee.csproj | 0 .../Debuggees}/ExitCodeTracee/Program.cs | 0 .../Debuggees/GCPOH/GCPOH.cs | 0 .../Debuggees/GCPOH/GCPOH.csproj | 0 .../Debuggees/GCWhere/GCWhere.cs | 0 .../Debuggees/GCWhere/GCWhere.csproj | 0 .../Debuggees/LineNums/LineNums.csproj | 0 .../Debuggees/LineNums/Program.cs | 0 .../NestedExceptionTest.cs | 0 .../NestedExceptionTest.csproj | 0 .../Debuggees/Overflow/Overflow.cs | 0 .../Debuggees/Overflow/Overflow.csproj | 0 .../ReflectionTest/ReflectionTest.cs | 0 .../ReflectionTest/ReflectionTest.csproj | 0 .../SimpleDebuggee/SimpleDebuggee.cs | 0 .../SimpleDebuggee/SimpleDebuggee.csproj | 0 .../runtimeconfig.template.json | 0 .../Debuggees/SimpleThrow/SimpleThrow.cs | 0 .../Debuggees/SimpleThrow/SimpleThrow.csproj | 0 .../Debuggees/SimpleThrow/UserObject.cs | 0 .../Debuggees}/StackTracee/Program.cs | 0 .../Debuggees}/StackTracee/StackTracee.csproj | 0 .../Debuggees/SymbolTestApp/SymbolTestApp.sln | 0 .../SymbolTestApp/SymbolTestApp.cs | 0 .../SymbolTestApp/SymbolTestApp.csproj | 0 .../SymbolTestDll/SymbolTestDll.csproj | 0 .../SymbolTestApp/SymbolTestDll/TestClass.cs | 0 .../RandomUserLibrary.csproj | 0 .../RandomUserLibrary/RandomUserTask.cs | 0 .../TaskNestedException.sln | 0 .../TaskNestedException.cs | 0 .../TaskNestedException.csproj | 0 .../Debuggees}/TestDebuggee/Test.cs | 0 .../TestDebuggee/TestDebuggee.csproj | 0 .../Debuggees}/Tracee/Program.cs | 0 .../Debuggees}/Tracee/Tracee.csproj | 0 .../Debuggees/WebApp3/Program.cs | 0 .../WebApp3/Properties/launchSettings.json | 12 + .../Debuggees/WebApp3/Startup.cs | 0 .../Debuggees/WebApp3/WebApp3.csproj | 0 .../WebApp3/appsettings.Development.json | 0 .../Debuggees/WebApp3/appsettings.json | 0 .../DesktopClrHost/CMakeLists.txt | 3 +- .../DesktopClrHost/DesktopClrHost.cpp | 0 {src/tests => tests}/Directory.Build.props | 6 +- tests/Directory.Build.targets | 27 ++ .../CSVExporterTests.cs | 0 .../ConsoleExporterTests.cs | 0 .../CounterMonitorPayloadTests.cs | 0 .../CounterMonitorTests.cs | 0 .../DotnetCounters.UnitTests.csproj | 17 ++ .../JSONExporterTests.cs | 0 .../DotnetCounters.UnitTests}/MockConsole.cs | 0 .../TestConstants.cs | 0 .../DotnetStack.UnitTests.csproj | 2 +- .../DotnetStack.UnitTests}/StackTests.cs | 0 .../CLRProviderParsing.cs | 0 .../ChildProcessTests.cs | 0 .../DotnetTrace.UnitTests.csproj | 12 + .../ProfileProviderMerging.cs | 0 .../DotnetTrace.UnitTests}/ProviderParsing.cs | 10 +- .../EventPipe.UnitTests}/ContentionEvents.cs | 0 .../EventPipe.UnitTests}/CustomEvents.cs | 0 .../EventPipe.UnitTests.csproj | 2 +- .../EventPipe.UnitTests}/GCEvents.cs | 0 .../EventPipe.UnitTests}/LoaderEvents.cs | 0 .../EventPipe.UnitTests}/MethodEvents.cs | 0 .../EventPipe.UnitTests}/README.md | 0 .../EventPipe.UnitTests}/ThreadPoolEvents.cs | 0 .../common/IpcTraceTest.cs | 0 .../common/RemoteTestExecutorHelper.cs | 0 .../common/StreamProxy.cs | 0 .../EventPipe.UnitTests}/providers.cs | 0 .../EventPipeStress/Common/BurstPattern.cs | 0 .../EventPipeStress/Common/Common.csproj | 0 .../EventPipeStress/Common/Options.cs | 0 .../Orchestrator/CommandLine.cs | 0 .../Orchestrator/Orchestrator.csproj | 0 .../EventPipeStress/Orchestrator/Program.cs | 0 .../Orchestrator/TestResult.cs | 0 .../tests => tests}/EventPipeStress/README.md | 0 .../EventPipeStress/Stress/Program.cs | 0 .../EventPipeStress/Stress/Stress.csproj | 0 {src/tests => tests}/Grape/Grape.csproj | 0 {src/tests => tests}/Grape/Program.cs | 0 {src/tests => tests}/Grape/TestRunner.cs | 0 .../Grape/TraceGeneratorConfiguration.cs | 0 .../TraceGenerators/EtwTraceGenerator.cs | 0 .../EventPipeTraceGenerator.cs | 0 {src/tests => tests}/Grape/config.json | 0 .../ClrmaTests.cs | 0 .../CommandServiceTests.cs | 0 .../Unix/Debugger.Tests.Config.txt | 0 .../Windows/Debugger.Tests.Config.txt | 0 .../DebugServicesTests.cs | 0 ...Diagnostics.DebugServices.UnitTests.csproj | 8 +- .../RunTests.cs | 0 .../ServiceEventTests.cs | 0 .../SymbolServiceTests.cs | 0 .../TestCommands.cs | 0 .../TestDbgEng.cs | 0 .../WriteTestData.cs | 0 .../AspNetTriggerUnitTests.cs | 0 .../DistributedTracesPipelineUnitTests.cs | 0 .../EventCounterConstants.cs | 0 .../EventCounterPipelineUnitTests.cs | 0 .../EventCounterTriggerTests.cs | 0 .../EventLogsPipelineUnitTests.cs | 16 +- .../EventTracePipelineUnitTests.cs | 0 .../GlobMatcherTests.cs | 0 .../LogsPipelineUnitTests.cs | 0 ...tics.Monitoring.EventPipe.UnitTests.csproj | 4 +- .../PipelineTestUtilities.cs | 0 .../SlidingWindowTests.cs | 0 .../TestStreamingLogger.cs | 0 ...ft.Diagnostics.Monitoring.UnitTests.csproj | 6 +- .../PipelineTests.cs | 0 .../DiagnosticsClientApiShim.cs | 0 .../DiagnosticsClientApiShimExtensions.cs | 0 .../EventPipeProviderTests.cs | 0 .../EventPipeSessionTests.cs | 0 .../GetProcessEnvironmentTests.cs | 0 .../GetProcessInfoTests.cs | 0 .../GetPublishedProcessesTests.cs | 0 .../HandleableCollectionTests.cs | 0 ...iagnostics.NETCore.Client.UnitTests.csproj | 4 +- .../PerfMapTests.cs | 0 .../ReversedServerTests.cs | 0 .../AcquireDotNetTestStep.cs | 0 .../AssertX.cs | 0 .../BaseDebuggeeCompiler.cs | 0 .../CliDebuggeeCompiler.cs | 0 .../ConsoleTestOutputHelper.cs | 0 .../CsprojBuildDebuggeeTestStep.cs | 0 .../DebuggeeCompiler.cs | 0 .../DotNetBuildDebuggeeTestStep.cs | 0 .../FileTestOutputHelper.cs | 0 .../IProcessLogger.cs | 0 .../IndentedTestOutputHelper.cs | 0 .../LoggingListener.cs | 0 .../Microsoft.Diagnostics.TestHelpers.csproj | 4 +- .../MultiplexTestOutputHelper.cs | 0 .../PrebuiltDebuggeeCompiler.cs | 0 .../ProcessRunner.cs | 0 .../RemoteExecutorHelper.cs | 0 .../SdkPrebuiltDebuggeeCompiler.cs | 0 .../TestConfiguration.cs | 0 .../TestHost/TestDataReader.cs | 0 .../TestHost/TestDataWriter.cs | 0 .../TestHost/TestDump.cs | 0 .../TestHost/TestHost.cs | 0 .../TestOutputProcessLogger.cs | 0 .../TestRunner.cs | 0 .../TestStep.cs | 0 .../Xunit.Extensions/SkipTestException.cs | 0 .../SkippableFactAttribute.cs | 0 .../SkippableFactDiscoverer.cs | 0 .../SkippableFactMessageBus.cs | 0 .../Xunit.Extensions/SkippableFactTestCase.cs | 0 .../SkippableTheoryAttribute.cs | 0 .../SkippableTheoryDiscoverer.cs | 0 .../SkippableTheoryTestCase.cs | 0 .../AddressSpace.cs | 0 .../ELF/Tests.cs | 0 .../Layouts.cs | 0 .../MachO/Tests.cs | 0 .../Microsoft.FileFormats.UnitTests.csproj | 16 +- .../Minidump/Tests.cs | 0 .../PDB/Tests.cs | 0 .../PE/Tests.cs | 0 .../PerfMap/Tests.cs | 0 .../PrimitiveTypes.cs | 0 .../TestBinaries/HelloWorld.exe | Bin .../TestBinaries/HelloWorld.pdb | Bin .../TestBinaries/HelloWorld.pdz | Bin .../System.ComponentModel.EventBasedAsync.dll | Bin ...m.ComponentModel.EventBasedAsync.ni.r2rmap | 0 .../System.Diagnostics.StackTrace.dll | Bin .../TestBinaries/apphost.gz | Bin .../TestBinaries/core.gz | Bin .../TestBinaries/ilasm.dbg | Bin .../TestBinaries/libclrjit.dylib.dwarf.gz | Bin .../TestBinaries/libcoreclr.dylib.gz | Bin .../TestBinaries/libcoreclr.so.gz | Bin .../libcoreclrtraceptprovider.so.dbg.gz | Bin .../TestBinaries/minidump_x64.dmp.gz | Bin .../TestBinaries/minidump_x86.dmp.gz | Bin .../TestBinaries/renamed_build_id_section | Bin .../TestBinaries/triagedump.gz | Bin .../KeyGeneratorTests.cs | 0 .../Microsoft.SymbolStore.UnitTests.csproj | 16 +- .../PEFileKeyGenerationTests.cs | 0 .../SymbolStoreTests.cs | 0 .../StackTraceSymbols.CoreCLR.cs.gz | Bin .../TestBinaries/coreclr.dll.gz | Bin .../dir1/System.Threading.Thread.dll | Bin .../dir1/System.Threading.Thread.pdb | Bin .../dir2/System.Threading.Thread.dll | Bin .../dir2/System.Threading.Thread.pdb | Bin ...ecurity.Cryptography.Native.Apple.dylib.gz | Bin .../TestBinaries/md5_build_id | Bin .../TestBinaries/mockclr_amd64.dll | Bin .../TestBinaries/mockclr_arm64.dll | Bin .../TestBinaries/mockclr_i386.dll | Bin .../TestBinaries/mockdac.dll | Bin .../TestBinaries/mockdbi.dll | Bin .../TestBinaries/mocksos.dll | Bin .../TestBinaries/stripped_executable | Bin .../TestBinaries/symbolized_executable | Bin .../Microsoft.SymbolStore.UnitTests/Tracer.cs | 0 .../Unix/Debugger.Tests.Config.txt | 4 +- .../Windows/Debugger.Tests.Config.txt | 4 +- .../SOS.UnitTests/DumpGenerationFixture.cs | 0 .../SOS.UnitTests/SOS.UnitTests.csproj | 4 +- {src/SOS => tests}/SOS.UnitTests/SOS.cs | 2 +- {src/SOS => tests}/SOS.UnitTests/SOSRunner.cs | 0 .../Scripts/ConcurrentDictionaries.script | 0 .../SOS.UnitTests/Scripts/DivZero.script | 0 .../SOS.UnitTests/Scripts/DualRuntimes.script | 0 .../SOS.UnitTests/Scripts/DumpGen.script | 0 .../Scripts/DynamicMethod.script | 0 .../SOS.UnitTests/Scripts/GCPOH.script | 0 .../SOS.UnitTests/Scripts/GCTests.script | 0 .../SOS.UnitTests/Scripts/LineNums.script | 0 .../Scripts/NestedExceptionTest.script | 0 .../Scripts/OtherCommands.script | 0 .../SOS.UnitTests/Scripts/Overflow.script | 0 .../SOS.UnitTests/Scripts/Reflection.script | 0 .../SOS.UnitTests/Scripts/SimpleThrow.script | 0 .../Scripts/StackAndOtherTests.script | 0 .../SOS.UnitTests/Scripts/StackTests.script | 0 .../StackTraceFaultingExceptionFrame.script | 0 .../StackTraceSoftwareExceptionFrame.script | 0 .../Scripts/TaskNestedException.script | 0 .../Scripts/TestExtensions.script | 0 .../SOS.UnitTests/Scripts/WebApp.script | 0 .../SOS.UnitTests/Scripts/lldbhelper.py | 0 .../TestExtension/TestCommands.cs | 0 .../TestExtension/TestExtension.csproj | 2 +- .../TestHelpers/MaxStreamReadHelper.cs | 0 .../TestHelpers/TestHelpers.cs | 0 .../TestHelpers/TestHelpers.csproj | 2 +- {src/tests => tests}/benchmarks/.gitignore | 0 {src/tests => tests}/benchmarks/Program.cs | 0 {src/tests => tests}/benchmarks/README.md | 0 .../benchmarks/RunBenchmarks.cmd | 0 .../benchmarks/RunBenchmarks.sh | 0 .../benchmarks/benchmarks.csproj | 0 {src/SOS => tests}/lldbplugin.tests/README.md | 0 .../lldbplugin.tests/t_cmd_bpmd_clear.py | 0 .../lldbplugin.tests/t_cmd_bpmd_clearall.py | 0 .../lldbplugin.tests/t_cmd_bpmd_methoddesc.py | 0 .../t_cmd_bpmd_module_function.py | 0 .../t_cmd_bpmd_module_function_iloffset.py | 0 ...cmd_bpmd_nofuturemodule_module_function.py | 0 .../lldbplugin.tests/t_cmd_clrstack.py | 0 .../lldbplugin.tests/t_cmd_clrthreads.py | 0 .../lldbplugin.tests/t_cmd_clru.py | 0 .../lldbplugin.tests/t_cmd_dso.py | 0 .../lldbplugin.tests/t_cmd_dumpclass.py | 0 .../lldbplugin.tests/t_cmd_dumpheap.py | 0 .../lldbplugin.tests/t_cmd_dumpil.py | 0 .../lldbplugin.tests/t_cmd_dumplog.py | 0 .../lldbplugin.tests/t_cmd_dumpmd.py | 0 .../lldbplugin.tests/t_cmd_dumpmodule.py | 0 .../lldbplugin.tests/t_cmd_dumpmt.py | 0 .../lldbplugin.tests/t_cmd_dumpobj.py | 0 .../lldbplugin.tests/t_cmd_dumpstack.py | 0 .../lldbplugin.tests/t_cmd_eeheap.py | 0 .../lldbplugin.tests/t_cmd_eestack.py | 0 .../lldbplugin.tests/t_cmd_gcroot.py | 0 .../lldbplugin.tests/t_cmd_histclear.py | 0 .../lldbplugin.tests/t_cmd_histinit.py | 0 .../lldbplugin.tests/t_cmd_histobj.py | 0 .../lldbplugin.tests/t_cmd_histobjfind.py | 0 .../lldbplugin.tests/t_cmd_histroot.py | 0 .../lldbplugin.tests/t_cmd_ip2md.py | 0 .../lldbplugin.tests/t_cmd_name2ee.py | 0 .../lldbplugin.tests/t_cmd_pe.py | 0 .../lldbplugin.tests/t_cmd_sos.py | 0 .../lldbplugin.tests/t_cmd_soshelp.py | 0 .../lldbplugin.tests/test_libsosplugin.py | 0 .../SOS => tests}/lldbplugin.tests/testsos.sh | 0 .../lldbplugin.tests/testutils.py | 0 {src/SOS => tests}/runcommand/CMakeLists.txt | 1 - {src/SOS => tests}/runcommand/runcommand.cpp | 0 332 files changed, 400 insertions(+), 342 deletions(-) delete mode 100644 src/SOS/SOS.UnitTests/Debuggees/WebApp3/Properties/launchSettings.json delete mode 100644 src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props delete mode 100644 src/tests/dotnet-counters/DotnetCounters.UnitTests.csproj delete mode 100644 src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj create mode 100644 tests/CMakeLists.txt rename {src/tests => tests}/CommonTestRunner/CommonTestRunner.csproj (93%) rename {src/tests => tests}/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt (100%) rename {src/tests => tests}/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt (100%) rename {src/tests => tests}/CommonTestRunner/DiagnosticPortsHelper.cs (100%) rename {src/tests => tests}/CommonTestRunner/TestRunner.cs (100%) rename {src/tests => tests}/CommonTestRunner/TestRunnerUtilities.cs (100%) rename {src/tests => tests}/DacCompareNativeTypes/DacCompareNativeTypes.csproj (100%) rename {src/tests => tests}/DacCompareNativeTypes/DwarfParse.cs (100%) rename {src/tests => tests}/DacCompareNativeTypes/Member.cs (100%) rename {src/tests => tests}/DacCompareNativeTypes/PdbParser.cs (100%) rename {src/tests => tests}/DacCompareNativeTypes/Program.cs (100%) rename {src/tests => tests}/DacCompareNativeTypes/Readme.md (100%) rename {src/tests => tests}/DacCompareNativeTypes/Type.cs (100%) rename {src/tests => tests}/DacCompareNativeTypes/Whitespace.cs (100%) rename {src/tests => tests}/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt (98%) rename {src/tests => tests}/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt (98%) rename {src/tests => tests}/DbgShim.UnitTests/DbgShim.UnitTests.csproj (95%) rename {src/tests => tests}/DbgShim.UnitTests/DbgShimAPI.cs (100%) rename {src/tests => tests}/DbgShim.UnitTests/DbgShimTests.cs (100%) rename {src/tests => tests}/DbgShim.UnitTests/DebuggeeInfo.cs (100%) rename {src/tests => tests}/DbgShim.UnitTests/ICLRDebugging.cs (100%) rename {src/tests => tests}/DbgShim.UnitTests/ICorDebug.cs (100%) rename {src/tests => tests}/DbgShim.UnitTests/ICorDebugController.cs (100%) rename {src/tests => tests}/DbgShim.UnitTests/LibraryProviderWrapper.cs (100%) rename {src/tests => tests}/DbgShim.UnitTests/ManagedCallbackWrapper.cs (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/Directory.Build.props (74%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/DivZero/DivZero.cs (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/DivZero/DivZero.csproj (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/DotnetDumpCommands/Program.cs (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/DynamicMethod/DynamicMethod.csproj (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/DynamicMethod/Program.cs (100%) rename {src/tests => tests/Debuggees}/EventPipeTracee/CustomMetrics.cs (100%) rename {src/tests => tests/Debuggees}/EventPipeTracee/DuplicateNameMetrics.cs (100%) rename {src/tests => tests/Debuggees}/EventPipeTracee/EventPipeTracee.csproj (81%) rename {src/tests => tests/Debuggees}/EventPipeTracee/Program.cs (100%) rename {src/tests => tests/Debuggees}/ExitCodeTracee/ExitCodeTracee.csproj (100%) rename {src/tests => tests/Debuggees}/ExitCodeTracee/Program.cs (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/GCPOH/GCPOH.cs (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/GCPOH/GCPOH.csproj (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/GCWhere/GCWhere.cs (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/GCWhere/GCWhere.csproj (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/LineNums/LineNums.csproj (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/LineNums/Program.cs (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/NestedExceptionTest/NestedExceptionTest.cs (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/Overflow/Overflow.cs (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/Overflow/Overflow.csproj (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/ReflectionTest/ReflectionTest.cs (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/ReflectionTest/ReflectionTest.csproj (100%) rename {src/tests/DbgShim.UnitTests => tests}/Debuggees/SimpleDebuggee/SimpleDebuggee.cs (100%) rename {src/tests/DbgShim.UnitTests => tests}/Debuggees/SimpleDebuggee/SimpleDebuggee.csproj (100%) rename {src/tests/DbgShim.UnitTests => tests}/Debuggees/SimpleDebuggee/runtimeconfig.template.json (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/SimpleThrow/SimpleThrow.cs (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/SimpleThrow/SimpleThrow.csproj (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/SimpleThrow/UserObject.cs (100%) rename {src/tests => tests/Debuggees}/StackTracee/Program.cs (100%) rename {src/tests => tests/Debuggees}/StackTracee/StackTracee.csproj (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/SymbolTestApp/SymbolTestApp.sln (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.cs (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/SymbolTestApp/SymbolTestDll/TestClass.cs (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserTask.cs (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/TaskNestedException/TaskNestedException.sln (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.cs (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj (100%) rename {src/SOS/lldbplugin.tests => tests/Debuggees}/TestDebuggee/Test.cs (100%) rename {src/SOS/lldbplugin.tests => tests/Debuggees}/TestDebuggee/TestDebuggee.csproj (100%) rename {src/tests => tests/Debuggees}/Tracee/Program.cs (100%) rename {src/tests => tests/Debuggees}/Tracee/Tracee.csproj (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/WebApp3/Program.cs (100%) create mode 100644 tests/Debuggees/WebApp3/Properties/launchSettings.json rename {src/SOS/SOS.UnitTests => tests}/Debuggees/WebApp3/Startup.cs (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/WebApp3/WebApp3.csproj (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/WebApp3/appsettings.Development.json (100%) rename {src/SOS/SOS.UnitTests => tests}/Debuggees/WebApp3/appsettings.json (100%) rename {src/SOS/SOS.UnitTests/Debuggees => tests}/DesktopClrHost/CMakeLists.txt (93%) rename {src/SOS/SOS.UnitTests/Debuggees => tests}/DesktopClrHost/DesktopClrHost.cpp (100%) rename {src/tests => tests}/Directory.Build.props (56%) create mode 100644 tests/Directory.Build.targets rename {src/tests/dotnet-counters => tests/DotnetCounters.UnitTests}/CSVExporterTests.cs (100%) rename {src/tests/dotnet-counters => tests/DotnetCounters.UnitTests}/ConsoleExporterTests.cs (100%) rename {src/tests/dotnet-counters => tests/DotnetCounters.UnitTests}/CounterMonitorPayloadTests.cs (100%) rename {src/tests/dotnet-counters => tests/DotnetCounters.UnitTests}/CounterMonitorTests.cs (100%) create mode 100644 tests/DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj rename {src/tests/dotnet-counters => tests/DotnetCounters.UnitTests}/JSONExporterTests.cs (100%) rename {src/tests/dotnet-counters => tests/DotnetCounters.UnitTests}/MockConsole.cs (100%) rename {src/tests/dotnet-counters => tests/DotnetCounters.UnitTests}/TestConstants.cs (100%) rename {src/tests/dotnet-stack => tests/DotnetStack.UnitTests}/DotnetStack.UnitTests.csproj (88%) rename {src/tests/dotnet-stack => tests/DotnetStack.UnitTests}/StackTests.cs (100%) rename {src/tests/dotnet-trace => tests/DotnetTrace.UnitTests}/CLRProviderParsing.cs (100%) rename {src/tests/dotnet-trace => tests/DotnetTrace.UnitTests}/ChildProcessTests.cs (100%) create mode 100644 tests/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj rename {src/tests/dotnet-trace => tests/DotnetTrace.UnitTests}/ProfileProviderMerging.cs (100%) rename {src/tests/dotnet-trace => tests/DotnetTrace.UnitTests}/ProviderParsing.cs (98%) rename {src/tests/eventpipe => tests/EventPipe.UnitTests}/ContentionEvents.cs (100%) rename {src/tests/eventpipe => tests/EventPipe.UnitTests}/CustomEvents.cs (100%) rename {src/tests/eventpipe => tests/EventPipe.UnitTests}/EventPipe.UnitTests.csproj (87%) rename {src/tests/eventpipe => tests/EventPipe.UnitTests}/GCEvents.cs (100%) rename {src/tests/eventpipe => tests/EventPipe.UnitTests}/LoaderEvents.cs (100%) rename {src/tests/eventpipe => tests/EventPipe.UnitTests}/MethodEvents.cs (100%) rename {src/tests/eventpipe => tests/EventPipe.UnitTests}/README.md (100%) rename {src/tests/eventpipe => tests/EventPipe.UnitTests}/ThreadPoolEvents.cs (100%) rename {src/tests/eventpipe => tests/EventPipe.UnitTests}/common/IpcTraceTest.cs (100%) rename {src/tests/eventpipe => tests/EventPipe.UnitTests}/common/RemoteTestExecutorHelper.cs (100%) rename {src/tests/eventpipe => tests/EventPipe.UnitTests}/common/StreamProxy.cs (100%) rename {src/tests/eventpipe => tests/EventPipe.UnitTests}/providers.cs (100%) rename {src/tests => tests}/EventPipeStress/Common/BurstPattern.cs (100%) rename {src/tests => tests}/EventPipeStress/Common/Common.csproj (100%) rename {src/tests => tests}/EventPipeStress/Common/Options.cs (100%) rename {src/tests => tests}/EventPipeStress/Orchestrator/CommandLine.cs (100%) rename {src/tests => tests}/EventPipeStress/Orchestrator/Orchestrator.csproj (100%) rename {src/tests => tests}/EventPipeStress/Orchestrator/Program.cs (100%) rename {src/tests => tests}/EventPipeStress/Orchestrator/TestResult.cs (100%) rename {src/tests => tests}/EventPipeStress/README.md (100%) rename {src/tests => tests}/EventPipeStress/Stress/Program.cs (100%) rename {src/tests => tests}/EventPipeStress/Stress/Stress.csproj (100%) rename {src/tests => tests}/Grape/Grape.csproj (100%) rename {src/tests => tests}/Grape/Program.cs (100%) rename {src/tests => tests}/Grape/TestRunner.cs (100%) rename {src/tests => tests}/Grape/TraceGeneratorConfiguration.cs (100%) rename {src/tests => tests}/Grape/TraceGenerators/EtwTraceGenerator.cs (100%) rename {src/tests => tests}/Grape/TraceGenerators/EventPipeTraceGenerator.cs (100%) rename {src/tests => tests}/Grape/config.json (100%) rename {src/tests => tests}/Microsoft.Diagnostics.DebugServices.UnitTests/ClrmaTests.cs (100%) rename {src/tests => tests}/Microsoft.Diagnostics.DebugServices.UnitTests/CommandServiceTests.cs (100%) rename {src/tests => tests}/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt (100%) rename {src/tests => tests}/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt (100%) rename {src/tests => tests}/Microsoft.Diagnostics.DebugServices.UnitTests/DebugServicesTests.cs (100%) rename {src/tests => tests}/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj (91%) rename {src/tests => tests}/Microsoft.Diagnostics.DebugServices.UnitTests/RunTests.cs (100%) rename {src/tests => tests}/Microsoft.Diagnostics.DebugServices.UnitTests/ServiceEventTests.cs (100%) rename {src/tests => tests}/Microsoft.Diagnostics.DebugServices.UnitTests/SymbolServiceTests.cs (100%) rename {src/tests => tests}/Microsoft.Diagnostics.DebugServices.UnitTests/TestCommands.cs (100%) rename {src/tests => tests}/Microsoft.Diagnostics.DebugServices.UnitTests/TestDbgEng.cs (100%) rename {src/tests => tests}/Microsoft.Diagnostics.DebugServices.UnitTests/WriteTestData.cs (100%) rename {src/tests/Microsoft.Diagnostics.Monitoring.EventPipe => tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests}/AspNetTriggerUnitTests.cs (100%) rename {src/tests/Microsoft.Diagnostics.Monitoring.EventPipe => tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests}/DistributedTracesPipelineUnitTests.cs (100%) rename {src/tests/Microsoft.Diagnostics.Monitoring.EventPipe => tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests}/EventCounterConstants.cs (100%) rename {src/tests/Microsoft.Diagnostics.Monitoring.EventPipe => tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests}/EventCounterPipelineUnitTests.cs (100%) rename {src/tests/Microsoft.Diagnostics.Monitoring.EventPipe => tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests}/EventCounterTriggerTests.cs (100%) rename {src/tests/Microsoft.Diagnostics.Monitoring.EventPipe => tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests}/EventLogsPipelineUnitTests.cs (97%) rename {src/tests/Microsoft.Diagnostics.Monitoring.EventPipe => tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests}/EventTracePipelineUnitTests.cs (100%) rename {src/tests/Microsoft.Diagnostics.Monitoring.EventPipe => tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests}/GlobMatcherTests.cs (100%) rename {src/tests/Microsoft.Diagnostics.Monitoring.EventPipe => tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests}/LogsPipelineUnitTests.cs (100%) rename {src/tests/Microsoft.Diagnostics.Monitoring.EventPipe => tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests}/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj (78%) rename {src/tests/Microsoft.Diagnostics.Monitoring.EventPipe => tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests}/PipelineTestUtilities.cs (100%) rename {src/tests/Microsoft.Diagnostics.Monitoring.EventPipe => tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests}/SlidingWindowTests.cs (100%) rename {src/tests/Microsoft.Diagnostics.Monitoring.EventPipe => tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests}/TestStreamingLogger.cs (100%) rename {src/tests/Microsoft.Diagnostics.Monitoring => tests/Microsoft.Diagnostics.Monitoring.UnitTests}/Microsoft.Diagnostics.Monitoring.UnitTests.csproj (65%) rename {src/tests/Microsoft.Diagnostics.Monitoring => tests/Microsoft.Diagnostics.Monitoring.UnitTests}/PipelineTests.cs (100%) rename {src/tests/Microsoft.Diagnostics.NETCore.Client => tests/Microsoft.Diagnostics.NETCore.Client.UnitTests}/DiagnosticsClientApiShim.cs (100%) rename {src/tests/Microsoft.Diagnostics.NETCore.Client => tests/Microsoft.Diagnostics.NETCore.Client.UnitTests}/DiagnosticsClientApiShimExtensions.cs (100%) rename {src/tests/Microsoft.Diagnostics.NETCore.Client => tests/Microsoft.Diagnostics.NETCore.Client.UnitTests}/EventPipeProviderTests.cs (100%) rename {src/tests/Microsoft.Diagnostics.NETCore.Client => tests/Microsoft.Diagnostics.NETCore.Client.UnitTests}/EventPipeSessionTests.cs (100%) rename {src/tests/Microsoft.Diagnostics.NETCore.Client => tests/Microsoft.Diagnostics.NETCore.Client.UnitTests}/GetProcessEnvironmentTests.cs (100%) rename {src/tests/Microsoft.Diagnostics.NETCore.Client => tests/Microsoft.Diagnostics.NETCore.Client.UnitTests}/GetProcessInfoTests.cs (100%) rename {src/tests/Microsoft.Diagnostics.NETCore.Client => tests/Microsoft.Diagnostics.NETCore.Client.UnitTests}/GetPublishedProcessesTests.cs (100%) rename {src/tests/Microsoft.Diagnostics.NETCore.Client => tests/Microsoft.Diagnostics.NETCore.Client.UnitTests}/HandleableCollectionTests.cs (100%) rename {src/tests/Microsoft.Diagnostics.NETCore.Client => tests/Microsoft.Diagnostics.NETCore.Client.UnitTests}/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj (69%) rename {src/tests/Microsoft.Diagnostics.NETCore.Client => tests/Microsoft.Diagnostics.NETCore.Client.UnitTests}/PerfMapTests.cs (100%) rename {src/tests/Microsoft.Diagnostics.NETCore.Client => tests/Microsoft.Diagnostics.NETCore.Client.UnitTests}/ReversedServerTests.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/AcquireDotNetTestStep.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/AssertX.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/BaseDebuggeeCompiler.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/ConsoleTestOutputHelper.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/CsprojBuildDebuggeeTestStep.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/DebuggeeCompiler.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/DotNetBuildDebuggeeTestStep.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/FileTestOutputHelper.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/IProcessLogger.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/IndentedTestOutputHelper.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/LoggingListener.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj (72%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/MultiplexTestOutputHelper.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/PrebuiltDebuggeeCompiler.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/ProcessRunner.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/RemoteExecutorHelper.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/SdkPrebuiltDebuggeeCompiler.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataReader.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataWriter.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/TestHost/TestDump.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/TestHost/TestHost.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/TestOutputProcessLogger.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/TestRunner.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/TestStep.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkipTestException.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactAttribute.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactDiscoverer.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactMessageBus.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactTestCase.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryAttribute.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryDiscoverer.cs (100%) rename {src => tests}/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryTestCase.cs (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/AddressSpace.cs (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/ELF/Tests.cs (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/Layouts.cs (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/MachO/Tests.cs (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj (95%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/Minidump/Tests.cs (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/PDB/Tests.cs (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/PE/Tests.cs (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/PerfMap/Tests.cs (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/PrimitiveTypes.cs (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.exe (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdb (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdz (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.ni.r2rmap (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/TestBinaries/System.Diagnostics.StackTrace.dll (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/TestBinaries/apphost.gz (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/TestBinaries/core.gz (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/TestBinaries/ilasm.dbg (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/TestBinaries/libclrjit.dylib.dwarf.gz (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.dylib.gz (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.so.gz (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x64.dmp.gz (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x86.dmp.gz (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/TestBinaries/renamed_build_id_section (100%) rename {src/tests => tests}/Microsoft.FileFormats.UnitTests/TestBinaries/triagedump.gz (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/KeyGeneratorTests.cs (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj (97%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/PEFileKeyGenerationTests.cs (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/coreclr.dll.gz (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.dll (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.dll (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.pdb (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/libSystem.Security.Cryptography.Native.Apple.dylib.gz (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/md5_build_id (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_amd64.dll (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_arm64.dll (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_i386.dll (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdac.dll (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdbi.dll (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/mocksos.dll (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/stripped_executable (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/symbolized_executable (100%) rename {src/tests => tests}/Microsoft.SymbolStore.UnitTests/Tracer.cs (100%) rename {src/SOS => tests}/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt (98%) rename {src/SOS => tests}/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt (98%) rename {src/SOS => tests}/SOS.UnitTests/DumpGenerationFixture.cs (100%) rename {src/SOS => tests}/SOS.UnitTests/SOS.UnitTests.csproj (90%) rename {src/SOS => tests}/SOS.UnitTests/SOS.cs (99%) rename {src/SOS => tests}/SOS.UnitTests/SOSRunner.cs (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/ConcurrentDictionaries.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/DivZero.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/DualRuntimes.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/DumpGen.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/DynamicMethod.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/GCPOH.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/GCTests.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/LineNums.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/NestedExceptionTest.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/OtherCommands.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/Overflow.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/Reflection.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/SimpleThrow.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/StackAndOtherTests.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/StackTests.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/StackTraceFaultingExceptionFrame.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/StackTraceSoftwareExceptionFrame.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/TaskNestedException.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/TestExtensions.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/WebApp.script (100%) rename {src/SOS => tests}/SOS.UnitTests/Scripts/lldbhelper.py (100%) rename {src/tests => tests}/TestExtension/TestCommands.cs (100%) rename {src/tests => tests}/TestExtension/TestExtension.csproj (72%) rename {src/tests => tests}/TestHelpers/MaxStreamReadHelper.cs (100%) rename {src/tests => tests}/TestHelpers/TestHelpers.cs (100%) rename {src/tests => tests}/TestHelpers/TestHelpers.csproj (81%) rename {src/tests => tests}/benchmarks/.gitignore (100%) rename {src/tests => tests}/benchmarks/Program.cs (100%) rename {src/tests => tests}/benchmarks/README.md (100%) rename {src/tests => tests}/benchmarks/RunBenchmarks.cmd (100%) rename {src/tests => tests}/benchmarks/RunBenchmarks.sh (100%) mode change 100755 => 100644 rename {src/tests => tests}/benchmarks/benchmarks.csproj (100%) rename {src/SOS => tests}/lldbplugin.tests/README.md (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_bpmd_clear.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_bpmd_clearall.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_bpmd_methoddesc.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_bpmd_module_function.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_bpmd_module_function_iloffset.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_bpmd_nofuturemodule_module_function.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_clrstack.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_clrthreads.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_clru.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_dso.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_dumpclass.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_dumpheap.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_dumpil.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_dumplog.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_dumpmd.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_dumpmodule.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_dumpmt.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_dumpobj.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_dumpstack.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_eeheap.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_eestack.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_gcroot.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_histclear.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_histinit.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_histobj.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_histobjfind.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_histroot.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_ip2md.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_name2ee.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_pe.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_sos.py (100%) rename {src/SOS => tests}/lldbplugin.tests/t_cmd_soshelp.py (100%) rename {src/SOS => tests}/lldbplugin.tests/test_libsosplugin.py (100%) rename {src/SOS => tests}/lldbplugin.tests/testsos.sh (100%) mode change 100755 => 100644 rename {src/SOS => tests}/lldbplugin.tests/testutils.py (100%) rename {src/SOS => tests}/runcommand/CMakeLists.txt (96%) rename {src/SOS => tests}/runcommand/runcommand.cpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fd7f9370f..17fe3d0043 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -195,3 +195,4 @@ endif(CLR_CMAKE_HOST_UNIX) # Native Projects #----------------------------------------- add_subdirectory(src) +add_subdirectory(tests) diff --git a/THIRD-PARTY-NOTICES.TXT b/THIRD-PARTY-NOTICES.TXT index 835970834c..577620edc5 100644 --- a/THIRD-PARTY-NOTICES.TXT +++ b/THIRD-PARTY-NOTICES.TXT @@ -278,7 +278,7 @@ SOFTWARE. ------------------------------------------------- -Source in src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/* is largely derived from source +Source in tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/* is largely derived from source source found at https://github.com/xunit/samples.xunit. This set of code is covered by the following license: diff --git a/debuggees.sln b/debuggees.sln index 8786ab4f78..8a1c545b2b 100644 --- a/debuggees.sln +++ b/debuggees.sln @@ -3,43 +3,51 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.12.35309.182 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestDebuggee", "src\SOS\lldbplugin.tests\TestDebuggee\TestDebuggee.csproj", "{6C43BE85-F8C3-4D76-8050-F25CE953A7FD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestDebuggee", "tests\Debuggees\TestDebuggee\TestDebuggee.csproj", "{6C43BE85-F8C3-4D76-8050-F25CE953A7FD}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SOS", "SOS", "{41638A4C-0DAF-47ED-A774-ECBBAC0315D7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{19FAB78C-3351-4911-8F0C-8C6056401740}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{19FAB78C-3351-4911-8F0C-8C6056401740}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Debuggees", "Debuggees", "{C3072949-6D24-451B-A308-2F3621F858B0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApp3", "src\SOS\SOS.UnitTests\Debuggees\WebApp3\WebApp3.csproj", "{252E5845-8D4C-4306-9D8F-ED2E2F7005F6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApp3", "tests\Debuggees\WebApp3\WebApp3.csproj", "{252E5845-8D4C-4306-9D8F-ED2E2F7005F6}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleThrow", "tests\Debuggees\SimpleThrow\SimpleThrow.csproj", "{179EF543-E30A-4428-ABA0-2E2621860173}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DivZero", "tests\Debuggees\DivZero\DivZero.csproj", "{447AC053-2E0A-4119-BD11-30A4A8E3F765}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GCWhere", "tests\Debuggees\GCWhere\GCWhere.csproj", "{664F46A9-3C99-489B-AAB9-4CD3A430C425}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NestedExceptionTest", "tests\Debuggees\NestedExceptionTest\NestedExceptionTest.csproj", "{0CB805C8-0B76-4B1D-8AAF-48535B180448}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Overflow", "tests\Debuggees\Overflow\Overflow.csproj", "{20251748-AA7B-45BE-ADAA-C9375F5CC80F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleThrow", "src\SOS\SOS.UnitTests\Debuggees\SimpleThrow\SimpleThrow.csproj", "{179EF543-E30A-4428-ABA0-2E2621860173}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReflectionTest", "tests\Debuggees\ReflectionTest\ReflectionTest.csproj", "{DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DivZero", "src\SOS\SOS.UnitTests\Debuggees\DivZero\DivZero.csproj", "{447AC053-2E0A-4119-BD11-30A4A8E3F765}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaskNestedException", "tests\Debuggees\TaskNestedException\TaskNestedException\TaskNestedException.csproj", "{73EA5188-1E4F-42D8-B63E-F1B878A4EB63}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GCWhere", "src\SOS\SOS.UnitTests\Debuggees\GCWhere\GCWhere.csproj", "{664F46A9-3C99-489B-AAB9-4CD3A430C425}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RandomUserLibrary", "tests\Debuggees\TaskNestedException\RandomUserLibrary\RandomUserLibrary.csproj", "{B50D14DB-8EE5-47BD-B412-62FA5C693CC7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NestedExceptionTest", "src\SOS\SOS.UnitTests\Debuggees\NestedExceptionTest\NestedExceptionTest.csproj", "{0CB805C8-0B76-4B1D-8AAF-48535B180448}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SymbolTestApp", "tests\Debuggees\SymbolTestApp\SymbolTestApp\SymbolTestApp.csproj", "{112FE2A7-3FD2-4496-8A14-171898AD5CF5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Overflow", "src\SOS\SOS.UnitTests\Debuggees\Overflow\Overflow.csproj", "{20251748-AA7B-45BE-ADAA-C9375F5CC80F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SymbolTestDll", "tests\Debuggees\SymbolTestApp\SymbolTestDll\SymbolTestDll.csproj", "{8C27904A-47C0-44C7-B191-88FF34580CBE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReflectionTest", "src\SOS\SOS.UnitTests\Debuggees\ReflectionTest\ReflectionTest.csproj", "{DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LineNums", "tests\Debuggees\LineNums\LineNums.csproj", "{84881FB8-37E1-4D9B-B27E-9831C30DCC04}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaskNestedException", "src\SOS\SOS.UnitTests\Debuggees\TaskNestedException\TaskNestedException\TaskNestedException.csproj", "{73EA5188-1E4F-42D8-B63E-F1B878A4EB63}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GCPOH", "tests\Debuggees\GCPOH\GCPOH.csproj", "{0A34CA51-8B8C-41A1-BE24-AB2C574EA144}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RandomUserLibrary", "src\SOS\SOS.UnitTests\Debuggees\TaskNestedException\RandomUserLibrary\RandomUserLibrary.csproj", "{B50D14DB-8EE5-47BD-B412-62FA5C693CC7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetDumpCommands", "tests\Debuggees\DotnetDumpCommands\DotnetDumpCommands.csproj", "{F9A69812-DC52-428D-9DB1-8B831A8FF776}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SymbolTestApp", "src\SOS\SOS.UnitTests\Debuggees\SymbolTestApp\SymbolTestApp\SymbolTestApp.csproj", "{112FE2A7-3FD2-4496-8A14-171898AD5CF5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicMethod", "tests\Debuggees\DynamicMethod\DynamicMethod.csproj", "{2F9AA5A9-D42A-42C6-B483-1B9284C62F91}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SymbolTestDll", "src\SOS\SOS.UnitTests\Debuggees\SymbolTestApp\SymbolTestDll\SymbolTestDll.csproj", "{8C27904A-47C0-44C7-B191-88FF34580CBE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventPipeTracee", "tests\Debuggees\EventPipeTracee\EventPipeTracee.csproj", "{85F3B31D-7B83-B76A-3CD4-4EF3B250329D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LineNums", "src\SOS\SOS.UnitTests\Debuggees\LineNums\LineNums.csproj", "{84881FB8-37E1-4D9B-B27E-9831C30DCC04}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExitCodeTracee", "tests\Debuggees\ExitCodeTracee\ExitCodeTracee.csproj", "{1270B50E-1BC3-161C-3052-F62FF5950154}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GCPOH", "src\SOS\SOS.UnitTests\Debuggees\GCPOH\GCPOH.csproj", "{0A34CA51-8B8C-41A1-BE24-AB2C574EA144}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StackTracee", "tests\Debuggees\StackTracee\StackTracee.csproj", "{904C1E5E-D18C-24A8-0B40-3372622A5105}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetDumpCommands", "src\SOS\SOS.UnitTests\Debuggees\DotnetDumpCommands\DotnetDumpCommands.csproj", "{F9A69812-DC52-428D-9DB1-8B831A8FF776}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleDebuggee", "tests\Debuggees\SimpleDebuggee\SimpleDebuggee.csproj", "{C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicMethod", "src\SOS\SOS.UnitTests\Debuggees\DynamicMethod\DynamicMethod.csproj", "{2F9AA5A9-D42A-42C6-B483-1B9284C62F91}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tracee", "tests\Debuggees\Tracee\Tracee.csproj", "{9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -705,14 +713,213 @@ Global {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.RelWithDebInfo|x86.Build.0 = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Checked|Any CPU.ActiveCfg = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Checked|Any CPU.Build.0 = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Checked|ARM.ActiveCfg = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Checked|ARM.Build.0 = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Checked|ARM64.ActiveCfg = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Checked|ARM64.Build.0 = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Checked|x64.ActiveCfg = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Checked|x64.Build.0 = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Checked|x86.ActiveCfg = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Checked|x86.Build.0 = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Debug|ARM.ActiveCfg = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Debug|ARM.Build.0 = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Debug|ARM64.Build.0 = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Debug|x64.ActiveCfg = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Debug|x64.Build.0 = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Debug|x86.ActiveCfg = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Debug|x86.Build.0 = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Release|Any CPU.Build.0 = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Release|ARM.ActiveCfg = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Release|ARM.Build.0 = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Release|ARM64.ActiveCfg = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Release|ARM64.Build.0 = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Release|x64.ActiveCfg = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Release|x64.Build.0 = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Release|x86.ActiveCfg = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.Release|x86.Build.0 = Release|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.RelWithDebInfo|ARM.ActiveCfg = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.RelWithDebInfo|ARM.Build.0 = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.RelWithDebInfo|ARM64.ActiveCfg = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.RelWithDebInfo|ARM64.Build.0 = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Checked|Any CPU.ActiveCfg = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Checked|Any CPU.Build.0 = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Checked|ARM.ActiveCfg = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Checked|ARM.Build.0 = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Checked|ARM64.ActiveCfg = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Checked|ARM64.Build.0 = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Checked|x64.ActiveCfg = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Checked|x64.Build.0 = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Checked|x86.ActiveCfg = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Checked|x86.Build.0 = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Debug|ARM.ActiveCfg = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Debug|ARM.Build.0 = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Debug|ARM64.Build.0 = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Debug|x64.ActiveCfg = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Debug|x64.Build.0 = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Debug|x86.ActiveCfg = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Debug|x86.Build.0 = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Release|Any CPU.Build.0 = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Release|ARM.ActiveCfg = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Release|ARM.Build.0 = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Release|ARM64.ActiveCfg = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Release|ARM64.Build.0 = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Release|x64.ActiveCfg = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Release|x64.Build.0 = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Release|x86.ActiveCfg = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.Release|x86.Build.0 = Release|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.RelWithDebInfo|ARM.ActiveCfg = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.RelWithDebInfo|ARM.Build.0 = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.RelWithDebInfo|ARM64.ActiveCfg = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.RelWithDebInfo|ARM64.Build.0 = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU + {1270B50E-1BC3-161C-3052-F62FF5950154}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Checked|Any CPU.ActiveCfg = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Checked|Any CPU.Build.0 = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Checked|ARM.ActiveCfg = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Checked|ARM.Build.0 = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Checked|ARM64.ActiveCfg = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Checked|ARM64.Build.0 = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Checked|x64.ActiveCfg = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Checked|x64.Build.0 = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Checked|x86.ActiveCfg = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Checked|x86.Build.0 = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Debug|Any CPU.Build.0 = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Debug|ARM.ActiveCfg = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Debug|ARM.Build.0 = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Debug|ARM64.Build.0 = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Debug|x64.ActiveCfg = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Debug|x64.Build.0 = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Debug|x86.ActiveCfg = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Debug|x86.Build.0 = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Release|Any CPU.ActiveCfg = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Release|Any CPU.Build.0 = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Release|ARM.ActiveCfg = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Release|ARM.Build.0 = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Release|ARM64.ActiveCfg = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Release|ARM64.Build.0 = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Release|x64.ActiveCfg = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Release|x64.Build.0 = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Release|x86.ActiveCfg = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.Release|x86.Build.0 = Release|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.RelWithDebInfo|ARM.ActiveCfg = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.RelWithDebInfo|ARM.Build.0 = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.RelWithDebInfo|ARM64.ActiveCfg = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.RelWithDebInfo|ARM64.Build.0 = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU + {904C1E5E-D18C-24A8-0B40-3372622A5105}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Checked|Any CPU.ActiveCfg = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Checked|Any CPU.Build.0 = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Checked|ARM.ActiveCfg = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Checked|ARM.Build.0 = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Checked|ARM64.ActiveCfg = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Checked|ARM64.Build.0 = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Checked|x64.ActiveCfg = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Checked|x64.Build.0 = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Checked|x86.ActiveCfg = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Checked|x86.Build.0 = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Debug|ARM.ActiveCfg = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Debug|ARM.Build.0 = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Debug|ARM64.Build.0 = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Debug|x64.ActiveCfg = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Debug|x64.Build.0 = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Debug|x86.ActiveCfg = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Debug|x86.Build.0 = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Release|Any CPU.Build.0 = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Release|ARM.ActiveCfg = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Release|ARM.Build.0 = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Release|ARM64.ActiveCfg = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Release|ARM64.Build.0 = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Release|x64.ActiveCfg = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Release|x64.Build.0 = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Release|x86.ActiveCfg = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.Release|x86.Build.0 = Release|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.RelWithDebInfo|ARM.ActiveCfg = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.RelWithDebInfo|ARM.Build.0 = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.RelWithDebInfo|ARM64.ActiveCfg = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.RelWithDebInfo|ARM64.Build.0 = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Checked|Any CPU.ActiveCfg = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Checked|Any CPU.Build.0 = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Checked|ARM.ActiveCfg = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Checked|ARM.Build.0 = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Checked|ARM64.ActiveCfg = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Checked|ARM64.Build.0 = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Checked|x64.ActiveCfg = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Checked|x64.Build.0 = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Checked|x86.ActiveCfg = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Checked|x86.Build.0 = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Debug|ARM.ActiveCfg = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Debug|ARM.Build.0 = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Debug|ARM64.Build.0 = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Debug|x64.ActiveCfg = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Debug|x64.Build.0 = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Debug|x86.ActiveCfg = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Debug|x86.Build.0 = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Release|Any CPU.Build.0 = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Release|ARM.ActiveCfg = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Release|ARM.Build.0 = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Release|ARM64.ActiveCfg = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Release|ARM64.Build.0 = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Release|x64.ActiveCfg = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Release|x64.Build.0 = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Release|x86.ActiveCfg = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.Release|x86.Build.0 = Release|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.RelWithDebInfo|ARM.ActiveCfg = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.RelWithDebInfo|ARM.Build.0 = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.RelWithDebInfo|ARM64.ActiveCfg = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.RelWithDebInfo|ARM64.Build.0 = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {6C43BE85-F8C3-4D76-8050-F25CE953A7FD} = {C3072949-6D24-451B-A308-2F3621F858B0} - {41638A4C-0DAF-47ED-A774-ECBBAC0315D7} = {19FAB78C-3351-4911-8F0C-8C6056401740} - {C3072949-6D24-451B-A308-2F3621F858B0} = {41638A4C-0DAF-47ED-A774-ECBBAC0315D7} + {C3072949-6D24-451B-A308-2F3621F858B0} = {19FAB78C-3351-4911-8F0C-8C6056401740} {252E5845-8D4C-4306-9D8F-ED2E2F7005F6} = {C3072949-6D24-451B-A308-2F3621F858B0} {179EF543-E30A-4428-ABA0-2E2621860173} = {C3072949-6D24-451B-A308-2F3621F858B0} {447AC053-2E0A-4119-BD11-30A4A8E3F765} = {C3072949-6D24-451B-A308-2F3621F858B0} @@ -728,6 +935,11 @@ Global {0A34CA51-8B8C-41A1-BE24-AB2C574EA144} = {C3072949-6D24-451B-A308-2F3621F858B0} {F9A69812-DC52-428D-9DB1-8B831A8FF776} = {C3072949-6D24-451B-A308-2F3621F858B0} {2F9AA5A9-D42A-42C6-B483-1B9284C62F91} = {C3072949-6D24-451B-A308-2F3621F858B0} + {85F3B31D-7B83-B76A-3CD4-4EF3B250329D} = {C3072949-6D24-451B-A308-2F3621F858B0} + {1270B50E-1BC3-161C-3052-F62FF5950154} = {C3072949-6D24-451B-A308-2F3621F858B0} + {904C1E5E-D18C-24A8-0B40-3372622A5105} = {C3072949-6D24-451B-A308-2F3621F858B0} + {C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7} = {C3072949-6D24-451B-A308-2F3621F858B0} + {9FA6DB05-57C1-8E9B-8CA4-850511BEB66A} = {C3072949-6D24-451B-A308-2F3621F858B0} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {46465737-C938-44FC-BE1A-4CE139EBB5E0} diff --git a/diagnostics.sln b/diagnostics.sln index 91ac02996f..3f77f13622 100644 --- a/diagnostics.sln +++ b/diagnostics.sln @@ -3,14 +3,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.3.32519.111 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.TestHelpers", "src\Microsoft.Diagnostics.TestHelpers\Microsoft.Diagnostics.TestHelpers.csproj", "{730C1201-1848-4F1E-8C1F-6316FB886C35}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.TestHelpers", "tests\Microsoft.Diagnostics.TestHelpers\Microsoft.Diagnostics.TestHelpers.csproj", "{730C1201-1848-4F1E-8C1F-6316FB886C35}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SOS", "SOS", "{41638A4C-0DAF-47ED-A774-ECBBAC0315D7}" ProjectSection(SolutionItems) = preProject src\SOS\CMakeLists.txt = src\SOS\CMakeLists.txt EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SOS.UnitTests", "src\SOS\SOS.UnitTests\SOS.UnitTests.csproj", "{1532DB3C-7DCD-45C6-B697-62B8378A16A2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SOS.UnitTests", "tests\SOS.UnitTests\SOS.UnitTests.csproj", "{1532DB3C-7DCD-45C6-B697-62B8378A16A2}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lldbplugin", "src\SOS\lldbplugin\lldbplugin.vcxproj", "{D52C65C4-2C7D-45E6-9F5C-6F3A96796018}" EndProject @@ -42,19 +42,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SOS.Symbol.Package", "src\S EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{03479E19-3F18-49A6-910A-F5041E27E7C0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetTrace.UnitTests", "src\tests\dotnet-trace\DotnetTrace.UnitTests.csproj", "{AEDCCF5B-5AD0-4D64-BF73-5CF468E07D22}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetTrace.UnitTests", "tests\DotnetTrace.UnitTests\DotnetTrace.UnitTests.csproj", "{AEDCCF5B-5AD0-4D64-BF73-5CF468E07D22}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-gcdump", "src\Tools\dotnet-gcdump\dotnet-gcdump.csproj", "{936678B3-3392-4F4F-943C-B6A4BFCBAADC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetCounters.UnitTests", "src\tests\dotnet-counters\DotnetCounters.UnitTests.csproj", "{E5A7DC6C-BF8D-418A-BCBD-094EB748FA82}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetCounters.UnitTests", "tests\DotnetCounters.UnitTests\DotnetCounters.UnitTests.csproj", "{E5A7DC6C-BF8D-418A-BCBD-094EB748FA82}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.NETCore.Client", "src\Microsoft.Diagnostics.NETCore.Client\Microsoft.Diagnostics.NETCore.Client.csproj", "{D8BE9C81-194E-43E5-82CF-2080892FBDE7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.NETCore.Client.UnitTests", "src\tests\Microsoft.Diagnostics.NETCore.Client\Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj", "{6F4DD2F8-1C7B-4A87-B7E5-1BEE9F5AC128}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.NETCore.Client.UnitTests", "tests\Microsoft.Diagnostics.NETCore.Client.UnitTests\Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj", "{6F4DD2F8-1C7B-4A87-B7E5-1BEE9F5AC128}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tracee", "src\tests\Tracee\Tracee.csproj", "{C79D6069-2C18-48CB-846E-71F7168C2F7D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventPipe.UnitTests", "src\tests\eventpipe\EventPipe.UnitTests.csproj", "{CED9ABBA-861E-4C0A-9359-22351208EF27}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventPipe.UnitTests", "tests\EventPipe.UnitTests\EventPipe.UnitTests.csproj", "{CED9ABBA-861E-4C0A-9359-22351208EF27}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{298AE119-6625-4604-BDE5-0765DC34C856}" ProjectSection(SolutionItems) = preProject @@ -192,18 +190,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "llvm", "llvm", "{06730767-4 src\shared\inc\llvm\ELF.h = src\shared\inc\llvm\ELF.h EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.UnitTests", "src\tests\Microsoft.Diagnostics.Monitoring\Microsoft.Diagnostics.Monitoring.UnitTests.csproj", "{6419BA04-6F1A-4D2F-8DE4-5C359E0364A3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventPipeTracee", "src\tests\EventPipeTracee\EventPipeTracee.csproj", "{870A7AD0-B808-491E-92F6-433BE990B374}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.UnitTests", "tests\Microsoft.Diagnostics.Monitoring.UnitTests\Microsoft.Diagnostics.Monitoring.UnitTests.csproj", "{6419BA04-6F1A-4D2F-8DE4-5C359E0364A3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.EventPipe", "src\Microsoft.Diagnostics.Monitoring.EventPipe\Microsoft.Diagnostics.Monitoring.EventPipe.csproj", "{E1E2C698-E247-4D48-AE01-542B43744ACB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests", "src\tests\Microsoft.Diagnostics.Monitoring.EventPipe\Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj", "{A58B7F72-E9DF-4962-9E15-300EF4C53ABB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests", "tests\Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests\Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj", "{A58B7F72-E9DF-4962-9E15-300EF4C53ABB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-stack", "src\Tools\dotnet-stack\dotnet-stack.csproj", "{642E6E67-8A84-473D-9507-C302BF10989D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StackTracee", "src\tests\StackTracee\StackTracee.csproj", "{57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.DebugServices.Implementation", "src\Microsoft.Diagnostics.DebugServices.Implementation\Microsoft.Diagnostics.DebugServices.Implementation.csproj", "{1F23F5DA-F766-445F-88FF-86137BDC2709}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "inc", "inc", "{BE45F03E-D700-404F-A890-8ED7D8969958}" @@ -230,9 +224,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "extensions", "src\SOS\exten EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.ExtensionCommands", "src\Microsoft.Diagnostics.ExtensionCommands\Microsoft.Diagnostics.ExtensionCommands.csproj", "{5FC66A16-41E9-4D22-A44C-FEBB7DCCAAF8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.DebugServices.UnitTests", "src\tests\Microsoft.Diagnostics.DebugServices.UnitTests\Microsoft.Diagnostics.DebugServices.UnitTests.csproj", "{064BC7DD-D44C-400E-9215-7546E092AB98}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExitCodeTracee", "src\tests\ExitCodeTracee\ExitCodeTracee.csproj", "{61F73DD0-F346-4D7A-AB12-63415B4EEEE1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.DebugServices.UnitTests", "tests\Microsoft.Diagnostics.DebugServices.UnitTests\Microsoft.Diagnostics.DebugServices.UnitTests.csproj", "{064BC7DD-D44C-400E-9215-7546E092AB98}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-dsrouter", "src\Tools\dotnet-dsrouter\dotnet-dsrouter.csproj", "{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}" EndProject @@ -253,15 +245,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "minipal", "minipal", "{795B src\shared\minipal\dn-u16.h = src\shared\minipal\dn-u16.h EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DbgShim.UnitTests", "src\tests\DbgShim.UnitTests\DbgShim.UnitTests.csproj", "{DD60B7C4-BECC-4C7D-A53B-FCDD4C92B728}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DbgShim.UnitTests", "tests\DbgShim.UnitTests\DbgShim.UnitTests.csproj", "{DD60B7C4-BECC-4C7D-A53B-FCDD4C92B728}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonTestRunner", "src\tests\CommonTestRunner\CommonTestRunner.csproj", "{DFF48CB6-4504-41C6-A8F1-F4A3D316D49F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommonTestRunner", "tests\CommonTestRunner\CommonTestRunner.csproj", "{DFF48CB6-4504-41C6-A8F1-F4A3D316D49F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetStack.UnitTests", "src\tests\dotnet-stack\DotnetStack.UnitTests.csproj", "{E8F133F8-4D20-475D-9D16-2BA236DAB65F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetStack.UnitTests", "tests\DotnetStack.UnitTests\DotnetStack.UnitTests.csproj", "{E8F133F8-4D20-475D-9D16-2BA236DAB65F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.WebSocketServer", "src\Microsoft.Diagnostics.WebSocketServer\Microsoft.Diagnostics.WebSocketServer.csproj", "{1043FA82-37CC-4809-80DC-C1EB06A55133}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestExtension", "src\tests\TestExtension\TestExtension.csproj", "{C6EB3C21-FDFF-4CF0-BE3A-3D1A3924408E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestExtension", "tests\TestExtension\TestExtension.csproj", "{C6EB3C21-FDFF-4CF0-BE3A-3D1A3924408E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FileFormats", "src\Microsoft.FileFormats\Microsoft.FileFormats.csproj", "{830A70D3-E604-467A-9846-6C5DF5BD3976}" EndProject @@ -269,11 +261,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SymbolStore", "sr EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-symbol", "src\Tools\dotnet-symbol\dotnet-symbol.csproj", "{B6C33C85-08A7-47D9-BEA8-36164BB3653B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestHelpers", "src\tests\TestHelpers\TestHelpers.csproj", "{C32F2858-6B5F-4967-ABC4-852B6399C4AE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestHelpers", "tests\TestHelpers\TestHelpers.csproj", "{C32F2858-6B5F-4967-ABC4-852B6399C4AE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FileFormats.UnitTests", "src\tests\Microsoft.FileFormats.UnitTests\Microsoft.FileFormats.UnitTests.csproj", "{44F93947-8FD4-4946-8AE5-EF6D25970CC7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FileFormats.UnitTests", "tests\Microsoft.FileFormats.UnitTests\Microsoft.FileFormats.UnitTests.csproj", "{44F93947-8FD4-4946-8AE5-EF6D25970CC7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SymbolStore.UnitTests", "src\tests\Microsoft.SymbolStore.UnitTests\Microsoft.SymbolStore.UnitTests.csproj", "{C2422836-BA25-4751-9060-7C7890085869}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SymbolStore.UnitTests", "tests\Microsoft.SymbolStore.UnitTests\Microsoft.SymbolStore.UnitTests.csproj", "{C2422836-BA25-4751-9060-7C7890085869}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SymbolManifestGenerator", "src\Microsoft.SymbolManifestGenerator\Microsoft.SymbolManifestGenerator.csproj", "{28B55114-88C0-44B6-BBD8-50C14ED59EE2}" EndProject @@ -1111,46 +1103,6 @@ Global {6F4DD2F8-1C7B-4A87-B7E5-1BEE9F5AC128}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {6F4DD2F8-1C7B-4A87-B7E5-1BEE9F5AC128}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU {6F4DD2F8-1C7B-4A87-B7E5-1BEE9F5AC128}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Checked|Any CPU.Build.0 = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Checked|ARM.ActiveCfg = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Checked|ARM.Build.0 = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Checked|ARM64.ActiveCfg = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Checked|ARM64.Build.0 = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Checked|x64.ActiveCfg = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Checked|x64.Build.0 = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Checked|x86.ActiveCfg = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Checked|x86.Build.0 = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Debug|ARM.ActiveCfg = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Debug|ARM.Build.0 = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Debug|ARM64.Build.0 = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Debug|x64.ActiveCfg = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Debug|x64.Build.0 = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Debug|x86.ActiveCfg = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Debug|x86.Build.0 = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Release|Any CPU.Build.0 = Release|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Release|ARM.ActiveCfg = Release|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Release|ARM.Build.0 = Release|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Release|ARM64.ActiveCfg = Release|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Release|ARM64.Build.0 = Release|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Release|x64.ActiveCfg = Release|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Release|x64.Build.0 = Release|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Release|x86.ActiveCfg = Release|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.Release|x86.Build.0 = Release|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.RelWithDebInfo|ARM.ActiveCfg = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.RelWithDebInfo|ARM.Build.0 = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.RelWithDebInfo|ARM64.ActiveCfg = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.RelWithDebInfo|ARM64.Build.0 = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU - {C79D6069-2C18-48CB-846E-71F7168C2F7D}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU {CED9ABBA-861E-4C0A-9359-22351208EF27}.Checked|Any CPU.ActiveCfg = Debug|Any CPU {CED9ABBA-861E-4C0A-9359-22351208EF27}.Checked|Any CPU.Build.0 = Debug|Any CPU {CED9ABBA-861E-4C0A-9359-22351208EF27}.Checked|ARM.ActiveCfg = Debug|Any CPU @@ -1271,46 +1223,6 @@ Global {6419BA04-6F1A-4D2F-8DE4-5C359E0364A3}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {6419BA04-6F1A-4D2F-8DE4-5C359E0364A3}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU {6419BA04-6F1A-4D2F-8DE4-5C359E0364A3}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Checked|Any CPU.Build.0 = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Checked|ARM.ActiveCfg = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Checked|ARM.Build.0 = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Checked|ARM64.ActiveCfg = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Checked|ARM64.Build.0 = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Checked|x64.ActiveCfg = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Checked|x64.Build.0 = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Checked|x86.ActiveCfg = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Checked|x86.Build.0 = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Debug|Any CPU.Build.0 = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Debug|ARM.ActiveCfg = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Debug|ARM.Build.0 = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Debug|ARM64.Build.0 = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Debug|x64.ActiveCfg = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Debug|x64.Build.0 = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Debug|x86.ActiveCfg = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Debug|x86.Build.0 = Debug|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Release|Any CPU.ActiveCfg = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Release|Any CPU.Build.0 = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Release|ARM.ActiveCfg = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Release|ARM.Build.0 = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Release|ARM64.ActiveCfg = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Release|ARM64.Build.0 = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Release|x64.ActiveCfg = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Release|x64.Build.0 = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Release|x86.ActiveCfg = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.Release|x86.Build.0 = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {870A7AD0-B808-491E-92F6-433BE990B374}.RelWithDebInfo|x86.Build.0 = Release|Any CPU {E1E2C698-E247-4D48-AE01-542B43744ACB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU {E1E2C698-E247-4D48-AE01-542B43744ACB}.Checked|Any CPU.Build.0 = Debug|Any CPU {E1E2C698-E247-4D48-AE01-542B43744ACB}.Checked|ARM.ActiveCfg = Debug|Any CPU @@ -1431,46 +1343,6 @@ Global {642E6E67-8A84-473D-9507-C302BF10989D}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU {642E6E67-8A84-473D-9507-C302BF10989D}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU {642E6E67-8A84-473D-9507-C302BF10989D}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Checked|Any CPU.Build.0 = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Checked|ARM.ActiveCfg = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Checked|ARM.Build.0 = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Checked|ARM64.ActiveCfg = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Checked|ARM64.Build.0 = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Checked|x64.ActiveCfg = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Checked|x64.Build.0 = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Checked|x86.ActiveCfg = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Checked|x86.Build.0 = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Debug|ARM.ActiveCfg = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Debug|ARM.Build.0 = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Debug|ARM64.Build.0 = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Debug|x64.ActiveCfg = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Debug|x64.Build.0 = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Debug|x86.ActiveCfg = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Debug|x86.Build.0 = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Release|Any CPU.Build.0 = Release|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Release|ARM.ActiveCfg = Release|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Release|ARM.Build.0 = Release|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Release|ARM64.ActiveCfg = Release|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Release|ARM64.Build.0 = Release|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Release|x64.ActiveCfg = Release|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Release|x64.Build.0 = Release|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Release|x86.ActiveCfg = Release|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.Release|x86.Build.0 = Release|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.RelWithDebInfo|Any CPU.ActiveCfg = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.RelWithDebInfo|Any CPU.Build.0 = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.RelWithDebInfo|ARM.ActiveCfg = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.RelWithDebInfo|ARM.Build.0 = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.RelWithDebInfo|ARM64.ActiveCfg = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.RelWithDebInfo|ARM64.Build.0 = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.RelWithDebInfo|x64.ActiveCfg = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.RelWithDebInfo|x64.Build.0 = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.RelWithDebInfo|x86.ActiveCfg = Debug|Any CPU - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB}.RelWithDebInfo|x86.Build.0 = Debug|Any CPU {1F23F5DA-F766-445F-88FF-86137BDC2709}.Checked|Any CPU.ActiveCfg = Debug|Any CPU {1F23F5DA-F766-445F-88FF-86137BDC2709}.Checked|Any CPU.Build.0 = Debug|Any CPU {1F23F5DA-F766-445F-88FF-86137BDC2709}.Checked|ARM.ActiveCfg = Debug|Any CPU @@ -1654,46 +1526,6 @@ Global {064BC7DD-D44C-400E-9215-7546E092AB98}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {064BC7DD-D44C-400E-9215-7546E092AB98}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU {064BC7DD-D44C-400E-9215-7546E092AB98}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Checked|Any CPU.Build.0 = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Checked|ARM.ActiveCfg = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Checked|ARM.Build.0 = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Checked|ARM64.ActiveCfg = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Checked|ARM64.Build.0 = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Checked|x64.ActiveCfg = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Checked|x64.Build.0 = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Checked|x86.ActiveCfg = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Checked|x86.Build.0 = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Debug|ARM.ActiveCfg = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Debug|ARM.Build.0 = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Debug|ARM64.Build.0 = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Debug|x64.ActiveCfg = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Debug|x64.Build.0 = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Debug|x86.ActiveCfg = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Debug|x86.Build.0 = Debug|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Release|Any CPU.Build.0 = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Release|ARM.ActiveCfg = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Release|ARM.Build.0 = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Release|ARM64.ActiveCfg = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Release|ARM64.Build.0 = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Release|x64.ActiveCfg = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Release|x64.Build.0 = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Release|x86.ActiveCfg = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.Release|x86.Build.0 = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.RelWithDebInfo|x86.Build.0 = Release|Any CPU {2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU {2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Checked|Any CPU.Build.0 = Debug|Any CPU {2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Checked|ARM.ActiveCfg = Debug|Any CPU @@ -2316,9 +2148,9 @@ Global HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {730C1201-1848-4F1E-8C1F-6316FB886C35} = {19FAB78C-3351-4911-8F0C-8C6056401740} + {730C1201-1848-4F1E-8C1F-6316FB886C35} = {03479E19-3F18-49A6-910A-F5041E27E7C0} {41638A4C-0DAF-47ED-A774-ECBBAC0315D7} = {19FAB78C-3351-4911-8F0C-8C6056401740} - {1532DB3C-7DCD-45C6-B697-62B8378A16A2} = {41638A4C-0DAF-47ED-A774-ECBBAC0315D7} + {1532DB3C-7DCD-45C6-B697-62B8378A16A2} = {03479E19-3F18-49A6-910A-F5041E27E7C0} {D52C65C4-2C7D-45E6-9F5C-6F3A96796018} = {41638A4C-0DAF-47ED-A774-ECBBAC0315D7} {B62728C8-1267-4043-B46F-5537BBAEC692} = {19FAB78C-3351-4911-8F0C-8C6056401740} {718350FA-2DD9-4950-BA41-D7A7F66DAC91} = {B62728C8-1267-4043-B46F-5537BBAEC692} @@ -2332,13 +2164,11 @@ Global {234416E9-EA5F-4018-AC34-67682C5D3E04} = {41638A4C-0DAF-47ED-A774-ECBBAC0315D7} {A1CE682A-12C4-4FF9-B864-A9A15A8726D2} = {19FAB78C-3351-4911-8F0C-8C6056401740} {410394E0-7F4F-42D5-B5FA-30956F44ACBC} = {41638A4C-0DAF-47ED-A774-ECBBAC0315D7} - {03479E19-3F18-49A6-910A-F5041E27E7C0} = {19FAB78C-3351-4911-8F0C-8C6056401740} {AEDCCF5B-5AD0-4D64-BF73-5CF468E07D22} = {03479E19-3F18-49A6-910A-F5041E27E7C0} {936678B3-3392-4F4F-943C-B6A4BFCBAADC} = {B62728C8-1267-4043-B46F-5537BBAEC692} {E5A7DC6C-BF8D-418A-BCBD-094EB748FA82} = {03479E19-3F18-49A6-910A-F5041E27E7C0} {D8BE9C81-194E-43E5-82CF-2080892FBDE7} = {19FAB78C-3351-4911-8F0C-8C6056401740} {6F4DD2F8-1C7B-4A87-B7E5-1BEE9F5AC128} = {03479E19-3F18-49A6-910A-F5041E27E7C0} - {C79D6069-2C18-48CB-846E-71F7168C2F7D} = {03479E19-3F18-49A6-910A-F5041E27E7C0} {CED9ABBA-861E-4C0A-9359-22351208EF27} = {03479E19-3F18-49A6-910A-F5041E27E7C0} {298AE119-6625-4604-BDE5-0765DC34C856} = {B62728C8-1267-4043-B46F-5537BBAEC692} {C457CBCD-3A8D-4402-9A2B-693A0390D3F9} = {298AE119-6625-4604-BDE5-0765DC34C856} @@ -2346,18 +2176,15 @@ Global {41BDFD6D-D165-4D67-BEF6-4E539040D30A} = {7852EDE4-93DF-4DB1-8A86-C521703811AF} {06730767-421B-465F-BB63-A3A07D72D7A2} = {41BDFD6D-D165-4D67-BEF6-4E539040D30A} {6419BA04-6F1A-4D2F-8DE4-5C359E0364A3} = {03479E19-3F18-49A6-910A-F5041E27E7C0} - {870A7AD0-B808-491E-92F6-433BE990B374} = {03479E19-3F18-49A6-910A-F5041E27E7C0} {E1E2C698-E247-4D48-AE01-542B43744ACB} = {19FAB78C-3351-4911-8F0C-8C6056401740} {A58B7F72-E9DF-4962-9E15-300EF4C53ABB} = {03479E19-3F18-49A6-910A-F5041E27E7C0} {642E6E67-8A84-473D-9507-C302BF10989D} = {B62728C8-1267-4043-B46F-5537BBAEC692} - {57EB54E7-521A-4CDE-9DAE-8D6AE90A20BB} = {03479E19-3F18-49A6-910A-F5041E27E7C0} {1F23F5DA-F766-445F-88FF-86137BDC2709} = {19FAB78C-3351-4911-8F0C-8C6056401740} {BE45F03E-D700-404F-A890-8ED7D8969958} = {41638A4C-0DAF-47ED-A774-ECBBAC0315D7} {729ED9E8-C92F-4E0E-B8A7-CC2C1374C751} = {41638A4C-0DAF-47ED-A774-ECBBAC0315D7} {EEC90A42-CDCD-4EE3-B47D-C109D604E7E2} = {41638A4C-0DAF-47ED-A774-ECBBAC0315D7} {5FC66A16-41E9-4D22-A44C-FEBB7DCCAAF8} = {19FAB78C-3351-4911-8F0C-8C6056401740} {064BC7DD-D44C-400E-9215-7546E092AB98} = {03479E19-3F18-49A6-910A-F5041E27E7C0} - {61F73DD0-F346-4D7A-AB12-63415B4EEEE1} = {03479E19-3F18-49A6-910A-F5041E27E7C0} {2BD55143-B102-4FEC-84AD-DC3B330FA9AC} = {B62728C8-1267-4043-B46F-5537BBAEC692} {BD779298-8631-3F5D-AA59-82897E5454A7} = {19FAB78C-3351-4911-8F0C-8C6056401740} {7852EDE4-93DF-4DB1-8A86-C521703811AF} = {19FAB78C-3351-4911-8F0C-8C6056401740} diff --git a/src/SOS/CMakeLists.txt b/src/SOS/CMakeLists.txt index e1de7aff33..7a54090337 100644 --- a/src/SOS/CMakeLists.txt +++ b/src/SOS/CMakeLists.txt @@ -7,16 +7,9 @@ endif(CLR_CMAKE_HOST_UNIX) # lldbplugin doesn't build with these options if(CLR_CMAKE_HOST_WIN32) message(STATUS "CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION: ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}") - message(STATUS "VSInstallDir: $ENV{VSInstallDir}") include_directories("$ENV{VSInstallDir}/DIA SDK/include") - add_compile_options(/Zl) # omit default library name in .OBJ - - add_subdirectory(runcommand) - if(NOT CLR_CMAKE_TARGET_ARCH_ARM) - add_subdirectory(SOS.UnitTests/Debuggees/DesktopClrHost) - endif(NOT CLR_CMAKE_TARGET_ARCH_ARM) endif(CLR_CMAKE_HOST_WIN32) add_compile_definitions(STRESS_LOG_ANALYZER) diff --git a/src/SOS/SOS.UnitTests/Debuggees/WebApp3/Properties/launchSettings.json b/src/SOS/SOS.UnitTests/Debuggees/WebApp3/Properties/launchSettings.json deleted file mode 100644 index c8d7225000..0000000000 --- a/src/SOS/SOS.UnitTests/Debuggees/WebApp3/Properties/launchSettings.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:55377/", - "sslPort": 0 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "commandLineArgs": "\"\" \"C:\\ssd\\diagnostics\\artifacts\\bin\\SymbolTestDll\\Debug\\net462\\publish\\SymbolTestDll.dll\" SymbolTestDll.TestClass ThrowException", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "nativeDebugging": false - }, - "WebApp3": { - "commandName": "Project", - "commandLineArgs": "\"\" \"C:\\ssd\\diagnostics\\artifacts\\bin\\SymbolTestDll\\Debug\\net462\\publish\\SymbolTestDll.dll\" SymbolTestDll.TestClass ThrowException", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "nativeDebugging": true, - "applicationUrl": "http://localhost:5000" - } - } -} diff --git a/src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props b/src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props deleted file mode 100644 index 99ff5a2abb..0000000000 --- a/src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/src/tests/dotnet-counters/DotnetCounters.UnitTests.csproj b/src/tests/dotnet-counters/DotnetCounters.UnitTests.csproj deleted file mode 100644 index 435bf3a738..0000000000 --- a/src/tests/dotnet-counters/DotnetCounters.UnitTests.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - $(NetCoreAppMinTargetFramework) - - - - - - - - - - - - - diff --git a/src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj b/src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj deleted file mode 100644 index 2ec652b315..0000000000 --- a/src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - $(NetCoreAppMinTargetFramework) - - - - - - - - diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 0000000000..3800b3ca02 --- /dev/null +++ b/tests/CMakeLists.txt @@ -0,0 +1,8 @@ +include(${CLR_SHARED_DIR}/shared.cmake) + +if(CLR_CMAKE_HOST_WIN32) + add_subdirectory(runcommand) + if(NOT CLR_CMAKE_TARGET_ARCH_ARM) + add_subdirectory(DesktopClrHost) + endif(NOT CLR_CMAKE_TARGET_ARCH_ARM) +endif(CLR_CMAKE_HOST_WIN32) diff --git a/src/tests/CommonTestRunner/CommonTestRunner.csproj b/tests/CommonTestRunner/CommonTestRunner.csproj similarity index 93% rename from src/tests/CommonTestRunner/CommonTestRunner.csproj rename to tests/CommonTestRunner/CommonTestRunner.csproj index 6d70ad1ad7..99acdb79b5 100644 --- a/src/tests/CommonTestRunner/CommonTestRunner.csproj +++ b/tests/CommonTestRunner/CommonTestRunner.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt b/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt similarity index 100% rename from src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt rename to tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt diff --git a/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt b/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt similarity index 100% rename from src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt rename to tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt diff --git a/src/tests/CommonTestRunner/DiagnosticPortsHelper.cs b/tests/CommonTestRunner/DiagnosticPortsHelper.cs similarity index 100% rename from src/tests/CommonTestRunner/DiagnosticPortsHelper.cs rename to tests/CommonTestRunner/DiagnosticPortsHelper.cs diff --git a/src/tests/CommonTestRunner/TestRunner.cs b/tests/CommonTestRunner/TestRunner.cs similarity index 100% rename from src/tests/CommonTestRunner/TestRunner.cs rename to tests/CommonTestRunner/TestRunner.cs diff --git a/src/tests/CommonTestRunner/TestRunnerUtilities.cs b/tests/CommonTestRunner/TestRunnerUtilities.cs similarity index 100% rename from src/tests/CommonTestRunner/TestRunnerUtilities.cs rename to tests/CommonTestRunner/TestRunnerUtilities.cs diff --git a/src/tests/DacCompareNativeTypes/DacCompareNativeTypes.csproj b/tests/DacCompareNativeTypes/DacCompareNativeTypes.csproj similarity index 100% rename from src/tests/DacCompareNativeTypes/DacCompareNativeTypes.csproj rename to tests/DacCompareNativeTypes/DacCompareNativeTypes.csproj diff --git a/src/tests/DacCompareNativeTypes/DwarfParse.cs b/tests/DacCompareNativeTypes/DwarfParse.cs similarity index 100% rename from src/tests/DacCompareNativeTypes/DwarfParse.cs rename to tests/DacCompareNativeTypes/DwarfParse.cs diff --git a/src/tests/DacCompareNativeTypes/Member.cs b/tests/DacCompareNativeTypes/Member.cs similarity index 100% rename from src/tests/DacCompareNativeTypes/Member.cs rename to tests/DacCompareNativeTypes/Member.cs diff --git a/src/tests/DacCompareNativeTypes/PdbParser.cs b/tests/DacCompareNativeTypes/PdbParser.cs similarity index 100% rename from src/tests/DacCompareNativeTypes/PdbParser.cs rename to tests/DacCompareNativeTypes/PdbParser.cs diff --git a/src/tests/DacCompareNativeTypes/Program.cs b/tests/DacCompareNativeTypes/Program.cs similarity index 100% rename from src/tests/DacCompareNativeTypes/Program.cs rename to tests/DacCompareNativeTypes/Program.cs diff --git a/src/tests/DacCompareNativeTypes/Readme.md b/tests/DacCompareNativeTypes/Readme.md similarity index 100% rename from src/tests/DacCompareNativeTypes/Readme.md rename to tests/DacCompareNativeTypes/Readme.md diff --git a/src/tests/DacCompareNativeTypes/Type.cs b/tests/DacCompareNativeTypes/Type.cs similarity index 100% rename from src/tests/DacCompareNativeTypes/Type.cs rename to tests/DacCompareNativeTypes/Type.cs diff --git a/src/tests/DacCompareNativeTypes/Whitespace.cs b/tests/DacCompareNativeTypes/Whitespace.cs similarity index 100% rename from src/tests/DacCompareNativeTypes/Whitespace.cs rename to tests/DacCompareNativeTypes/Whitespace.cs diff --git a/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt similarity index 98% rename from src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt rename to tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt index 283f1082cf..2b4989f0ad 100644 --- a/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -8,7 +8,7 @@ $(RootBinDir)/TestResults/$(TargetConfiguration)/dbgshim.unittests_$(Timestamp) ProjectK - $(RepoRootDir)/src/tests/DbgShim.UnitTests/Debuggees + $(RepoRootDir)/tests/Debuggees $(RepoRootDir)/eng/AuxMsbuildFiles cli SimpleDebuggee diff --git a/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt similarity index 98% rename from src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt rename to tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt index 9370ae5607..8d57ab6ced 100644 --- a/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -9,7 +9,7 @@ $(RootBinDir)\TestResults\$(TargetConfiguration)\dbgshim.unittests_$(Timestamp) ProjectK - $(RepoRootDir)\src\tests\DbgShim.UnitTests\Debuggees + $(RepoRootDir)\tests\Debuggees $(RepoRootDir)\eng\AuxMsbuildFiles cli SimpleDebuggee diff --git a/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj b/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj similarity index 95% rename from src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj rename to tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj index 7af9023141..4fb0f0e9c4 100644 --- a/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj +++ b/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/src/tests/DbgShim.UnitTests/DbgShimAPI.cs b/tests/DbgShim.UnitTests/DbgShimAPI.cs similarity index 100% rename from src/tests/DbgShim.UnitTests/DbgShimAPI.cs rename to tests/DbgShim.UnitTests/DbgShimAPI.cs diff --git a/src/tests/DbgShim.UnitTests/DbgShimTests.cs b/tests/DbgShim.UnitTests/DbgShimTests.cs similarity index 100% rename from src/tests/DbgShim.UnitTests/DbgShimTests.cs rename to tests/DbgShim.UnitTests/DbgShimTests.cs diff --git a/src/tests/DbgShim.UnitTests/DebuggeeInfo.cs b/tests/DbgShim.UnitTests/DebuggeeInfo.cs similarity index 100% rename from src/tests/DbgShim.UnitTests/DebuggeeInfo.cs rename to tests/DbgShim.UnitTests/DebuggeeInfo.cs diff --git a/src/tests/DbgShim.UnitTests/ICLRDebugging.cs b/tests/DbgShim.UnitTests/ICLRDebugging.cs similarity index 100% rename from src/tests/DbgShim.UnitTests/ICLRDebugging.cs rename to tests/DbgShim.UnitTests/ICLRDebugging.cs diff --git a/src/tests/DbgShim.UnitTests/ICorDebug.cs b/tests/DbgShim.UnitTests/ICorDebug.cs similarity index 100% rename from src/tests/DbgShim.UnitTests/ICorDebug.cs rename to tests/DbgShim.UnitTests/ICorDebug.cs diff --git a/src/tests/DbgShim.UnitTests/ICorDebugController.cs b/tests/DbgShim.UnitTests/ICorDebugController.cs similarity index 100% rename from src/tests/DbgShim.UnitTests/ICorDebugController.cs rename to tests/DbgShim.UnitTests/ICorDebugController.cs diff --git a/src/tests/DbgShim.UnitTests/LibraryProviderWrapper.cs b/tests/DbgShim.UnitTests/LibraryProviderWrapper.cs similarity index 100% rename from src/tests/DbgShim.UnitTests/LibraryProviderWrapper.cs rename to tests/DbgShim.UnitTests/LibraryProviderWrapper.cs diff --git a/src/tests/DbgShim.UnitTests/ManagedCallbackWrapper.cs b/tests/DbgShim.UnitTests/ManagedCallbackWrapper.cs similarity index 100% rename from src/tests/DbgShim.UnitTests/ManagedCallbackWrapper.cs rename to tests/DbgShim.UnitTests/ManagedCallbackWrapper.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/Directory.Build.props b/tests/Debuggees/Directory.Build.props similarity index 74% rename from src/SOS/SOS.UnitTests/Debuggees/Directory.Build.props rename to tests/Debuggees/Directory.Build.props index 55c701fd8e..e498ae1003 100644 --- a/src/SOS/SOS.UnitTests/Debuggees/Directory.Build.props +++ b/tests/Debuggees/Directory.Build.props @@ -1,6 +1,5 @@ - - + false diff --git a/src/SOS/SOS.UnitTests/Debuggees/DivZero/DivZero.cs b/tests/Debuggees/DivZero/DivZero.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/DivZero/DivZero.cs rename to tests/Debuggees/DivZero/DivZero.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/DivZero/DivZero.csproj b/tests/Debuggees/DivZero/DivZero.csproj similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/DivZero/DivZero.csproj rename to tests/Debuggees/DivZero/DivZero.csproj diff --git a/src/SOS/SOS.UnitTests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj b/tests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj rename to tests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj diff --git a/src/SOS/SOS.UnitTests/Debuggees/DotnetDumpCommands/Program.cs b/tests/Debuggees/DotnetDumpCommands/Program.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/DotnetDumpCommands/Program.cs rename to tests/Debuggees/DotnetDumpCommands/Program.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/DynamicMethod/DynamicMethod.csproj b/tests/Debuggees/DynamicMethod/DynamicMethod.csproj similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/DynamicMethod/DynamicMethod.csproj rename to tests/Debuggees/DynamicMethod/DynamicMethod.csproj diff --git a/src/SOS/SOS.UnitTests/Debuggees/DynamicMethod/Program.cs b/tests/Debuggees/DynamicMethod/Program.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/DynamicMethod/Program.cs rename to tests/Debuggees/DynamicMethod/Program.cs diff --git a/src/tests/EventPipeTracee/CustomMetrics.cs b/tests/Debuggees/EventPipeTracee/CustomMetrics.cs similarity index 100% rename from src/tests/EventPipeTracee/CustomMetrics.cs rename to tests/Debuggees/EventPipeTracee/CustomMetrics.cs diff --git a/src/tests/EventPipeTracee/DuplicateNameMetrics.cs b/tests/Debuggees/EventPipeTracee/DuplicateNameMetrics.cs similarity index 100% rename from src/tests/EventPipeTracee/DuplicateNameMetrics.cs rename to tests/Debuggees/EventPipeTracee/DuplicateNameMetrics.cs diff --git a/src/tests/EventPipeTracee/EventPipeTracee.csproj b/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj similarity index 81% rename from src/tests/EventPipeTracee/EventPipeTracee.csproj rename to tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj index 39e40b1eea..c8df61e29b 100644 --- a/src/tests/EventPipeTracee/EventPipeTracee.csproj +++ b/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/tests/EventPipeTracee/Program.cs b/tests/Debuggees/EventPipeTracee/Program.cs similarity index 100% rename from src/tests/EventPipeTracee/Program.cs rename to tests/Debuggees/EventPipeTracee/Program.cs diff --git a/src/tests/ExitCodeTracee/ExitCodeTracee.csproj b/tests/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj similarity index 100% rename from src/tests/ExitCodeTracee/ExitCodeTracee.csproj rename to tests/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj diff --git a/src/tests/ExitCodeTracee/Program.cs b/tests/Debuggees/ExitCodeTracee/Program.cs similarity index 100% rename from src/tests/ExitCodeTracee/Program.cs rename to tests/Debuggees/ExitCodeTracee/Program.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/GCPOH/GCPOH.cs b/tests/Debuggees/GCPOH/GCPOH.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/GCPOH/GCPOH.cs rename to tests/Debuggees/GCPOH/GCPOH.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/GCPOH/GCPOH.csproj b/tests/Debuggees/GCPOH/GCPOH.csproj similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/GCPOH/GCPOH.csproj rename to tests/Debuggees/GCPOH/GCPOH.csproj diff --git a/src/SOS/SOS.UnitTests/Debuggees/GCWhere/GCWhere.cs b/tests/Debuggees/GCWhere/GCWhere.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/GCWhere/GCWhere.cs rename to tests/Debuggees/GCWhere/GCWhere.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/GCWhere/GCWhere.csproj b/tests/Debuggees/GCWhere/GCWhere.csproj similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/GCWhere/GCWhere.csproj rename to tests/Debuggees/GCWhere/GCWhere.csproj diff --git a/src/SOS/SOS.UnitTests/Debuggees/LineNums/LineNums.csproj b/tests/Debuggees/LineNums/LineNums.csproj similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/LineNums/LineNums.csproj rename to tests/Debuggees/LineNums/LineNums.csproj diff --git a/src/SOS/SOS.UnitTests/Debuggees/LineNums/Program.cs b/tests/Debuggees/LineNums/Program.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/LineNums/Program.cs rename to tests/Debuggees/LineNums/Program.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/NestedExceptionTest/NestedExceptionTest.cs b/tests/Debuggees/NestedExceptionTest/NestedExceptionTest.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/NestedExceptionTest/NestedExceptionTest.cs rename to tests/Debuggees/NestedExceptionTest/NestedExceptionTest.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj b/tests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj rename to tests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj diff --git a/src/SOS/SOS.UnitTests/Debuggees/Overflow/Overflow.cs b/tests/Debuggees/Overflow/Overflow.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/Overflow/Overflow.cs rename to tests/Debuggees/Overflow/Overflow.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/Overflow/Overflow.csproj b/tests/Debuggees/Overflow/Overflow.csproj similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/Overflow/Overflow.csproj rename to tests/Debuggees/Overflow/Overflow.csproj diff --git a/src/SOS/SOS.UnitTests/Debuggees/ReflectionTest/ReflectionTest.cs b/tests/Debuggees/ReflectionTest/ReflectionTest.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/ReflectionTest/ReflectionTest.cs rename to tests/Debuggees/ReflectionTest/ReflectionTest.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/ReflectionTest/ReflectionTest.csproj b/tests/Debuggees/ReflectionTest/ReflectionTest.csproj similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/ReflectionTest/ReflectionTest.csproj rename to tests/Debuggees/ReflectionTest/ReflectionTest.csproj diff --git a/src/tests/DbgShim.UnitTests/Debuggees/SimpleDebuggee/SimpleDebuggee.cs b/tests/Debuggees/SimpleDebuggee/SimpleDebuggee.cs similarity index 100% rename from src/tests/DbgShim.UnitTests/Debuggees/SimpleDebuggee/SimpleDebuggee.cs rename to tests/Debuggees/SimpleDebuggee/SimpleDebuggee.cs diff --git a/src/tests/DbgShim.UnitTests/Debuggees/SimpleDebuggee/SimpleDebuggee.csproj b/tests/Debuggees/SimpleDebuggee/SimpleDebuggee.csproj similarity index 100% rename from src/tests/DbgShim.UnitTests/Debuggees/SimpleDebuggee/SimpleDebuggee.csproj rename to tests/Debuggees/SimpleDebuggee/SimpleDebuggee.csproj diff --git a/src/tests/DbgShim.UnitTests/Debuggees/SimpleDebuggee/runtimeconfig.template.json b/tests/Debuggees/SimpleDebuggee/runtimeconfig.template.json similarity index 100% rename from src/tests/DbgShim.UnitTests/Debuggees/SimpleDebuggee/runtimeconfig.template.json rename to tests/Debuggees/SimpleDebuggee/runtimeconfig.template.json diff --git a/src/SOS/SOS.UnitTests/Debuggees/SimpleThrow/SimpleThrow.cs b/tests/Debuggees/SimpleThrow/SimpleThrow.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/SimpleThrow/SimpleThrow.cs rename to tests/Debuggees/SimpleThrow/SimpleThrow.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/SimpleThrow/SimpleThrow.csproj b/tests/Debuggees/SimpleThrow/SimpleThrow.csproj similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/SimpleThrow/SimpleThrow.csproj rename to tests/Debuggees/SimpleThrow/SimpleThrow.csproj diff --git a/src/SOS/SOS.UnitTests/Debuggees/SimpleThrow/UserObject.cs b/tests/Debuggees/SimpleThrow/UserObject.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/SimpleThrow/UserObject.cs rename to tests/Debuggees/SimpleThrow/UserObject.cs diff --git a/src/tests/StackTracee/Program.cs b/tests/Debuggees/StackTracee/Program.cs similarity index 100% rename from src/tests/StackTracee/Program.cs rename to tests/Debuggees/StackTracee/Program.cs diff --git a/src/tests/StackTracee/StackTracee.csproj b/tests/Debuggees/StackTracee/StackTracee.csproj similarity index 100% rename from src/tests/StackTracee/StackTracee.csproj rename to tests/Debuggees/StackTracee/StackTracee.csproj diff --git a/src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestApp.sln b/tests/Debuggees/SymbolTestApp/SymbolTestApp.sln similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestApp.sln rename to tests/Debuggees/SymbolTestApp/SymbolTestApp.sln diff --git a/src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.cs b/tests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.cs rename to tests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj b/tests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj rename to tests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj diff --git a/src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj b/tests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj rename to tests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj diff --git a/src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestDll/TestClass.cs b/tests/Debuggees/SymbolTestApp/SymbolTestDll/TestClass.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestDll/TestClass.cs rename to tests/Debuggees/SymbolTestApp/SymbolTestDll/TestClass.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj b/tests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj rename to tests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj diff --git a/src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserTask.cs b/tests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserTask.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserTask.cs rename to tests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserTask.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/TaskNestedException.sln b/tests/Debuggees/TaskNestedException/TaskNestedException.sln similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/TaskNestedException.sln rename to tests/Debuggees/TaskNestedException/TaskNestedException.sln diff --git a/src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.cs b/tests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.cs rename to tests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj b/tests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj rename to tests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj diff --git a/src/SOS/lldbplugin.tests/TestDebuggee/Test.cs b/tests/Debuggees/TestDebuggee/Test.cs similarity index 100% rename from src/SOS/lldbplugin.tests/TestDebuggee/Test.cs rename to tests/Debuggees/TestDebuggee/Test.cs diff --git a/src/SOS/lldbplugin.tests/TestDebuggee/TestDebuggee.csproj b/tests/Debuggees/TestDebuggee/TestDebuggee.csproj similarity index 100% rename from src/SOS/lldbplugin.tests/TestDebuggee/TestDebuggee.csproj rename to tests/Debuggees/TestDebuggee/TestDebuggee.csproj diff --git a/src/tests/Tracee/Program.cs b/tests/Debuggees/Tracee/Program.cs similarity index 100% rename from src/tests/Tracee/Program.cs rename to tests/Debuggees/Tracee/Program.cs diff --git a/src/tests/Tracee/Tracee.csproj b/tests/Debuggees/Tracee/Tracee.csproj similarity index 100% rename from src/tests/Tracee/Tracee.csproj rename to tests/Debuggees/Tracee/Tracee.csproj diff --git a/src/SOS/SOS.UnitTests/Debuggees/WebApp3/Program.cs b/tests/Debuggees/WebApp3/Program.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/WebApp3/Program.cs rename to tests/Debuggees/WebApp3/Program.cs diff --git a/tests/Debuggees/WebApp3/Properties/launchSettings.json b/tests/Debuggees/WebApp3/Properties/launchSettings.json new file mode 100644 index 0000000000..d5965825cd --- /dev/null +++ b/tests/Debuggees/WebApp3/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "profiles": { + "WebApp3": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "https://localhost:54990;http://localhost:54991" + } + } +} \ No newline at end of file diff --git a/src/SOS/SOS.UnitTests/Debuggees/WebApp3/Startup.cs b/tests/Debuggees/WebApp3/Startup.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/WebApp3/Startup.cs rename to tests/Debuggees/WebApp3/Startup.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/WebApp3/WebApp3.csproj b/tests/Debuggees/WebApp3/WebApp3.csproj similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/WebApp3/WebApp3.csproj rename to tests/Debuggees/WebApp3/WebApp3.csproj diff --git a/src/SOS/SOS.UnitTests/Debuggees/WebApp3/appsettings.Development.json b/tests/Debuggees/WebApp3/appsettings.Development.json similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/WebApp3/appsettings.Development.json rename to tests/Debuggees/WebApp3/appsettings.Development.json diff --git a/src/SOS/SOS.UnitTests/Debuggees/WebApp3/appsettings.json b/tests/Debuggees/WebApp3/appsettings.json similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/WebApp3/appsettings.json rename to tests/Debuggees/WebApp3/appsettings.json diff --git a/src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/CMakeLists.txt b/tests/DesktopClrHost/CMakeLists.txt similarity index 93% rename from src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/CMakeLists.txt rename to tests/DesktopClrHost/CMakeLists.txt index 6d1aeff17a..cdd4744a97 100644 --- a/src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/CMakeLists.txt +++ b/tests/DesktopClrHost/CMakeLists.txt @@ -2,11 +2,12 @@ project(DesktopClrHost) set(CMAKE_INCLUDE_CURRENT_DIR ON) -include_directories(inc) include_directories("$ENV{VSInstallDir}/DIA SDK/include") add_definitions(-DUSE_STL) +add_compile_options(/Zl) # omit default library name in .OBJ + set(DESKTOPCLRHOST_SOURCES DesktopClrHost.cpp ) diff --git a/src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/DesktopClrHost.cpp b/tests/DesktopClrHost/DesktopClrHost.cpp similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/DesktopClrHost/DesktopClrHost.cpp rename to tests/DesktopClrHost/DesktopClrHost.cpp diff --git a/src/tests/Directory.Build.props b/tests/Directory.Build.props similarity index 56% rename from src/tests/Directory.Build.props rename to tests/Directory.Build.props index 9abe7d34cd..b634f4d270 100644 --- a/src/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -1,9 +1,13 @@ + + $(Platform) $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) + true + true + false - diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets new file mode 100644 index 0000000000..bcd8685e26 --- /dev/null +++ b/tests/Directory.Build.targets @@ -0,0 +1,27 @@ + + + + + + + $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)')) + + + + + + + + + + + + + + diff --git a/src/tests/dotnet-counters/CSVExporterTests.cs b/tests/DotnetCounters.UnitTests/CSVExporterTests.cs similarity index 100% rename from src/tests/dotnet-counters/CSVExporterTests.cs rename to tests/DotnetCounters.UnitTests/CSVExporterTests.cs diff --git a/src/tests/dotnet-counters/ConsoleExporterTests.cs b/tests/DotnetCounters.UnitTests/ConsoleExporterTests.cs similarity index 100% rename from src/tests/dotnet-counters/ConsoleExporterTests.cs rename to tests/DotnetCounters.UnitTests/ConsoleExporterTests.cs diff --git a/src/tests/dotnet-counters/CounterMonitorPayloadTests.cs b/tests/DotnetCounters.UnitTests/CounterMonitorPayloadTests.cs similarity index 100% rename from src/tests/dotnet-counters/CounterMonitorPayloadTests.cs rename to tests/DotnetCounters.UnitTests/CounterMonitorPayloadTests.cs diff --git a/src/tests/dotnet-counters/CounterMonitorTests.cs b/tests/DotnetCounters.UnitTests/CounterMonitorTests.cs similarity index 100% rename from src/tests/dotnet-counters/CounterMonitorTests.cs rename to tests/DotnetCounters.UnitTests/CounterMonitorTests.cs diff --git a/tests/DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj b/tests/DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj new file mode 100644 index 0000000000..39421b8d8b --- /dev/null +++ b/tests/DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj @@ -0,0 +1,17 @@ + + + + $(NetCoreAppMinTargetFramework) + + + + + + + + + + + + + diff --git a/src/tests/dotnet-counters/JSONExporterTests.cs b/tests/DotnetCounters.UnitTests/JSONExporterTests.cs similarity index 100% rename from src/tests/dotnet-counters/JSONExporterTests.cs rename to tests/DotnetCounters.UnitTests/JSONExporterTests.cs diff --git a/src/tests/dotnet-counters/MockConsole.cs b/tests/DotnetCounters.UnitTests/MockConsole.cs similarity index 100% rename from src/tests/dotnet-counters/MockConsole.cs rename to tests/DotnetCounters.UnitTests/MockConsole.cs diff --git a/src/tests/dotnet-counters/TestConstants.cs b/tests/DotnetCounters.UnitTests/TestConstants.cs similarity index 100% rename from src/tests/dotnet-counters/TestConstants.cs rename to tests/DotnetCounters.UnitTests/TestConstants.cs diff --git a/src/tests/dotnet-stack/DotnetStack.UnitTests.csproj b/tests/DotnetStack.UnitTests/DotnetStack.UnitTests.csproj similarity index 88% rename from src/tests/dotnet-stack/DotnetStack.UnitTests.csproj rename to tests/DotnetStack.UnitTests/DotnetStack.UnitTests.csproj index d6b536f04d..8eccf3bfda 100644 --- a/src/tests/dotnet-stack/DotnetStack.UnitTests.csproj +++ b/tests/DotnetStack.UnitTests/DotnetStack.UnitTests.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/tests/dotnet-stack/StackTests.cs b/tests/DotnetStack.UnitTests/StackTests.cs similarity index 100% rename from src/tests/dotnet-stack/StackTests.cs rename to tests/DotnetStack.UnitTests/StackTests.cs diff --git a/src/tests/dotnet-trace/CLRProviderParsing.cs b/tests/DotnetTrace.UnitTests/CLRProviderParsing.cs similarity index 100% rename from src/tests/dotnet-trace/CLRProviderParsing.cs rename to tests/DotnetTrace.UnitTests/CLRProviderParsing.cs diff --git a/src/tests/dotnet-trace/ChildProcessTests.cs b/tests/DotnetTrace.UnitTests/ChildProcessTests.cs similarity index 100% rename from src/tests/dotnet-trace/ChildProcessTests.cs rename to tests/DotnetTrace.UnitTests/ChildProcessTests.cs diff --git a/tests/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj b/tests/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj new file mode 100644 index 0000000000..21e1bee1c0 --- /dev/null +++ b/tests/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj @@ -0,0 +1,12 @@ + + + + $(NetCoreAppMinTargetFramework) + + + + + + + + diff --git a/src/tests/dotnet-trace/ProfileProviderMerging.cs b/tests/DotnetTrace.UnitTests/ProfileProviderMerging.cs similarity index 100% rename from src/tests/dotnet-trace/ProfileProviderMerging.cs rename to tests/DotnetTrace.UnitTests/ProfileProviderMerging.cs diff --git a/src/tests/dotnet-trace/ProviderParsing.cs b/tests/DotnetTrace.UnitTests/ProviderParsing.cs similarity index 98% rename from src/tests/dotnet-trace/ProviderParsing.cs rename to tests/DotnetTrace.UnitTests/ProviderParsing.cs index bab3b6fb0d..5bb621fd6d 100644 --- a/src/tests/dotnet-trace/ProviderParsing.cs +++ b/tests/DotnetTrace.UnitTests/ProviderParsing.cs @@ -76,12 +76,12 @@ public void ValidProviderKeyword_CorrectlyParses(string providerToParse) public void ValidProviderEventLevel_CorrectlyParses(string providerToParse) { List parsedProviders = Extensions.ToProviders(providerToParse); - Assert.Equal(1, parsedProviders.Count); + Assert.Single(parsedProviders); EventPipeProvider provider = parsedProviders.First(); Assert.Equal("VeryCoolProvider", provider.Name); Assert.Equal(0, provider.Keywords); Assert.Equal(System.Diagnostics.Tracing.EventLevel.Informational, provider.EventLevel); - Assert.Equal(1, provider.Arguments.Count); + Assert.Single(provider.Arguments); Assert.Equal("QuotedValue", provider.Arguments["FilterAndPayloadSpecs"]); } @@ -220,7 +220,7 @@ public void ProvidersWithComplexFilters_CorrectlyParse() providerTwo = parsedProviders[1]; Assert.Equal("MyProvider", providerOne.Name); Assert.Equal("MyProvider2", providerTwo.Name); - Assert.Equal(1, providerOne.Arguments.Count); + Assert.Single(providerOne.Arguments); Assert.Equal(3, providerTwo.Arguments.Count); Assert.Equal("B;C=D", providerOne.Arguments["A"]); Assert.Equal("spaced words", providerTwo.Arguments["A"]); @@ -313,7 +313,7 @@ public void DeDupeProviders_DefaultAndSpecified(string providersToParse) { List parsedProviders = Extensions.ToProviders(providersToParse); Assert.Equal("DupeProvider", parsedProviders.First().Name); - Assert.Equal(1, parsedProviders.Count); + Assert.Single(parsedProviders); Assert.Equal(0xF, parsedProviders.First().Keywords); Assert.Equal(System.Diagnostics.Tracing.EventLevel.LogAlways, parsedProviders.First().EventLevel); Assert.Null(parsedProviders.First().Arguments); @@ -325,7 +325,7 @@ public void DeDupeProviders_BothSpecified(string providersToParse) { List parsedProviders = Extensions.ToProviders(providersToParse); Assert.Equal("DupeProvider", parsedProviders.First().Name); - Assert.Equal(1, parsedProviders.Count); + Assert.Single(parsedProviders); Assert.Equal(0xFF, parsedProviders.First().Keywords); Assert.Equal(System.Diagnostics.Tracing.EventLevel.Verbose, parsedProviders.First().EventLevel); Assert.Null(parsedProviders.First().Arguments); diff --git a/src/tests/eventpipe/ContentionEvents.cs b/tests/EventPipe.UnitTests/ContentionEvents.cs similarity index 100% rename from src/tests/eventpipe/ContentionEvents.cs rename to tests/EventPipe.UnitTests/ContentionEvents.cs diff --git a/src/tests/eventpipe/CustomEvents.cs b/tests/EventPipe.UnitTests/CustomEvents.cs similarity index 100% rename from src/tests/eventpipe/CustomEvents.cs rename to tests/EventPipe.UnitTests/CustomEvents.cs diff --git a/src/tests/eventpipe/EventPipe.UnitTests.csproj b/tests/EventPipe.UnitTests/EventPipe.UnitTests.csproj similarity index 87% rename from src/tests/eventpipe/EventPipe.UnitTests.csproj rename to tests/EventPipe.UnitTests/EventPipe.UnitTests.csproj index d375aac992..9864dd2ba9 100644 --- a/src/tests/eventpipe/EventPipe.UnitTests.csproj +++ b/tests/EventPipe.UnitTests/EventPipe.UnitTests.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/tests/eventpipe/GCEvents.cs b/tests/EventPipe.UnitTests/GCEvents.cs similarity index 100% rename from src/tests/eventpipe/GCEvents.cs rename to tests/EventPipe.UnitTests/GCEvents.cs diff --git a/src/tests/eventpipe/LoaderEvents.cs b/tests/EventPipe.UnitTests/LoaderEvents.cs similarity index 100% rename from src/tests/eventpipe/LoaderEvents.cs rename to tests/EventPipe.UnitTests/LoaderEvents.cs diff --git a/src/tests/eventpipe/MethodEvents.cs b/tests/EventPipe.UnitTests/MethodEvents.cs similarity index 100% rename from src/tests/eventpipe/MethodEvents.cs rename to tests/EventPipe.UnitTests/MethodEvents.cs diff --git a/src/tests/eventpipe/README.md b/tests/EventPipe.UnitTests/README.md similarity index 100% rename from src/tests/eventpipe/README.md rename to tests/EventPipe.UnitTests/README.md diff --git a/src/tests/eventpipe/ThreadPoolEvents.cs b/tests/EventPipe.UnitTests/ThreadPoolEvents.cs similarity index 100% rename from src/tests/eventpipe/ThreadPoolEvents.cs rename to tests/EventPipe.UnitTests/ThreadPoolEvents.cs diff --git a/src/tests/eventpipe/common/IpcTraceTest.cs b/tests/EventPipe.UnitTests/common/IpcTraceTest.cs similarity index 100% rename from src/tests/eventpipe/common/IpcTraceTest.cs rename to tests/EventPipe.UnitTests/common/IpcTraceTest.cs diff --git a/src/tests/eventpipe/common/RemoteTestExecutorHelper.cs b/tests/EventPipe.UnitTests/common/RemoteTestExecutorHelper.cs similarity index 100% rename from src/tests/eventpipe/common/RemoteTestExecutorHelper.cs rename to tests/EventPipe.UnitTests/common/RemoteTestExecutorHelper.cs diff --git a/src/tests/eventpipe/common/StreamProxy.cs b/tests/EventPipe.UnitTests/common/StreamProxy.cs similarity index 100% rename from src/tests/eventpipe/common/StreamProxy.cs rename to tests/EventPipe.UnitTests/common/StreamProxy.cs diff --git a/src/tests/eventpipe/providers.cs b/tests/EventPipe.UnitTests/providers.cs similarity index 100% rename from src/tests/eventpipe/providers.cs rename to tests/EventPipe.UnitTests/providers.cs diff --git a/src/tests/EventPipeStress/Common/BurstPattern.cs b/tests/EventPipeStress/Common/BurstPattern.cs similarity index 100% rename from src/tests/EventPipeStress/Common/BurstPattern.cs rename to tests/EventPipeStress/Common/BurstPattern.cs diff --git a/src/tests/EventPipeStress/Common/Common.csproj b/tests/EventPipeStress/Common/Common.csproj similarity index 100% rename from src/tests/EventPipeStress/Common/Common.csproj rename to tests/EventPipeStress/Common/Common.csproj diff --git a/src/tests/EventPipeStress/Common/Options.cs b/tests/EventPipeStress/Common/Options.cs similarity index 100% rename from src/tests/EventPipeStress/Common/Options.cs rename to tests/EventPipeStress/Common/Options.cs diff --git a/src/tests/EventPipeStress/Orchestrator/CommandLine.cs b/tests/EventPipeStress/Orchestrator/CommandLine.cs similarity index 100% rename from src/tests/EventPipeStress/Orchestrator/CommandLine.cs rename to tests/EventPipeStress/Orchestrator/CommandLine.cs diff --git a/src/tests/EventPipeStress/Orchestrator/Orchestrator.csproj b/tests/EventPipeStress/Orchestrator/Orchestrator.csproj similarity index 100% rename from src/tests/EventPipeStress/Orchestrator/Orchestrator.csproj rename to tests/EventPipeStress/Orchestrator/Orchestrator.csproj diff --git a/src/tests/EventPipeStress/Orchestrator/Program.cs b/tests/EventPipeStress/Orchestrator/Program.cs similarity index 100% rename from src/tests/EventPipeStress/Orchestrator/Program.cs rename to tests/EventPipeStress/Orchestrator/Program.cs diff --git a/src/tests/EventPipeStress/Orchestrator/TestResult.cs b/tests/EventPipeStress/Orchestrator/TestResult.cs similarity index 100% rename from src/tests/EventPipeStress/Orchestrator/TestResult.cs rename to tests/EventPipeStress/Orchestrator/TestResult.cs diff --git a/src/tests/EventPipeStress/README.md b/tests/EventPipeStress/README.md similarity index 100% rename from src/tests/EventPipeStress/README.md rename to tests/EventPipeStress/README.md diff --git a/src/tests/EventPipeStress/Stress/Program.cs b/tests/EventPipeStress/Stress/Program.cs similarity index 100% rename from src/tests/EventPipeStress/Stress/Program.cs rename to tests/EventPipeStress/Stress/Program.cs diff --git a/src/tests/EventPipeStress/Stress/Stress.csproj b/tests/EventPipeStress/Stress/Stress.csproj similarity index 100% rename from src/tests/EventPipeStress/Stress/Stress.csproj rename to tests/EventPipeStress/Stress/Stress.csproj diff --git a/src/tests/Grape/Grape.csproj b/tests/Grape/Grape.csproj similarity index 100% rename from src/tests/Grape/Grape.csproj rename to tests/Grape/Grape.csproj diff --git a/src/tests/Grape/Program.cs b/tests/Grape/Program.cs similarity index 100% rename from src/tests/Grape/Program.cs rename to tests/Grape/Program.cs diff --git a/src/tests/Grape/TestRunner.cs b/tests/Grape/TestRunner.cs similarity index 100% rename from src/tests/Grape/TestRunner.cs rename to tests/Grape/TestRunner.cs diff --git a/src/tests/Grape/TraceGeneratorConfiguration.cs b/tests/Grape/TraceGeneratorConfiguration.cs similarity index 100% rename from src/tests/Grape/TraceGeneratorConfiguration.cs rename to tests/Grape/TraceGeneratorConfiguration.cs diff --git a/src/tests/Grape/TraceGenerators/EtwTraceGenerator.cs b/tests/Grape/TraceGenerators/EtwTraceGenerator.cs similarity index 100% rename from src/tests/Grape/TraceGenerators/EtwTraceGenerator.cs rename to tests/Grape/TraceGenerators/EtwTraceGenerator.cs diff --git a/src/tests/Grape/TraceGenerators/EventPipeTraceGenerator.cs b/tests/Grape/TraceGenerators/EventPipeTraceGenerator.cs similarity index 100% rename from src/tests/Grape/TraceGenerators/EventPipeTraceGenerator.cs rename to tests/Grape/TraceGenerators/EventPipeTraceGenerator.cs diff --git a/src/tests/Grape/config.json b/tests/Grape/config.json similarity index 100% rename from src/tests/Grape/config.json rename to tests/Grape/config.json diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ClrmaTests.cs b/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ClrmaTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ClrmaTests.cs rename to tests/Microsoft.Diagnostics.DebugServices.UnitTests/ClrmaTests.cs diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/CommandServiceTests.cs b/tests/Microsoft.Diagnostics.DebugServices.UnitTests/CommandServiceTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/CommandServiceTests.cs rename to tests/Microsoft.Diagnostics.DebugServices.UnitTests/CommandServiceTests.cs diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt similarity index 100% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt rename to tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt similarity index 100% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt rename to tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/DebugServicesTests.cs b/tests/Microsoft.Diagnostics.DebugServices.UnitTests/DebugServicesTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/DebugServicesTests.cs rename to tests/Microsoft.Diagnostics.DebugServices.UnitTests/DebugServicesTests.cs diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj b/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj similarity index 91% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj rename to tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj index c6efc5cfd9..fa247fa245 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj +++ b/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj @@ -13,10 +13,10 @@ - - - - + + + + diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/RunTests.cs b/tests/Microsoft.Diagnostics.DebugServices.UnitTests/RunTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/RunTests.cs rename to tests/Microsoft.Diagnostics.DebugServices.UnitTests/RunTests.cs diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ServiceEventTests.cs b/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ServiceEventTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ServiceEventTests.cs rename to tests/Microsoft.Diagnostics.DebugServices.UnitTests/ServiceEventTests.cs diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/SymbolServiceTests.cs b/tests/Microsoft.Diagnostics.DebugServices.UnitTests/SymbolServiceTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/SymbolServiceTests.cs rename to tests/Microsoft.Diagnostics.DebugServices.UnitTests/SymbolServiceTests.cs diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestCommands.cs b/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestCommands.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestCommands.cs rename to tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestCommands.cs diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestDbgEng.cs b/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestDbgEng.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestDbgEng.cs rename to tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestDbgEng.cs diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/WriteTestData.cs b/tests/Microsoft.Diagnostics.DebugServices.UnitTests/WriteTestData.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/WriteTestData.cs rename to tests/Microsoft.Diagnostics.DebugServices.UnitTests/WriteTestData.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/AspNetTriggerUnitTests.cs b/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/AspNetTriggerUnitTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/AspNetTriggerUnitTests.cs rename to tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/AspNetTriggerUnitTests.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/DistributedTracesPipelineUnitTests.cs b/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/DistributedTracesPipelineUnitTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/DistributedTracesPipelineUnitTests.cs rename to tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/DistributedTracesPipelineUnitTests.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterConstants.cs b/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterConstants.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterConstants.cs rename to tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterConstants.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterPipelineUnitTests.cs b/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterPipelineUnitTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterPipelineUnitTests.cs rename to tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterPipelineUnitTests.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs b/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterTriggerTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs rename to tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterTriggerTests.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs b/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventLogsPipelineUnitTests.cs similarity index 97% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs rename to tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventLogsPipelineUnitTests.cs index c8ed1e4f24..b087b93833 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs +++ b/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventLogsPipelineUnitTests.cs @@ -278,9 +278,9 @@ private static void ValidateLoggerRemoteCategoryWarningMessage(StreamReader read Assert.Equal("Warning", result.LogLevel); Assert.Equal(7, result.EventId); Assert.Equal("AnotherEventId", result.EventName); - Assert.Equal(0, result.Scopes.Count); + Assert.Empty(result.Scopes); //We are expecting only the original format - Assert.Equal(1, result.Arguments.Count); + Assert.Single(result.Arguments); } private static void ValidateAppLoggerCategoryInformationMessage(StreamReader reader) @@ -294,9 +294,9 @@ private static void ValidateAppLoggerCategoryInformationMessage(StreamReader rea Assert.Equal("Information", result.LogLevel); Assert.Equal(0, result.EventId); Assert.Equal(string.Empty, result.EventName); - Assert.Equal(0, result.Scopes.Count); + Assert.Empty(result.Scopes); //We are expecting only the original format - Assert.Equal(1, result.Arguments.Count); + Assert.Single(result.Arguments); } private static void ValidateAppLoggerCategoryWarningMessage(StreamReader reader) @@ -310,9 +310,9 @@ private static void ValidateAppLoggerCategoryWarningMessage(StreamReader reader) Assert.Equal("Warning", result.LogLevel); Assert.Equal(5, result.EventId); Assert.Equal("WarningEventId", result.EventName); - Assert.Equal(0, result.Scopes.Count); + Assert.Empty(result.Scopes); //We are expecting only the original format - Assert.Equal(1, result.Arguments.Count); + Assert.Single(result.Arguments); } private static void ValidateAppLoggerCategoryErrorMessage(StreamReader reader) @@ -326,9 +326,9 @@ private static void ValidateAppLoggerCategoryErrorMessage(StreamReader reader) Assert.Equal("Error", result.LogLevel); Assert.Equal(0, result.EventId); Assert.Equal(string.Empty, result.EventName); - Assert.Equal(0, result.Scopes.Count); + Assert.Empty(result.Scopes); //We are expecting only the original format - Assert.Equal(1, result.Arguments.Count); + Assert.Single(result.Arguments); } private static void Validate(IDictionary values, params (string key, object value)[] expectedValues) diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventTracePipelineUnitTests.cs b/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventTracePipelineUnitTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventTracePipelineUnitTests.cs rename to tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventTracePipelineUnitTests.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/GlobMatcherTests.cs b/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/GlobMatcherTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/GlobMatcherTests.cs rename to tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/GlobMatcherTests.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/LogsPipelineUnitTests.cs b/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/LogsPipelineUnitTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/LogsPipelineUnitTests.cs rename to tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/LogsPipelineUnitTests.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj b/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj similarity index 78% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj rename to tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj index 8f50320f25..c12faf6f78 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj +++ b/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/PipelineTestUtilities.cs b/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/PipelineTestUtilities.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/PipelineTestUtilities.cs rename to tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/PipelineTestUtilities.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/SlidingWindowTests.cs b/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/SlidingWindowTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/SlidingWindowTests.cs rename to tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/SlidingWindowTests.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/TestStreamingLogger.cs b/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/TestStreamingLogger.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/TestStreamingLogger.cs rename to tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/TestStreamingLogger.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.UnitTests.csproj b/tests/Microsoft.Diagnostics.Monitoring.UnitTests/Microsoft.Diagnostics.Monitoring.UnitTests.csproj similarity index 65% rename from src/tests/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.UnitTests.csproj rename to tests/Microsoft.Diagnostics.Monitoring.UnitTests/Microsoft.Diagnostics.Monitoring.UnitTests.csproj index 599592baf7..8f1ab8c3eb 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.UnitTests.csproj +++ b/tests/Microsoft.Diagnostics.Monitoring.UnitTests/Microsoft.Diagnostics.Monitoring.UnitTests.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/src/tests/Microsoft.Diagnostics.Monitoring/PipelineTests.cs b/tests/Microsoft.Diagnostics.Monitoring.UnitTests/PipelineTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring/PipelineTests.cs rename to tests/Microsoft.Diagnostics.Monitoring.UnitTests/PipelineTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClientApiShim.cs b/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/DiagnosticsClientApiShim.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClientApiShim.cs rename to tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/DiagnosticsClientApiShim.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClientApiShimExtensions.cs b/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/DiagnosticsClientApiShimExtensions.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClientApiShimExtensions.cs rename to tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/DiagnosticsClientApiShimExtensions.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/EventPipeProviderTests.cs b/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/EventPipeProviderTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client/EventPipeProviderTests.cs rename to tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/EventPipeProviderTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/EventPipeSessionTests.cs b/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/EventPipeSessionTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client/EventPipeSessionTests.cs rename to tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/EventPipeSessionTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/GetProcessEnvironmentTests.cs b/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetProcessEnvironmentTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client/GetProcessEnvironmentTests.cs rename to tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetProcessEnvironmentTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/GetProcessInfoTests.cs b/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetProcessInfoTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client/GetProcessInfoTests.cs rename to tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetProcessInfoTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/GetPublishedProcessesTests.cs b/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetPublishedProcessesTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client/GetPublishedProcessesTests.cs rename to tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetPublishedProcessesTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/HandleableCollectionTests.cs b/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/HandleableCollectionTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client/HandleableCollectionTests.cs rename to tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/HandleableCollectionTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj b/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj similarity index 69% rename from src/tests/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj rename to tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj index 0737076d0e..752c00758e 100644 --- a/src/tests/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj +++ b/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/PerfMapTests.cs b/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/PerfMapTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client/PerfMapTests.cs rename to tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/PerfMapTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/ReversedServerTests.cs b/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/ReversedServerTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client/ReversedServerTests.cs rename to tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/ReversedServerTests.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/AcquireDotNetTestStep.cs b/tests/Microsoft.Diagnostics.TestHelpers/AcquireDotNetTestStep.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/AcquireDotNetTestStep.cs rename to tests/Microsoft.Diagnostics.TestHelpers/AcquireDotNetTestStep.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/AssertX.cs b/tests/Microsoft.Diagnostics.TestHelpers/AssertX.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/AssertX.cs rename to tests/Microsoft.Diagnostics.TestHelpers/AssertX.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/BaseDebuggeeCompiler.cs b/tests/Microsoft.Diagnostics.TestHelpers/BaseDebuggeeCompiler.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/BaseDebuggeeCompiler.cs rename to tests/Microsoft.Diagnostics.TestHelpers/BaseDebuggeeCompiler.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs b/tests/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs rename to tests/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/ConsoleTestOutputHelper.cs b/tests/Microsoft.Diagnostics.TestHelpers/ConsoleTestOutputHelper.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/ConsoleTestOutputHelper.cs rename to tests/Microsoft.Diagnostics.TestHelpers/ConsoleTestOutputHelper.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/CsprojBuildDebuggeeTestStep.cs b/tests/Microsoft.Diagnostics.TestHelpers/CsprojBuildDebuggeeTestStep.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/CsprojBuildDebuggeeTestStep.cs rename to tests/Microsoft.Diagnostics.TestHelpers/CsprojBuildDebuggeeTestStep.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/DebuggeeCompiler.cs b/tests/Microsoft.Diagnostics.TestHelpers/DebuggeeCompiler.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/DebuggeeCompiler.cs rename to tests/Microsoft.Diagnostics.TestHelpers/DebuggeeCompiler.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/DotNetBuildDebuggeeTestStep.cs b/tests/Microsoft.Diagnostics.TestHelpers/DotNetBuildDebuggeeTestStep.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/DotNetBuildDebuggeeTestStep.cs rename to tests/Microsoft.Diagnostics.TestHelpers/DotNetBuildDebuggeeTestStep.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/FileTestOutputHelper.cs b/tests/Microsoft.Diagnostics.TestHelpers/FileTestOutputHelper.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/FileTestOutputHelper.cs rename to tests/Microsoft.Diagnostics.TestHelpers/FileTestOutputHelper.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/IProcessLogger.cs b/tests/Microsoft.Diagnostics.TestHelpers/IProcessLogger.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/IProcessLogger.cs rename to tests/Microsoft.Diagnostics.TestHelpers/IProcessLogger.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/IndentedTestOutputHelper.cs b/tests/Microsoft.Diagnostics.TestHelpers/IndentedTestOutputHelper.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/IndentedTestOutputHelper.cs rename to tests/Microsoft.Diagnostics.TestHelpers/IndentedTestOutputHelper.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/LoggingListener.cs b/tests/Microsoft.Diagnostics.TestHelpers/LoggingListener.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/LoggingListener.cs rename to tests/Microsoft.Diagnostics.TestHelpers/LoggingListener.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj b/tests/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj similarity index 72% rename from src/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj rename to tests/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj index 4e3df14e84..23a9b798d8 100644 --- a/src/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj +++ b/tests/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj @@ -19,7 +19,7 @@ - - + + diff --git a/src/Microsoft.Diagnostics.TestHelpers/MultiplexTestOutputHelper.cs b/tests/Microsoft.Diagnostics.TestHelpers/MultiplexTestOutputHelper.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/MultiplexTestOutputHelper.cs rename to tests/Microsoft.Diagnostics.TestHelpers/MultiplexTestOutputHelper.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/PrebuiltDebuggeeCompiler.cs b/tests/Microsoft.Diagnostics.TestHelpers/PrebuiltDebuggeeCompiler.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/PrebuiltDebuggeeCompiler.cs rename to tests/Microsoft.Diagnostics.TestHelpers/PrebuiltDebuggeeCompiler.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/ProcessRunner.cs b/tests/Microsoft.Diagnostics.TestHelpers/ProcessRunner.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/ProcessRunner.cs rename to tests/Microsoft.Diagnostics.TestHelpers/ProcessRunner.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/RemoteExecutorHelper.cs b/tests/Microsoft.Diagnostics.TestHelpers/RemoteExecutorHelper.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/RemoteExecutorHelper.cs rename to tests/Microsoft.Diagnostics.TestHelpers/RemoteExecutorHelper.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/SdkPrebuiltDebuggeeCompiler.cs b/tests/Microsoft.Diagnostics.TestHelpers/SdkPrebuiltDebuggeeCompiler.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/SdkPrebuiltDebuggeeCompiler.cs rename to tests/Microsoft.Diagnostics.TestHelpers/SdkPrebuiltDebuggeeCompiler.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs b/tests/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs rename to tests/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataReader.cs b/tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataReader.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataReader.cs rename to tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataReader.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataWriter.cs b/tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataWriter.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataWriter.cs rename to tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataWriter.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/TestHost/TestDump.cs b/tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestDump.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/TestHost/TestDump.cs rename to tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestDump.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/TestHost/TestHost.cs b/tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestHost.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/TestHost/TestHost.cs rename to tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestHost.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/TestOutputProcessLogger.cs b/tests/Microsoft.Diagnostics.TestHelpers/TestOutputProcessLogger.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/TestOutputProcessLogger.cs rename to tests/Microsoft.Diagnostics.TestHelpers/TestOutputProcessLogger.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/TestRunner.cs b/tests/Microsoft.Diagnostics.TestHelpers/TestRunner.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/TestRunner.cs rename to tests/Microsoft.Diagnostics.TestHelpers/TestRunner.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/TestStep.cs b/tests/Microsoft.Diagnostics.TestHelpers/TestStep.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/TestStep.cs rename to tests/Microsoft.Diagnostics.TestHelpers/TestStep.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkipTestException.cs b/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkipTestException.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkipTestException.cs rename to tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkipTestException.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactAttribute.cs b/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactAttribute.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactAttribute.cs rename to tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactAttribute.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactDiscoverer.cs b/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactDiscoverer.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactDiscoverer.cs rename to tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactDiscoverer.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactMessageBus.cs b/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactMessageBus.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactMessageBus.cs rename to tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactMessageBus.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactTestCase.cs b/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactTestCase.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactTestCase.cs rename to tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactTestCase.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryAttribute.cs b/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryAttribute.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryAttribute.cs rename to tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryAttribute.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryDiscoverer.cs b/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryDiscoverer.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryDiscoverer.cs rename to tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryDiscoverer.cs diff --git a/src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryTestCase.cs b/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryTestCase.cs similarity index 100% rename from src/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryTestCase.cs rename to tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryTestCase.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/AddressSpace.cs b/tests/Microsoft.FileFormats.UnitTests/AddressSpace.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/AddressSpace.cs rename to tests/Microsoft.FileFormats.UnitTests/AddressSpace.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/ELF/Tests.cs b/tests/Microsoft.FileFormats.UnitTests/ELF/Tests.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/ELF/Tests.cs rename to tests/Microsoft.FileFormats.UnitTests/ELF/Tests.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/Layouts.cs b/tests/Microsoft.FileFormats.UnitTests/Layouts.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/Layouts.cs rename to tests/Microsoft.FileFormats.UnitTests/Layouts.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/MachO/Tests.cs b/tests/Microsoft.FileFormats.UnitTests/MachO/Tests.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/MachO/Tests.cs rename to tests/Microsoft.FileFormats.UnitTests/MachO/Tests.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj b/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj similarity index 95% rename from src/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj rename to tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj index 35b78f4be7..ee11b75344 100644 --- a/src/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj +++ b/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj @@ -3,6 +3,16 @@ $(NetCoreAppMinTargetFramework) ;1591;1701 + + + + + + + + + + @@ -57,10 +67,4 @@ PreserveNewest - - - - - - diff --git a/src/tests/Microsoft.FileFormats.UnitTests/Minidump/Tests.cs b/tests/Microsoft.FileFormats.UnitTests/Minidump/Tests.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/Minidump/Tests.cs rename to tests/Microsoft.FileFormats.UnitTests/Minidump/Tests.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/PDB/Tests.cs b/tests/Microsoft.FileFormats.UnitTests/PDB/Tests.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/PDB/Tests.cs rename to tests/Microsoft.FileFormats.UnitTests/PDB/Tests.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/PE/Tests.cs b/tests/Microsoft.FileFormats.UnitTests/PE/Tests.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/PE/Tests.cs rename to tests/Microsoft.FileFormats.UnitTests/PE/Tests.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/PerfMap/Tests.cs b/tests/Microsoft.FileFormats.UnitTests/PerfMap/Tests.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/PerfMap/Tests.cs rename to tests/Microsoft.FileFormats.UnitTests/PerfMap/Tests.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/PrimitiveTypes.cs b/tests/Microsoft.FileFormats.UnitTests/PrimitiveTypes.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/PrimitiveTypes.cs rename to tests/Microsoft.FileFormats.UnitTests/PrimitiveTypes.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.exe b/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.exe similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.exe rename to tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.exe diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdb b/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdb similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdb rename to tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdb diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdz b/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdz rename to tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll b/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll rename to tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.ni.r2rmap b/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.ni.r2rmap similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.ni.r2rmap rename to tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.ni.r2rmap diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/System.Diagnostics.StackTrace.dll b/tests/Microsoft.FileFormats.UnitTests/TestBinaries/System.Diagnostics.StackTrace.dll similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/System.Diagnostics.StackTrace.dll rename to tests/Microsoft.FileFormats.UnitTests/TestBinaries/System.Diagnostics.StackTrace.dll diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/apphost.gz b/tests/Microsoft.FileFormats.UnitTests/TestBinaries/apphost.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/apphost.gz rename to tests/Microsoft.FileFormats.UnitTests/TestBinaries/apphost.gz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/core.gz b/tests/Microsoft.FileFormats.UnitTests/TestBinaries/core.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/core.gz rename to tests/Microsoft.FileFormats.UnitTests/TestBinaries/core.gz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/ilasm.dbg b/tests/Microsoft.FileFormats.UnitTests/TestBinaries/ilasm.dbg similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/ilasm.dbg rename to tests/Microsoft.FileFormats.UnitTests/TestBinaries/ilasm.dbg diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libclrjit.dylib.dwarf.gz b/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libclrjit.dylib.dwarf.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libclrjit.dylib.dwarf.gz rename to tests/Microsoft.FileFormats.UnitTests/TestBinaries/libclrjit.dylib.dwarf.gz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.dylib.gz b/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.dylib.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.dylib.gz rename to tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.dylib.gz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.so.gz b/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.so.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.so.gz rename to tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.so.gz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz b/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz rename to tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x64.dmp.gz b/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x64.dmp.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x64.dmp.gz rename to tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x64.dmp.gz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x86.dmp.gz b/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x86.dmp.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x86.dmp.gz rename to tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x86.dmp.gz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/renamed_build_id_section b/tests/Microsoft.FileFormats.UnitTests/TestBinaries/renamed_build_id_section similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/renamed_build_id_section rename to tests/Microsoft.FileFormats.UnitTests/TestBinaries/renamed_build_id_section diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/triagedump.gz b/tests/Microsoft.FileFormats.UnitTests/TestBinaries/triagedump.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/triagedump.gz rename to tests/Microsoft.FileFormats.UnitTests/TestBinaries/triagedump.gz diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/KeyGeneratorTests.cs b/tests/Microsoft.SymbolStore.UnitTests/KeyGeneratorTests.cs similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/KeyGeneratorTests.cs rename to tests/Microsoft.SymbolStore.UnitTests/KeyGeneratorTests.cs diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj b/tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj similarity index 97% rename from src/tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj rename to tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj index b3a103a3fa..50173deba3 100644 --- a/src/tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj +++ b/tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj @@ -5,15 +5,11 @@ - - - - - + - + @@ -21,6 +17,14 @@ + + + + + + + + PreserveNewest diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/PEFileKeyGenerationTests.cs b/tests/Microsoft.SymbolStore.UnitTests/PEFileKeyGenerationTests.cs similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/PEFileKeyGenerationTests.cs rename to tests/Microsoft.SymbolStore.UnitTests/PEFileKeyGenerationTests.cs diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs b/tests/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs rename to tests/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz b/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz rename to tests/Microsoft.SymbolStore.UnitTests/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/coreclr.dll.gz b/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/coreclr.dll.gz similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/coreclr.dll.gz rename to tests/Microsoft.SymbolStore.UnitTests/TestBinaries/coreclr.dll.gz diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.dll b/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.dll rename to tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.dll diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb b/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb rename to tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.dll b/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.dll rename to tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.dll diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.pdb b/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.pdb similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.pdb rename to tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.pdb diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/libSystem.Security.Cryptography.Native.Apple.dylib.gz b/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/libSystem.Security.Cryptography.Native.Apple.dylib.gz similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/libSystem.Security.Cryptography.Native.Apple.dylib.gz rename to tests/Microsoft.SymbolStore.UnitTests/TestBinaries/libSystem.Security.Cryptography.Native.Apple.dylib.gz diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/md5_build_id b/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/md5_build_id similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/md5_build_id rename to tests/Microsoft.SymbolStore.UnitTests/TestBinaries/md5_build_id diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_amd64.dll b/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_amd64.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_amd64.dll rename to tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_amd64.dll diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_arm64.dll b/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_arm64.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_arm64.dll rename to tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_arm64.dll diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_i386.dll b/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_i386.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_i386.dll rename to tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_i386.dll diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdac.dll b/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdac.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdac.dll rename to tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdac.dll diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdbi.dll b/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdbi.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdbi.dll rename to tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdbi.dll diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mocksos.dll b/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mocksos.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mocksos.dll rename to tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mocksos.dll diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/stripped_executable b/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/stripped_executable similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/stripped_executable rename to tests/Microsoft.SymbolStore.UnitTests/TestBinaries/stripped_executable diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/symbolized_executable b/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/symbolized_executable similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/symbolized_executable rename to tests/Microsoft.SymbolStore.UnitTests/TestBinaries/symbolized_executable diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/Tracer.cs b/tests/Microsoft.SymbolStore.UnitTests/Tracer.cs similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/Tracer.cs rename to tests/Microsoft.SymbolStore.UnitTests/Tracer.cs diff --git a/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt similarity index 98% rename from src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt rename to tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt index 336715b0ff..79bf72c76e 100644 --- a/src/SOS/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -13,7 +13,7 @@ ProjectK - $(RepoRootDir)/src/SOS/SOS.UnitTests/Scripts + $(RepoRootDir)/tests/SOS.UnitTests/Scripts $(RepoRootDir)/artifacts $(RootBinDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration) $(RootBinDir)/TestResults/$(TargetConfiguration)/sos.unittests_$(Timestamp) @@ -28,7 +28,7 @@ true false - $(RepoRootDir)/src/SOS/SOS.UnitTests/Debuggees + $(RepoRootDir)/tests/Debuggees $(RepoRootDir)/eng/AuxMsbuildFiles sdk.prebuilt $(RootBinDir) diff --git a/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt similarity index 98% rename from src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt rename to tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt index 885c235399..84f7b43fe9 100644 --- a/src/SOS/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -13,7 +13,7 @@ $(RepoRootDir)\.dotnet-test\x86 - $(RepoRootDir)\src\SOS\SOS.UnitTests\Scripts + $(RepoRootDir)\tests\SOS.UnitTests\Scripts $(RepoRootDir)\artifacts $(RootBinDir)\bin\Windows_NT.$(TargetArchitecture).$(TargetConfiguration) $(RootBinDir)\TestResults\$(TargetConfiguration)\sos.unittests_$(Timestamp) @@ -38,7 +38,7 @@ $(WinDir)\Microsoft.Net\Framework64\v4.0.30319\ $(WinDir)\Microsoft.Net\Framework\v4.0.30319\ - $(RepoRootDir)\src\SOS\SOS.UnitTests\Debuggees + $(RepoRootDir)\tests\Debuggees $(RepoRootDir)\eng\AuxMsbuildFiles sdk.prebuilt $(RootBinDir) diff --git a/src/SOS/SOS.UnitTests/DumpGenerationFixture.cs b/tests/SOS.UnitTests/DumpGenerationFixture.cs similarity index 100% rename from src/SOS/SOS.UnitTests/DumpGenerationFixture.cs rename to tests/SOS.UnitTests/DumpGenerationFixture.cs diff --git a/src/SOS/SOS.UnitTests/SOS.UnitTests.csproj b/tests/SOS.UnitTests/SOS.UnitTests.csproj similarity index 90% rename from src/SOS/SOS.UnitTests/SOS.UnitTests.csproj rename to tests/SOS.UnitTests/SOS.UnitTests.csproj index c0ab49ec2d..29d924b5bc 100644 --- a/src/SOS/SOS.UnitTests/SOS.UnitTests.csproj +++ b/tests/SOS.UnitTests/SOS.UnitTests.csproj @@ -30,8 +30,8 @@ - - + + diff --git a/src/SOS/SOS.UnitTests/SOS.cs b/tests/SOS.UnitTests/SOS.cs similarity index 99% rename from src/SOS/SOS.UnitTests/SOS.cs rename to tests/SOS.UnitTests/SOS.cs index 365c4f3307..548c2eb32c 100644 --- a/src/SOS/SOS.UnitTests/SOS.cs +++ b/tests/SOS.UnitTests/SOS.cs @@ -570,7 +570,7 @@ public async Task LLDBPluginTests(TestConfiguration config) string repoRootDir = TestConfiguration.MakeCanonicalPath(config.AllSettings["RepoRootDir"]); // Get test python script path - string scriptDir = Path.Combine(repoRootDir, "src", "SOS", "lldbplugin.tests"); + string scriptDir = Path.Combine(repoRootDir, "tests", "lldbplugin.tests"); arguments.Append(Path.Combine(scriptDir, "test_libsosplugin.py")); arguments.Append(' '); diff --git a/src/SOS/SOS.UnitTests/SOSRunner.cs b/tests/SOS.UnitTests/SOSRunner.cs similarity index 100% rename from src/SOS/SOS.UnitTests/SOSRunner.cs rename to tests/SOS.UnitTests/SOSRunner.cs diff --git a/src/SOS/SOS.UnitTests/Scripts/ConcurrentDictionaries.script b/tests/SOS.UnitTests/Scripts/ConcurrentDictionaries.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/ConcurrentDictionaries.script rename to tests/SOS.UnitTests/Scripts/ConcurrentDictionaries.script diff --git a/src/SOS/SOS.UnitTests/Scripts/DivZero.script b/tests/SOS.UnitTests/Scripts/DivZero.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/DivZero.script rename to tests/SOS.UnitTests/Scripts/DivZero.script diff --git a/src/SOS/SOS.UnitTests/Scripts/DualRuntimes.script b/tests/SOS.UnitTests/Scripts/DualRuntimes.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/DualRuntimes.script rename to tests/SOS.UnitTests/Scripts/DualRuntimes.script diff --git a/src/SOS/SOS.UnitTests/Scripts/DumpGen.script b/tests/SOS.UnitTests/Scripts/DumpGen.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/DumpGen.script rename to tests/SOS.UnitTests/Scripts/DumpGen.script diff --git a/src/SOS/SOS.UnitTests/Scripts/DynamicMethod.script b/tests/SOS.UnitTests/Scripts/DynamicMethod.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/DynamicMethod.script rename to tests/SOS.UnitTests/Scripts/DynamicMethod.script diff --git a/src/SOS/SOS.UnitTests/Scripts/GCPOH.script b/tests/SOS.UnitTests/Scripts/GCPOH.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/GCPOH.script rename to tests/SOS.UnitTests/Scripts/GCPOH.script diff --git a/src/SOS/SOS.UnitTests/Scripts/GCTests.script b/tests/SOS.UnitTests/Scripts/GCTests.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/GCTests.script rename to tests/SOS.UnitTests/Scripts/GCTests.script diff --git a/src/SOS/SOS.UnitTests/Scripts/LineNums.script b/tests/SOS.UnitTests/Scripts/LineNums.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/LineNums.script rename to tests/SOS.UnitTests/Scripts/LineNums.script diff --git a/src/SOS/SOS.UnitTests/Scripts/NestedExceptionTest.script b/tests/SOS.UnitTests/Scripts/NestedExceptionTest.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/NestedExceptionTest.script rename to tests/SOS.UnitTests/Scripts/NestedExceptionTest.script diff --git a/src/SOS/SOS.UnitTests/Scripts/OtherCommands.script b/tests/SOS.UnitTests/Scripts/OtherCommands.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/OtherCommands.script rename to tests/SOS.UnitTests/Scripts/OtherCommands.script diff --git a/src/SOS/SOS.UnitTests/Scripts/Overflow.script b/tests/SOS.UnitTests/Scripts/Overflow.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/Overflow.script rename to tests/SOS.UnitTests/Scripts/Overflow.script diff --git a/src/SOS/SOS.UnitTests/Scripts/Reflection.script b/tests/SOS.UnitTests/Scripts/Reflection.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/Reflection.script rename to tests/SOS.UnitTests/Scripts/Reflection.script diff --git a/src/SOS/SOS.UnitTests/Scripts/SimpleThrow.script b/tests/SOS.UnitTests/Scripts/SimpleThrow.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/SimpleThrow.script rename to tests/SOS.UnitTests/Scripts/SimpleThrow.script diff --git a/src/SOS/SOS.UnitTests/Scripts/StackAndOtherTests.script b/tests/SOS.UnitTests/Scripts/StackAndOtherTests.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/StackAndOtherTests.script rename to tests/SOS.UnitTests/Scripts/StackAndOtherTests.script diff --git a/src/SOS/SOS.UnitTests/Scripts/StackTests.script b/tests/SOS.UnitTests/Scripts/StackTests.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/StackTests.script rename to tests/SOS.UnitTests/Scripts/StackTests.script diff --git a/src/SOS/SOS.UnitTests/Scripts/StackTraceFaultingExceptionFrame.script b/tests/SOS.UnitTests/Scripts/StackTraceFaultingExceptionFrame.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/StackTraceFaultingExceptionFrame.script rename to tests/SOS.UnitTests/Scripts/StackTraceFaultingExceptionFrame.script diff --git a/src/SOS/SOS.UnitTests/Scripts/StackTraceSoftwareExceptionFrame.script b/tests/SOS.UnitTests/Scripts/StackTraceSoftwareExceptionFrame.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/StackTraceSoftwareExceptionFrame.script rename to tests/SOS.UnitTests/Scripts/StackTraceSoftwareExceptionFrame.script diff --git a/src/SOS/SOS.UnitTests/Scripts/TaskNestedException.script b/tests/SOS.UnitTests/Scripts/TaskNestedException.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/TaskNestedException.script rename to tests/SOS.UnitTests/Scripts/TaskNestedException.script diff --git a/src/SOS/SOS.UnitTests/Scripts/TestExtensions.script b/tests/SOS.UnitTests/Scripts/TestExtensions.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/TestExtensions.script rename to tests/SOS.UnitTests/Scripts/TestExtensions.script diff --git a/src/SOS/SOS.UnitTests/Scripts/WebApp.script b/tests/SOS.UnitTests/Scripts/WebApp.script similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/WebApp.script rename to tests/SOS.UnitTests/Scripts/WebApp.script diff --git a/src/SOS/SOS.UnitTests/Scripts/lldbhelper.py b/tests/SOS.UnitTests/Scripts/lldbhelper.py similarity index 100% rename from src/SOS/SOS.UnitTests/Scripts/lldbhelper.py rename to tests/SOS.UnitTests/Scripts/lldbhelper.py diff --git a/src/tests/TestExtension/TestCommands.cs b/tests/TestExtension/TestCommands.cs similarity index 100% rename from src/tests/TestExtension/TestCommands.cs rename to tests/TestExtension/TestCommands.cs diff --git a/src/tests/TestExtension/TestExtension.csproj b/tests/TestExtension/TestExtension.csproj similarity index 72% rename from src/tests/TestExtension/TestExtension.csproj rename to tests/TestExtension/TestExtension.csproj index 3db8fe9c15..4f299ccaa6 100644 --- a/src/tests/TestExtension/TestExtension.csproj +++ b/tests/TestExtension/TestExtension.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/tests/TestHelpers/MaxStreamReadHelper.cs b/tests/TestHelpers/MaxStreamReadHelper.cs similarity index 100% rename from src/tests/TestHelpers/MaxStreamReadHelper.cs rename to tests/TestHelpers/MaxStreamReadHelper.cs diff --git a/src/tests/TestHelpers/TestHelpers.cs b/tests/TestHelpers/TestHelpers.cs similarity index 100% rename from src/tests/TestHelpers/TestHelpers.cs rename to tests/TestHelpers/TestHelpers.cs diff --git a/src/tests/TestHelpers/TestHelpers.csproj b/tests/TestHelpers/TestHelpers.csproj similarity index 81% rename from src/tests/TestHelpers/TestHelpers.csproj rename to tests/TestHelpers/TestHelpers.csproj index 3ad5a576f6..ea7e51f06d 100644 --- a/src/tests/TestHelpers/TestHelpers.csproj +++ b/tests/TestHelpers/TestHelpers.csproj @@ -5,6 +5,6 @@ - + diff --git a/src/tests/benchmarks/.gitignore b/tests/benchmarks/.gitignore similarity index 100% rename from src/tests/benchmarks/.gitignore rename to tests/benchmarks/.gitignore diff --git a/src/tests/benchmarks/Program.cs b/tests/benchmarks/Program.cs similarity index 100% rename from src/tests/benchmarks/Program.cs rename to tests/benchmarks/Program.cs diff --git a/src/tests/benchmarks/README.md b/tests/benchmarks/README.md similarity index 100% rename from src/tests/benchmarks/README.md rename to tests/benchmarks/README.md diff --git a/src/tests/benchmarks/RunBenchmarks.cmd b/tests/benchmarks/RunBenchmarks.cmd similarity index 100% rename from src/tests/benchmarks/RunBenchmarks.cmd rename to tests/benchmarks/RunBenchmarks.cmd diff --git a/src/tests/benchmarks/RunBenchmarks.sh b/tests/benchmarks/RunBenchmarks.sh old mode 100755 new mode 100644 similarity index 100% rename from src/tests/benchmarks/RunBenchmarks.sh rename to tests/benchmarks/RunBenchmarks.sh diff --git a/src/tests/benchmarks/benchmarks.csproj b/tests/benchmarks/benchmarks.csproj similarity index 100% rename from src/tests/benchmarks/benchmarks.csproj rename to tests/benchmarks/benchmarks.csproj diff --git a/src/SOS/lldbplugin.tests/README.md b/tests/lldbplugin.tests/README.md similarity index 100% rename from src/SOS/lldbplugin.tests/README.md rename to tests/lldbplugin.tests/README.md diff --git a/src/SOS/lldbplugin.tests/t_cmd_bpmd_clear.py b/tests/lldbplugin.tests/t_cmd_bpmd_clear.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_bpmd_clear.py rename to tests/lldbplugin.tests/t_cmd_bpmd_clear.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_bpmd_clearall.py b/tests/lldbplugin.tests/t_cmd_bpmd_clearall.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_bpmd_clearall.py rename to tests/lldbplugin.tests/t_cmd_bpmd_clearall.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_bpmd_methoddesc.py b/tests/lldbplugin.tests/t_cmd_bpmd_methoddesc.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_bpmd_methoddesc.py rename to tests/lldbplugin.tests/t_cmd_bpmd_methoddesc.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_bpmd_module_function.py b/tests/lldbplugin.tests/t_cmd_bpmd_module_function.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_bpmd_module_function.py rename to tests/lldbplugin.tests/t_cmd_bpmd_module_function.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_bpmd_module_function_iloffset.py b/tests/lldbplugin.tests/t_cmd_bpmd_module_function_iloffset.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_bpmd_module_function_iloffset.py rename to tests/lldbplugin.tests/t_cmd_bpmd_module_function_iloffset.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_bpmd_nofuturemodule_module_function.py b/tests/lldbplugin.tests/t_cmd_bpmd_nofuturemodule_module_function.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_bpmd_nofuturemodule_module_function.py rename to tests/lldbplugin.tests/t_cmd_bpmd_nofuturemodule_module_function.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_clrstack.py b/tests/lldbplugin.tests/t_cmd_clrstack.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_clrstack.py rename to tests/lldbplugin.tests/t_cmd_clrstack.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_clrthreads.py b/tests/lldbplugin.tests/t_cmd_clrthreads.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_clrthreads.py rename to tests/lldbplugin.tests/t_cmd_clrthreads.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_clru.py b/tests/lldbplugin.tests/t_cmd_clru.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_clru.py rename to tests/lldbplugin.tests/t_cmd_clru.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_dso.py b/tests/lldbplugin.tests/t_cmd_dso.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_dso.py rename to tests/lldbplugin.tests/t_cmd_dso.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_dumpclass.py b/tests/lldbplugin.tests/t_cmd_dumpclass.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_dumpclass.py rename to tests/lldbplugin.tests/t_cmd_dumpclass.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_dumpheap.py b/tests/lldbplugin.tests/t_cmd_dumpheap.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_dumpheap.py rename to tests/lldbplugin.tests/t_cmd_dumpheap.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_dumpil.py b/tests/lldbplugin.tests/t_cmd_dumpil.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_dumpil.py rename to tests/lldbplugin.tests/t_cmd_dumpil.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_dumplog.py b/tests/lldbplugin.tests/t_cmd_dumplog.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_dumplog.py rename to tests/lldbplugin.tests/t_cmd_dumplog.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_dumpmd.py b/tests/lldbplugin.tests/t_cmd_dumpmd.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_dumpmd.py rename to tests/lldbplugin.tests/t_cmd_dumpmd.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_dumpmodule.py b/tests/lldbplugin.tests/t_cmd_dumpmodule.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_dumpmodule.py rename to tests/lldbplugin.tests/t_cmd_dumpmodule.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_dumpmt.py b/tests/lldbplugin.tests/t_cmd_dumpmt.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_dumpmt.py rename to tests/lldbplugin.tests/t_cmd_dumpmt.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_dumpobj.py b/tests/lldbplugin.tests/t_cmd_dumpobj.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_dumpobj.py rename to tests/lldbplugin.tests/t_cmd_dumpobj.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_dumpstack.py b/tests/lldbplugin.tests/t_cmd_dumpstack.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_dumpstack.py rename to tests/lldbplugin.tests/t_cmd_dumpstack.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_eeheap.py b/tests/lldbplugin.tests/t_cmd_eeheap.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_eeheap.py rename to tests/lldbplugin.tests/t_cmd_eeheap.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_eestack.py b/tests/lldbplugin.tests/t_cmd_eestack.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_eestack.py rename to tests/lldbplugin.tests/t_cmd_eestack.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_gcroot.py b/tests/lldbplugin.tests/t_cmd_gcroot.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_gcroot.py rename to tests/lldbplugin.tests/t_cmd_gcroot.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_histclear.py b/tests/lldbplugin.tests/t_cmd_histclear.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_histclear.py rename to tests/lldbplugin.tests/t_cmd_histclear.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_histinit.py b/tests/lldbplugin.tests/t_cmd_histinit.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_histinit.py rename to tests/lldbplugin.tests/t_cmd_histinit.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_histobj.py b/tests/lldbplugin.tests/t_cmd_histobj.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_histobj.py rename to tests/lldbplugin.tests/t_cmd_histobj.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_histobjfind.py b/tests/lldbplugin.tests/t_cmd_histobjfind.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_histobjfind.py rename to tests/lldbplugin.tests/t_cmd_histobjfind.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_histroot.py b/tests/lldbplugin.tests/t_cmd_histroot.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_histroot.py rename to tests/lldbplugin.tests/t_cmd_histroot.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_ip2md.py b/tests/lldbplugin.tests/t_cmd_ip2md.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_ip2md.py rename to tests/lldbplugin.tests/t_cmd_ip2md.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_name2ee.py b/tests/lldbplugin.tests/t_cmd_name2ee.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_name2ee.py rename to tests/lldbplugin.tests/t_cmd_name2ee.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_pe.py b/tests/lldbplugin.tests/t_cmd_pe.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_pe.py rename to tests/lldbplugin.tests/t_cmd_pe.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_sos.py b/tests/lldbplugin.tests/t_cmd_sos.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_sos.py rename to tests/lldbplugin.tests/t_cmd_sos.py diff --git a/src/SOS/lldbplugin.tests/t_cmd_soshelp.py b/tests/lldbplugin.tests/t_cmd_soshelp.py similarity index 100% rename from src/SOS/lldbplugin.tests/t_cmd_soshelp.py rename to tests/lldbplugin.tests/t_cmd_soshelp.py diff --git a/src/SOS/lldbplugin.tests/test_libsosplugin.py b/tests/lldbplugin.tests/test_libsosplugin.py similarity index 100% rename from src/SOS/lldbplugin.tests/test_libsosplugin.py rename to tests/lldbplugin.tests/test_libsosplugin.py diff --git a/src/SOS/lldbplugin.tests/testsos.sh b/tests/lldbplugin.tests/testsos.sh old mode 100755 new mode 100644 similarity index 100% rename from src/SOS/lldbplugin.tests/testsos.sh rename to tests/lldbplugin.tests/testsos.sh diff --git a/src/SOS/lldbplugin.tests/testutils.py b/tests/lldbplugin.tests/testutils.py similarity index 100% rename from src/SOS/lldbplugin.tests/testutils.py rename to tests/lldbplugin.tests/testutils.py diff --git a/src/SOS/runcommand/CMakeLists.txt b/tests/runcommand/CMakeLists.txt similarity index 96% rename from src/SOS/runcommand/CMakeLists.txt rename to tests/runcommand/CMakeLists.txt index c9b492de8a..a52c56da3f 100644 --- a/src/SOS/runcommand/CMakeLists.txt +++ b/tests/runcommand/CMakeLists.txt @@ -2,7 +2,6 @@ project(runcommand) set(CMAKE_INCLUDE_CURRENT_DIR ON) -include_directories(inc) include_directories("$ENV{VSInstallDir}/DIA SDK/include") add_definitions(-DUSE_STL) diff --git a/src/SOS/runcommand/runcommand.cpp b/tests/runcommand/runcommand.cpp similarity index 100% rename from src/SOS/runcommand/runcommand.cpp rename to tests/runcommand/runcommand.cpp From ad7cdcd17bec687d309e7d05b97f645d53880bc2 Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Mon, 28 Apr 2025 15:42:40 -0700 Subject: [PATCH 02/17] Remove debuggee from DbgShim.UnitTest project --- tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj | 7 ------- 1 file changed, 7 deletions(-) diff --git a/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj b/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj index 4fb0f0e9c4..29526fb47d 100644 --- a/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj +++ b/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj @@ -7,10 +7,6 @@ 1.0.351101 - - - - @@ -74,9 +70,6 @@ - - - From 1f9a870507746710f5d25d014a54d1c7f091bdaa Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Tue, 29 Apr 2025 09:36:33 -0700 Subject: [PATCH 03/17] Everything under the tests directory is not packable --- tests/Directory.Build.props | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index b634f4d270..a8c31eac01 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -9,5 +9,6 @@ true true false + false From 93a5efa8914ce513b6813031addc12dac9aafc7a Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Wed, 30 Apr 2025 14:38:18 -0700 Subject: [PATCH 04/17] Fix packing in official build --- Directory.Build.props | 3 +++ eng/ci-prepare-artifacts.cmd | 4 ++-- src/Directory.Build.props | 4 +--- tests/Directory.Build.props | 2 -- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 393951b02c..ca2daa3dea 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -9,8 +9,11 @@ Latest 4 true + false true <_SkipUpgradeNetAnalyzersNuGetWarning>true + false + false diff --git a/eng/ci-prepare-artifacts.cmd b/eng/ci-prepare-artifacts.cmd index af95f7c3aa..7050148ad0 100644 --- a/eng/ci-prepare-artifacts.cmd +++ b/eng/ci-prepare-artifacts.cmd @@ -5,11 +5,11 @@ set "_commonArgs=-restore -ci -prepareMachine -verbosity minimal -configuration set "_logDir=%~dp0..\artifacts\log\Release\" echo Creating packages -powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0common\Build.ps1""" %_commonArgs% -pack -noBl /bl:'%_logDir%Pack.binlog' %*" +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0common\Build.ps1""" %_commonArgs% -pack -noBl /bl:'%_logDir%Pack.binlog' -projects %~dp0..\diagnostics.sln %*" if NOT '%ERRORLEVEL%' == '0' goto ExitWithCode echo Creating bundles -powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" %_commonArgs% -build -bundletools %*" +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" %_commonArgs% -build -bundletools -projects %~dp0..\diagnostics.sln %*" if NOT '%ERRORLEVEL%' == '0' goto ExitWithCode echo Creating dbgshim packages diff --git a/src/Directory.Build.props b/src/Directory.Build.props index ed7c3a0764..a701713c47 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -3,11 +3,9 @@ - false - false true - true true + true $(ArtifactsDir)bundledtools/ diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index a8c31eac01..9e5db261ef 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -8,7 +8,5 @@ $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant) true true - false - false From a57bf978b2909dd334974ed01654e5e6f4dec77f Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Wed, 30 Apr 2025 16:43:02 -0700 Subject: [PATCH 05/17] Fix single-file build step --- eng/ci-prepare-artifacts.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/ci-prepare-artifacts.cmd b/eng/ci-prepare-artifacts.cmd index 7050148ad0..ec47985367 100644 --- a/eng/ci-prepare-artifacts.cmd +++ b/eng/ci-prepare-artifacts.cmd @@ -9,7 +9,7 @@ powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0common\Build.p if NOT '%ERRORLEVEL%' == '0' goto ExitWithCode echo Creating bundles -powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" %_commonArgs% -build -bundletools -projects %~dp0..\diagnostics.sln %*" +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" %_commonArgs% -build -bundletools %*" if NOT '%ERRORLEVEL%' == '0' goto ExitWithCode echo Creating dbgshim packages From aebac9ccec1751bf322ee0a8b0b2b92a0b5a0b8b Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Tue, 5 Aug 2025 16:28:09 -0400 Subject: [PATCH 06/17] Split out build tools and tests from running them --- Build.proj | 36 +++++++++++++++++++ Test.proj | 44 +++++++++++++++++++++++ eng/Build.props | 11 ++---- eng/build.ps1 | 17 +++++++-- eng/build.sh | 21 ++++++++--- eng/pipelines/build.yml | 27 +++++++++----- global.json | 1 + test.sh | 2 +- tests/Directory.Build.props | 2 +- tests/DotnetStack.UnitTests/StackTests.cs | 1 - 10 files changed, 135 insertions(+), 27 deletions(-) create mode 100644 Build.proj create mode 100644 Test.proj diff --git a/Build.proj b/Build.proj new file mode 100644 index 0000000000..bb20a62c55 --- /dev/null +++ b/Build.proj @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Test.proj b/Test.proj new file mode 100644 index 0000000000..6b1618e794 --- /dev/null +++ b/Test.proj @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eng/Build.props b/eng/Build.props index 61f52242a2..ef837e2b98 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -1,12 +1,5 @@ - - - - + + - - - - - \ No newline at end of file diff --git a/eng/build.ps1 b/eng/build.ps1 index 15f2d14f7e..fd279ed067 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -3,7 +3,8 @@ Param( [ValidateSet("x86","x64","arm","arm64")][string][Alias('a', "platform")]$architecture = [System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant(), [ValidateSet("Debug","Release")][string][Alias('c')] $configuration = "Debug", [string][Alias('v')] $verbosity = "minimal", - [switch][Alias('t')] $test, + [switch][Alias('bt')] $buildtests, + [switch][Alias('rt')] $runtests, [switch] $installruntimes, [switch] $privatebuild, [switch] $ci, @@ -23,6 +24,11 @@ Param( Set-StrictMode -Version Latest $ErrorActionPreference = "Stop" +if ($runtests) { + $skipmanaged = $true + $skipnative = $true +} + $crossbuild = $false if (($architecture -eq "arm") -or ($architecture -eq "arm64")) { $processor = @([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant()) @@ -67,6 +73,10 @@ if (-not $skipnative) { # Install sdk for building, restore and build managed components. if (-not $skipmanaged) { + if ($buildtests) { + $remainingargs = "/p:BuildTests=true " + $remainingargs + } + Invoke-Expression "& `"$engroot\common\build.ps1`" -configuration $configuration -verbosity $verbosity $bl /p:TargetOS=$os /p:TargetArch=$architecture /p:TestArchitectures=$architecture $remainingargs" if ($lastExitCode -ne 0) { @@ -93,7 +103,7 @@ if ($installruntimes -or $privatebuild) { } # Run the xunit tests -if ($test) { +if ($runtests) { if (-not $crossbuild) { if ($useCdac) { $env:SOS_TEST_CDAC="true" @@ -111,7 +121,8 @@ if ($test) { /p:DotnetRuntimeDownloadVersion="$dotnetruntimedownloadversion" ` /p:RuntimeSourceFeed="$runtimesourcefeed" ` /p:RuntimeSourceFeedKey="$runtimesourcefeedkey" ` - /p:LiveRuntimeDir="$liveRuntimeDir" + /p:LiveRuntimeDir="$liveRuntimeDir" ` + /p:IsTestRun=true if ($lastExitCode -ne 0) { exit $lastExitCode diff --git a/eng/build.sh b/eng/build.sh index e84a3eb197..62e1dc7c0c 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -28,7 +28,8 @@ __SkipConfigure=0 __SkipGenerateVersion=0 __InstallRuntimes=0 __PrivateBuild=0 -__Test=0 +__BuildTests=0 +__RunTests=0 __UnprocessedBuildArgs= __UseCdac=0 __LiveRuntimeDir= @@ -101,8 +102,14 @@ handle_arguments() { __PrivateBuild=1 ;; - test|-test) - __Test=1 + buildtests|-buildtests) + __BuildTests=1 + ;; + + runtests|-runtests) + __RunTests=1 + __NativeBuild=0 + __ManagedBuild=0 ;; usecdac|-usecdac) @@ -219,6 +226,11 @@ if [[ "$__ManagedBuild" == 1 ]]; then # __CommonMSBuildArgs contains TargetOS property echo "Commencing managed build for $__BuildType in $__RootBinDir/bin" + + if [[ "$__BuildTests" == 1 ]]; then + __ManagedBuildArgs="$__ManagedBuildArgs /p:BuildTests=true" + fi + "$__RepoRootDir/eng/common/build.sh" \ --configuration "$__BuildType" \ /p:TargetArch="$__TargetArch" \ @@ -258,7 +270,7 @@ fi # Run xunit tests # -if [[ "$__Test" == 1 ]]; then +if [[ "$__RunTests" == 1 ]]; then if [[ "$__CrossBuild" == 0 ]]; then if [[ -z "$LLDB_PATH" ]]; then check_version_exists() { @@ -314,6 +326,7 @@ if [[ "$__Test" == 1 ]]; then /p:RuntimeSourceFeed="$__RuntimeSourceFeed" \ /p:RuntimeSourceFeedKey="$__RuntimeSourceFeedKey" \ /p:LiveRuntimeDir="$__LiveRuntimeDir" \ + /p:IsTestRun=true \ $__CommonMSBuildArgs if [ $? != 0 ]; then diff --git a/eng/pipelines/build.yml b/eng/pipelines/build.yml index ba061cc2f2..3b4f3c96d4 100644 --- a/eng/pipelines/build.yml +++ b/eng/pipelines/build.yml @@ -130,7 +130,8 @@ jobs: - _PhaseName: ${{ coalesce(parameters.name, parameters.osGroup) }}_${{ config.architecture }}_${{ config.configuration }} - _Pipeline_StreamDumpDir: $(Build.SourcesDirectory)/artifacts/tmp/${{ config.configuration }}/streams - - _TestArgs: '-test' + - _BuildTestArgs: '-buildtests' + - _RunTestArgs: '-runtests' - _Cross: '' - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: @@ -142,10 +143,10 @@ jobs: 'error, testOnly and buildOnly cannot be true at the same time': error - ${{ if eq(parameters.testOnly, 'true') }}: - - _TestArgs: '-test -skipnative' + - _BuildTestArgs: '-buildtests -skipnative' - ${{ if or(eq(parameters.buildOnly, 'true'), eq(parameters.isCodeQLRun, 'true')) }}: - - _TestArgs: '' + - _BuildTestArgs: '' # For testing msrc's and service releases. The RuntimeSourceVersion is either "default" or the service release version to test - _InternalInstallArgs: '' @@ -185,18 +186,28 @@ jobs: -binaryLog -configuration ${{ config.configuration }} -architecture ${{ config.architecture }} - $(_TestArgs) + $(_BuildTestArgs) $(_Cross) $(_InternalInstallArgs) /p:OfficialBuildId=$(BUILD.BUILDNUMBER) ${{ if eq(parameters.testOnly, 'true') }}: - displayName: Test - ${{ elseif eq(parameters.buildOnly, 'true') }}: - displayName: Build + displayName: Build Tests ${{ else }}: - displayName: Build / Test + displayName: Build condition: succeeded() + - ${{ if and(ne(parameters.isCodeQLRun, 'true'), ne(parameters.buildOnly, 'true')) }}: + - script: $(_buildScript) + -ci + -binaryLog + -configuration ${{ config.configuration }} + -architecture ${{ config.architecture }} + $(_RunTestArgs) + $(_InternalInstallArgs) + /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + displayName: Run Tests + condition: succeeded() + - ${{ if eq(parameters.isCodeQLRun, 'true') }}: - task: CodeQL3000Finalize@0 displayName: CodeQL Finalize diff --git a/global.json b/global.json index 9c3adfeb03..c41ff161a6 100644 --- a/global.json +++ b/global.json @@ -17,6 +17,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", + "Microsoft.Build.Traversal": "3.4.0", "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25351.106" } } diff --git a/test.sh b/test.sh index 65eb42dd00..11ea60cfeb 100755 --- a/test.sh +++ b/test.sh @@ -13,5 +13,5 @@ while [[ -h $source ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -"$scriptroot/eng/build.sh" -test -skipmanaged -skipnative $@ +"$scriptroot/eng/build.sh" -runtests $@ diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index fcbce7cd88..edeebe382d 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -1,6 +1,6 @@ - + diff --git a/tests/DotnetStack.UnitTests/StackTests.cs b/tests/DotnetStack.UnitTests/StackTests.cs index c689e5a5ba..fe5d0ea5f9 100644 --- a/tests/DotnetStack.UnitTests/StackTests.cs +++ b/tests/DotnetStack.UnitTests/StackTests.cs @@ -4,7 +4,6 @@ using System; using System.Collections.Generic; using System.CommandLine; -using System.CommandLine.IO; using System.CommandLine.Parsing; using System.Threading.Tasks; using Microsoft.Diagnostics.TestHelpers; From 7c06f2db44a41bce93132268ea9e16deb9b2ae2e Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Tue, 5 Aug 2025 18:36:39 -0400 Subject: [PATCH 07/17] Use -withtests instead because powershell doesn't seem to like prefixes with build in them. Flags as duplicate params --- eng/build.ps1 | 4 ++-- eng/build.sh | 2 +- eng/pipelines/build.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/build.ps1 b/eng/build.ps1 index fd279ed067..a0837d8fdd 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -3,7 +3,7 @@ Param( [ValidateSet("x86","x64","arm","arm64")][string][Alias('a', "platform")]$architecture = [System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant(), [ValidateSet("Debug","Release")][string][Alias('c')] $configuration = "Debug", [string][Alias('v')] $verbosity = "minimal", - [switch][Alias('bt')] $buildtests, + [switch][Alias('wt')] $withtests, [switch][Alias('rt')] $runtests, [switch] $installruntimes, [switch] $privatebuild, @@ -73,7 +73,7 @@ if (-not $skipnative) { # Install sdk for building, restore and build managed components. if (-not $skipmanaged) { - if ($buildtests) { + if ($withtests) { $remainingargs = "/p:BuildTests=true " + $remainingargs } diff --git a/eng/build.sh b/eng/build.sh index 62e1dc7c0c..d8f1aedb2f 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -102,7 +102,7 @@ handle_arguments() { __PrivateBuild=1 ;; - buildtests|-buildtests) + withtests|-withtests) __BuildTests=1 ;; diff --git a/eng/pipelines/build.yml b/eng/pipelines/build.yml index 3b4f3c96d4..ec12f7cd35 100644 --- a/eng/pipelines/build.yml +++ b/eng/pipelines/build.yml @@ -130,7 +130,7 @@ jobs: - _PhaseName: ${{ coalesce(parameters.name, parameters.osGroup) }}_${{ config.architecture }}_${{ config.configuration }} - _Pipeline_StreamDumpDir: $(Build.SourcesDirectory)/artifacts/tmp/${{ config.configuration }}/streams - - _BuildTestArgs: '-buildtests' + - _BuildTestArgs: '-withtests' - _RunTestArgs: '-runtests' - _Cross: '' @@ -143,7 +143,7 @@ jobs: 'error, testOnly and buildOnly cannot be true at the same time': error - ${{ if eq(parameters.testOnly, 'true') }}: - - _BuildTestArgs: '-buildtests -skipnative' + - _BuildTestArgs: '-withtests -skipnative' - ${{ if or(eq(parameters.buildOnly, 'true'), eq(parameters.isCodeQLRun, 'true')) }}: - _BuildTestArgs: '' From b118af2fd90145762bdff0f17ec470fb380995b6 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Mon, 25 Aug 2025 15:42:18 -0400 Subject: [PATCH 08/17] WIP - DbgShim.UnitTests can run outside of the repo with a few tweaks (NuGet.config, Version.props, and a debuggee Directory.Build.props+targets) --- Directory.Build.props | 9 + eng/InstallRuntimes.proj | 10 - eng/SendToHelix.proj | 26 +++ eng/build.sh | 13 ++ .../Unix/Debugger.Tests.Config.txt | 6 +- .../Windows/Debugger.Tests.Config.txt | 7 +- .../DbgShim.UnitTests.csproj | 38 ++-- tests/Debuggees/Directory.Build.props | 1 + tests/Directory.Build.props | 35 ++++ tests/Directory.Build.targets | 173 ++++++++++++++++++ ...Diagnostics.DebugServices.UnitTests.csproj | 14 +- .../TestConfiguration.cs | 5 +- tests/SOS.UnitTests/SOS.UnitTests.csproj | 7 +- 13 files changed, 292 insertions(+), 52 deletions(-) create mode 100644 eng/SendToHelix.proj diff --git a/Directory.Build.props b/Directory.Build.props index 9ce0b14e26..b180e2e33e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -70,4 +70,13 @@ net8.0 + + $(RepoRoot).dotnet-test\ + HKEY_LOCAL_MACHINE\SOFTWARE + + + + $(RepoRoot).dotnet-test\x86\ + HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node + diff --git a/eng/InstallRuntimes.proj b/eng/InstallRuntimes.proj index d817ad01f9..1e2b86ccca 100644 --- a/eng/InstallRuntimes.proj +++ b/eng/InstallRuntimes.proj @@ -22,16 +22,6 @@ $([MSBuild]::NormalizePath('$(LiveRuntimeDir)')) - - $(RepoRoot).dotnet-test\ - HKEY_LOCAL_MACHINE\SOFTWARE - - - - $(RepoRoot).dotnet-test\x86\ - HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node - - -NoPath -SkipNonVersionedFiles -Architecture $(TargetArch) -InstallDir $(DotNetInstallRoot) $([MSBuild]::NormalizeDirectory('$(DotNetInstallRoot)', 'shared', 'Microsoft.NETCore.App', '$(MicrosoftNETCoreAppRefVersion)')) diff --git a/eng/SendToHelix.proj b/eng/SendToHelix.proj new file mode 100644 index 0000000000..fe28f37b73 --- /dev/null +++ b/eng/SendToHelix.proj @@ -0,0 +1,26 @@ + + + $(TargetArch) + $(OfficialBuildId) + 99999999.99 + Release + tests/diagnostics/ + + + + true + sdk + $(MicrosoftNetSdkVersion) + Current + + + + + + runtime + + + aspnetcore-runtime + + + \ No newline at end of file diff --git a/eng/build.sh b/eng/build.sh index d8f1aedb2f..ee1acc8df8 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -112,6 +112,10 @@ handle_arguments() { __ManagedBuild=0 ;; + helix|-helix) + __UseHelix=1 + ;; + usecdac|-usecdac) __UseCdac=1 ;; @@ -229,6 +233,10 @@ if [[ "$__ManagedBuild" == 1 ]]; then if [[ "$__BuildTests" == 1 ]]; then __ManagedBuildArgs="$__ManagedBuildArgs /p:BuildTests=true" + + if [[ "$__UseHelix" == 1 ]]; then + __ManagedBuildArgs="$__ManagedBuildArgs /p:ArchiveTests=true" + fi fi "$__RepoRootDir/eng/common/build.sh" \ @@ -314,6 +322,10 @@ if [[ "$__RunTests" == 1 ]]; then export SOS_TEST_CDAC="true" fi + if [[ "$__UseHelix" == 1 ]]; then + __ManagedBuildArgs="$__ManagedBuildArgs /p:UseHelix=true" + fi + # __CommonMSBuildArgs contains TargetOS property "$__RepoRootDir/eng/common/build.sh" \ --test \ @@ -327,6 +339,7 @@ if [[ "$__RunTests" == 1 ]]; then /p:RuntimeSourceFeedKey="$__RuntimeSourceFeedKey" \ /p:LiveRuntimeDir="$__LiveRuntimeDir" \ /p:IsTestRun=true \ + $__ManagedBuildArgs \ $__CommonMSBuildArgs if [ $? != 0 ]; then diff --git a/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt index 2b4989f0ad..889031e8f4 100644 --- a/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -1,10 +1,10 @@ - $(RepoRootDir)/.dotnet-test - + $(TestDotNetRoot) + $(RepoRootDir)/artifacts - $(RootBinDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration) + $(TestNativeDir) $(RootBinDir)/TestResults/$(TargetConfiguration)/dbgshim.unittests_$(Timestamp) ProjectK diff --git a/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt index 8d57ab6ced..4ccdaac189 100644 --- a/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -1,11 +1,10 @@ - $(RepoRootDir)\.dotnet-test - $(RepoRootDir)\.dotnet-test\x86 - + $(TestDotNetRoot) + $(RepoRootDir)\artifacts - $(RootBinDir)\bin\Windows_NT.$(TargetArchitecture).$(TargetConfiguration) + $(TestNativeDir) $(RootBinDir)\TestResults\$(TargetConfiguration)\dbgshim.unittests_$(Timestamp) ProjectK diff --git a/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj b/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj index 29526fb47d..7a0dc6ca9a 100644 --- a/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj +++ b/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj @@ -5,6 +5,9 @@ true $(OutputPath)$(TargetFramework)\Debugger.Tests.Common.txt 1.0.351101 + true + true + true @@ -23,16 +26,6 @@ - - - - - - - - - - @@ -42,11 +35,14 @@ $(Configuration) - $(RepoRoot) - $(NuGetPackageRoot)testassets.windows.x64.6.0\$(TestAssetsVersion)\content - $(NuGetPackageRoot)testassets.windows.x86.6.0\$(TestAssetsVersion)\content - $(NuGetPackageRoot)testassets.linux.x64.6.0\$(TestAssetsVersion)\content - $(NuGetPackageRoot)testassets.linux.arm64.6.0\$(TestAssetsVersion)\content + $(TestDotNetRootDir) + $(TestRepoRoot) + $(TestNativeDir) + $(TestVersionConfigDir) + $(TestPackageArtifactsRootDir)\testassets.windows.x64.6.0\$(TestAssetsVersion)\content + $(TestPackageArtifactsRootDir)\testassets.windows.x86.6.0\$(TestAssetsVersion)\content + $(TestPackageArtifactsRootDir)\testassets.linux.x64.6.0\$(TestAssetsVersion)\content + $(TestPackageArtifactsRootDir)\testassets.linux.arm64.6.0\$(TestAssetsVersion)\content ]]> @@ -62,14 +58,20 @@ $(Configuration) - $(RepoRoot) - $(NuGetPackageRoot)testassets.linux.x64.6.0/$(TestAssetsVersion)/content - $(NuGetPackageRoot)testassets.linux.arm64.6.0/$(TestAssetsVersion)/content + $(TestDotNetRootDir) + $(TestRepoRoot) + $(TestNativeDir) + $(TestVersionConfigDir) + $(TestPackageArtifactsRootDir)\testassets.linux.x64.6.0\$(TestAssetsVersion)\content + $(TestPackageArtifactsRootDir)\testassets.linux.arm64.6.0\$(TestAssetsVersion)\content ]]> + + + diff --git a/tests/Debuggees/Directory.Build.props b/tests/Debuggees/Directory.Build.props index e498ae1003..ada0b8bc45 100644 --- a/tests/Debuggees/Directory.Build.props +++ b/tests/Debuggees/Directory.Build.props @@ -6,6 +6,7 @@ full true false + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'debuggees', '$(MSBuildProjectName)', '$(Configuration)')) diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index edeebe382d..d7c07256dd 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -7,4 +7,39 @@ true true + + + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'eng', 'AuxMsbuildFiles')) + $([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'Debuggees')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'debuggees')) + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'packages')) + $([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Debugger.Tests.Versions.txt')) + + + + $(ArtifactsDir)helix/ + $(TestArchiveRoot)tests/ + + + + . + packages + eng/AuxMsbuildFiles + . + native + + + + $(RepoRoot) + $(DotNetInstallRoot) + $(NuGetPackageRoot) + $(AuxMSBuildRootDir) + $(ArtifactsBinDir) + $(ArtifactsBinNativeDir) + + + + true + true + diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets index bcd8685e26..4fce9b9160 100644 --- a/tests/Directory.Build.targets +++ b/tests/Directory.Build.targets @@ -11,6 +11,25 @@ + + + + + + + + + + + + + + + + + + + <_cdbFiles Include="$(NuGetPackageRoot)cdb-sos\$(cdbsosversion)\**\*" + Condition="'$(NeedsCdb)' == 'true'" /> + + <_testAssetsWinx64 Include="$(NuGetPackageRoot)testassets.windows.x64.6.0\$(TestAssetsVersion)\**\*" + Condition="'$(NeedsTestAssets)' == 'true' and '$(OS)' == 'Windows_NT'" /> + + <_testAssetsWinx86 Include="$(NuGetPackageRoot)testassets.windows.x86.6.0\$(TestAssetsVersion)\**\*" + Condition="'$(NeedsTestAssets)' == 'true' and '$(OS)' == 'Windows_NT'" /> + + <_testAssetsLinux64 Include="$(NuGetPackageRoot)testassets.linux.x64.6.0\$(TestAssetsVersion)\**\*" + Condition="'$(NeedsTestAssets)' == 'true'" /> + + <_testAssetsLinuxArm64 Include="$(NuGetPackageRoot)testassets.linux.arm64.6.0\$(TestAssetsVersion)\**\*" + Condition="'$(NeedsTestAssets)' == 'true'" /> + + + + + + + + + + + + + + + + + + <_ZipSourceDirectory>$(OutDir) + <_ZipSourceDirectory Condition="'$(NeedsPublishing)' == 'true'">$(PublishDir) + + + + + + + <_TempZipFiles Include="$(_ZipSourceDirectory)*" /> + <_TempZipFiles Include="$(DebuggerVersionConfigFileName)" /> + <_TempZipFiles Include="$(XunitConsoleNetCoreAppPath)" /> + <_DebuggeeFiles Include="$(DebuggeeSourceRootDir)**\*" /> + <_DebuggeeArtifactFiles Include="$(DebuggeeArtifactsRootDir)**\*" /> + <_AuxMsBuildFiles Include="$(AuxMSBuildRootDir)**\*" /> + <_TestPackageFiles Include="$(PackageArtifactsRootDir)**\*" /> + <_DebuggerNativeFiles Include="$(ArtifactsBinNativeDir)**\*" /> + + + + <_TempZipDir>$([MSBuild]::NormalizeDirectory('$(IntermediateOutputPath)', 'TempZip')) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + $(InternalReleaseTesting) + $(PrivateBuildTesting) +]]> + + + + +%(RuntimeTestVersions.Runtime) + %(RuntimeTestVersions.AspNet) + %(RuntimeTestVersions.TargetFramework) +]]> + + + + + +]]> + + + + + + + + + + + + diff --git a/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj b/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj index fa247fa245..e6f94eee52 100644 --- a/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj +++ b/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj @@ -6,9 +6,12 @@ 1.0.351101 true + true + true + @@ -19,17 +22,6 @@ - - - - - - - - - - - Debugger.Tests.Config.txt diff --git a/tests/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs b/tests/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs index 01821e3244..1d07780404 100644 --- a/tests/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs +++ b/tests/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs @@ -80,7 +80,8 @@ private void ParseConfigFile(string path) ["TargetRid"] = GetRid(), ["TargetArchitecture"] = OS.TargetArchitecture.ToString().ToLowerInvariant(), ["NuGetPackageCacheDir"] = nugetPackages, - ["TestCDAC"] = Environment.GetEnvironmentVariable("SOS_TEST_CDAC") + ["TestCDAC"] = Environment.GetEnvironmentVariable("SOS_TEST_CDAC"), + ["DotNetRoot"] = Environment.GetEnvironmentVariable("DOTNET_ROOT") }; if (OS.Kind == OSKind.Windows) { @@ -824,7 +825,7 @@ public string DotNetRoot get { string dotnetRoot = GetValue("DotNetRoot"); - return MakeCanonicalPath(dotnetRoot); + return (!string.IsNullOrEmpty(dotnetRoot)) ? MakeCanonicalPath(dotnetRoot) : MakeCanonicalPath(Environment.GetEnvironmentVariable("DOTNET_ROOT")); } } diff --git a/tests/SOS.UnitTests/SOS.UnitTests.csproj b/tests/SOS.UnitTests/SOS.UnitTests.csproj index 29d924b5bc..15fa53a130 100644 --- a/tests/SOS.UnitTests/SOS.UnitTests.csproj +++ b/tests/SOS.UnitTests/SOS.UnitTests.csproj @@ -4,7 +4,9 @@ false ;1591;1701 $(DefineConstants);CORE_CLR + true true + true $(OutputPath)$(TargetFramework)\Debugger.Tests.Common.txt @@ -26,6 +28,7 @@ + @@ -34,10 +37,6 @@ - - - - From 6eecb797c58947c72eac857626f6c05976388080 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Wed, 27 Aug 2025 17:43:15 -0400 Subject: [PATCH 09/17] fix paths --- .../SdkPrebuiltDebuggeeCompiler.cs | 6 +++--- .../ConfigFiles/Windows/Debugger.Tests.Config.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Microsoft.Diagnostics.TestHelpers/SdkPrebuiltDebuggeeCompiler.cs b/tests/Microsoft.Diagnostics.TestHelpers/SdkPrebuiltDebuggeeCompiler.cs index ebc4105d43..1caef7c7a0 100644 --- a/tests/Microsoft.Diagnostics.TestHelpers/SdkPrebuiltDebuggeeCompiler.cs +++ b/tests/Microsoft.Diagnostics.TestHelpers/SdkPrebuiltDebuggeeCompiler.cs @@ -26,14 +26,14 @@ public SdkPrebuiltDebuggeeCompiler(TestConfiguration config, string debuggeeName // The layout is how the current .NET Core SDK layouts the binaries out: // Source Path: //[] - // Binary Path: /bin/// - // Binary Exe Path: /bin////.dll + // Binary Path: /bin/debuggees/// + // Binary Exe Path: /bin/debuggees////.dll _sourcePath = Path.Combine(config.DebuggeeSourceRoot, debuggeeName); if (Directory.Exists(Path.Combine(_sourcePath, debuggeeName))) { _sourcePath = Path.Combine(_sourcePath, debuggeeName); } - _binaryPath = Path.Combine(config.DebuggeeBuildRoot, "bin", debuggeeName, config.TargetConfiguration, config.BuildProjectFramework); + _binaryPath = Path.Combine(config.DebuggeeBuildRoot, "bin", "debuggees", debuggeeName, config.TargetConfiguration, config.BuildProjectFramework); _binaryExePath = Path.Combine(_binaryPath, debuggeeName) + (config.IsDesktop ? ".exe" : ".dll"); } diff --git a/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt index 84f7b43fe9..676d5924a6 100644 --- a/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -202,7 +202,7 @@ SOS.DualRuntimes -ms -timeout 10 - $(RootBinDir)\bin\SymbolTestDll\$(TargetConfiguration)\$(DesktopFramework)\SymbolTestDll.dll SymbolTestDll.TestClass ThrowException + $(RootBinDir)\bin\debuggees\SymbolTestDll\$(TargetConfiguration)\$(DesktopFramework)\SymbolTestDll.dll SymbolTestDll.TestClass ThrowException From 878a01aeb29653e2b9f042c63113c815232158b6 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 28 Aug 2025 12:52:36 -0400 Subject: [PATCH 10/17] modify build.proj --- Build.proj | 56 +++++++++++++++++++--------------------- Test.proj | 76 +++++++++++++++++++++++++++--------------------------- 2 files changed, 65 insertions(+), 67 deletions(-) diff --git a/Build.proj b/Build.proj index bb20a62c55..86e2ac1e4d 100644 --- a/Build.proj +++ b/Build.proj @@ -1,36 +1,34 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - - + - \ No newline at end of file + diff --git a/Test.proj b/Test.proj index 6b1618e794..e9f4ade84f 100644 --- a/Test.proj +++ b/Test.proj @@ -1,44 +1,44 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + From 56fd8e8ab099ec99765f1763bc3037337841fac8 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 28 Aug 2025 13:56:09 -0400 Subject: [PATCH 11/17] fix source-build --- Build.proj | 4 ++-- Test.proj | 44 -------------------------------------------- eng/Build.props | 9 +++++++-- tests/Test.proj | 44 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 53 insertions(+), 48 deletions(-) delete mode 100644 Test.proj create mode 100644 tests/Test.proj diff --git a/Build.proj b/Build.proj index 86e2ac1e4d..3d5ccf18d4 100644 --- a/Build.proj +++ b/Build.proj @@ -1,8 +1,8 @@ - + @@ -29,6 +29,6 @@ - + diff --git a/Test.proj b/Test.proj deleted file mode 100644 index e9f4ade84f..0000000000 --- a/Test.proj +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Build.props b/eng/Build.props index ef837e2b98..a25a1e704b 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -1,5 +1,10 @@ - + - \ No newline at end of file + + + + + + diff --git a/tests/Test.proj b/tests/Test.proj new file mode 100644 index 0000000000..8b86c321d9 --- /dev/null +++ b/tests/Test.proj @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 2ed0c53ff8e45ad0c2d393cc41d63af5e1044d40 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 28 Aug 2025 14:16:51 -0400 Subject: [PATCH 12/17] support helix in build.ps1 --- eng/build.ps1 | 5 +++++ eng/build.sh | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/eng/build.ps1 b/eng/build.ps1 index a0837d8fdd..a3373de325 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -8,6 +8,7 @@ Param( [switch] $installruntimes, [switch] $privatebuild, [switch] $ci, + [switch] $helix, [switch][Alias('bl')]$binaryLog, [switch] $skipmanaged, [switch] $skipnative, @@ -75,6 +76,10 @@ if (-not $skipnative) { if (-not $skipmanaged) { if ($withtests) { $remainingargs = "/p:BuildTests=true " + $remainingargs + + if ($helix) { + $remainingargs = "/p:ArchiveTests=true " + $remainingargs + } } Invoke-Expression "& `"$engroot\common\build.ps1`" -configuration $configuration -verbosity $verbosity $bl /p:TargetOS=$os /p:TargetArch=$architecture /p:TestArchitectures=$architecture $remainingargs" diff --git a/eng/build.sh b/eng/build.sh index ee1acc8df8..0792840d2e 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -30,6 +30,7 @@ __InstallRuntimes=0 __PrivateBuild=0 __BuildTests=0 __RunTests=0 +__UseHelix=0 __UnprocessedBuildArgs= __UseCdac=0 __LiveRuntimeDir= @@ -105,7 +106,7 @@ handle_arguments() { withtests|-withtests) __BuildTests=1 ;; - + runtests|-runtests) __RunTests=1 __NativeBuild=0 @@ -271,7 +272,7 @@ if [[ "$__InstallRuntimes" == 1 || "$__PrivateBuild" == 1 ]]; then /p:TargetArch="$__TargetArch" \ /p:TargetRid="$__TargetRid" \ /p:TestArchitectures="$__TargetArch" \ - /p:LiveRuntimeDir="$__LiveRuntimeDir" + /p:LiveRuntimeDir="$__LiveRuntimeDir" fi # From 7b4bb0818666d9d3d5607fa37a4eb491a949229c Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 28 Aug 2025 16:54:41 -0400 Subject: [PATCH 13/17] wip --- diagnostics.yml | 4 + eng/build.ps1 | 1 + eng/cdaccomtest.ps1 | 0 eng/common/build.ps1 | 10 +- eng/pipelines/build.yml | 25 + eng/pipelines/helix.yml | 29 + eng/pipelines/platform-matrix.yml | 931 ++++++++++++++++++ eng/pipelines/xplat-setup.yml | 202 ++++ tests/Directory.Build.targets | 39 +- .../helixpublish.proj | 9 +- 10 files changed, 1224 insertions(+), 26 deletions(-) create mode 100644 eng/cdaccomtest.ps1 create mode 100644 eng/pipelines/helix.yml create mode 100644 eng/pipelines/platform-matrix.yml create mode 100644 eng/pipelines/xplat-setup.yml rename eng/SendToHelix.proj => tests/helixpublish.proj (75%) diff --git a/diagnostics.yml b/diagnostics.yml index a6c816ae85..eaaa97406f 100644 --- a/diagnostics.yml +++ b/diagnostics.yml @@ -75,6 +75,10 @@ extends: jobTemplate: ${{ variables.jobTemplate }} name: Windows osGroup: Windows_NT + postBuildSteps: + - template: /eng/pipelines/helix.yml + parameters: + creator: dotnet-bot buildConfigs: - configuration: Debug architecture: x64 diff --git a/eng/build.ps1 b/eng/build.ps1 index a3373de325..6cd4922e81 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -118,6 +118,7 @@ if ($runtests) { -configuration $configuration ` -verbosity $verbosity ` -ci:$ci ` + -projects tests\SOS.UnitTests\SOS.UnitTests.csproj ` /bl:$logdir\Test.binlog ` /p:TargetOS=$os ` /p:TargetArch=$architecture ` diff --git a/eng/cdaccomtest.ps1 b/eng/cdaccomtest.ps1 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 8cfee107e7..83e1979e39 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -24,6 +24,7 @@ Param( [switch]$fromVMR, [switch][Alias('bl')]$binaryLog, [switch][Alias('nobl')]$excludeCIBinarylog, + [switch] $sourceBuild, [switch] $ci, [switch] $prepareMachine, [string] $runtimeSourceFeed = '', @@ -37,7 +38,7 @@ Param( # Unset 'Platform' environment variable to avoid unwanted collision in InstallDotNetCore.targets file # some computer has this env var defined (e.g. Some HP) if($env:Platform) { - $env:Platform="" + $env:Platform="" } function Print-Usage() { Write-Host "Common settings:" @@ -108,10 +109,10 @@ function Build { # Re-assign properties to a new variable because PowerShell doesn't let us append properties directly for unclear reasons. # Explicitly set the type as string[] because otherwise PowerShell would make this char[] if $properties is empty. [string[]] $msbuildArgs = $properties - - # Resolve relative project paths into full paths + + # Resolve relative project paths into full paths $projects = ($projects.Split(';').ForEach({Resolve-Path $_}) -join ';') - + $msbuildArgs += "/p:Projects=$projects" $properties = $msbuildArgs } @@ -130,6 +131,7 @@ function Build { /p:Test=$test ` /p:Pack=$pack ` /p:DotNetBuild=$productBuild ` + /p:DotNetBuildSourceOnly=$sourceBuild ` /p:DotNetBuildFromVMR=$fromVMR ` /p:IntegrationTest=$integrationTest ` /p:PerformanceTest=$performanceTest ` diff --git a/eng/pipelines/build.yml b/eng/pipelines/build.yml index ec12f7cd35..571590849a 100644 --- a/eng/pipelines/build.yml +++ b/eng/pipelines/build.yml @@ -196,6 +196,31 @@ jobs: displayName: Build condition: succeeded() + # If intended to send extra steps after regular build add them here. + - ${{ if ne(parameters.postBuildSteps,'') }}: + - ${{ each postBuildStep in parameters.postBuildSteps }}: + - ${{ if ne(postBuildStep.template, '') }}: + - template: ${{ postBuildStep.template }} + parameters: + osGroup: ${{ parameters.osGroup }} + osSubgroup: ${{ parameters.osSubgroup }} + archType: ${{ parameters.archType }} + buildConfig: ${{ parameters.buildConfig }} + runtimeFlavor: ${{ parameters.runtimeFlavor }} + runtimeVariant: ${{ parameters.runtimeVariant }} + helixQueues: ${{ parameters.helixQueues }} + targetRid: ${{ parameters.targetRid }} + nameSuffix: ${{ parameters.nameSuffix }} + platform: ${{ parameters.platform }} + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + ${{ if ne(postBuildStep.forwardedParameters, '') }}: + ${{ each parameter in postBuildStep.forwardedParameters }}: + ${{ parameter }}: ${{ parameters[parameter] }} + ${{ if ne(postBuildStep.parameters, '') }}: + ${{ insert }}: ${{ postBuildStep.parameters }} + - ${{ else }}: + - ${{ postBuildStep }} + - ${{ if and(ne(parameters.isCodeQLRun, 'true'), ne(parameters.buildOnly, 'true')) }}: - script: $(_buildScript) -ci diff --git a/eng/pipelines/helix.yml b/eng/pipelines/helix.yml new file mode 100644 index 0000000000..1d537a3642 --- /dev/null +++ b/eng/pipelines/helix.yml @@ -0,0 +1,29 @@ +parameters: + archType: '' + osGroup: '' + creator: '' + helixQueues: '' + +steps: + - template: /eng/common/templates/steps/send-to-helix.yml + parameters: + DisplayNamePrefix: Send to Helix + HelixProjectPath: tests/helixpublish.proj + ${{ if ne(parameters.osGroup, 'windows') }}: + HelixProjectArguments: >- + --ci + /p:Configuration=$(_BuildConfig) + /p:TargetArchitecture=${{ parameters.archType }} + /p:TargetOS=${{ parameters.osGroup }} + ${{ if eq(parameters.osGroup, 'windows') }}: + HelixProjectArguments: >- + -ci + /p:Configuration=$(_BuildConfig) + /p:TargetArchitecture=${{ parameters.archType }} + /p:TargetOS=${{ parameters.osGroup }} + Creator: ${{ parameters.creator }} + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + HelixAccessToken: $(HelixApiAccessToken) + HelixTargetQueues: ${{ replace(lower(join('+', parameters.helixQueues)), '.open', '') }} + ${{ if eq(variables['System.TeamProject'], 'public') }}: + HelixTargetQueues: ${{ join('+', parameters.helixQueues) }} diff --git a/eng/pipelines/platform-matrix.yml b/eng/pipelines/platform-matrix.yml new file mode 100644 index 0000000000..9a34b19470 --- /dev/null +++ b/eng/pipelines/platform-matrix.yml @@ -0,0 +1,931 @@ +parameters: + runtimeFlavor: 'coreclr' + jobTemplate: '' + buildConfig: '' + platforms: [] + # platformGroup is a named collection of platforms. Allowed values: + # 'all' - all platforms + # 'gcstress' - platforms that support running under GCStress0x3 and GCStress0xC scenarios + platformGroup: '' + # helixQueueGroup is a named collection of Helix Queues. If specified, it determines which Helix queues are + # used, instead of the usual criteria. Values that must be supported by the supplied helixQueuesTemplate: + # 'pr' - the queues used for a pull request for the platform. Typically a small set. + # 'ci' - the queues used for a CI (post-merge) test run. + # Other values might be supported by the template specified in helixQueuesTemplate, but they do not have specified + # meanings here. + helixQueueGroup: 'pr' + # helixQueuesTemplate is a yaml template which will be expanded in order to set up the helix queues + # for the given platform and helixQueueGroup. + helixQueuesTemplate: '' + container: '' + shouldContinueOnError: false + jobParameters: {} + variables: [] + +jobs: + +# Linux arm + +- ${{ if or(containsValue(parameters.platforms, 'linux_arm'), in(parameters.platformGroup, 'all', 'gcstress')) }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + archType: arm + targetRid: linux-arm + platform: linux_arm + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: linux_arm + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + crossBuild: true + ${{ insert }}: ${{ parameters.jobParameters }} + +# Linux arm64 + +- ${{ if or(containsValue(parameters.platforms, 'linux_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + archType: arm64 + targetRid: linux-arm64 + platform: linux_arm64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + ${{ if eq(parameters.container, '') }}: + container: linux_arm64 + ${{ if ne(parameters.container, '') }}: + container: + image: ${{ parameters.container }} + registry: mcr + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + crossBuild: true + ${{ insert }}: ${{ parameters.jobParameters }} + +# Linux musl x64 + +- ${{ if or(containsValue(parameters.platforms, 'linux_musl_x64'), eq(parameters.platformGroup, 'all')) }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + osSubgroup: _musl + archType: x64 + targetRid: linux-musl-x64 + platform: linux_musl_x64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: linux_musl_x64 + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + crossBuild: true + ${{ insert }}: ${{ parameters.jobParameters }} + +# Linux musl arm + +- ${{ if or(containsValue(parameters.platforms, 'linux_musl_arm'), eq(parameters.platformGroup, 'all')) }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + osSubgroup: _musl + archType: arm + targetRid: linux-musl-arm + platform: linux_musl_arm + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: linux_musl_arm + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + crossBuild: true + ${{ insert }}: ${{ parameters.jobParameters }} + +# Linux musl arm64 + +- ${{ if or(containsValue(parameters.platforms, 'linux_musl_arm64'), eq(parameters.platformGroup, 'all')) }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + osSubgroup: _musl + archType: arm64 + targetRid: linux-musl-arm64 + platform: linux_musl_arm64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: linux_musl_arm64 + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + crossBuild: true + ${{ insert }}: ${{ parameters.jobParameters }} + +# Linux Bionic arm + +- ${{ if containsValue(parameters.platforms, 'linux_bionic_arm') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + osSubgroup: _bionic + archType: arm + targetRid: linux-bionic-arm + platform: linux_bionic_arm + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: linux_bionic + jobParameters: + runtimeFlavor: mono + # We build on Linux, but the test queue runs Windows, so + # we need to override the test script generation + runScriptWindowsCmd: true + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# Linux Bionic arm64 + +- ${{ if containsValue(parameters.platforms, 'linux_bionic_arm64') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + osSubgroup: _bionic + archType: arm64 + targetRid: linux-bionic-arm64 + platform: linux_bionic_arm64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: linux_bionic + jobParameters: + runtimeFlavor: mono + # We build on Linux, but the test queue runs Windows, so + # we need to override the test script generation + runScriptWindowsCmd: true + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# Linux Bionic x64 + +- ${{ if containsValue(parameters.platforms, 'linux_bionic_x64') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + osSubgroup: _bionic + archType: x64 + targetRid: linux-bionic-x64 + platform: linux_bionic_x64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: linux_bionic + jobParameters: + runtimeFlavor: mono + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# Linux x64 + +- ${{ if or(containsValue(parameters.platforms, 'linux_x64'), containsValue(parameters.platforms, 'CoreClrTestBuildHost'), in(parameters.platformGroup, 'all', 'gcstress')) }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + archType: x64 + targetRid: linux-x64 + platform: linux_x64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + ${{ if eq(parameters.container, '') }}: + container: linux_x64 + ${{ if ne(parameters.container, '') }}: + container: + image: ${{ parameters.container }} + registry: mcr + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + crossBuild: true + ${{ insert }}: ${{ parameters.jobParameters }} + +- ${{ if containsValue(parameters.platforms, 'linux_x64_sanitizer') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + archType: x64 + targetRid: linux-x64 + platform: linux_x64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: linux_x64_sanitizer + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + crossBuild: true + cxxStandardLibrary: libc++ + cxxStandardLibraryStatic: true + cxxAbiLibrary: libstdc++ + ${{ insert }}: ${{ parameters.jobParameters }} + +# Linux x86 + +- ${{ if containsValue(parameters.platforms, 'linux_x86') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + archType: x86 + targetRid: linux-x86 + platform: linux_x86 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: linux_x86 + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + crossBuild: true + ${{ insert }}: ${{ parameters.jobParameters }} + +# Runtime-dev-innerloop build + +- ${{ if containsValue(parameters.platforms, 'linux_x64_dev_innerloop') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + archType: x64 + targetRid: linux-x64 + platform: linux_x64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: linux_x64_dev_innerloop + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +- ${{ if containsValue(parameters.platforms, 'linux_musl_x64_dev_innerloop') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + osSubgroup: _musl + archType: x64 + targetRid: linux-musl-x64 + platform: linux_musl_x64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: linux_musl_x64_dev_innerloop + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# GCC Linux x64 Build + +- ${{ if containsValue(parameters.platforms, 'gcc_linux_x64') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + archType: x64 + targetRid: linux-x64 + platform: linux_x64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: debian-12-gcc15-amd64 + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# Mono LLVMAot test build + +- ${{ if containsValue(parameters.platforms, 'linux_x64_llvmaot') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + archType: x64 + targetRid: linux-x64 + platform: linux_x64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: linux_x64_llvmaot + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# Linux s390x + +- ${{ if containsValue(parameters.platforms, 'linux_s390x') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + archType: s390x + targetRid: linux-s390x + platform: linux_s390x + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: linux_s390x + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + crossBuild: true + ${{ insert }}: ${{ parameters.jobParameters }} + +# Linux PPC64le + +- ${{ if containsValue(parameters.platforms, 'linux_ppc64le') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + archType: ppc64le + targetRid: linux-ppc64le + platform: linux_ppc64le + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: linux_ppc64le + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + crossBuild: true + ${{ insert }}: ${{ parameters.jobParameters }} + +# Linux RISCV64 + +- ${{ if containsValue(parameters.platforms, 'linux_riscv64') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + archType: riscv64 + targetRid: linux-riscv64 + platform: linux_riscv64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: linux_riscv64 + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + crossBuild: true + ${{ insert }}: ${{ parameters.jobParameters }} + +# Linux LoongArch64 + +- ${{ if containsValue(parameters.platforms, 'linux_loongarch64') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: linux + archType: loongarch64 + targetRid: linux-loongarch64 + platform: linux_loongarch64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: linux_loongarch64 + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + crossBuild: true + ${{ insert }}: ${{ parameters.jobParameters }} + +# WASI WebAssembly + +- ${{ if containsValue(parameters.platforms, 'wasi_wasm') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: wasi + archType: wasm + targetRid: wasi-wasm + platform: wasi_wasm + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: wasi_wasm + jobParameters: + hostedOs: linux + runtimeFlavor: ${{ parameters.runtimeFlavor }} + stagedBuild: ${{ parameters.stagedBuild }} + buildConfig: ${{ parameters.buildConfig }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# WASI WebAssembly windows + +- ${{ if containsValue(parameters.platforms, 'wasi_wasm_win') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: wasi + archType: wasm + targetRid: wasi-wasm + platform: wasi_wasm_win + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + jobParameters: + hostedOs: windows + runtimeFlavor: ${{ parameters.runtimeFlavor }} + stagedBuild: ${{ parameters.stagedBuild }} + buildConfig: ${{ parameters.buildConfig }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# Browser WebAssembly + +- ${{ if containsValue(parameters.platforms, 'browser_wasm') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: browser + archType: wasm + targetRid: browser-wasm + platform: browser_wasm + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: browser_wasm + jobParameters: + hostedOs: linux + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# Browser WebAssembly Linux Firefox + +- ${{ if containsValue(parameters.platforms, 'browser_wasm_firefox') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: browser + archType: wasm + targetRid: browser-wasm + platform: browser_wasm_firefox + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: browser_wasm + jobParameters: + hostedOs: linux + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# Browser WebAssembly on Windows + +- ${{ if containsValue(parameters.platforms, 'browser_wasm_win') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: browser + archType: wasm + targetRid: browser-wasm + platform: browser_wasm_win + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + jobParameters: + hostedOs: windows + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# FreeBSD +- ${{ if containsValue(parameters.platforms, 'freebsd_x64') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: freebsd + archType: x64 + targetRid: freebsd-x64 + platform: freebsd_x64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: freebsd_x64 + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + crossBuild: true + ${{ insert }}: ${{ parameters.jobParameters }} + +# Android x64 + +- ${{ if containsValue(parameters.platforms, 'android_x64') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: android + archType: x64 + targetRid: android-x64 + platform: android_x64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: android + jobParameters: + runtimeFlavor: mono + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# Android x64 with Docker-in-Docker + +- ${{ if containsValue(parameters.platforms, 'android_x64_docker') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: android + archType: x64 + targetRid: android-x64 + platform: android_x64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: android_docker + jobParameters: + runtimeFlavor: mono + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# Android x86 + +- ${{ if containsValue(parameters.platforms, 'android_x86') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: android + archType: x86 + targetRid: android-x86 + platform: android_x86 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: android + jobParameters: + runtimeFlavor: mono + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# Android arm + +- ${{ if containsValue(parameters.platforms, 'android_arm') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: android + archType: arm + targetRid: android-arm + platform: android_arm + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: android + jobParameters: + runtimeFlavor: mono + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# Android arm64 + +- ${{ if containsValue(parameters.platforms, 'android_arm64') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: android + archType: arm64 + targetRid: android-arm64 + platform: android_arm64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + container: android + jobParameters: + runtimeFlavor: mono + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# Mac Catalyst x64 + +- ${{ if containsValue(parameters.platforms, 'maccatalyst_x64') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: maccatalyst + archType: x64 + targetRid: maccatalyst-x64 + platform: maccatalyst_x64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + jobParameters: + ${{ if eq(parameters.runtimeFlavor, '') }}: + runtimeFlavor: mono + ${{ else }}: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# Mac Catalyst arm64 + +- ${{ if containsValue(parameters.platforms, 'maccatalyst_arm64') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: maccatalyst + archType: arm64 + targetRid: maccatalyst-arm64 + platform: maccatalyst_arm64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + jobParameters: + ${{ if eq(parameters.runtimeFlavor, '') }}: + runtimeFlavor: mono + ${{ else }}: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# tvOS arm64 + +- ${{ if containsValue(parameters.platforms, 'tvos_arm64') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: tvos + archType: arm64 + targetRid: tvos-arm64 + platform: tvos_arm64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + jobParameters: + ${{ if eq(parameters.runtimeFlavor, '') }}: + runtimeFlavor: mono + ${{ else }}: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# tvOS Simulator x64 + +- ${{ if containsValue(parameters.platforms, 'tvossimulator_x64') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: tvossimulator + archType: x64 + targetRid: tvossimulator-x64 + platform: tvossimulator_x64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + jobParameters: + ${{ if eq(parameters.runtimeFlavor, '') }}: + runtimeFlavor: mono + ${{ else }}: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# tvOS Simulator arm64 + +- ${{ if containsValue(parameters.platforms, 'tvossimulator_arm64') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: tvossimulator + archType: arm64 + targetRid: tvossimulator-arm64 + platform: tvossimulator_arm64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + jobParameters: + ${{ if eq(parameters.runtimeFlavor, '') }}: + runtimeFlavor: mono + ${{ else }}: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# iOS arm64 + +- ${{ if containsValue(parameters.platforms, 'ios_arm64') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: ios + archType: arm64 + targetRid: ios-arm64 + platform: ios_arm64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + jobParameters: + ${{ if eq(parameters.runtimeFlavor, '') }}: + runtimeFlavor: mono + ${{ else }}: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# iOS Simulator x64 + +- ${{ if containsValue(parameters.platforms, 'iossimulator_x64') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: iossimulator + archType: x64 + targetRid: iossimulator-x64 + platform: iossimulator_x64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + jobParameters: + ${{ if eq(parameters.runtimeFlavor, '') }}: + runtimeFlavor: mono + ${{ else }}: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# iOS Simulator arm64 + +- ${{ if containsValue(parameters.platforms, 'iossimulator_arm64') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: iossimulator + archType: arm64 + targetRid: iossimulator-arm64 + platform: iossimulator_arm64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + jobParameters: + ${{ if eq(parameters.runtimeFlavor, '') }}: + runtimeFlavor: mono + ${{ else }}: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# macOS arm64 + +- ${{ if containsValue(parameters.platforms, 'osx_arm64') }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: osx + archType: arm64 + targetRid: osx-arm64 + platform: osx_arm64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + crossBuild: true + ${{ insert }}: ${{ parameters.jobParameters }} + +# macOS x64 + +- ${{ if or(containsValue(parameters.platforms, 'osx_x64'), eq(parameters.platformGroup, 'all')) }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: osx + archType: x64 + targetRid: osx-x64 + platform: osx_x64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# Windows x64 + +- ${{ if or(containsValue(parameters.platforms, 'windows_x64'), in(parameters.platformGroup, 'all', 'gcstress')) }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: windows + archType: x64 + targetRid: win-x64 + platform: windows_x64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# Windows x86 + +- ${{ if or(containsValue(parameters.platforms, 'windows_x86'), in(parameters.platformGroup, 'all', 'gcstress')) }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: windows + archType: x86 + targetRid: win-x86 + platform: windows_x86 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} + +# Windows arm64 + +- ${{ if or(containsValue(parameters.platforms, 'windows_arm64'), in(parameters.platformGroup, 'all', 'gcstress')) }}: + - template: xplat-setup.yml + parameters: + jobTemplate: ${{ parameters.jobTemplate }} + helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }} + variables: ${{ parameters.variables }} + osGroup: windows + archType: arm64 + targetRid: win-arm64 + platform: windows_arm64 + shouldContinueOnError: ${{ parameters.shouldContinueOnError }} + jobParameters: + runtimeFlavor: ${{ parameters.runtimeFlavor }} + buildConfig: ${{ parameters.buildConfig }} + helixQueueGroup: ${{ parameters.helixQueueGroup }} + ${{ insert }}: ${{ parameters.jobParameters }} diff --git a/eng/pipelines/xplat-setup.yml b/eng/pipelines/xplat-setup.yml new file mode 100644 index 0000000000..fda4c66b4a --- /dev/null +++ b/eng/pipelines/xplat-setup.yml @@ -0,0 +1,202 @@ +parameters: + jobTemplate: '' + hostedOs: '' + hostedArch: '' + osGroup: '' + osSubgroup: '' + archType: '' + container: '' + helixQueuesTemplate: '' + platform: '' + targetRid: '' + jobParameters: {} + shouldContinueOnError: false # set `shouldContinueOnError: forceFalse` to not use the defaults, and set specifically to `false` + variables: [] + +jobs: +- template: ${{ coalesce(parameters.helixQueuesTemplate, parameters.jobTemplate) }} + parameters: + shouldContinueOnError: ${{ or(eq(parameters.shouldContinueOnError, true), and(ne(parameters.shouldContinueOnError, 'forceFalse'), endsWith(variables['Build.DefinitionName'], 'staging'), eq(variables['Build.Reason'], 'PullRequest'))) }} + + variables: + - template: /eng/common/${{ coalesce(parameters.jobParameters.templatePath, 'templates') }}/variables/pool-providers.yml + # Disable component governance in our CI builds. These builds are not shipping nor + # are they a service. Also the component governance jobs issue lots of inconsequential + # warnings and errors into our build timelines that make it hard to track down + # real errors in the build + - name: skipComponentGovernanceDetection + value: true + - name: runCodesignValidationInjection + value: false + + - name: checkoutFetchDepth + value: 20 + + - name: buildConfigUpper + ${{ if eq(parameters.jobParameters.buildConfig, 'debug') }}: + value: 'Debug' + ${{ if eq(parameters.jobParameters.buildConfig, 'release') }}: + value: 'Release' + ${{ if eq(parameters.jobParameters.buildConfig, 'checked') }}: + value: 'Checked' + + - name: _BuildConfig + value: $(buildConfigUpper) + + - name: archType + value: ${{ parameters.archType }} + + - name: osGroup + value: ${{ parameters.osGroup }} + + - name: osSubgroup + value: ${{ parameters.osSubgroup }} + + - name: _runSmokeTestsOnlyArg + value: '/p:RunSmokeTestsOnly=$(isRunSmokeTestsOnly)' + + - name: _overrideTestScriptWindowsCmdParameter + ${{ if eq(parameters.jobParameters.runScriptWindowsCmd, true) }}: + value: '/p:RunScriptWindowsCmd=true' + ${{ if ne(parameters.jobParameters.runScriptWindowsCmd, true) }}: + value: '' + + - name: _hostedOs + value: ${{ parameters.jobParameters.hostedOs }} + + - ${{ if or(eq(parameters.osGroup, 'windows'), eq(parameters.jobParameters.hostedOs, 'windows')) }}: + - name: archiveExtension + value: '.zip' + - name: archiveType + value: zip + - name: tarCompression + value: '' + - name: exeExt + value: '.exe' + - name: scriptExt + value: '.cmd' + - name: dir + value: '\' + - name: _msbuildCommand + value: powershell -ExecutionPolicy ByPass -NoProfile eng\common\msbuild.ps1 -ci + - name: _warnAsErrorParamHelixOverride + value: -warnaserror 0 + - name: setScriptToEchoAndFailOnNonZero + value: '' + - name: logRootNameArg + value: 'log ' + + - ${{ if and(ne(parameters.osGroup, 'windows'), ne(parameters.jobParameters.hostedOs, 'windows')) }}: + - name: archiveExtension + value: '.tar.gz' + - name: archiveType + value: tar + - name: tarCompression + value: gz + - name: exeExt + value: '' + - name: scriptExt + value: '.sh' + - name: dir + value: '/' + - name: _msbuildCommand + value: ./eng/common/msbuild.sh --ci + - name: _warnAsErrorParamHelixOverride + value: --warnaserror false + # Set the bash script to display each command, and stop if any command exits nonzero. + - name: setScriptToEchoAndFailOnNonZero + value: 'set -xe' + - name: logRootNameArg + value: '-log:' + + - name: runtimeFlavorName + ${{ if eq(parameters.jobParameters.runtimeFlavor, 'mono') }}: + value: Mono + ${{ if eq(parameters.jobParameters.runtimeFlavor, 'coreclr') }}: + value: CoreCLR + + - ${{ if eq(parameters.archType, 'wasm') }}: + - name: wasmDarcDependenciesChanged + value: $[ or( + eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-10_0_100_Transport'], true), + eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_DotNet_Build_Tasks_Workloads'], true), + eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['DarcDependenciesChanged.System_Runtime_TimeZoneData'], true), + eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_Net_Compilers_Toolset'], true), + eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_CodeAnalysis'], true), + eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_CodeAnalysis_CSharp'], true), + eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_CodeAnalysis_Analyzers'], true), + eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_CodeAnalysis_NetAnalyzers'], true), + eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['DarcDependenciesChanged.Microsoft_NET_ILLink_Tasks'], true)) ] + + - name: shouldRunWasmBuildTestsOnDefaultPipeline + value: $[ + or( + eq(variables['wasmDarcDependenciesChanged'], true), + eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_tools_illink.containsChange'], true), + eq(stageDependencies.EvaluatePaths.evaluate_paths.outputs['SetPathVars_wasmbuildtests.containsChange'], true)) + ] + + # needed for Wasm.Build.Tests + - name: wasmSingleThreadedBuildOnlyNeededOnDefaultPipeline + value: $[ variables['shouldRunWasmBuildTestsOnDefaultPipeline'] ] + - name: wasmMultiThreadedBuildOnlyNeededOnDefaultPipeline + value: $[ variables['shouldRunWasmBuildTestsOnDefaultPipeline'] ] + + - ${{ each variable in parameters.variables }}: + - ${{ variable }} + + osGroup: ${{ parameters.osGroup }} + osSubgroup: ${{ parameters.osSubgroup }} + archType: ${{ parameters.archType }} + targetRid: ${{ parameters.targetRid }} + platform: ${{ parameters.platform }} + + ${{ if ne(parameters.container, '') }}: + ${{ if eq(parameters.container.registry, 'mcr') }}: + container: ${{ format('{0}:{1}', 'mcr.microsoft.com/dotnet-buildtools/prereqs', parameters.container.image) }} + ${{ if and(ne(parameters.container.image, ''), ne(parameters.container.registry, 'mcr')) }}: + container: ${{ format('{0}:{1}', parameters.container.registry, parameters.container.image) }} + ${{ if eq(parameters.container.image, '') }}: + container: ${{ parameters.container }} + + ${{ if eq(parameters.jobParameters.pool, '') }}: + pool: + # Public Linux Build Pool + ${{ if and(or(in(parameters.osGroup, 'linux', 'freebsd', 'android', 'tizen'), eq(parameters.jobParameters.hostedOs, 'linux')), eq(variables['System.TeamProject'], 'public')) }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open + + # Official Build Linux Pool + ${{ if and(or(in(parameters.osGroup, 'linux', 'freebsd', 'android', 'tizen'), eq(parameters.jobParameters.hostedOs, 'linux')), ne(variables['System.TeamProject'], 'public')) }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals 1es-ubuntu-2204 + os: linux + + # OSX Public Build Pool (we don't have on-prem OSX BuildPool). + ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), eq(variables['System.TeamProject'], 'public')) }}: + vmImage: 'macos-13' + + # Official build OSX pool + ${{ if and(in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'iossimulator', 'tvos', 'tvossimulator'), ne(variables['System.TeamProject'], 'public')) }}: + name: "Azure Pipelines" + vmImage: 'macos-latest-internal' + os: macOS + + # Official Build Windows Pool + ${{ if and(or(eq(parameters.osGroup, 'windows'), eq(parameters.jobParameters.hostedOs, 'windows')), ne(variables['System.TeamProject'], 'public')) }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64 + + # Public Windows Build Pool + ${{ if and(or(eq(parameters.osGroup, 'windows'), eq(parameters.jobParameters.hostedOs, 'windows')), eq(variables['System.TeamProject'], 'public')) }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64.open + + ${{ if eq(parameters.helixQueuesTemplate, '') }}: + # macOS hosted pool machines are slower so we need to give a greater timeout than the 60 mins default. + ${{ if and(eq(parameters.jobParameters.timeoutInMinutes, ''), in(parameters.osGroup, 'osx', 'maccatalyst', 'ios', 'tvos')) }}: + timeoutInMinutes: 120 + ${{ insert }}: ${{ parameters.jobParameters }} + ${{ if ne(parameters.helixQueuesTemplate, '') }}: + jobTemplate: ${{ parameters.jobTemplate }} + jobParameters: ${{ parameters.jobParameters }} diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets index 4fce9b9160..c29859f718 100644 --- a/tests/Directory.Build.targets +++ b/tests/Directory.Build.targets @@ -12,21 +12,21 @@ - - - - - @@ -48,21 +48,21 @@ AfterTargets="Build" DependsOnTargets="_CopyDebugTestAssets;_CompressTest" /> - + - <_cdbFiles Include="$(NuGetPackageRoot)cdb-sos\$(cdbsosversion)\**\*" + <_cdbFiles Include="$(NuGetPackageRoot)cdb-sos\$(cdbsosversion)\**\*" Condition="'$(NeedsCdb)' == 'true'" /> - - <_testAssetsWinx64 Include="$(NuGetPackageRoot)testassets.windows.x64.6.0\$(TestAssetsVersion)\**\*" + + <_testAssetsWinx64 Include="$(NuGetPackageRoot)testassets.windows.x64.6.0\$(TestAssetsVersion)\**\*" Condition="'$(NeedsTestAssets)' == 'true' and '$(OS)' == 'Windows_NT'" /> - - <_testAssetsWinx86 Include="$(NuGetPackageRoot)testassets.windows.x86.6.0\$(TestAssetsVersion)\**\*" + + <_testAssetsWinx86 Include="$(NuGetPackageRoot)testassets.windows.x86.6.0\$(TestAssetsVersion)\**\*" Condition="'$(NeedsTestAssets)' == 'true' and '$(OS)' == 'Windows_NT'" /> - - <_testAssetsLinux64 Include="$(NuGetPackageRoot)testassets.linux.x64.6.0\$(TestAssetsVersion)\**\*" + + <_testAssetsLinux64 Include="$(NuGetPackageRoot)testassets.linux.x64.6.0\$(TestAssetsVersion)\**\*" Condition="'$(NeedsTestAssets)' == 'true'" /> - - <_testAssetsLinuxArm64 Include="$(NuGetPackageRoot)testassets.linux.arm64.6.0\$(TestAssetsVersion)\**\*" + + <_testAssetsLinuxArm64 Include="$(NuGetPackageRoot)testassets.linux.arm64.6.0\$(TestAssetsVersion)\**\*" Condition="'$(NeedsTestAssets)' == 'true'" /> @@ -95,19 +95,22 @@ - + <_TempZipFiles Include="$(_ZipSourceDirectory)*" /> <_TempZipFiles Include="$(DebuggerVersionConfigFileName)" /> <_TempZipFiles Include="$(XunitConsoleNetCoreAppPath)" /> + <_TempZipFiles Include="$(RepoRoot)global.json"/> + <_TempZipFiles Include="$(RepoRoot)Nuget.config"/> + <_TempZipFiles Include="$(RepoRoot)eng\Versions.props"/> <_DebuggeeFiles Include="$(DebuggeeSourceRootDir)**\*" /> <_DebuggeeArtifactFiles Include="$(DebuggeeArtifactsRootDir)**\*" /> <_AuxMsBuildFiles Include="$(AuxMSBuildRootDir)**\*" /> <_TestPackageFiles Include="$(PackageArtifactsRootDir)**\*" /> <_DebuggerNativeFiles Include="$(ArtifactsBinNativeDir)**\*" /> - + <_TempZipDir>$([MSBuild]::NormalizeDirectory('$(IntermediateOutputPath)', 'TempZip')) @@ -147,7 +150,7 @@ SourceDirectory="$(_TempZipDir)" DestinationFile="$([MSBuild]::NormalizePath('$(TestArchiveTestsDir)', '$(MSBuildProjectName).zip'))" Overwrite="true" /> - + + - $(TargetArch) + $(TargetArch) $(OfficialBuildId) 99999999.99 - Release + $(Configuration) tests/diagnostics/ + host-$(TargetOS)-$(TargetArch)-$(Configuration) @ @@ -23,4 +24,4 @@ aspnetcore-runtime - \ No newline at end of file + From b7ca9227c669277a9fe74e6d43cf4ea5c623aa28 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri, 29 Aug 2025 12:00:18 -0400 Subject: [PATCH 14/17] fix DbgShim out of process --- tests/Directory.Build.targets | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets index c29859f718..7b15d46ce8 100644 --- a/tests/Directory.Build.targets +++ b/tests/Directory.Build.targets @@ -71,16 +71,16 @@ SkipUnchangedFiles="true" /> + DestinationFiles="@(_testAssetsWinx64->'$(PackageArtifactsRootDir)testassets.windows.x64.6.0\$(TestAssetsVersion)\%(RecursiveDir)%(Filename)%(Extension)')" /> + DestinationFiles="@(_testAssetsWinx86->'$(PackageArtifactsRootDir)testassets.windows.x86.6.0\$(TestAssetsVersion)\%(RecursiveDir)%(Filename)%(Extension)')" /> + DestinationFiles="@(_testAssetsLinux64->'$(PackageArtifactsRootDir)testassets.linux.x64.6.0\$(TestAssetsVersion)\%(RecursiveDir)%(Filename)%(Extension)')" /> + DestinationFiles="@(_testAssetsLinuxArm64->'$(PackageArtifactsRootDir)testassets.linux.arm64.6.0\$(TestAssetsVersion)\%(RecursiveDir)%(Filename)%(Extension)')" /> <_TempZipFiles Include="$(_ZipSourceDirectory)*" /> <_TempZipFiles Include="$(DebuggerVersionConfigFileName)" /> - <_TempZipFiles Include="$(XunitConsoleNetCoreAppPath)" /> + <_TempZipFiles Include="$([System.IO.Path]::GetDirectoryName('$(XunitConsoleNetCoreAppPath)'))\*" /> <_TempZipFiles Include="$(RepoRoot)global.json"/> <_TempZipFiles Include="$(RepoRoot)Nuget.config"/> - <_TempZipFiles Include="$(RepoRoot)eng\Versions.props"/> + <_TempZipFiles Include="$(RepoRoot)Directory.Build.props"/> + <_TempZipFiles Include="$(RepoRoot)Directory.Build.targets"/> + <_EngFiles Include="$(RepoRoot)eng\Versions.props"/> + <_EngFiles Include="$(RepoRoot)eng\Version.Details.props"/> <_DebuggeeFiles Include="$(DebuggeeSourceRootDir)**\*" /> <_DebuggeeArtifactFiles Include="$(DebuggeeArtifactsRootDir)**\*" /> <_AuxMsBuildFiles Include="$(AuxMSBuildRootDir)**\*" /> @@ -118,6 +121,7 @@ + @@ -130,6 +134,10 @@ SourceFiles="@(_DebuggerNativeFiles)" DestinationFiles="@(_DebuggerNativeFiles->'$(_TempZipDir)native\%(RecursiveDir)%(Filename)%(Extension)')" /> + + From e22dafa27c9393a3d706d82bc3fb9ea540ecf99a Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri, 29 Aug 2025 14:33:26 -0400 Subject: [PATCH 15/17] sos tests run out of tree --- tests/Directory.Build.targets | 1 - tests/SOS.UnitTests/SOS.UnitTests.csproj | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets index 7b15d46ce8..9c530a73f0 100644 --- a/tests/Directory.Build.targets +++ b/tests/Directory.Build.targets @@ -91,7 +91,6 @@ Condition="'$(OutDir)' != ''"> <_ZipSourceDirectory>$(OutDir) - <_ZipSourceDirectory Condition="'$(NeedsPublishing)' == 'true'">$(PublishDir) diff --git a/tests/SOS.UnitTests/SOS.UnitTests.csproj b/tests/SOS.UnitTests/SOS.UnitTests.csproj index 15fa53a130..22a9ee1f1e 100644 --- a/tests/SOS.UnitTests/SOS.UnitTests.csproj +++ b/tests/SOS.UnitTests/SOS.UnitTests.csproj @@ -45,8 +45,8 @@ $(Configuration) $(DesktopTargetFramework) $(NetCoreAppMinTargetFramework) - $(RepoRoot) - $(NuGetPackageRoot)cdb-sos\$(cdbsosversion)\runtimes\win-%24(TargetArchitecture)\native\cdb.exe + $(TestRepoRoot) + $(TestPackageArtifactsRootDir)cdb-sos\$(cdbsosversion)\runtimes\win-%24(TargetArchitecture)\native\cdb.exe ]]> From 8c9bdead88dfaeebd79601b20de90997a7e7da79 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Tue, 2 Sep 2025 12:20:29 -0400 Subject: [PATCH 16/17] support running SOS tests out of tree --- .../Windows/Debugger.Tests.Config.txt | 4 +- tests/Directory.Build.targets | 36 +++++++------ .../Unix/Debugger.Tests.Config.txt | 4 +- .../Windows/Debugger.Tests.Config.txt | 10 ++-- tests/SOS.UnitTests/SOS.UnitTests.csproj | 51 +++++++++++++------ 5 files changed, 64 insertions(+), 41 deletions(-) diff --git a/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt index 4ccdaac189..7e9b476426 100644 --- a/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -1,7 +1,7 @@ $(TestDotNetRoot) - + $(RepoRootDir)\artifacts $(TestNativeDir) @@ -17,7 +17,7 @@ true false - + true false diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets index 9c530a73f0..d305456aa6 100644 --- a/tests/Directory.Build.targets +++ b/tests/Directory.Build.targets @@ -67,7 +67,7 @@ + + + + <_TempZipDir>$([MSBuild]::NormalizeDirectory('$(IntermediateOutputPath)', 'TempZip')) + + + + + + + + + + + + + + + Condition="'$(OutDir)' != ''" + DependsOnTargets="_CreateTempDir;$(ProjectSpecificTestAssetTargets)"> <_ZipSourceDirectory>$(OutDir) - @@ -113,18 +131,6 @@ <_DebuggerNativeFiles Include="$(ArtifactsBinNativeDir)**\*" /> - - <_TempZipDir>$([MSBuild]::NormalizeDirectory('$(IntermediateOutputPath)', 'TempZip')) - - - - - - - - - - diff --git a/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt index 79bf72c76e..572cc744b7 100644 --- a/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -9,8 +9,8 @@ - $(RepoRootDir)/.dotnet-test - + $(TestDotNetRoot) + ProjectK $(RepoRootDir)/tests/SOS.UnitTests/Scripts diff --git a/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt index 676d5924a6..6a06d04d69 100644 --- a/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -9,16 +9,12 @@ - $(RepoRootDir)\.dotnet-test - $(RepoRootDir)\.dotnet-test\x86 - + - $(RepoRootDir)\tests\SOS.UnitTests\Scripts $(RepoRootDir)\artifacts - $(RootBinDir)\bin\Windows_NT.$(TargetArchitecture).$(TargetConfiguration) $(RootBinDir)\TestResults\$(TargetConfiguration)\sos.unittests_$(Timestamp) $(RootBinDir)\tmp\$(TargetConfiguration)\dumps - $(InstallDir)\runcommand.dll + $(NativeDir)\runcommand.dll $(DotNetRoot)\shared\Microsoft.NETCore.App\ true @@ -283,7 +279,7 @@ nightly private - $(InstallDir)\sos.dll + $(NativeDir)\sos.dll $(DotNetRoot)\dotnet.exe $(RootBinDir)\bin\dotnet-dump\$(TargetConfiguration)\$(NetCoreAppMinTargetFramework)\publish\dotnet-dump.dll $(DumpDir)\$(TestProduct)\$(RuntimeFrameworkVersion)\$(BuildProjectFramework) diff --git a/tests/SOS.UnitTests/SOS.UnitTests.csproj b/tests/SOS.UnitTests/SOS.UnitTests.csproj index 22a9ee1f1e..4e0abd8359 100644 --- a/tests/SOS.UnitTests/SOS.UnitTests.csproj +++ b/tests/SOS.UnitTests/SOS.UnitTests.csproj @@ -8,6 +8,7 @@ true true $(OutputPath)$(TargetFramework)\Debugger.Tests.Common.txt + CopyProjectSpecificTestAssets @@ -35,24 +36,27 @@ + - - - - $(Configuration) - $(DesktopTargetFramework) - $(NetCoreAppMinTargetFramework) - $(TestRepoRoot) - $(TestPackageArtifactsRootDir)cdb-sos\$(cdbsosversion)\runtimes\win-%24(TargetArchitecture)\native\cdb.exe - -]]> - - - - + + + + + + + + + + + + + + + + + @@ -60,4 +64,21 @@ + + + + + + + + + + + + + + + From 0752240fc3ad1992bd167f2c2d9b48228e134f1a Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Tue, 2 Sep 2025 12:21:19 -0400 Subject: [PATCH 17/17] add temp helix test helper --- helix_test.ps1 | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) create mode 100644 helix_test.ps1 diff --git a/helix_test.ps1 b/helix_test.ps1 new file mode 100644 index 0000000000..22b4a9f900 --- /dev/null +++ b/helix_test.ps1 @@ -0,0 +1,87 @@ +param( + [switch]$skipbuild, + [switch]$skipcopy, + [string]$testName = "DbgShim" +) + +# Save the starting directory +$startingDirectory = Get-Location + +try { + $diagnosticRepoPath="C:\Users\maxcharlamb\source\reposA\diagnostics" + $helixFolder="C:\Users\maxcharlamb\temp\helix_folder" + + if (!$skipbuild) { + Write-Host "Running build with tests and helix" + & "$diagnosticRepoPath\build.cmd" "-withtests -bl -helix" +} else { + Write-Host "Skipping build (skipbuild parameter specified)" +} + +# Only run privatebuild if .dotnet-test folder doesn't exist +if (!(Test-Path "$diagnosticRepoPath\.dotnet-test")) { + Write-Host "Running privatebuild to create .dotnet-test folder" + & "$diagnosticRepoPath\build.cmd" "-installruntimes -skipmanaged -skipnative" +} else { + Write-Host ".dotnet-test folder already exists, skipping privatebuild" +} + +# Unzip $testName.UnitTests.zip into the helix folder +if (!$skipcopy) +{ + $zipPath = "$diagnosticRepoPath\artifacts\helix\tests\$testName.UnitTests.zip" + if (Test-Path $zipPath) { + # Clean up the helix folder if it exists + if (Test-Path $helixFolder) { + Write-Host "Cleaning up existing contents in $helixFolder" + Remove-Item -Path "$helixFolder\*" -Recurse -Force -ErrorAction SilentlyContinue + } else { + New-Item -ItemType Directory -Path $helixFolder -Force + } + Expand-Archive -Path $zipPath -DestinationPath $helixFolder -Force + Write-Host "Successfully extracted $zipPath to $helixFolder" + } else { + Write-Warning "Zip file not found at: $zipPath" + } +} + +# Set DOTNET_ROOT environment variable +$env:DOTNET_ROOT = "$diagnosticRepoPath\.dotnet-test" + +# Change to the helix folder before running dotnet +Set-Location $helixFolder +Write-Host "Changed directory to $helixFolder" + +# Build dotnet arguments array for better readability +$dotnetArgs = @( + "exec" + "--depsfile", "$testName.UnitTests.deps.json" + "--runtimeconfig", "$testName.UnitTests.runtimeconfig.json" + "xunit.console.dll" + "$testName.UnitTests.dll" + "-noautoreporters" + "-xml", "artifacts/TestResults/Release/$testName.UnitTests_net8.0_x64.xml" + "-html", "artifacts/TestResults/Release/$testName.UnitTests_net8.0_x64.html" +) + +# $dotnetArgs = @( +# "test" +# "$testName.UnitTests.dll" +# "--results-directory", "./testresults/" +# "--logger", "console;verbosity=detailed" +# "--logger", "html;logfilename=testResults.html" +# "--filter", "FullyQualifiedName~OtherCommands" +# ) + + + +# Print the command that will be executed +Write-Host "Executing command: $env:DOTNET_ROOT\dotnet.exe $($dotnetArgs -join ' ')" + +& "$env:DOTNET_ROOT\dotnet.exe" @dotnetArgs + +} finally { + # Always return to the starting directory + Set-Location $startingDirectory + Write-Host "Returned to starting directory: $startingDirectory" +}