From 8186c59590168507de0ef07d2d7f30bb9874f620 Mon Sep 17 00:00:00 2001 From: Mike McLaughlin Date: Fri, 25 Apr 2025 18:09:19 -0700 Subject: [PATCH 01/52] 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/52] 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/52] 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/52] 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/52] 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/52] 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/52] 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/52] 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/52] 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/52] 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/52] 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/52] 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 1c87d1c1b09c5d33cd46d303b2df16c8b1dbd98a Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 28 Aug 2025 16:59:14 -0400 Subject: [PATCH 13/52] remove references to helix --- eng/SendToHelix.proj | 26 -------------------------- eng/build.ps1 | 5 ----- eng/build.sh | 9 --------- tests/Directory.Build.props | 13 ------------- 4 files changed, 53 deletions(-) delete mode 100644 eng/SendToHelix.proj diff --git a/eng/SendToHelix.proj b/eng/SendToHelix.proj deleted file mode 100644 index fe28f37b73..0000000000 --- a/eng/SendToHelix.proj +++ /dev/null @@ -1,26 +0,0 @@ - - - $(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.ps1 b/eng/build.ps1 index a3373de325..a0837d8fdd 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -8,7 +8,6 @@ Param( [switch] $installruntimes, [switch] $privatebuild, [switch] $ci, - [switch] $helix, [switch][Alias('bl')]$binaryLog, [switch] $skipmanaged, [switch] $skipnative, @@ -76,10 +75,6 @@ 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 0792840d2e..302be64fb4 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -30,7 +30,6 @@ __InstallRuntimes=0 __PrivateBuild=0 __BuildTests=0 __RunTests=0 -__UseHelix=0 __UnprocessedBuildArgs= __UseCdac=0 __LiveRuntimeDir= @@ -113,10 +112,6 @@ handle_arguments() { __ManagedBuild=0 ;; - helix|-helix) - __UseHelix=1 - ;; - usecdac|-usecdac) __UseCdac=1 ;; @@ -234,10 +229,6 @@ 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" \ diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index d7c07256dd..3da60009d6 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -17,19 +17,6 @@ - $(ArtifactsDir)helix/ - $(TestArchiveRoot)tests/ - - - - . - packages - eng/AuxMsbuildFiles - . - native - - - $(RepoRoot) $(DotNetInstallRoot) $(NuGetPackageRoot) From 418570adfc27112fa59be33a6ae3326c14ceb38e Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 28 Aug 2025 17:44:27 -0400 Subject: [PATCH 14/52] remove helix references --- eng/build.sh | 4 -- tests/Directory.Build.targets | 123 ++-------------------------------- 2 files changed, 5 insertions(+), 122 deletions(-) diff --git a/eng/build.sh b/eng/build.sh index 302be64fb4..b12c8b2c1e 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -314,10 +314,6 @@ 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 \ diff --git a/tests/Directory.Build.targets b/tests/Directory.Build.targets index 4fce9b9160..caa65d4941 100644 --- a/tests/Directory.Build.targets +++ b/tests/Directory.Build.targets @@ -12,21 +12,21 @@ - - - - - @@ -43,119 +43,6 @@ - - - - - <_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')) - - - - - - - - - - - - - - - - - - - - - - - - - - - - Date: Fri, 29 Aug 2025 14:48:33 -0400 Subject: [PATCH 15/52] modify cli arguments --- eng/build.ps1 | 13 ++++--------- eng/build.sh | 18 ++++++++---------- eng/pipelines/build.yml | 7 +++---- test.sh | 3 +-- 4 files changed, 16 insertions(+), 25 deletions(-) diff --git a/eng/build.ps1 b/eng/build.ps1 index a0837d8fdd..4c9a39fd62 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -3,12 +3,12 @@ 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('wt')] $withtests, - [switch][Alias('rt')] $runtests, + [switch][Alias('t')] $test, [switch] $installruntimes, [switch] $privatebuild, [switch] $ci, [switch][Alias('bl')]$binaryLog, + [switch] $skiptest, [switch] $skipmanaged, [switch] $skipnative, [switch] $bundletools, @@ -24,11 +24,6 @@ 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()) @@ -73,7 +68,7 @@ if (-not $skipnative) { # Install sdk for building, restore and build managed components. if (-not $skipmanaged) { - if ($withtests) { + if (-not $skiptest) { $remainingargs = "/p:BuildTests=true " + $remainingargs } @@ -103,7 +98,7 @@ if ($installruntimes -or $privatebuild) { } # Run the xunit tests -if ($runtests) { +if ($test) { if (-not $crossbuild) { if ($useCdac) { $env:SOS_TEST_CDAC="true" diff --git a/eng/build.sh b/eng/build.sh index b12c8b2c1e..0e981ef1c2 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -28,8 +28,8 @@ __SkipConfigure=0 __SkipGenerateVersion=0 __InstallRuntimes=0 __PrivateBuild=0 -__BuildTests=0 -__RunTests=0 +__Test=0 +__TestBuild=1 __UnprocessedBuildArgs= __UseCdac=0 __LiveRuntimeDir= @@ -102,14 +102,12 @@ handle_arguments() { __PrivateBuild=1 ;; - withtests|-withtests) - __BuildTests=1 + test|-test) + __Test=1 ;; - runtests|-runtests) - __RunTests=1 - __NativeBuild=0 - __ManagedBuild=0 + skiptest|-skiptest) + __TestBuild=0 ;; usecdac|-usecdac) @@ -227,7 +225,7 @@ if [[ "$__ManagedBuild" == 1 ]]; then # __CommonMSBuildArgs contains TargetOS property echo "Commencing managed build for $__BuildType in $__RootBinDir/bin" - if [[ "$__BuildTests" == 1 ]]; then + if [[ "$__TestBuild" == 1 ]]; then __ManagedBuildArgs="$__ManagedBuildArgs /p:BuildTests=true" fi @@ -270,7 +268,7 @@ fi # Run xunit tests # -if [[ "$__RunTests" == 1 ]]; then +if [[ "$__Test" == 1 ]]; then if [[ "$__CrossBuild" == 0 ]]; then if [[ -z "$LLDB_PATH" ]]; then check_version_exists() { diff --git a/eng/pipelines/build.yml b/eng/pipelines/build.yml index ec12f7cd35..d5177ecf29 100644 --- a/eng/pipelines/build.yml +++ b/eng/pipelines/build.yml @@ -130,8 +130,7 @@ jobs: - _PhaseName: ${{ coalesce(parameters.name, parameters.osGroup) }}_${{ config.architecture }}_${{ config.configuration }} - _Pipeline_StreamDumpDir: $(Build.SourcesDirectory)/artifacts/tmp/${{ config.configuration }}/streams - - _BuildTestArgs: '-withtests' - - _RunTestArgs: '-runtests' + - _TestArgs: '-test' - _Cross: '' - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: @@ -143,10 +142,10 @@ jobs: 'error, testOnly and buildOnly cannot be true at the same time': error - ${{ if eq(parameters.testOnly, 'true') }}: - - _BuildTestArgs: '-withtests -skipnative' + - _BuildTestArgs: '-skipnative' - ${{ if or(eq(parameters.buildOnly, 'true'), eq(parameters.isCodeQLRun, 'true')) }}: - - _BuildTestArgs: '' + - _BuildTestArgs: '-skiptest' # For testing msrc's and service releases. The RuntimeSourceVersion is either "default" or the service release version to test - _InternalInstallArgs: '' diff --git a/test.sh b/test.sh index 11ea60cfeb..be0705bcdf 100755 --- a/test.sh +++ b/test.sh @@ -13,5 +13,4 @@ while [[ -h $source ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -"$scriptroot/eng/build.sh" -runtests $@ - +"$scriptroot/eng/build.sh" -test -skipmanaged -skipnative $@ From 12da84a2d4e78a040726e322b0b798697898b76f Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri, 29 Aug 2025 14:59:08 -0400 Subject: [PATCH 16/52] Update eng/build.ps1 --- eng/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.ps1 b/eng/build.ps1 index 4c9a39fd62..71de592ba2 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -8,7 +8,7 @@ Param( [switch] $privatebuild, [switch] $ci, [switch][Alias('bl')]$binaryLog, - [switch] $skiptest, + [switch] $skiptest = $false, [switch] $skipmanaged, [switch] $skipnative, [switch] $bundletools, From 4d0b29fa9b698821532e1512b6f9680a796ab166 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri, 29 Aug 2025 15:17:28 -0400 Subject: [PATCH 17/52] fix pipeline --- eng/pipelines/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/pipelines/build.yml b/eng/pipelines/build.yml index d5177ecf29..e29e275e45 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' + - _RunTestArgs: '-test' + - _BuildTestArgs: '' - _Cross: '' - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: From 7a4f23e8d37e3613ce798aeeed4000f42019c384 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri, 29 Aug 2025 15:17:58 -0400 Subject: [PATCH 18/52] undo change --- eng/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.ps1 b/eng/build.ps1 index 71de592ba2..4c9a39fd62 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -8,7 +8,7 @@ Param( [switch] $privatebuild, [switch] $ci, [switch][Alias('bl')]$binaryLog, - [switch] $skiptest = $false, + [switch] $skiptest, [switch] $skipmanaged, [switch] $skipnative, [switch] $bundletools, From 73ff521f957cb894998ad01d91bdfb07d2e3741a Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Thu, 4 Sep 2025 14:52:27 -0400 Subject: [PATCH 19/52] Move tests into src/tests and adjust any pathing weirdness --- Build.proj | 2 +- CMakeLists.txt | 1 - THIRD-PARTY-NOTICES.TXT | 2 +- debuggees.sln | 802 +----------------- diagnostics.sln | 12 +- eng/testsos.cmd | 2 +- eng/testsos.sh | 2 +- eng/testsoscdac.cmd | 2 +- eng/testsoscdac.sh | 2 +- src/CMakeLists.txt | 1 + {tests => src/tests}/CMakeLists.txt | 0 .../CommonTestRunner/CommonTestRunner.csproj | 0 .../Unix/Debugger.Tests.Config.txt | 0 .../Windows/Debugger.Tests.Config.txt | 0 .../CommonTestRunner/DiagnosticPortsHelper.cs | 0 .../tests}/CommonTestRunner/TestRunner.cs | 0 .../CommonTestRunner/TestRunnerUtilities.cs | 0 .../DacCompareNativeTypes.csproj | 0 .../DacCompareNativeTypes/DwarfParse.cs | 0 .../tests}/DacCompareNativeTypes/Member.cs | 0 .../tests}/DacCompareNativeTypes/PdbParser.cs | 0 .../tests}/DacCompareNativeTypes/Program.cs | 0 .../tests}/DacCompareNativeTypes/Readme.md | 0 .../tests}/DacCompareNativeTypes/Type.cs | 0 .../DacCompareNativeTypes/Whitespace.cs | 0 .../Unix/Debugger.Tests.Config.txt | 2 +- .../Windows/Debugger.Tests.Config.txt | 2 +- .../DbgShim.UnitTests.csproj | 2 +- .../tests}/DbgShim.UnitTests/DbgShimAPI.cs | 0 .../tests}/DbgShim.UnitTests/DbgShimTests.cs | 0 .../tests}/DbgShim.UnitTests/DebuggeeInfo.cs | 0 .../tests}/DbgShim.UnitTests/ICLRDebugging.cs | 0 .../tests}/DbgShim.UnitTests/ICorDebug.cs | 0 .../DbgShim.UnitTests/ICorDebugController.cs | 0 .../LibraryProviderWrapper.cs | 0 .../ManagedCallbackWrapper.cs | 0 .../tests}/Debuggees/Directory.Build.props | 0 .../tests}/Debuggees/DivZero/DivZero.cs | 0 .../tests}/Debuggees/DivZero/DivZero.csproj | 0 .../DotnetDumpCommands.csproj | 0 .../Debuggees/DotnetDumpCommands/Program.cs | 0 .../DynamicMethod/DynamicMethod.csproj | 0 .../tests}/Debuggees/DynamicMethod/Program.cs | 0 .../EventPipeTracee/CustomMetrics.cs | 0 .../EventPipeTracee/DuplicateNameMetrics.cs | 0 .../EventPipeTracee/EventPipeTracee.csproj | 0 .../Debuggees/EventPipeTracee/Program.cs | 0 .../ExitCodeTracee/ExitCodeTracee.csproj | 0 .../Debuggees/ExitCodeTracee/Program.cs | 0 {tests => src/tests}/Debuggees/GCPOH/GCPOH.cs | 0 .../tests}/Debuggees/GCPOH/GCPOH.csproj | 0 .../tests}/Debuggees/GCWhere/GCWhere.cs | 0 .../tests}/Debuggees/GCWhere/GCWhere.csproj | 0 .../tests}/Debuggees/LineNums/LineNums.csproj | 0 .../tests}/Debuggees/LineNums/Program.cs | 0 .../NestedExceptionTest.cs | 0 .../NestedExceptionTest.csproj | 0 .../tests}/Debuggees/Overflow/Overflow.cs | 0 .../tests}/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 .../tests}/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 .../tests}/Debuggees/TestDebuggee/Test.cs | 0 .../TestDebuggee/TestDebuggee.csproj | 0 .../tests}/Debuggees/Tracee/Program.cs | 0 .../tests}/Debuggees/Tracee/Tracee.csproj | 0 .../tests}/Debuggees/WebApp3/Program.cs | 0 .../tests}/Debuggees/WebApp3/Startup.cs | 0 .../tests}/Debuggees/WebApp3/WebApp3.csproj | 0 .../WebApp3/appsettings.Development.json | 0 .../tests}/Debuggees/WebApp3/appsettings.json | 0 .../tests}/DesktopClrHost/CMakeLists.txt | 0 .../tests}/DesktopClrHost/DesktopClrHost.cpp | 0 {tests => src/tests}/Directory.Build.props | 2 +- {tests => src/tests}/Directory.Build.targets | 0 .../CSVExporterTests.cs | 0 .../ConsoleExporterTests.cs | 0 .../CounterMonitorPayloadTests.cs | 0 .../CounterMonitorTests.cs | 0 .../DotnetCounters.UnitTests.csproj | 2 +- .../JSONExporterTests.cs | 0 .../DotnetCounters.UnitTests/MockConsole.cs | 0 .../DotnetCounters.UnitTests/TestConstants.cs | 0 .../DotnetStack.UnitTests.csproj | 2 +- .../DotnetStack.UnitTests/StackTests.cs | 0 .../CLRProviderParsing.cs | 0 .../ChildProcessTests.cs | 0 .../DotnetTrace.UnitTests.csproj | 2 +- .../ProfileProviderMerging.cs | 0 .../DotnetTrace.UnitTests/ProviderParsing.cs | 0 .../EventPipe.UnitTests/ContentionEvents.cs | 0 .../EventPipe.UnitTests/CustomEvents.cs | 0 .../EventPipe.UnitTests.csproj | 2 +- .../tests}/EventPipe.UnitTests/GCEvents.cs | 0 .../EventPipe.UnitTests/LoaderEvents.cs | 0 .../EventPipe.UnitTests/MethodEvents.cs | 0 .../tests}/EventPipe.UnitTests/README.md | 0 .../EventPipe.UnitTests/ThreadPoolEvents.cs | 0 .../common/IpcTraceTest.cs | 0 .../common/RemoteTestExecutorHelper.cs | 0 .../EventPipe.UnitTests/common/StreamProxy.cs | 0 .../tests}/EventPipe.UnitTests/providers.cs | 0 .../EventPipeStress/Common/BurstPattern.cs | 0 .../EventPipeStress/Common/Common.csproj | 0 .../tests}/EventPipeStress/Common/Options.cs | 0 .../Orchestrator/CommandLine.cs | 0 .../Orchestrator/Orchestrator.csproj | 0 .../EventPipeStress/Orchestrator/Program.cs | 0 .../Orchestrator/TestResult.cs | 0 .../tests}/EventPipeStress/README.md | 0 .../tests}/EventPipeStress/Stress/Program.cs | 0 .../EventPipeStress/Stress/Stress.csproj | 0 {tests => src/tests}/Grape/Grape.csproj | 0 {tests => src/tests}/Grape/Program.cs | 0 {tests => src/tests}/Grape/TestRunner.cs | 0 .../Grape/TraceGeneratorConfiguration.cs | 0 .../TraceGenerators/EtwTraceGenerator.cs | 0 .../EventPipeTraceGenerator.cs | 0 {tests => src/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 | 6 +- .../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 | 0 .../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 | 17 + .../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 | 2 +- .../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 | 2 +- .../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.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 | 2 +- .../PEFileKeyGenerationTests.cs | 0 .../SymbolStoreTests.cs | 0 .../StackTraceSymbols.CoreCLR.cs.gz | Bin .../TestBinaries/coreclr.dll.gz | Bin .../dir1/System.Threading.Thread.dll | Bin .../dir2/System.Threading.Thread.dll | 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 .../tests}/SOS.UnitTests/SOS.UnitTests.csproj | 0 {tests => src/tests}/SOS.UnitTests/SOS.cs | 0 .../tests}/SOS.UnitTests/SOSRunner.cs | 0 .../Scripts/ClrStackWithNumberOfFrames.script | 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 .../tests}/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 {tests => src/tests}/Test.proj | 0 .../tests}/TestExtension/TestCommands.cs | 0 .../tests}/TestExtension/TestExtension.csproj | 2 +- .../tests}/TestHelpers/MaxStreamReadHelper.cs | 0 .../tests}/TestHelpers/TestHelpers.cs | 0 .../tests}/TestHelpers/TestHelpers.csproj | 2 +- {tests => src/tests}/benchmarks/.gitignore | 0 {tests => src/tests}/benchmarks/Program.cs | 0 {tests => src/tests}/benchmarks/README.md | 0 .../tests}/benchmarks/RunBenchmarks.cmd | 0 .../tests}/benchmarks/RunBenchmarks.sh | 0 .../tests}/benchmarks/benchmarks.csproj | 0 .../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 .../tests}/lldbplugin.tests/t_cmd_clrstack.py | 0 .../lldbplugin.tests/t_cmd_clrthreads.py | 0 .../tests}/lldbplugin.tests/t_cmd_clru.py | 0 .../tests}/lldbplugin.tests/t_cmd_dso.py | 0 .../lldbplugin.tests/t_cmd_dumpclass.py | 0 .../tests}/lldbplugin.tests/t_cmd_dumpheap.py | 0 .../tests}/lldbplugin.tests/t_cmd_dumpil.py | 0 .../tests}/lldbplugin.tests/t_cmd_dumplog.py | 0 .../tests}/lldbplugin.tests/t_cmd_dumpmd.py | 0 .../lldbplugin.tests/t_cmd_dumpmodule.py | 0 .../tests}/lldbplugin.tests/t_cmd_dumpmt.py | 0 .../tests}/lldbplugin.tests/t_cmd_dumpobj.py | 0 .../lldbplugin.tests/t_cmd_dumpstack.py | 0 .../tests}/lldbplugin.tests/t_cmd_eeheap.py | 0 .../tests}/lldbplugin.tests/t_cmd_eestack.py | 0 .../tests}/lldbplugin.tests/t_cmd_gcroot.py | 0 .../lldbplugin.tests/t_cmd_histclear.py | 0 .../tests}/lldbplugin.tests/t_cmd_histinit.py | 0 .../tests}/lldbplugin.tests/t_cmd_histobj.py | 0 .../lldbplugin.tests/t_cmd_histobjfind.py | 0 .../tests}/lldbplugin.tests/t_cmd_histroot.py | 0 .../tests}/lldbplugin.tests/t_cmd_ip2md.py | 0 .../tests}/lldbplugin.tests/t_cmd_name2ee.py | 0 .../tests}/lldbplugin.tests/t_cmd_pe.py | 0 .../tests}/lldbplugin.tests/t_cmd_sos.py | 0 .../tests}/lldbplugin.tests/t_cmd_soshelp.py | 0 .../lldbplugin.tests/test_libsosplugin.py | 0 .../tests}/lldbplugin.tests/testsos.sh | 4 +- .../tests}/lldbplugin.tests/testutils.py | 0 .../tests}/runcommand/CMakeLists.txt | 0 .../tests}/runcommand/runcommand.cpp | 0 .../WebApp3/Properties/launchSettings.json | 12 - ...ft.Diagnostics.Monitoring.UnitTests.csproj | 17 - .../TestBinaries/HelloWorld.pdb | Bin 11776 -> 0 bytes .../dir1/System.Threading.Thread.pdb | Bin 5560 -> 0 bytes .../dir2/System.Threading.Thread.pdb | Bin 5560 -> 0 bytes 336 files changed, 80 insertions(+), 846 deletions(-) rename {tests => src/tests}/CMakeLists.txt (100%) rename {tests => src/tests}/CommonTestRunner/CommonTestRunner.csproj (100%) rename {tests => src/tests}/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt (100%) rename {tests => src/tests}/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt (100%) rename {tests => src/tests}/CommonTestRunner/DiagnosticPortsHelper.cs (100%) rename {tests => src/tests}/CommonTestRunner/TestRunner.cs (100%) rename {tests => src/tests}/CommonTestRunner/TestRunnerUtilities.cs (100%) rename {tests => src/tests}/DacCompareNativeTypes/DacCompareNativeTypes.csproj (100%) rename {tests => src/tests}/DacCompareNativeTypes/DwarfParse.cs (100%) rename {tests => src/tests}/DacCompareNativeTypes/Member.cs (100%) rename {tests => src/tests}/DacCompareNativeTypes/PdbParser.cs (100%) rename {tests => src/tests}/DacCompareNativeTypes/Program.cs (100%) rename {tests => src/tests}/DacCompareNativeTypes/Readme.md (100%) rename {tests => src/tests}/DacCompareNativeTypes/Type.cs (100%) rename {tests => src/tests}/DacCompareNativeTypes/Whitespace.cs (100%) rename {tests => src/tests}/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt (98%) rename {tests => src/tests}/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt (98%) rename {tests => src/tests}/DbgShim.UnitTests/DbgShim.UnitTests.csproj (97%) rename {tests => src/tests}/DbgShim.UnitTests/DbgShimAPI.cs (100%) rename {tests => src/tests}/DbgShim.UnitTests/DbgShimTests.cs (100%) rename {tests => src/tests}/DbgShim.UnitTests/DebuggeeInfo.cs (100%) rename {tests => src/tests}/DbgShim.UnitTests/ICLRDebugging.cs (100%) rename {tests => src/tests}/DbgShim.UnitTests/ICorDebug.cs (100%) rename {tests => src/tests}/DbgShim.UnitTests/ICorDebugController.cs (100%) rename {tests => src/tests}/DbgShim.UnitTests/LibraryProviderWrapper.cs (100%) rename {tests => src/tests}/DbgShim.UnitTests/ManagedCallbackWrapper.cs (100%) rename {tests => src/tests}/Debuggees/Directory.Build.props (100%) rename {tests => src/tests}/Debuggees/DivZero/DivZero.cs (100%) rename {tests => src/tests}/Debuggees/DivZero/DivZero.csproj (100%) rename {tests => src/tests}/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj (100%) rename {tests => src/tests}/Debuggees/DotnetDumpCommands/Program.cs (100%) rename {tests => src/tests}/Debuggees/DynamicMethod/DynamicMethod.csproj (100%) rename {tests => src/tests}/Debuggees/DynamicMethod/Program.cs (100%) rename {tests => src/tests}/Debuggees/EventPipeTracee/CustomMetrics.cs (100%) rename {tests => src/tests}/Debuggees/EventPipeTracee/DuplicateNameMetrics.cs (100%) rename {tests => src/tests}/Debuggees/EventPipeTracee/EventPipeTracee.csproj (100%) rename {tests => src/tests}/Debuggees/EventPipeTracee/Program.cs (100%) rename {tests => src/tests}/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj (100%) rename {tests => src/tests}/Debuggees/ExitCodeTracee/Program.cs (100%) rename {tests => src/tests}/Debuggees/GCPOH/GCPOH.cs (100%) rename {tests => src/tests}/Debuggees/GCPOH/GCPOH.csproj (100%) rename {tests => src/tests}/Debuggees/GCWhere/GCWhere.cs (100%) rename {tests => src/tests}/Debuggees/GCWhere/GCWhere.csproj (100%) rename {tests => src/tests}/Debuggees/LineNums/LineNums.csproj (100%) rename {tests => src/tests}/Debuggees/LineNums/Program.cs (100%) rename {tests => src/tests}/Debuggees/NestedExceptionTest/NestedExceptionTest.cs (100%) rename {tests => src/tests}/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj (100%) rename {tests => src/tests}/Debuggees/Overflow/Overflow.cs (100%) rename {tests => src/tests}/Debuggees/Overflow/Overflow.csproj (100%) rename {tests => src/tests}/Debuggees/ReflectionTest/ReflectionTest.cs (100%) rename {tests => src/tests}/Debuggees/ReflectionTest/ReflectionTest.csproj (100%) rename {tests => src/tests}/Debuggees/SimpleDebuggee/SimpleDebuggee.cs (100%) rename {tests => src/tests}/Debuggees/SimpleDebuggee/SimpleDebuggee.csproj (100%) rename {tests => src/tests}/Debuggees/SimpleDebuggee/runtimeconfig.template.json (100%) rename {tests => src/tests}/Debuggees/SimpleThrow/SimpleThrow.cs (100%) rename {tests => src/tests}/Debuggees/SimpleThrow/SimpleThrow.csproj (100%) rename {tests => src/tests}/Debuggees/SimpleThrow/UserObject.cs (100%) rename {tests => src/tests}/Debuggees/StackTracee/Program.cs (100%) rename {tests => src/tests}/Debuggees/StackTracee/StackTracee.csproj (100%) rename {tests => src/tests}/Debuggees/SymbolTestApp/SymbolTestApp.sln (100%) rename {tests => src/tests}/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.cs (100%) rename {tests => src/tests}/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj (100%) rename {tests => src/tests}/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj (100%) rename {tests => src/tests}/Debuggees/SymbolTestApp/SymbolTestDll/TestClass.cs (100%) rename {tests => src/tests}/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj (100%) rename {tests => src/tests}/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserTask.cs (100%) rename {tests => src/tests}/Debuggees/TaskNestedException/TaskNestedException.sln (100%) rename {tests => src/tests}/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.cs (100%) rename {tests => src/tests}/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj (100%) rename {tests => src/tests}/Debuggees/TestDebuggee/Test.cs (100%) rename {tests => src/tests}/Debuggees/TestDebuggee/TestDebuggee.csproj (100%) rename {tests => src/tests}/Debuggees/Tracee/Program.cs (100%) rename {tests => src/tests}/Debuggees/Tracee/Tracee.csproj (100%) rename {tests => src/tests}/Debuggees/WebApp3/Program.cs (100%) rename {tests => src/tests}/Debuggees/WebApp3/Startup.cs (100%) rename {tests => src/tests}/Debuggees/WebApp3/WebApp3.csproj (100%) rename {tests => src/tests}/Debuggees/WebApp3/appsettings.Development.json (100%) rename {tests => src/tests}/Debuggees/WebApp3/appsettings.json (100%) rename {tests => src/tests}/DesktopClrHost/CMakeLists.txt (100%) rename {tests => src/tests}/DesktopClrHost/DesktopClrHost.cpp (100%) rename {tests => src/tests}/Directory.Build.props (95%) rename {tests => src/tests}/Directory.Build.targets (100%) rename {tests => src/tests}/DotnetCounters.UnitTests/CSVExporterTests.cs (100%) rename {tests => src/tests}/DotnetCounters.UnitTests/ConsoleExporterTests.cs (100%) rename {tests => src/tests}/DotnetCounters.UnitTests/CounterMonitorPayloadTests.cs (100%) rename {tests => src/tests}/DotnetCounters.UnitTests/CounterMonitorTests.cs (100%) rename {tests => src/tests}/DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj (82%) rename {tests => src/tests}/DotnetCounters.UnitTests/JSONExporterTests.cs (100%) rename {tests => src/tests}/DotnetCounters.UnitTests/MockConsole.cs (100%) rename {tests => src/tests}/DotnetCounters.UnitTests/TestConstants.cs (100%) rename {tests => src/tests}/DotnetStack.UnitTests/DotnetStack.UnitTests.csproj (72%) rename {tests => src/tests}/DotnetStack.UnitTests/StackTests.cs (100%) rename {tests => src/tests}/DotnetTrace.UnitTests/CLRProviderParsing.cs (100%) rename {tests => src/tests}/DotnetTrace.UnitTests/ChildProcessTests.cs (100%) rename {tests => src/tests}/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj (72%) rename {tests => src/tests}/DotnetTrace.UnitTests/ProfileProviderMerging.cs (100%) rename {tests => src/tests}/DotnetTrace.UnitTests/ProviderParsing.cs (100%) rename {tests => src/tests}/EventPipe.UnitTests/ContentionEvents.cs (100%) rename {tests => src/tests}/EventPipe.UnitTests/CustomEvents.cs (100%) rename {tests => src/tests}/EventPipe.UnitTests/EventPipe.UnitTests.csproj (77%) rename {tests => src/tests}/EventPipe.UnitTests/GCEvents.cs (100%) rename {tests => src/tests}/EventPipe.UnitTests/LoaderEvents.cs (100%) rename {tests => src/tests}/EventPipe.UnitTests/MethodEvents.cs (100%) rename {tests => src/tests}/EventPipe.UnitTests/README.md (100%) rename {tests => src/tests}/EventPipe.UnitTests/ThreadPoolEvents.cs (100%) rename {tests => src/tests}/EventPipe.UnitTests/common/IpcTraceTest.cs (100%) rename {tests => src/tests}/EventPipe.UnitTests/common/RemoteTestExecutorHelper.cs (100%) rename {tests => src/tests}/EventPipe.UnitTests/common/StreamProxy.cs (100%) rename {tests => src/tests}/EventPipe.UnitTests/providers.cs (100%) rename {tests => src/tests}/EventPipeStress/Common/BurstPattern.cs (100%) rename {tests => src/tests}/EventPipeStress/Common/Common.csproj (100%) rename {tests => src/tests}/EventPipeStress/Common/Options.cs (100%) rename {tests => src/tests}/EventPipeStress/Orchestrator/CommandLine.cs (100%) rename {tests => src/tests}/EventPipeStress/Orchestrator/Orchestrator.csproj (100%) rename {tests => src/tests}/EventPipeStress/Orchestrator/Program.cs (100%) rename {tests => src/tests}/EventPipeStress/Orchestrator/TestResult.cs (100%) rename {tests => src/tests}/EventPipeStress/README.md (100%) rename {tests => src/tests}/EventPipeStress/Stress/Program.cs (100%) rename {tests => src/tests}/EventPipeStress/Stress/Stress.csproj (100%) rename {tests => src/tests}/Grape/Grape.csproj (100%) rename {tests => src/tests}/Grape/Program.cs (100%) rename {tests => src/tests}/Grape/TestRunner.cs (100%) rename {tests => src/tests}/Grape/TraceGeneratorConfiguration.cs (100%) rename {tests => src/tests}/Grape/TraceGenerators/EtwTraceGenerator.cs (100%) rename {tests => src/tests}/Grape/TraceGenerators/EventPipeTraceGenerator.cs (100%) rename {tests => src/tests}/Grape/config.json (100%) rename {tests => src/tests}/Microsoft.Diagnostics.DebugServices.UnitTests/ClrmaTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.DebugServices.UnitTests/CommandServiceTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt (100%) rename {tests => src/tests}/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt (100%) rename {tests => src/tests}/Microsoft.Diagnostics.DebugServices.UnitTests/DebugServicesTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj (89%) rename {tests => src/tests}/Microsoft.Diagnostics.DebugServices.UnitTests/RunTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.DebugServices.UnitTests/ServiceEventTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.DebugServices.UnitTests/SymbolServiceTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.DebugServices.UnitTests/TestCommands.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.DebugServices.UnitTests/TestDbgEng.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.DebugServices.UnitTests/WriteTestData.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/AspNetTriggerUnitTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/DistributedTracesPipelineUnitTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterConstants.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterPipelineUnitTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterTriggerTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventLogsPipelineUnitTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventTracePipelineUnitTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/GlobMatcherTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/LogsPipelineUnitTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj (63%) rename {tests => src/tests}/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/PipelineTestUtilities.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/SlidingWindowTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/TestStreamingLogger.cs (100%) create mode 100644 src/tests/Microsoft.Diagnostics.Monitoring.UnitTests/Microsoft.Diagnostics.Monitoring.UnitTests.csproj rename {tests => src/tests}/Microsoft.Diagnostics.Monitoring.UnitTests/PipelineTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.NETCore.Client.UnitTests/DiagnosticsClientApiShim.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.NETCore.Client.UnitTests/DiagnosticsClientApiShimExtensions.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.NETCore.Client.UnitTests/EventPipeProviderTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.NETCore.Client.UnitTests/EventPipeSessionTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetProcessEnvironmentTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetProcessInfoTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetPublishedProcessesTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.NETCore.Client.UnitTests/HandleableCollectionTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.NETCore.Client.UnitTests/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj (79%) rename {tests => src/tests}/Microsoft.Diagnostics.NETCore.Client.UnitTests/PerfMapTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.NETCore.Client.UnitTests/ReversedServerTests.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/AcquireDotNetTestStep.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/AssertX.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/BaseDebuggeeCompiler.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/ConsoleTestOutputHelper.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/CsprojBuildDebuggeeTestStep.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/DebuggeeCompiler.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/DotNetBuildDebuggeeTestStep.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/FileTestOutputHelper.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/IProcessLogger.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/IndentedTestOutputHelper.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/LoggingListener.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj (72%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/MultiplexTestOutputHelper.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/PrebuiltDebuggeeCompiler.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/ProcessRunner.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/RemoteExecutorHelper.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/SdkPrebuiltDebuggeeCompiler.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataReader.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataWriter.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/TestHost/TestDump.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/TestHost/TestHost.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/TestOutputProcessLogger.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/TestRunner.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/TestStep.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkipTestException.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactAttribute.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactDiscoverer.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactMessageBus.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactTestCase.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryAttribute.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryDiscoverer.cs (100%) rename {tests => src/tests}/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryTestCase.cs (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/AddressSpace.cs (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/ELF/Tests.cs (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/Layouts.cs (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/MachO/Tests.cs (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj (96%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/Minidump/Tests.cs (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/PDB/Tests.cs (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/PE/Tests.cs (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/PerfMap/Tests.cs (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/PrimitiveTypes.cs (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.exe (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdz (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.ni.r2rmap (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/TestBinaries/System.Diagnostics.StackTrace.dll (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/TestBinaries/apphost.gz (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/TestBinaries/core.gz (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/TestBinaries/ilasm.dbg (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/TestBinaries/libclrjit.dylib.dwarf.gz (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.dylib.gz (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.so.gz (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x64.dmp.gz (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x86.dmp.gz (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/TestBinaries/renamed_build_id_section (100%) rename {tests => src/tests}/Microsoft.FileFormats.UnitTests/TestBinaries/triagedump.gz (100%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/KeyGeneratorTests.cs (100%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj (98%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/PEFileKeyGenerationTests.cs (100%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs (100%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz (100%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/coreclr.dll.gz (100%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.dll (100%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.dll (100%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/libSystem.Security.Cryptography.Native.Apple.dylib.gz (100%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/md5_build_id (100%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_amd64.dll (100%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_arm64.dll (100%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_i386.dll (100%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdac.dll (100%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdbi.dll (100%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/mocksos.dll (100%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/stripped_executable (100%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/TestBinaries/symbolized_executable (100%) rename {tests => src/tests}/Microsoft.SymbolStore.UnitTests/Tracer.cs (100%) rename {tests => src/tests}/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt (98%) rename {tests => src/tests}/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt (99%) rename {tests => src/tests}/SOS.UnitTests/DumpGenerationFixture.cs (100%) rename {tests => src/tests}/SOS.UnitTests/SOS.UnitTests.csproj (100%) rename {tests => src/tests}/SOS.UnitTests/SOS.cs (100%) rename {tests => src/tests}/SOS.UnitTests/SOSRunner.cs (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/ClrStackWithNumberOfFrames.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/ConcurrentDictionaries.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/DivZero.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/DualRuntimes.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/DumpGen.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/DynamicMethod.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/GCPOH.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/GCTests.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/LineNums.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/NestedExceptionTest.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/OtherCommands.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/Overflow.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/Reflection.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/SimpleThrow.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/StackAndOtherTests.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/StackTests.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/StackTraceFaultingExceptionFrame.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/StackTraceSoftwareExceptionFrame.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/TaskNestedException.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/TestExtensions.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/WebApp.script (100%) rename {tests => src/tests}/SOS.UnitTests/Scripts/lldbhelper.py (100%) rename {tests => src/tests}/Test.proj (100%) rename {tests => src/tests}/TestExtension/TestCommands.cs (100%) rename {tests => src/tests}/TestExtension/TestExtension.csproj (52%) rename {tests => src/tests}/TestHelpers/MaxStreamReadHelper.cs (100%) rename {tests => src/tests}/TestHelpers/TestHelpers.cs (100%) rename {tests => src/tests}/TestHelpers/TestHelpers.csproj (61%) rename {tests => src/tests}/benchmarks/.gitignore (100%) rename {tests => src/tests}/benchmarks/Program.cs (100%) rename {tests => src/tests}/benchmarks/README.md (100%) rename {tests => src/tests}/benchmarks/RunBenchmarks.cmd (100%) rename {tests => src/tests}/benchmarks/RunBenchmarks.sh (100%) rename {tests => src/tests}/benchmarks/benchmarks.csproj (100%) rename {tests => src/tests}/lldbplugin.tests/README.md (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_bpmd_clear.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_bpmd_clearall.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_bpmd_methoddesc.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_bpmd_module_function.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_bpmd_module_function_iloffset.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_bpmd_nofuturemodule_module_function.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_clrstack.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_clrthreads.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_clru.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_dso.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_dumpclass.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_dumpheap.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_dumpil.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_dumplog.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_dumpmd.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_dumpmodule.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_dumpmt.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_dumpobj.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_dumpstack.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_eeheap.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_eestack.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_gcroot.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_histclear.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_histinit.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_histobj.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_histobjfind.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_histroot.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_ip2md.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_name2ee.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_pe.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_sos.py (100%) rename {tests => src/tests}/lldbplugin.tests/t_cmd_soshelp.py (100%) rename {tests => src/tests}/lldbplugin.tests/test_libsosplugin.py (100%) rename {tests => src/tests}/lldbplugin.tests/testsos.sh (77%) rename {tests => src/tests}/lldbplugin.tests/testutils.py (100%) rename {tests => src/tests}/runcommand/CMakeLists.txt (100%) rename {tests => src/tests}/runcommand/runcommand.cpp (100%) delete mode 100644 tests/Debuggees/WebApp3/Properties/launchSettings.json delete mode 100644 tests/Microsoft.Diagnostics.Monitoring.UnitTests/Microsoft.Diagnostics.Monitoring.UnitTests.csproj delete mode 100644 tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdb delete mode 100644 tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb delete mode 100644 tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.pdb diff --git a/Build.proj b/Build.proj index 3d5ccf18d4..fca5743862 100644 --- a/Build.proj +++ b/Build.proj @@ -29,6 +29,6 @@ - + diff --git a/CMakeLists.txt b/CMakeLists.txt index 524046fa46..882f5b3e05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -199,4 +199,3 @@ 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 b358816237..da0d78931d 100644 --- a/THIRD-PARTY-NOTICES.TXT +++ b/THIRD-PARTY-NOTICES.TXT @@ -1559,7 +1559,7 @@ SOFTWARE. ------------------------------------------------- -Source in tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/* is largely derived from source +Source in src/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 8a1c545b2b..0646387aec 100644 --- a/debuggees.sln +++ b/debuggees.sln @@ -3,51 +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", "tests\Debuggees\TestDebuggee\TestDebuggee.csproj", "{6C43BE85-F8C3-4D76-8050-F25CE953A7FD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestDebuggee", "src\tests\Debuggees\TestDebuggee\TestDebuggee.csproj", "{6C43BE85-F8C3-4D76-8050-F25CE953A7FD}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{19FAB78C-3351-4911-8F0C-8C6056401740}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "src\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", "tests\Debuggees\WebApp3\WebApp3.csproj", "{252E5845-8D4C-4306-9D8F-ED2E2F7005F6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApp3", "src\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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleThrow", "src\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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DivZero", "src\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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GCWhere", "src\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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NestedExceptionTest", "src\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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Overflow", "src\tests\Debuggees\Overflow\Overflow.csproj", "{20251748-AA7B-45BE-ADAA-C9375F5CC80F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReflectionTest", "tests\Debuggees\ReflectionTest\ReflectionTest.csproj", "{DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReflectionTest", "src\tests\Debuggees\ReflectionTest\ReflectionTest.csproj", "{DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaskNestedException", "tests\Debuggees\TaskNestedException\TaskNestedException\TaskNestedException.csproj", "{73EA5188-1E4F-42D8-B63E-F1B878A4EB63}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TaskNestedException", "src\tests\Debuggees\TaskNestedException\TaskNestedException\TaskNestedException.csproj", "{73EA5188-1E4F-42D8-B63E-F1B878A4EB63}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RandomUserLibrary", "tests\Debuggees\TaskNestedException\RandomUserLibrary\RandomUserLibrary.csproj", "{B50D14DB-8EE5-47BD-B412-62FA5C693CC7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RandomUserLibrary", "src\tests\Debuggees\TaskNestedException\RandomUserLibrary\RandomUserLibrary.csproj", "{B50D14DB-8EE5-47BD-B412-62FA5C693CC7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SymbolTestApp", "tests\Debuggees\SymbolTestApp\SymbolTestApp\SymbolTestApp.csproj", "{112FE2A7-3FD2-4496-8A14-171898AD5CF5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SymbolTestApp", "src\tests\Debuggees\SymbolTestApp\SymbolTestApp\SymbolTestApp.csproj", "{112FE2A7-3FD2-4496-8A14-171898AD5CF5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SymbolTestDll", "tests\Debuggees\SymbolTestApp\SymbolTestDll\SymbolTestDll.csproj", "{8C27904A-47C0-44C7-B191-88FF34580CBE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SymbolTestDll", "src\tests\Debuggees\SymbolTestApp\SymbolTestDll\SymbolTestDll.csproj", "{8C27904A-47C0-44C7-B191-88FF34580CBE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LineNums", "tests\Debuggees\LineNums\LineNums.csproj", "{84881FB8-37E1-4D9B-B27E-9831C30DCC04}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LineNums", "src\tests\Debuggees\LineNums\LineNums.csproj", "{84881FB8-37E1-4D9B-B27E-9831C30DCC04}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GCPOH", "tests\Debuggees\GCPOH\GCPOH.csproj", "{0A34CA51-8B8C-41A1-BE24-AB2C574EA144}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GCPOH", "src\tests\Debuggees\GCPOH\GCPOH.csproj", "{0A34CA51-8B8C-41A1-BE24-AB2C574EA144}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetDumpCommands", "tests\Debuggees\DotnetDumpCommands\DotnetDumpCommands.csproj", "{F9A69812-DC52-428D-9DB1-8B831A8FF776}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetDumpCommands", "src\tests\Debuggees\DotnetDumpCommands\DotnetDumpCommands.csproj", "{F9A69812-DC52-428D-9DB1-8B831A8FF776}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicMethod", "tests\Debuggees\DynamicMethod\DynamicMethod.csproj", "{2F9AA5A9-D42A-42C6-B483-1B9284C62F91}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicMethod", "src\tests\Debuggees\DynamicMethod\DynamicMethod.csproj", "{2F9AA5A9-D42A-42C6-B483-1B9284C62F91}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventPipeTracee", "tests\Debuggees\EventPipeTracee\EventPipeTracee.csproj", "{85F3B31D-7B83-B76A-3CD4-4EF3B250329D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EventPipeTracee", "src\tests\Debuggees\EventPipeTracee\EventPipeTracee.csproj", "{85F3B31D-7B83-B76A-3CD4-4EF3B250329D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExitCodeTracee", "tests\Debuggees\ExitCodeTracee\ExitCodeTracee.csproj", "{1270B50E-1BC3-161C-3052-F62FF5950154}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExitCodeTracee", "src\tests\Debuggees\ExitCodeTracee\ExitCodeTracee.csproj", "{1270B50E-1BC3-161C-3052-F62FF5950154}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StackTracee", "tests\Debuggees\StackTracee\StackTracee.csproj", "{904C1E5E-D18C-24A8-0B40-3372622A5105}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StackTracee", "src\tests\Debuggees\StackTracee\StackTracee.csproj", "{904C1E5E-D18C-24A8-0B40-3372622A5105}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleDebuggee", "tests\Debuggees\SimpleDebuggee\SimpleDebuggee.csproj", "{C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SimpleDebuggee", "src\tests\Debuggees\SimpleDebuggee\SimpleDebuggee.csproj", "{C8CE4E7D-F2C1-8B9A-9C59-AF80F9D64EB7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tracee", "tests\Debuggees\Tracee\Tracee.csproj", "{9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tracee", "src\tests\Debuggees\Tracee\Tracee.csproj", "{9FA6DB05-57C1-8E9B-8CA4-850511BEB66A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -157,762 +157,7 @@ Global {179EF543-E30A-4428-ABA0-2E2621860173}.Checked|Any CPU.Build.0 = Debug|Any CPU {179EF543-E30A-4428-ABA0-2E2621860173}.Checked|ARM.ActiveCfg = Debug|Any CPU {179EF543-E30A-4428-ABA0-2E2621860173}.Checked|ARM.Build.0 = Debug|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Checked|ARM64.ActiveCfg = Debug|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Checked|ARM64.Build.0 = Debug|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Checked|x64.ActiveCfg = Debug|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Checked|x64.Build.0 = Debug|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Checked|x86.ActiveCfg = Debug|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Checked|x86.Build.0 = Debug|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Debug|Any CPU.Build.0 = Debug|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Debug|ARM.ActiveCfg = Debug|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Debug|ARM.Build.0 = Debug|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Debug|ARM64.Build.0 = Debug|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Debug|x64.ActiveCfg = Debug|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Debug|x64.Build.0 = Debug|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Debug|x86.ActiveCfg = Debug|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Debug|x86.Build.0 = Debug|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Release|Any CPU.ActiveCfg = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Release|Any CPU.Build.0 = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Release|ARM.ActiveCfg = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Release|ARM.Build.0 = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Release|ARM64.ActiveCfg = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Release|ARM64.Build.0 = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Release|x64.ActiveCfg = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Release|x64.Build.0 = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Release|x86.ActiveCfg = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.Release|x86.Build.0 = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {179EF543-E30A-4428-ABA0-2E2621860173}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Checked|Any CPU.Build.0 = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Checked|ARM.ActiveCfg = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Checked|ARM.Build.0 = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Checked|ARM64.ActiveCfg = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Checked|ARM64.Build.0 = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Checked|x64.ActiveCfg = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Checked|x64.Build.0 = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Checked|x86.ActiveCfg = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Checked|x86.Build.0 = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Debug|Any CPU.Build.0 = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Debug|ARM.ActiveCfg = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Debug|ARM.Build.0 = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Debug|ARM64.Build.0 = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Debug|x64.ActiveCfg = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Debug|x64.Build.0 = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Debug|x86.ActiveCfg = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Debug|x86.Build.0 = Debug|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Release|Any CPU.ActiveCfg = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Release|Any CPU.Build.0 = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Release|ARM.ActiveCfg = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Release|ARM.Build.0 = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Release|ARM64.ActiveCfg = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Release|ARM64.Build.0 = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Release|x64.ActiveCfg = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Release|x64.Build.0 = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Release|x86.ActiveCfg = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.Release|x86.Build.0 = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {447AC053-2E0A-4119-BD11-30A4A8E3F765}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Checked|Any CPU.Build.0 = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Checked|ARM.ActiveCfg = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Checked|ARM.Build.0 = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Checked|ARM64.ActiveCfg = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Checked|ARM64.Build.0 = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Checked|x64.ActiveCfg = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Checked|x64.Build.0 = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Checked|x86.ActiveCfg = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Checked|x86.Build.0 = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Debug|Any CPU.Build.0 = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Debug|ARM.ActiveCfg = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Debug|ARM.Build.0 = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Debug|ARM64.Build.0 = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Debug|x64.ActiveCfg = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Debug|x64.Build.0 = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Debug|x86.ActiveCfg = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Debug|x86.Build.0 = Debug|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Release|Any CPU.ActiveCfg = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Release|Any CPU.Build.0 = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Release|ARM.ActiveCfg = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Release|ARM.Build.0 = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Release|ARM64.ActiveCfg = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Release|ARM64.Build.0 = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Release|x64.ActiveCfg = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Release|x64.Build.0 = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Release|x86.ActiveCfg = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.Release|x86.Build.0 = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {664F46A9-3C99-489B-AAB9-4CD3A430C425}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Checked|Any CPU.Build.0 = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Checked|ARM.ActiveCfg = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Checked|ARM.Build.0 = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Checked|ARM64.ActiveCfg = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Checked|ARM64.Build.0 = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Checked|x64.ActiveCfg = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Checked|x64.Build.0 = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Checked|x86.ActiveCfg = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Checked|x86.Build.0 = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Debug|ARM.ActiveCfg = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Debug|ARM.Build.0 = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Debug|ARM64.Build.0 = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Debug|x64.ActiveCfg = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Debug|x64.Build.0 = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Debug|x86.ActiveCfg = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Debug|x86.Build.0 = Debug|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Release|Any CPU.Build.0 = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Release|ARM.ActiveCfg = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Release|ARM.Build.0 = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Release|ARM64.ActiveCfg = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Release|ARM64.Build.0 = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Release|x64.ActiveCfg = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Release|x64.Build.0 = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Release|x86.ActiveCfg = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.Release|x86.Build.0 = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {0CB805C8-0B76-4B1D-8AAF-48535B180448}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Checked|Any CPU.Build.0 = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Checked|ARM.ActiveCfg = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Checked|ARM.Build.0 = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Checked|ARM64.ActiveCfg = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Checked|ARM64.Build.0 = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Checked|x64.ActiveCfg = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Checked|x64.Build.0 = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Checked|x86.ActiveCfg = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Checked|x86.Build.0 = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Debug|ARM.ActiveCfg = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Debug|ARM.Build.0 = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Debug|ARM64.Build.0 = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Debug|x64.ActiveCfg = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Debug|x64.Build.0 = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Debug|x86.ActiveCfg = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Debug|x86.Build.0 = Debug|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Release|Any CPU.Build.0 = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Release|ARM.ActiveCfg = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Release|ARM.Build.0 = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Release|ARM64.ActiveCfg = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Release|ARM64.Build.0 = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Release|x64.ActiveCfg = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Release|x64.Build.0 = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Release|x86.ActiveCfg = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.Release|x86.Build.0 = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {20251748-AA7B-45BE-ADAA-C9375F5CC80F}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Checked|Any CPU.Build.0 = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Checked|ARM.ActiveCfg = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Checked|ARM.Build.0 = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Checked|ARM64.ActiveCfg = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Checked|ARM64.Build.0 = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Checked|x64.ActiveCfg = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Checked|x64.Build.0 = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Checked|x86.ActiveCfg = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Checked|x86.Build.0 = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Debug|ARM.ActiveCfg = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Debug|ARM.Build.0 = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Debug|ARM64.Build.0 = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Debug|x64.ActiveCfg = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Debug|x64.Build.0 = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Debug|x86.ActiveCfg = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Debug|x86.Build.0 = Debug|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Release|Any CPU.Build.0 = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Release|ARM.ActiveCfg = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Release|ARM.Build.0 = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Release|ARM64.ActiveCfg = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Release|ARM64.Build.0 = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Release|x64.ActiveCfg = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Release|x64.Build.0 = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Release|x86.ActiveCfg = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.Release|x86.Build.0 = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {DDDA69DF-2C4C-477A-B6C9-B4FE73C6E288}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Checked|Any CPU.Build.0 = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Checked|ARM.ActiveCfg = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Checked|ARM.Build.0 = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Checked|ARM64.ActiveCfg = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Checked|ARM64.Build.0 = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Checked|x64.ActiveCfg = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Checked|x64.Build.0 = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Checked|x86.ActiveCfg = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Checked|x86.Build.0 = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Debug|ARM.ActiveCfg = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Debug|ARM.Build.0 = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Debug|ARM64.Build.0 = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Debug|x64.ActiveCfg = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Debug|x64.Build.0 = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Debug|x86.ActiveCfg = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Debug|x86.Build.0 = Debug|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Release|Any CPU.Build.0 = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Release|ARM.ActiveCfg = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Release|ARM.Build.0 = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Release|ARM64.ActiveCfg = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Release|ARM64.Build.0 = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Release|x64.ActiveCfg = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Release|x64.Build.0 = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Release|x86.ActiveCfg = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.Release|x86.Build.0 = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {73EA5188-1E4F-42D8-B63E-F1B878A4EB63}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Checked|Any CPU.Build.0 = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Checked|ARM.ActiveCfg = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Checked|ARM.Build.0 = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Checked|ARM64.ActiveCfg = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Checked|ARM64.Build.0 = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Checked|x64.ActiveCfg = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Checked|x64.Build.0 = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Checked|x86.ActiveCfg = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Checked|x86.Build.0 = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Debug|ARM.ActiveCfg = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Debug|ARM.Build.0 = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Debug|ARM64.Build.0 = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Debug|x64.ActiveCfg = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Debug|x64.Build.0 = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Debug|x86.ActiveCfg = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Debug|x86.Build.0 = Debug|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Release|Any CPU.Build.0 = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Release|ARM.ActiveCfg = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Release|ARM.Build.0 = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Release|ARM64.ActiveCfg = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Release|ARM64.Build.0 = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Release|x64.ActiveCfg = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Release|x64.Build.0 = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Release|x86.ActiveCfg = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.Release|x86.Build.0 = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {B50D14DB-8EE5-47BD-B412-62FA5C693CC7}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Checked|Any CPU.Build.0 = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Checked|ARM.ActiveCfg = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Checked|ARM.Build.0 = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Checked|ARM64.ActiveCfg = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Checked|ARM64.Build.0 = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Checked|x64.ActiveCfg = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Checked|x64.Build.0 = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Checked|x86.ActiveCfg = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Checked|x86.Build.0 = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Debug|ARM.ActiveCfg = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Debug|ARM.Build.0 = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Debug|ARM64.Build.0 = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Debug|x64.ActiveCfg = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Debug|x64.Build.0 = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Debug|x86.ActiveCfg = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Debug|x86.Build.0 = Debug|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Release|Any CPU.Build.0 = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Release|ARM.ActiveCfg = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Release|ARM.Build.0 = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Release|ARM64.ActiveCfg = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Release|ARM64.Build.0 = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Release|x64.ActiveCfg = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Release|x64.Build.0 = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Release|x86.ActiveCfg = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.Release|x86.Build.0 = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {112FE2A7-3FD2-4496-8A14-171898AD5CF5}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Checked|Any CPU.Build.0 = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Checked|ARM.ActiveCfg = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Checked|ARM.Build.0 = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Checked|ARM64.ActiveCfg = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Checked|ARM64.Build.0 = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Checked|x64.ActiveCfg = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Checked|x64.Build.0 = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Checked|x86.ActiveCfg = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Checked|x86.Build.0 = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Debug|ARM.ActiveCfg = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Debug|ARM.Build.0 = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Debug|ARM64.Build.0 = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Debug|x64.ActiveCfg = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Debug|x64.Build.0 = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Debug|x86.ActiveCfg = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Debug|x86.Build.0 = Debug|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Release|Any CPU.Build.0 = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Release|ARM.ActiveCfg = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Release|ARM.Build.0 = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Release|ARM64.ActiveCfg = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Release|ARM64.Build.0 = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Release|x64.ActiveCfg = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Release|x64.Build.0 = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Release|x86.ActiveCfg = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.Release|x86.Build.0 = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {8C27904A-47C0-44C7-B191-88FF34580CBE}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Checked|Any CPU.Build.0 = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Checked|ARM.ActiveCfg = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Checked|ARM.Build.0 = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Checked|ARM64.ActiveCfg = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Checked|ARM64.Build.0 = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Checked|x64.ActiveCfg = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Checked|x64.Build.0 = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Checked|x86.ActiveCfg = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Checked|x86.Build.0 = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Debug|ARM.ActiveCfg = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Debug|ARM.Build.0 = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Debug|ARM64.Build.0 = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Debug|x64.ActiveCfg = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Debug|x64.Build.0 = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Debug|x86.ActiveCfg = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Debug|x86.Build.0 = Debug|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Release|Any CPU.Build.0 = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Release|ARM.ActiveCfg = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Release|ARM.Build.0 = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Release|ARM64.ActiveCfg = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Release|ARM64.Build.0 = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Release|x64.ActiveCfg = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Release|x64.Build.0 = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Release|x86.ActiveCfg = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.Release|x86.Build.0 = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {84881FB8-37E1-4D9B-B27E-9831C30DCC04}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Checked|Any CPU.Build.0 = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Checked|ARM.ActiveCfg = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Checked|ARM.Build.0 = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Checked|ARM64.ActiveCfg = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Checked|ARM64.Build.0 = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Checked|x64.ActiveCfg = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Checked|x64.Build.0 = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Checked|x86.ActiveCfg = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Checked|x86.Build.0 = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Debug|ARM.ActiveCfg = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Debug|ARM.Build.0 = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Debug|ARM64.Build.0 = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Debug|x64.ActiveCfg = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Debug|x64.Build.0 = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Debug|x86.ActiveCfg = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Debug|x86.Build.0 = Debug|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Release|Any CPU.Build.0 = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Release|ARM.ActiveCfg = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Release|ARM.Build.0 = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Release|ARM64.ActiveCfg = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Release|ARM64.Build.0 = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Release|x64.ActiveCfg = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Release|x64.Build.0 = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Release|x86.ActiveCfg = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.Release|x86.Build.0 = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {0A34CA51-8B8C-41A1-BE24-AB2C574EA144}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Checked|Any CPU.Build.0 = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Checked|ARM.ActiveCfg = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Checked|ARM.Build.0 = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Checked|ARM64.ActiveCfg = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Checked|ARM64.Build.0 = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Checked|x64.ActiveCfg = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Checked|x64.Build.0 = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Checked|x86.ActiveCfg = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Checked|x86.Build.0 = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Debug|ARM.ActiveCfg = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Debug|ARM.Build.0 = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Debug|ARM64.Build.0 = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Debug|x64.ActiveCfg = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Debug|x64.Build.0 = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Debug|x86.ActiveCfg = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Debug|x86.Build.0 = Debug|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Release|Any CPU.Build.0 = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Release|ARM.ActiveCfg = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Release|ARM.Build.0 = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Release|ARM64.ActiveCfg = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Release|ARM64.Build.0 = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Release|x64.ActiveCfg = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Release|x64.Build.0 = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Release|x86.ActiveCfg = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.Release|x86.Build.0 = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.RelWithDebInfo|x64.Build.0 = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU - {F9A69812-DC52-428D-9DB1-8B831A8FF776}.RelWithDebInfo|x86.Build.0 = Release|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Checked|Any CPU.ActiveCfg = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Checked|Any CPU.Build.0 = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Checked|ARM.ActiveCfg = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Checked|ARM.Build.0 = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Checked|ARM64.ActiveCfg = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Checked|ARM64.Build.0 = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Checked|x64.ActiveCfg = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Checked|x64.Build.0 = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Checked|x86.ActiveCfg = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Checked|x86.Build.0 = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Debug|ARM.ActiveCfg = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Debug|ARM.Build.0 = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Debug|ARM64.Build.0 = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Debug|x64.ActiveCfg = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Debug|x64.Build.0 = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Debug|x86.ActiveCfg = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Debug|x86.Build.0 = Debug|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Release|Any CPU.Build.0 = Release|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Release|ARM.ActiveCfg = Release|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Release|ARM.Build.0 = Release|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Release|ARM64.ActiveCfg = Release|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Release|ARM64.Build.0 = Release|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Release|x64.ActiveCfg = Release|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Release|x64.Build.0 = Release|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Release|x86.ActiveCfg = Release|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.Release|x86.Build.0 = Release|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU - {2F9AA5A9-D42A-42C6-B483-1B9284C62F91}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU - {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 +... (remaining content unchanged) ... EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -945,3 +190,4 @@ Global SolutionGuid = {46465737-C938-44FC-BE1A-4CE139EBB5E0} EndGlobalSection EndGlobal + diff --git a/diagnostics.sln b/diagnostics.sln index 3f77f13622..ee9a69073b 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", "tests\Microsoft.Diagnostics.TestHelpers\Microsoft.Diagnostics.TestHelpers.csproj", "{730C1201-1848-4F1E-8C1F-6316FB886C35}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.TestHelpers", "src\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", "tests\SOS.UnitTests\SOS.UnitTests.csproj", "{1532DB3C-7DCD-45C6-B697-62B8378A16A2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SOS.UnitTests", "src\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,17 +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", "tests\DotnetTrace.UnitTests\DotnetTrace.UnitTests.csproj", "{AEDCCF5B-5AD0-4D64-BF73-5CF468E07D22}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetTrace.UnitTests", "src\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", "tests\DotnetCounters.UnitTests\DotnetCounters.UnitTests.csproj", "{E5A7DC6C-BF8D-418A-BCBD-094EB748FA82}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetCounters.UnitTests", "src\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", "tests\Microsoft.Diagnostics.NETCore.Client.UnitTests\Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj", "{6F4DD2F8-1C7B-4A87-B7E5-1BEE9F5AC128}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.NETCore.Client.UnitTests", "src\tests\Microsoft.Diagnostics.NETCore.Client.UnitTests\Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj", "{6F4DD2F8-1C7B-4A87-B7E5-1BEE9F5AC128}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventPipe.UnitTests", "tests\EventPipe.UnitTests\EventPipe.UnitTests.csproj", "{CED9ABBA-861E-4C0A-9359-22351208EF27}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventPipe.UnitTests", "src\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 diff --git a/eng/testsos.cmd b/eng/testsos.cmd index 949e583534..640638a32d 100644 --- a/eng/testsos.cmd +++ b/eng/testsos.cmd @@ -1 +1 @@ -%~dp0..\.dotnet\dotnet.exe test --no-build --logger "console;verbosity=detailed" %~dp0..\src\SOS\SOS.UnitTests\SOS.UnitTests.csproj +%~dp0..\.dotnet\dotnet.exe test --no-build --logger "console;verbosity=detailed" %~dp0..\src\tests\SOS.UnitTests\SOS.UnitTests.csproj diff --git a/eng/testsos.sh b/eng/testsos.sh index 273455e2fd..aa911d7a16 100755 --- a/eng/testsos.sh +++ b/eng/testsos.sh @@ -14,4 +14,4 @@ done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" export LLDB_PATH=/usr/bin/lldb -$scriptroot/../.dotnet/dotnet test --no-build --logger "console;verbosity=detailed" $scriptroot/../src/SOS/SOS.UnitTests/SOS.UnitTests.csproj +$scriptroot/../.dotnet/dotnet test --no-build --logger "console;verbosity=detailed" $scriptroot/../src/tests/SOS.UnitTests/SOS.UnitTests.csproj diff --git a/eng/testsoscdac.cmd b/eng/testsoscdac.cmd index 17f025b0c8..c499ffaecb 100644 --- a/eng/testsoscdac.cmd +++ b/eng/testsoscdac.cmd @@ -1,2 +1,2 @@ set SOS_TEST_CDAC=true -%~dp0..\.dotnet\dotnet.exe test --no-build --logger "console;verbosity=detailed" %~dp0..\src\SOS\SOS.UnitTests\SOS.UnitTests.csproj --filter "Category=CDACCompatible" +%~dp0..\.dotnet\dotnet.exe test --no-build --logger "console;verbosity=detailed" %~dp0..\src\tests\SOS.UnitTests\SOS.UnitTests.csproj --filter "Category=CDACCompatible" diff --git a/eng/testsoscdac.sh b/eng/testsoscdac.sh index 4bad4dd7b4..bafe751021 100644 --- a/eng/testsoscdac.sh +++ b/eng/testsoscdac.sh @@ -15,4 +15,4 @@ done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" export LLDB_PATH=/usr/bin/lldb export SOS_TEST_CDAC=true -$scriptroot/../.dotnet/dotnet test --no-build --logger "console;verbosity=detailed" $scriptroot/../src/SOS/SOS.UnitTests/SOS.UnitTests.csproj --filter "Category=CDACCompatible" +$scriptroot/../.dotnet/dotnet test --no-build --logger "console;verbosity=detailed" $scriptroot/../src/tests/SOS.UnitTests/SOS.UnitTests.csproj --filter "Category=CDACCompatible" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bcc839a522..9cc90dbd49 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,3 +7,4 @@ endif (CLR_CMAKE_HOST_UNIX) add_subdirectory(shared) add_subdirectory(SOS) add_subdirectory(dbgshim) +add_subdirectory(tests) diff --git a/tests/CMakeLists.txt b/src/tests/CMakeLists.txt similarity index 100% rename from tests/CMakeLists.txt rename to src/tests/CMakeLists.txt diff --git a/tests/CommonTestRunner/CommonTestRunner.csproj b/src/tests/CommonTestRunner/CommonTestRunner.csproj similarity index 100% rename from tests/CommonTestRunner/CommonTestRunner.csproj rename to src/tests/CommonTestRunner/CommonTestRunner.csproj diff --git a/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt similarity index 100% rename from tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt rename to src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt diff --git a/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt similarity index 100% rename from tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt rename to src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt diff --git a/tests/CommonTestRunner/DiagnosticPortsHelper.cs b/src/tests/CommonTestRunner/DiagnosticPortsHelper.cs similarity index 100% rename from tests/CommonTestRunner/DiagnosticPortsHelper.cs rename to src/tests/CommonTestRunner/DiagnosticPortsHelper.cs diff --git a/tests/CommonTestRunner/TestRunner.cs b/src/tests/CommonTestRunner/TestRunner.cs similarity index 100% rename from tests/CommonTestRunner/TestRunner.cs rename to src/tests/CommonTestRunner/TestRunner.cs diff --git a/tests/CommonTestRunner/TestRunnerUtilities.cs b/src/tests/CommonTestRunner/TestRunnerUtilities.cs similarity index 100% rename from tests/CommonTestRunner/TestRunnerUtilities.cs rename to src/tests/CommonTestRunner/TestRunnerUtilities.cs diff --git a/tests/DacCompareNativeTypes/DacCompareNativeTypes.csproj b/src/tests/DacCompareNativeTypes/DacCompareNativeTypes.csproj similarity index 100% rename from tests/DacCompareNativeTypes/DacCompareNativeTypes.csproj rename to src/tests/DacCompareNativeTypes/DacCompareNativeTypes.csproj diff --git a/tests/DacCompareNativeTypes/DwarfParse.cs b/src/tests/DacCompareNativeTypes/DwarfParse.cs similarity index 100% rename from tests/DacCompareNativeTypes/DwarfParse.cs rename to src/tests/DacCompareNativeTypes/DwarfParse.cs diff --git a/tests/DacCompareNativeTypes/Member.cs b/src/tests/DacCompareNativeTypes/Member.cs similarity index 100% rename from tests/DacCompareNativeTypes/Member.cs rename to src/tests/DacCompareNativeTypes/Member.cs diff --git a/tests/DacCompareNativeTypes/PdbParser.cs b/src/tests/DacCompareNativeTypes/PdbParser.cs similarity index 100% rename from tests/DacCompareNativeTypes/PdbParser.cs rename to src/tests/DacCompareNativeTypes/PdbParser.cs diff --git a/tests/DacCompareNativeTypes/Program.cs b/src/tests/DacCompareNativeTypes/Program.cs similarity index 100% rename from tests/DacCompareNativeTypes/Program.cs rename to src/tests/DacCompareNativeTypes/Program.cs diff --git a/tests/DacCompareNativeTypes/Readme.md b/src/tests/DacCompareNativeTypes/Readme.md similarity index 100% rename from tests/DacCompareNativeTypes/Readme.md rename to src/tests/DacCompareNativeTypes/Readme.md diff --git a/tests/DacCompareNativeTypes/Type.cs b/src/tests/DacCompareNativeTypes/Type.cs similarity index 100% rename from tests/DacCompareNativeTypes/Type.cs rename to src/tests/DacCompareNativeTypes/Type.cs diff --git a/tests/DacCompareNativeTypes/Whitespace.cs b/src/tests/DacCompareNativeTypes/Whitespace.cs similarity index 100% rename from tests/DacCompareNativeTypes/Whitespace.cs rename to src/tests/DacCompareNativeTypes/Whitespace.cs diff --git a/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt similarity index 98% rename from tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt rename to src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt index 889031e8f4..7f4ca390eb 100644 --- a/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -8,7 +8,7 @@ $(RootBinDir)/TestResults/$(TargetConfiguration)/dbgshim.unittests_$(Timestamp) ProjectK - $(RepoRootDir)/tests/Debuggees + $(RepoRootDir)/src/tests/Debuggees $(RepoRootDir)/eng/AuxMsbuildFiles cli SimpleDebuggee diff --git a/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt similarity index 98% rename from tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt rename to src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt index 4ccdaac189..6becd1ba5e 100644 --- a/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -8,7 +8,7 @@ $(RootBinDir)\TestResults\$(TargetConfiguration)\dbgshim.unittests_$(Timestamp) ProjectK - $(RepoRootDir)\tests\Debuggees + $(RepoRootDir)\src\tests\Debuggees $(RepoRootDir)\eng\AuxMsbuildFiles cli SimpleDebuggee diff --git a/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj b/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj similarity index 97% rename from tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj rename to src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj index 7a0dc6ca9a..b610ebdc4b 100644 --- a/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj +++ b/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj @@ -12,7 +12,7 @@ - + diff --git a/tests/DbgShim.UnitTests/DbgShimAPI.cs b/src/tests/DbgShim.UnitTests/DbgShimAPI.cs similarity index 100% rename from tests/DbgShim.UnitTests/DbgShimAPI.cs rename to src/tests/DbgShim.UnitTests/DbgShimAPI.cs diff --git a/tests/DbgShim.UnitTests/DbgShimTests.cs b/src/tests/DbgShim.UnitTests/DbgShimTests.cs similarity index 100% rename from tests/DbgShim.UnitTests/DbgShimTests.cs rename to src/tests/DbgShim.UnitTests/DbgShimTests.cs diff --git a/tests/DbgShim.UnitTests/DebuggeeInfo.cs b/src/tests/DbgShim.UnitTests/DebuggeeInfo.cs similarity index 100% rename from tests/DbgShim.UnitTests/DebuggeeInfo.cs rename to src/tests/DbgShim.UnitTests/DebuggeeInfo.cs diff --git a/tests/DbgShim.UnitTests/ICLRDebugging.cs b/src/tests/DbgShim.UnitTests/ICLRDebugging.cs similarity index 100% rename from tests/DbgShim.UnitTests/ICLRDebugging.cs rename to src/tests/DbgShim.UnitTests/ICLRDebugging.cs diff --git a/tests/DbgShim.UnitTests/ICorDebug.cs b/src/tests/DbgShim.UnitTests/ICorDebug.cs similarity index 100% rename from tests/DbgShim.UnitTests/ICorDebug.cs rename to src/tests/DbgShim.UnitTests/ICorDebug.cs diff --git a/tests/DbgShim.UnitTests/ICorDebugController.cs b/src/tests/DbgShim.UnitTests/ICorDebugController.cs similarity index 100% rename from tests/DbgShim.UnitTests/ICorDebugController.cs rename to src/tests/DbgShim.UnitTests/ICorDebugController.cs diff --git a/tests/DbgShim.UnitTests/LibraryProviderWrapper.cs b/src/tests/DbgShim.UnitTests/LibraryProviderWrapper.cs similarity index 100% rename from tests/DbgShim.UnitTests/LibraryProviderWrapper.cs rename to src/tests/DbgShim.UnitTests/LibraryProviderWrapper.cs diff --git a/tests/DbgShim.UnitTests/ManagedCallbackWrapper.cs b/src/tests/DbgShim.UnitTests/ManagedCallbackWrapper.cs similarity index 100% rename from tests/DbgShim.UnitTests/ManagedCallbackWrapper.cs rename to src/tests/DbgShim.UnitTests/ManagedCallbackWrapper.cs diff --git a/tests/Debuggees/Directory.Build.props b/src/tests/Debuggees/Directory.Build.props similarity index 100% rename from tests/Debuggees/Directory.Build.props rename to src/tests/Debuggees/Directory.Build.props diff --git a/tests/Debuggees/DivZero/DivZero.cs b/src/tests/Debuggees/DivZero/DivZero.cs similarity index 100% rename from tests/Debuggees/DivZero/DivZero.cs rename to src/tests/Debuggees/DivZero/DivZero.cs diff --git a/tests/Debuggees/DivZero/DivZero.csproj b/src/tests/Debuggees/DivZero/DivZero.csproj similarity index 100% rename from tests/Debuggees/DivZero/DivZero.csproj rename to src/tests/Debuggees/DivZero/DivZero.csproj diff --git a/tests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj b/src/tests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj similarity index 100% rename from tests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj rename to src/tests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj diff --git a/tests/Debuggees/DotnetDumpCommands/Program.cs b/src/tests/Debuggees/DotnetDumpCommands/Program.cs similarity index 100% rename from tests/Debuggees/DotnetDumpCommands/Program.cs rename to src/tests/Debuggees/DotnetDumpCommands/Program.cs diff --git a/tests/Debuggees/DynamicMethod/DynamicMethod.csproj b/src/tests/Debuggees/DynamicMethod/DynamicMethod.csproj similarity index 100% rename from tests/Debuggees/DynamicMethod/DynamicMethod.csproj rename to src/tests/Debuggees/DynamicMethod/DynamicMethod.csproj diff --git a/tests/Debuggees/DynamicMethod/Program.cs b/src/tests/Debuggees/DynamicMethod/Program.cs similarity index 100% rename from tests/Debuggees/DynamicMethod/Program.cs rename to src/tests/Debuggees/DynamicMethod/Program.cs diff --git a/tests/Debuggees/EventPipeTracee/CustomMetrics.cs b/src/tests/Debuggees/EventPipeTracee/CustomMetrics.cs similarity index 100% rename from tests/Debuggees/EventPipeTracee/CustomMetrics.cs rename to src/tests/Debuggees/EventPipeTracee/CustomMetrics.cs diff --git a/tests/Debuggees/EventPipeTracee/DuplicateNameMetrics.cs b/src/tests/Debuggees/EventPipeTracee/DuplicateNameMetrics.cs similarity index 100% rename from tests/Debuggees/EventPipeTracee/DuplicateNameMetrics.cs rename to src/tests/Debuggees/EventPipeTracee/DuplicateNameMetrics.cs diff --git a/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj b/src/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj similarity index 100% rename from tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj rename to src/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj diff --git a/tests/Debuggees/EventPipeTracee/Program.cs b/src/tests/Debuggees/EventPipeTracee/Program.cs similarity index 100% rename from tests/Debuggees/EventPipeTracee/Program.cs rename to src/tests/Debuggees/EventPipeTracee/Program.cs diff --git a/tests/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj b/src/tests/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj similarity index 100% rename from tests/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj rename to src/tests/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj diff --git a/tests/Debuggees/ExitCodeTracee/Program.cs b/src/tests/Debuggees/ExitCodeTracee/Program.cs similarity index 100% rename from tests/Debuggees/ExitCodeTracee/Program.cs rename to src/tests/Debuggees/ExitCodeTracee/Program.cs diff --git a/tests/Debuggees/GCPOH/GCPOH.cs b/src/tests/Debuggees/GCPOH/GCPOH.cs similarity index 100% rename from tests/Debuggees/GCPOH/GCPOH.cs rename to src/tests/Debuggees/GCPOH/GCPOH.cs diff --git a/tests/Debuggees/GCPOH/GCPOH.csproj b/src/tests/Debuggees/GCPOH/GCPOH.csproj similarity index 100% rename from tests/Debuggees/GCPOH/GCPOH.csproj rename to src/tests/Debuggees/GCPOH/GCPOH.csproj diff --git a/tests/Debuggees/GCWhere/GCWhere.cs b/src/tests/Debuggees/GCWhere/GCWhere.cs similarity index 100% rename from tests/Debuggees/GCWhere/GCWhere.cs rename to src/tests/Debuggees/GCWhere/GCWhere.cs diff --git a/tests/Debuggees/GCWhere/GCWhere.csproj b/src/tests/Debuggees/GCWhere/GCWhere.csproj similarity index 100% rename from tests/Debuggees/GCWhere/GCWhere.csproj rename to src/tests/Debuggees/GCWhere/GCWhere.csproj diff --git a/tests/Debuggees/LineNums/LineNums.csproj b/src/tests/Debuggees/LineNums/LineNums.csproj similarity index 100% rename from tests/Debuggees/LineNums/LineNums.csproj rename to src/tests/Debuggees/LineNums/LineNums.csproj diff --git a/tests/Debuggees/LineNums/Program.cs b/src/tests/Debuggees/LineNums/Program.cs similarity index 100% rename from tests/Debuggees/LineNums/Program.cs rename to src/tests/Debuggees/LineNums/Program.cs diff --git a/tests/Debuggees/NestedExceptionTest/NestedExceptionTest.cs b/src/tests/Debuggees/NestedExceptionTest/NestedExceptionTest.cs similarity index 100% rename from tests/Debuggees/NestedExceptionTest/NestedExceptionTest.cs rename to src/tests/Debuggees/NestedExceptionTest/NestedExceptionTest.cs diff --git a/tests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj b/src/tests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj similarity index 100% rename from tests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj rename to src/tests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj diff --git a/tests/Debuggees/Overflow/Overflow.cs b/src/tests/Debuggees/Overflow/Overflow.cs similarity index 100% rename from tests/Debuggees/Overflow/Overflow.cs rename to src/tests/Debuggees/Overflow/Overflow.cs diff --git a/tests/Debuggees/Overflow/Overflow.csproj b/src/tests/Debuggees/Overflow/Overflow.csproj similarity index 100% rename from tests/Debuggees/Overflow/Overflow.csproj rename to src/tests/Debuggees/Overflow/Overflow.csproj diff --git a/tests/Debuggees/ReflectionTest/ReflectionTest.cs b/src/tests/Debuggees/ReflectionTest/ReflectionTest.cs similarity index 100% rename from tests/Debuggees/ReflectionTest/ReflectionTest.cs rename to src/tests/Debuggees/ReflectionTest/ReflectionTest.cs diff --git a/tests/Debuggees/ReflectionTest/ReflectionTest.csproj b/src/tests/Debuggees/ReflectionTest/ReflectionTest.csproj similarity index 100% rename from tests/Debuggees/ReflectionTest/ReflectionTest.csproj rename to src/tests/Debuggees/ReflectionTest/ReflectionTest.csproj diff --git a/tests/Debuggees/SimpleDebuggee/SimpleDebuggee.cs b/src/tests/Debuggees/SimpleDebuggee/SimpleDebuggee.cs similarity index 100% rename from tests/Debuggees/SimpleDebuggee/SimpleDebuggee.cs rename to src/tests/Debuggees/SimpleDebuggee/SimpleDebuggee.cs diff --git a/tests/Debuggees/SimpleDebuggee/SimpleDebuggee.csproj b/src/tests/Debuggees/SimpleDebuggee/SimpleDebuggee.csproj similarity index 100% rename from tests/Debuggees/SimpleDebuggee/SimpleDebuggee.csproj rename to src/tests/Debuggees/SimpleDebuggee/SimpleDebuggee.csproj diff --git a/tests/Debuggees/SimpleDebuggee/runtimeconfig.template.json b/src/tests/Debuggees/SimpleDebuggee/runtimeconfig.template.json similarity index 100% rename from tests/Debuggees/SimpleDebuggee/runtimeconfig.template.json rename to src/tests/Debuggees/SimpleDebuggee/runtimeconfig.template.json diff --git a/tests/Debuggees/SimpleThrow/SimpleThrow.cs b/src/tests/Debuggees/SimpleThrow/SimpleThrow.cs similarity index 100% rename from tests/Debuggees/SimpleThrow/SimpleThrow.cs rename to src/tests/Debuggees/SimpleThrow/SimpleThrow.cs diff --git a/tests/Debuggees/SimpleThrow/SimpleThrow.csproj b/src/tests/Debuggees/SimpleThrow/SimpleThrow.csproj similarity index 100% rename from tests/Debuggees/SimpleThrow/SimpleThrow.csproj rename to src/tests/Debuggees/SimpleThrow/SimpleThrow.csproj diff --git a/tests/Debuggees/SimpleThrow/UserObject.cs b/src/tests/Debuggees/SimpleThrow/UserObject.cs similarity index 100% rename from tests/Debuggees/SimpleThrow/UserObject.cs rename to src/tests/Debuggees/SimpleThrow/UserObject.cs diff --git a/tests/Debuggees/StackTracee/Program.cs b/src/tests/Debuggees/StackTracee/Program.cs similarity index 100% rename from tests/Debuggees/StackTracee/Program.cs rename to src/tests/Debuggees/StackTracee/Program.cs diff --git a/tests/Debuggees/StackTracee/StackTracee.csproj b/src/tests/Debuggees/StackTracee/StackTracee.csproj similarity index 100% rename from tests/Debuggees/StackTracee/StackTracee.csproj rename to src/tests/Debuggees/StackTracee/StackTracee.csproj diff --git a/tests/Debuggees/SymbolTestApp/SymbolTestApp.sln b/src/tests/Debuggees/SymbolTestApp/SymbolTestApp.sln similarity index 100% rename from tests/Debuggees/SymbolTestApp/SymbolTestApp.sln rename to src/tests/Debuggees/SymbolTestApp/SymbolTestApp.sln diff --git a/tests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.cs b/src/tests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.cs similarity index 100% rename from tests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.cs rename to src/tests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.cs diff --git a/tests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj b/src/tests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj similarity index 100% rename from tests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj rename to src/tests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj diff --git a/tests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj b/src/tests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj similarity index 100% rename from tests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj rename to src/tests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj diff --git a/tests/Debuggees/SymbolTestApp/SymbolTestDll/TestClass.cs b/src/tests/Debuggees/SymbolTestApp/SymbolTestDll/TestClass.cs similarity index 100% rename from tests/Debuggees/SymbolTestApp/SymbolTestDll/TestClass.cs rename to src/tests/Debuggees/SymbolTestApp/SymbolTestDll/TestClass.cs diff --git a/tests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj b/src/tests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj similarity index 100% rename from tests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj rename to src/tests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj diff --git a/tests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserTask.cs b/src/tests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserTask.cs similarity index 100% rename from tests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserTask.cs rename to src/tests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserTask.cs diff --git a/tests/Debuggees/TaskNestedException/TaskNestedException.sln b/src/tests/Debuggees/TaskNestedException/TaskNestedException.sln similarity index 100% rename from tests/Debuggees/TaskNestedException/TaskNestedException.sln rename to src/tests/Debuggees/TaskNestedException/TaskNestedException.sln diff --git a/tests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.cs b/src/tests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.cs similarity index 100% rename from tests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.cs rename to src/tests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.cs diff --git a/tests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj b/src/tests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj similarity index 100% rename from tests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj rename to src/tests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj diff --git a/tests/Debuggees/TestDebuggee/Test.cs b/src/tests/Debuggees/TestDebuggee/Test.cs similarity index 100% rename from tests/Debuggees/TestDebuggee/Test.cs rename to src/tests/Debuggees/TestDebuggee/Test.cs diff --git a/tests/Debuggees/TestDebuggee/TestDebuggee.csproj b/src/tests/Debuggees/TestDebuggee/TestDebuggee.csproj similarity index 100% rename from tests/Debuggees/TestDebuggee/TestDebuggee.csproj rename to src/tests/Debuggees/TestDebuggee/TestDebuggee.csproj diff --git a/tests/Debuggees/Tracee/Program.cs b/src/tests/Debuggees/Tracee/Program.cs similarity index 100% rename from tests/Debuggees/Tracee/Program.cs rename to src/tests/Debuggees/Tracee/Program.cs diff --git a/tests/Debuggees/Tracee/Tracee.csproj b/src/tests/Debuggees/Tracee/Tracee.csproj similarity index 100% rename from tests/Debuggees/Tracee/Tracee.csproj rename to src/tests/Debuggees/Tracee/Tracee.csproj diff --git a/tests/Debuggees/WebApp3/Program.cs b/src/tests/Debuggees/WebApp3/Program.cs similarity index 100% rename from tests/Debuggees/WebApp3/Program.cs rename to src/tests/Debuggees/WebApp3/Program.cs diff --git a/tests/Debuggees/WebApp3/Startup.cs b/src/tests/Debuggees/WebApp3/Startup.cs similarity index 100% rename from tests/Debuggees/WebApp3/Startup.cs rename to src/tests/Debuggees/WebApp3/Startup.cs diff --git a/tests/Debuggees/WebApp3/WebApp3.csproj b/src/tests/Debuggees/WebApp3/WebApp3.csproj similarity index 100% rename from tests/Debuggees/WebApp3/WebApp3.csproj rename to src/tests/Debuggees/WebApp3/WebApp3.csproj diff --git a/tests/Debuggees/WebApp3/appsettings.Development.json b/src/tests/Debuggees/WebApp3/appsettings.Development.json similarity index 100% rename from tests/Debuggees/WebApp3/appsettings.Development.json rename to src/tests/Debuggees/WebApp3/appsettings.Development.json diff --git a/tests/Debuggees/WebApp3/appsettings.json b/src/tests/Debuggees/WebApp3/appsettings.json similarity index 100% rename from tests/Debuggees/WebApp3/appsettings.json rename to src/tests/Debuggees/WebApp3/appsettings.json diff --git a/tests/DesktopClrHost/CMakeLists.txt b/src/tests/DesktopClrHost/CMakeLists.txt similarity index 100% rename from tests/DesktopClrHost/CMakeLists.txt rename to src/tests/DesktopClrHost/CMakeLists.txt diff --git a/tests/DesktopClrHost/DesktopClrHost.cpp b/src/tests/DesktopClrHost/DesktopClrHost.cpp similarity index 100% rename from tests/DesktopClrHost/DesktopClrHost.cpp rename to src/tests/DesktopClrHost/DesktopClrHost.cpp diff --git a/tests/Directory.Build.props b/src/tests/Directory.Build.props similarity index 95% rename from tests/Directory.Build.props rename to src/tests/Directory.Build.props index 3da60009d6..3bd4d6e9da 100644 --- a/tests/Directory.Build.props +++ b/src/tests/Directory.Build.props @@ -1,5 +1,5 @@ - + diff --git a/tests/Directory.Build.targets b/src/tests/Directory.Build.targets similarity index 100% rename from tests/Directory.Build.targets rename to src/tests/Directory.Build.targets diff --git a/tests/DotnetCounters.UnitTests/CSVExporterTests.cs b/src/tests/DotnetCounters.UnitTests/CSVExporterTests.cs similarity index 100% rename from tests/DotnetCounters.UnitTests/CSVExporterTests.cs rename to src/tests/DotnetCounters.UnitTests/CSVExporterTests.cs diff --git a/tests/DotnetCounters.UnitTests/ConsoleExporterTests.cs b/src/tests/DotnetCounters.UnitTests/ConsoleExporterTests.cs similarity index 100% rename from tests/DotnetCounters.UnitTests/ConsoleExporterTests.cs rename to src/tests/DotnetCounters.UnitTests/ConsoleExporterTests.cs diff --git a/tests/DotnetCounters.UnitTests/CounterMonitorPayloadTests.cs b/src/tests/DotnetCounters.UnitTests/CounterMonitorPayloadTests.cs similarity index 100% rename from tests/DotnetCounters.UnitTests/CounterMonitorPayloadTests.cs rename to src/tests/DotnetCounters.UnitTests/CounterMonitorPayloadTests.cs diff --git a/tests/DotnetCounters.UnitTests/CounterMonitorTests.cs b/src/tests/DotnetCounters.UnitTests/CounterMonitorTests.cs similarity index 100% rename from tests/DotnetCounters.UnitTests/CounterMonitorTests.cs rename to src/tests/DotnetCounters.UnitTests/CounterMonitorTests.cs diff --git a/tests/DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj b/src/tests/DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj similarity index 82% rename from tests/DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj rename to src/tests/DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj index 39421b8d8b..cdac1c6ae6 100644 --- a/tests/DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj +++ b/src/tests/DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj @@ -5,7 +5,7 @@ - + diff --git a/tests/DotnetCounters.UnitTests/JSONExporterTests.cs b/src/tests/DotnetCounters.UnitTests/JSONExporterTests.cs similarity index 100% rename from tests/DotnetCounters.UnitTests/JSONExporterTests.cs rename to src/tests/DotnetCounters.UnitTests/JSONExporterTests.cs diff --git a/tests/DotnetCounters.UnitTests/MockConsole.cs b/src/tests/DotnetCounters.UnitTests/MockConsole.cs similarity index 100% rename from tests/DotnetCounters.UnitTests/MockConsole.cs rename to src/tests/DotnetCounters.UnitTests/MockConsole.cs diff --git a/tests/DotnetCounters.UnitTests/TestConstants.cs b/src/tests/DotnetCounters.UnitTests/TestConstants.cs similarity index 100% rename from tests/DotnetCounters.UnitTests/TestConstants.cs rename to src/tests/DotnetCounters.UnitTests/TestConstants.cs diff --git a/tests/DotnetStack.UnitTests/DotnetStack.UnitTests.csproj b/src/tests/DotnetStack.UnitTests/DotnetStack.UnitTests.csproj similarity index 72% rename from tests/DotnetStack.UnitTests/DotnetStack.UnitTests.csproj rename to src/tests/DotnetStack.UnitTests/DotnetStack.UnitTests.csproj index 8eccf3bfda..0425059030 100644 --- a/tests/DotnetStack.UnitTests/DotnetStack.UnitTests.csproj +++ b/src/tests/DotnetStack.UnitTests/DotnetStack.UnitTests.csproj @@ -5,7 +5,7 @@ - + diff --git a/tests/DotnetStack.UnitTests/StackTests.cs b/src/tests/DotnetStack.UnitTests/StackTests.cs similarity index 100% rename from tests/DotnetStack.UnitTests/StackTests.cs rename to src/tests/DotnetStack.UnitTests/StackTests.cs diff --git a/tests/DotnetTrace.UnitTests/CLRProviderParsing.cs b/src/tests/DotnetTrace.UnitTests/CLRProviderParsing.cs similarity index 100% rename from tests/DotnetTrace.UnitTests/CLRProviderParsing.cs rename to src/tests/DotnetTrace.UnitTests/CLRProviderParsing.cs diff --git a/tests/DotnetTrace.UnitTests/ChildProcessTests.cs b/src/tests/DotnetTrace.UnitTests/ChildProcessTests.cs similarity index 100% rename from tests/DotnetTrace.UnitTests/ChildProcessTests.cs rename to src/tests/DotnetTrace.UnitTests/ChildProcessTests.cs diff --git a/tests/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj b/src/tests/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj similarity index 72% rename from tests/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj rename to src/tests/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj index 21e1bee1c0..ec9aefd278 100644 --- a/tests/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj +++ b/src/tests/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj @@ -5,7 +5,7 @@ - + diff --git a/tests/DotnetTrace.UnitTests/ProfileProviderMerging.cs b/src/tests/DotnetTrace.UnitTests/ProfileProviderMerging.cs similarity index 100% rename from tests/DotnetTrace.UnitTests/ProfileProviderMerging.cs rename to src/tests/DotnetTrace.UnitTests/ProfileProviderMerging.cs diff --git a/tests/DotnetTrace.UnitTests/ProviderParsing.cs b/src/tests/DotnetTrace.UnitTests/ProviderParsing.cs similarity index 100% rename from tests/DotnetTrace.UnitTests/ProviderParsing.cs rename to src/tests/DotnetTrace.UnitTests/ProviderParsing.cs diff --git a/tests/EventPipe.UnitTests/ContentionEvents.cs b/src/tests/EventPipe.UnitTests/ContentionEvents.cs similarity index 100% rename from tests/EventPipe.UnitTests/ContentionEvents.cs rename to src/tests/EventPipe.UnitTests/ContentionEvents.cs diff --git a/tests/EventPipe.UnitTests/CustomEvents.cs b/src/tests/EventPipe.UnitTests/CustomEvents.cs similarity index 100% rename from tests/EventPipe.UnitTests/CustomEvents.cs rename to src/tests/EventPipe.UnitTests/CustomEvents.cs diff --git a/tests/EventPipe.UnitTests/EventPipe.UnitTests.csproj b/src/tests/EventPipe.UnitTests/EventPipe.UnitTests.csproj similarity index 77% rename from tests/EventPipe.UnitTests/EventPipe.UnitTests.csproj rename to src/tests/EventPipe.UnitTests/EventPipe.UnitTests.csproj index 9864dd2ba9..7e384178a0 100644 --- a/tests/EventPipe.UnitTests/EventPipe.UnitTests.csproj +++ b/src/tests/EventPipe.UnitTests/EventPipe.UnitTests.csproj @@ -8,7 +8,7 @@ - + diff --git a/tests/EventPipe.UnitTests/GCEvents.cs b/src/tests/EventPipe.UnitTests/GCEvents.cs similarity index 100% rename from tests/EventPipe.UnitTests/GCEvents.cs rename to src/tests/EventPipe.UnitTests/GCEvents.cs diff --git a/tests/EventPipe.UnitTests/LoaderEvents.cs b/src/tests/EventPipe.UnitTests/LoaderEvents.cs similarity index 100% rename from tests/EventPipe.UnitTests/LoaderEvents.cs rename to src/tests/EventPipe.UnitTests/LoaderEvents.cs diff --git a/tests/EventPipe.UnitTests/MethodEvents.cs b/src/tests/EventPipe.UnitTests/MethodEvents.cs similarity index 100% rename from tests/EventPipe.UnitTests/MethodEvents.cs rename to src/tests/EventPipe.UnitTests/MethodEvents.cs diff --git a/tests/EventPipe.UnitTests/README.md b/src/tests/EventPipe.UnitTests/README.md similarity index 100% rename from tests/EventPipe.UnitTests/README.md rename to src/tests/EventPipe.UnitTests/README.md diff --git a/tests/EventPipe.UnitTests/ThreadPoolEvents.cs b/src/tests/EventPipe.UnitTests/ThreadPoolEvents.cs similarity index 100% rename from tests/EventPipe.UnitTests/ThreadPoolEvents.cs rename to src/tests/EventPipe.UnitTests/ThreadPoolEvents.cs diff --git a/tests/EventPipe.UnitTests/common/IpcTraceTest.cs b/src/tests/EventPipe.UnitTests/common/IpcTraceTest.cs similarity index 100% rename from tests/EventPipe.UnitTests/common/IpcTraceTest.cs rename to src/tests/EventPipe.UnitTests/common/IpcTraceTest.cs diff --git a/tests/EventPipe.UnitTests/common/RemoteTestExecutorHelper.cs b/src/tests/EventPipe.UnitTests/common/RemoteTestExecutorHelper.cs similarity index 100% rename from tests/EventPipe.UnitTests/common/RemoteTestExecutorHelper.cs rename to src/tests/EventPipe.UnitTests/common/RemoteTestExecutorHelper.cs diff --git a/tests/EventPipe.UnitTests/common/StreamProxy.cs b/src/tests/EventPipe.UnitTests/common/StreamProxy.cs similarity index 100% rename from tests/EventPipe.UnitTests/common/StreamProxy.cs rename to src/tests/EventPipe.UnitTests/common/StreamProxy.cs diff --git a/tests/EventPipe.UnitTests/providers.cs b/src/tests/EventPipe.UnitTests/providers.cs similarity index 100% rename from tests/EventPipe.UnitTests/providers.cs rename to src/tests/EventPipe.UnitTests/providers.cs diff --git a/tests/EventPipeStress/Common/BurstPattern.cs b/src/tests/EventPipeStress/Common/BurstPattern.cs similarity index 100% rename from tests/EventPipeStress/Common/BurstPattern.cs rename to src/tests/EventPipeStress/Common/BurstPattern.cs diff --git a/tests/EventPipeStress/Common/Common.csproj b/src/tests/EventPipeStress/Common/Common.csproj similarity index 100% rename from tests/EventPipeStress/Common/Common.csproj rename to src/tests/EventPipeStress/Common/Common.csproj diff --git a/tests/EventPipeStress/Common/Options.cs b/src/tests/EventPipeStress/Common/Options.cs similarity index 100% rename from tests/EventPipeStress/Common/Options.cs rename to src/tests/EventPipeStress/Common/Options.cs diff --git a/tests/EventPipeStress/Orchestrator/CommandLine.cs b/src/tests/EventPipeStress/Orchestrator/CommandLine.cs similarity index 100% rename from tests/EventPipeStress/Orchestrator/CommandLine.cs rename to src/tests/EventPipeStress/Orchestrator/CommandLine.cs diff --git a/tests/EventPipeStress/Orchestrator/Orchestrator.csproj b/src/tests/EventPipeStress/Orchestrator/Orchestrator.csproj similarity index 100% rename from tests/EventPipeStress/Orchestrator/Orchestrator.csproj rename to src/tests/EventPipeStress/Orchestrator/Orchestrator.csproj diff --git a/tests/EventPipeStress/Orchestrator/Program.cs b/src/tests/EventPipeStress/Orchestrator/Program.cs similarity index 100% rename from tests/EventPipeStress/Orchestrator/Program.cs rename to src/tests/EventPipeStress/Orchestrator/Program.cs diff --git a/tests/EventPipeStress/Orchestrator/TestResult.cs b/src/tests/EventPipeStress/Orchestrator/TestResult.cs similarity index 100% rename from tests/EventPipeStress/Orchestrator/TestResult.cs rename to src/tests/EventPipeStress/Orchestrator/TestResult.cs diff --git a/tests/EventPipeStress/README.md b/src/tests/EventPipeStress/README.md similarity index 100% rename from tests/EventPipeStress/README.md rename to src/tests/EventPipeStress/README.md diff --git a/tests/EventPipeStress/Stress/Program.cs b/src/tests/EventPipeStress/Stress/Program.cs similarity index 100% rename from tests/EventPipeStress/Stress/Program.cs rename to src/tests/EventPipeStress/Stress/Program.cs diff --git a/tests/EventPipeStress/Stress/Stress.csproj b/src/tests/EventPipeStress/Stress/Stress.csproj similarity index 100% rename from tests/EventPipeStress/Stress/Stress.csproj rename to src/tests/EventPipeStress/Stress/Stress.csproj diff --git a/tests/Grape/Grape.csproj b/src/tests/Grape/Grape.csproj similarity index 100% rename from tests/Grape/Grape.csproj rename to src/tests/Grape/Grape.csproj diff --git a/tests/Grape/Program.cs b/src/tests/Grape/Program.cs similarity index 100% rename from tests/Grape/Program.cs rename to src/tests/Grape/Program.cs diff --git a/tests/Grape/TestRunner.cs b/src/tests/Grape/TestRunner.cs similarity index 100% rename from tests/Grape/TestRunner.cs rename to src/tests/Grape/TestRunner.cs diff --git a/tests/Grape/TraceGeneratorConfiguration.cs b/src/tests/Grape/TraceGeneratorConfiguration.cs similarity index 100% rename from tests/Grape/TraceGeneratorConfiguration.cs rename to src/tests/Grape/TraceGeneratorConfiguration.cs diff --git a/tests/Grape/TraceGenerators/EtwTraceGenerator.cs b/src/tests/Grape/TraceGenerators/EtwTraceGenerator.cs similarity index 100% rename from tests/Grape/TraceGenerators/EtwTraceGenerator.cs rename to src/tests/Grape/TraceGenerators/EtwTraceGenerator.cs diff --git a/tests/Grape/TraceGenerators/EventPipeTraceGenerator.cs b/src/tests/Grape/TraceGenerators/EventPipeTraceGenerator.cs similarity index 100% rename from tests/Grape/TraceGenerators/EventPipeTraceGenerator.cs rename to src/tests/Grape/TraceGenerators/EventPipeTraceGenerator.cs diff --git a/tests/Grape/config.json b/src/tests/Grape/config.json similarity index 100% rename from tests/Grape/config.json rename to src/tests/Grape/config.json diff --git a/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ClrmaTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ClrmaTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.DebugServices.UnitTests/ClrmaTests.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ClrmaTests.cs diff --git a/tests/Microsoft.Diagnostics.DebugServices.UnitTests/CommandServiceTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/CommandServiceTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.DebugServices.UnitTests/CommandServiceTests.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/CommandServiceTests.cs diff --git a/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt similarity index 100% rename from tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt diff --git a/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt similarity index 100% rename from tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt diff --git a/tests/Microsoft.Diagnostics.DebugServices.UnitTests/DebugServicesTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/DebugServicesTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.DebugServices.UnitTests/DebugServicesTests.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/DebugServicesTests.cs diff --git a/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj similarity index 89% rename from tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj index e6f94eee52..78f6120344 100644 --- a/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj +++ b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj @@ -17,9 +17,9 @@ - - - + + + diff --git a/tests/Microsoft.Diagnostics.DebugServices.UnitTests/RunTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/RunTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.DebugServices.UnitTests/RunTests.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/RunTests.cs diff --git a/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ServiceEventTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ServiceEventTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.DebugServices.UnitTests/ServiceEventTests.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ServiceEventTests.cs diff --git a/tests/Microsoft.Diagnostics.DebugServices.UnitTests/SymbolServiceTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/SymbolServiceTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.DebugServices.UnitTests/SymbolServiceTests.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/SymbolServiceTests.cs diff --git a/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestCommands.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestCommands.cs similarity index 100% rename from tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestCommands.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestCommands.cs diff --git a/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestDbgEng.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestDbgEng.cs similarity index 100% rename from tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestDbgEng.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestDbgEng.cs diff --git a/tests/Microsoft.Diagnostics.DebugServices.UnitTests/WriteTestData.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/WriteTestData.cs similarity index 100% rename from tests/Microsoft.Diagnostics.DebugServices.UnitTests/WriteTestData.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/WriteTestData.cs diff --git a/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/AspNetTriggerUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/AspNetTriggerUnitTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/AspNetTriggerUnitTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/AspNetTriggerUnitTests.cs diff --git a/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/DistributedTracesPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/DistributedTracesPipelineUnitTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/DistributedTracesPipelineUnitTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/DistributedTracesPipelineUnitTests.cs diff --git a/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterConstants.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterConstants.cs similarity index 100% rename from tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterConstants.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterConstants.cs diff --git a/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterPipelineUnitTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterPipelineUnitTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterPipelineUnitTests.cs diff --git a/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterTriggerTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterTriggerTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterTriggerTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterTriggerTests.cs diff --git a/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventLogsPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventLogsPipelineUnitTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventLogsPipelineUnitTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventLogsPipelineUnitTests.cs diff --git a/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventTracePipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventTracePipelineUnitTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventTracePipelineUnitTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventTracePipelineUnitTests.cs diff --git a/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/GlobMatcherTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/GlobMatcherTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/GlobMatcherTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/GlobMatcherTests.cs diff --git a/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/LogsPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/LogsPipelineUnitTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/LogsPipelineUnitTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/LogsPipelineUnitTests.cs diff --git a/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj similarity index 63% rename from tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj index c12faf6f78..9968f7be5a 100644 --- a/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/PipelineTestUtilities.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/PipelineTestUtilities.cs similarity index 100% rename from tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/PipelineTestUtilities.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/PipelineTestUtilities.cs diff --git a/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/SlidingWindowTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/SlidingWindowTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/SlidingWindowTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/SlidingWindowTests.cs diff --git a/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/TestStreamingLogger.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/TestStreamingLogger.cs similarity index 100% rename from tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/TestStreamingLogger.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/TestStreamingLogger.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.UnitTests/Microsoft.Diagnostics.Monitoring.UnitTests.csproj b/src/tests/Microsoft.Diagnostics.Monitoring.UnitTests/Microsoft.Diagnostics.Monitoring.UnitTests.csproj new file mode 100644 index 0000000000..cb4fccd10c --- /dev/null +++ b/src/tests/Microsoft.Diagnostics.Monitoring.UnitTests/Microsoft.Diagnostics.Monitoring.UnitTests.csproj @@ -0,0 +1,17 @@ + + + + $(SupportedXUnitTestTargetFrameworks) + + + + + + + + + + + + + diff --git a/tests/Microsoft.Diagnostics.Monitoring.UnitTests/PipelineTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.UnitTests/PipelineTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.Monitoring.UnitTests/PipelineTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.UnitTests/PipelineTests.cs diff --git a/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/DiagnosticsClientApiShim.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/DiagnosticsClientApiShim.cs similarity index 100% rename from tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/DiagnosticsClientApiShim.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/DiagnosticsClientApiShim.cs diff --git a/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/DiagnosticsClientApiShimExtensions.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/DiagnosticsClientApiShimExtensions.cs similarity index 100% rename from tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/DiagnosticsClientApiShimExtensions.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/DiagnosticsClientApiShimExtensions.cs diff --git a/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/EventPipeProviderTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/EventPipeProviderTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/EventPipeProviderTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/EventPipeProviderTests.cs diff --git a/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/EventPipeSessionTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/EventPipeSessionTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/EventPipeSessionTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/EventPipeSessionTests.cs diff --git a/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetProcessEnvironmentTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetProcessEnvironmentTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetProcessEnvironmentTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetProcessEnvironmentTests.cs diff --git a/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetProcessInfoTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetProcessInfoTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetProcessInfoTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetProcessInfoTests.cs diff --git a/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetPublishedProcessesTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetPublishedProcessesTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetPublishedProcessesTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetPublishedProcessesTests.cs diff --git a/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/HandleableCollectionTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/HandleableCollectionTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/HandleableCollectionTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/HandleableCollectionTests.cs diff --git a/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj b/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj similarity index 79% rename from tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj rename to src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj index 752c00758e..6bc2cd68c9 100644 --- a/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj +++ b/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj @@ -5,7 +5,7 @@ - + diff --git a/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/PerfMapTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/PerfMapTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/PerfMapTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/PerfMapTests.cs diff --git a/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/ReversedServerTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/ReversedServerTests.cs similarity index 100% rename from tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/ReversedServerTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/ReversedServerTests.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/AcquireDotNetTestStep.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/AcquireDotNetTestStep.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/AcquireDotNetTestStep.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/AcquireDotNetTestStep.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/AssertX.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/AssertX.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/AssertX.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/AssertX.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/BaseDebuggeeCompiler.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/BaseDebuggeeCompiler.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/BaseDebuggeeCompiler.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/BaseDebuggeeCompiler.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/CliDebuggeeCompiler.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/ConsoleTestOutputHelper.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/ConsoleTestOutputHelper.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/ConsoleTestOutputHelper.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/ConsoleTestOutputHelper.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/CsprojBuildDebuggeeTestStep.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/CsprojBuildDebuggeeTestStep.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/CsprojBuildDebuggeeTestStep.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/CsprojBuildDebuggeeTestStep.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/DebuggeeCompiler.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/DebuggeeCompiler.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/DebuggeeCompiler.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/DebuggeeCompiler.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/DotNetBuildDebuggeeTestStep.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/DotNetBuildDebuggeeTestStep.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/DotNetBuildDebuggeeTestStep.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/DotNetBuildDebuggeeTestStep.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/FileTestOutputHelper.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/FileTestOutputHelper.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/FileTestOutputHelper.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/FileTestOutputHelper.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/IProcessLogger.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/IProcessLogger.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/IProcessLogger.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/IProcessLogger.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/IndentedTestOutputHelper.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/IndentedTestOutputHelper.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/IndentedTestOutputHelper.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/IndentedTestOutputHelper.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/LoggingListener.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/LoggingListener.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/LoggingListener.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/LoggingListener.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj b/src/tests/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj similarity index 72% rename from tests/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj rename to src/tests/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj index 23a9b798d8..a9fb05848e 100644 --- a/tests/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj +++ b/src/tests/Microsoft.Diagnostics.TestHelpers/Microsoft.Diagnostics.TestHelpers.csproj @@ -19,7 +19,7 @@ - - + + diff --git a/tests/Microsoft.Diagnostics.TestHelpers/MultiplexTestOutputHelper.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/MultiplexTestOutputHelper.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/MultiplexTestOutputHelper.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/MultiplexTestOutputHelper.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/PrebuiltDebuggeeCompiler.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/PrebuiltDebuggeeCompiler.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/PrebuiltDebuggeeCompiler.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/PrebuiltDebuggeeCompiler.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/ProcessRunner.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/ProcessRunner.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/ProcessRunner.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/ProcessRunner.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/RemoteExecutorHelper.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/RemoteExecutorHelper.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/RemoteExecutorHelper.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/RemoteExecutorHelper.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/SdkPrebuiltDebuggeeCompiler.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/SdkPrebuiltDebuggeeCompiler.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/SdkPrebuiltDebuggeeCompiler.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/SdkPrebuiltDebuggeeCompiler.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataReader.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataReader.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataReader.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataReader.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataWriter.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataWriter.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataWriter.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestDataWriter.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestDump.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestDump.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestDump.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestDump.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestHost.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestHost.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestHost.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/TestHost/TestHost.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/TestOutputProcessLogger.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/TestOutputProcessLogger.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/TestOutputProcessLogger.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/TestOutputProcessLogger.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/TestRunner.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/TestRunner.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/TestRunner.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/TestRunner.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/TestStep.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/TestStep.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/TestStep.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/TestStep.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkipTestException.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkipTestException.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkipTestException.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkipTestException.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactAttribute.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactAttribute.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactAttribute.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactAttribute.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactDiscoverer.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactDiscoverer.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactDiscoverer.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactDiscoverer.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactMessageBus.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactMessageBus.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactMessageBus.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactMessageBus.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactTestCase.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactTestCase.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactTestCase.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableFactTestCase.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryAttribute.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryAttribute.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryAttribute.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryAttribute.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryDiscoverer.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryDiscoverer.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryDiscoverer.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryDiscoverer.cs diff --git a/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryTestCase.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryTestCase.cs similarity index 100% rename from tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryTestCase.cs rename to src/tests/Microsoft.Diagnostics.TestHelpers/Xunit.Extensions/SkippableTheoryTestCase.cs diff --git a/tests/Microsoft.FileFormats.UnitTests/AddressSpace.cs b/src/tests/Microsoft.FileFormats.UnitTests/AddressSpace.cs similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/AddressSpace.cs rename to src/tests/Microsoft.FileFormats.UnitTests/AddressSpace.cs diff --git a/tests/Microsoft.FileFormats.UnitTests/ELF/Tests.cs b/src/tests/Microsoft.FileFormats.UnitTests/ELF/Tests.cs similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/ELF/Tests.cs rename to src/tests/Microsoft.FileFormats.UnitTests/ELF/Tests.cs diff --git a/tests/Microsoft.FileFormats.UnitTests/Layouts.cs b/src/tests/Microsoft.FileFormats.UnitTests/Layouts.cs similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/Layouts.cs rename to src/tests/Microsoft.FileFormats.UnitTests/Layouts.cs diff --git a/tests/Microsoft.FileFormats.UnitTests/MachO/Tests.cs b/src/tests/Microsoft.FileFormats.UnitTests/MachO/Tests.cs similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/MachO/Tests.cs rename to src/tests/Microsoft.FileFormats.UnitTests/MachO/Tests.cs diff --git a/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj b/src/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj similarity index 96% rename from tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj rename to src/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj index ee11b75344..33032a7996 100644 --- a/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj +++ b/src/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj @@ -9,7 +9,7 @@ - + diff --git a/tests/Microsoft.FileFormats.UnitTests/Minidump/Tests.cs b/src/tests/Microsoft.FileFormats.UnitTests/Minidump/Tests.cs similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/Minidump/Tests.cs rename to src/tests/Microsoft.FileFormats.UnitTests/Minidump/Tests.cs diff --git a/tests/Microsoft.FileFormats.UnitTests/PDB/Tests.cs b/src/tests/Microsoft.FileFormats.UnitTests/PDB/Tests.cs similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/PDB/Tests.cs rename to src/tests/Microsoft.FileFormats.UnitTests/PDB/Tests.cs diff --git a/tests/Microsoft.FileFormats.UnitTests/PE/Tests.cs b/src/tests/Microsoft.FileFormats.UnitTests/PE/Tests.cs similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/PE/Tests.cs rename to src/tests/Microsoft.FileFormats.UnitTests/PE/Tests.cs diff --git a/tests/Microsoft.FileFormats.UnitTests/PerfMap/Tests.cs b/src/tests/Microsoft.FileFormats.UnitTests/PerfMap/Tests.cs similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/PerfMap/Tests.cs rename to src/tests/Microsoft.FileFormats.UnitTests/PerfMap/Tests.cs diff --git a/tests/Microsoft.FileFormats.UnitTests/PrimitiveTypes.cs b/src/tests/Microsoft.FileFormats.UnitTests/PrimitiveTypes.cs similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/PrimitiveTypes.cs rename to src/tests/Microsoft.FileFormats.UnitTests/PrimitiveTypes.cs diff --git a/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.exe b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.exe similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.exe rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.exe diff --git a/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdz similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdz diff --git a/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll diff --git a/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.ni.r2rmap b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.ni.r2rmap similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.ni.r2rmap rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.ni.r2rmap diff --git a/tests/Microsoft.FileFormats.UnitTests/TestBinaries/System.Diagnostics.StackTrace.dll b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/System.Diagnostics.StackTrace.dll similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/TestBinaries/System.Diagnostics.StackTrace.dll rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/System.Diagnostics.StackTrace.dll diff --git a/tests/Microsoft.FileFormats.UnitTests/TestBinaries/apphost.gz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/apphost.gz similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/TestBinaries/apphost.gz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/apphost.gz diff --git a/tests/Microsoft.FileFormats.UnitTests/TestBinaries/core.gz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/core.gz similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/TestBinaries/core.gz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/core.gz diff --git a/tests/Microsoft.FileFormats.UnitTests/TestBinaries/ilasm.dbg b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/ilasm.dbg similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/TestBinaries/ilasm.dbg rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/ilasm.dbg diff --git a/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libclrjit.dylib.dwarf.gz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libclrjit.dylib.dwarf.gz similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/TestBinaries/libclrjit.dylib.dwarf.gz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libclrjit.dylib.dwarf.gz diff --git a/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.dylib.gz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.dylib.gz similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.dylib.gz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.dylib.gz diff --git a/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.so.gz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.so.gz similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.so.gz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.so.gz diff --git a/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz diff --git a/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x64.dmp.gz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x64.dmp.gz similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x64.dmp.gz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x64.dmp.gz diff --git a/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x86.dmp.gz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x86.dmp.gz similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x86.dmp.gz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x86.dmp.gz diff --git a/tests/Microsoft.FileFormats.UnitTests/TestBinaries/renamed_build_id_section b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/renamed_build_id_section similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/TestBinaries/renamed_build_id_section rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/renamed_build_id_section diff --git a/tests/Microsoft.FileFormats.UnitTests/TestBinaries/triagedump.gz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/triagedump.gz similarity index 100% rename from tests/Microsoft.FileFormats.UnitTests/TestBinaries/triagedump.gz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/triagedump.gz diff --git a/tests/Microsoft.SymbolStore.UnitTests/KeyGeneratorTests.cs b/src/tests/Microsoft.SymbolStore.UnitTests/KeyGeneratorTests.cs similarity index 100% rename from tests/Microsoft.SymbolStore.UnitTests/KeyGeneratorTests.cs rename to src/tests/Microsoft.SymbolStore.UnitTests/KeyGeneratorTests.cs diff --git a/tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj b/src/tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj similarity index 98% rename from tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj rename to src/tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj index 50173deba3..32816c8a84 100644 --- a/tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj +++ b/src/tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj @@ -9,7 +9,7 @@ - + diff --git a/tests/Microsoft.SymbolStore.UnitTests/PEFileKeyGenerationTests.cs b/src/tests/Microsoft.SymbolStore.UnitTests/PEFileKeyGenerationTests.cs similarity index 100% rename from tests/Microsoft.SymbolStore.UnitTests/PEFileKeyGenerationTests.cs rename to src/tests/Microsoft.SymbolStore.UnitTests/PEFileKeyGenerationTests.cs diff --git a/tests/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs b/src/tests/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs similarity index 100% rename from tests/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs rename to src/tests/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs diff --git a/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz similarity index 100% rename from tests/Microsoft.SymbolStore.UnitTests/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz diff --git a/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/coreclr.dll.gz b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/coreclr.dll.gz similarity index 100% rename from tests/Microsoft.SymbolStore.UnitTests/TestBinaries/coreclr.dll.gz rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/coreclr.dll.gz diff --git a/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.dll b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.dll similarity index 100% rename from tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.dll rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.dll diff --git a/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.dll b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.dll similarity index 100% rename from tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.dll rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.dll diff --git a/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/libSystem.Security.Cryptography.Native.Apple.dylib.gz b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/libSystem.Security.Cryptography.Native.Apple.dylib.gz similarity index 100% rename from tests/Microsoft.SymbolStore.UnitTests/TestBinaries/libSystem.Security.Cryptography.Native.Apple.dylib.gz rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/libSystem.Security.Cryptography.Native.Apple.dylib.gz diff --git a/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/md5_build_id b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/md5_build_id similarity index 100% rename from tests/Microsoft.SymbolStore.UnitTests/TestBinaries/md5_build_id rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/md5_build_id diff --git a/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_amd64.dll b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_amd64.dll similarity index 100% rename from tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_amd64.dll rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_amd64.dll diff --git a/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_arm64.dll b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_arm64.dll similarity index 100% rename from tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_arm64.dll rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_arm64.dll diff --git a/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_i386.dll b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_i386.dll similarity index 100% rename from tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_i386.dll rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_i386.dll diff --git a/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdac.dll b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdac.dll similarity index 100% rename from tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdac.dll rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdac.dll diff --git a/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdbi.dll b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdbi.dll similarity index 100% rename from tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdbi.dll rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdbi.dll diff --git a/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mocksos.dll b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mocksos.dll similarity index 100% rename from tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mocksos.dll rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mocksos.dll diff --git a/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/stripped_executable b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/stripped_executable similarity index 100% rename from tests/Microsoft.SymbolStore.UnitTests/TestBinaries/stripped_executable rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/stripped_executable diff --git a/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/symbolized_executable b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/symbolized_executable similarity index 100% rename from tests/Microsoft.SymbolStore.UnitTests/TestBinaries/symbolized_executable rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/symbolized_executable diff --git a/tests/Microsoft.SymbolStore.UnitTests/Tracer.cs b/src/tests/Microsoft.SymbolStore.UnitTests/Tracer.cs similarity index 100% rename from tests/Microsoft.SymbolStore.UnitTests/Tracer.cs rename to src/tests/Microsoft.SymbolStore.UnitTests/Tracer.cs diff --git a/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt similarity index 98% rename from tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt rename to src/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt index 79bf72c76e..2f591d4a23 100644 --- a/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/src/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -13,7 +13,7 @@ ProjectK - $(RepoRootDir)/tests/SOS.UnitTests/Scripts + $(RepoRootDir)/src/tests/SOS.UnitTests/Scripts $(RepoRootDir)/artifacts $(RootBinDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration) $(RootBinDir)/TestResults/$(TargetConfiguration)/sos.unittests_$(Timestamp) @@ -28,7 +28,7 @@ true false - $(RepoRootDir)/tests/Debuggees + $(RepoRootDir)/src/tests/Debuggees $(RepoRootDir)/eng/AuxMsbuildFiles sdk.prebuilt $(RootBinDir) diff --git a/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt similarity index 99% rename from tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt rename to src/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt index 676d5924a6..c5f05c49e6 100644 --- a/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/src/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -13,7 +13,7 @@ $(RepoRootDir)\.dotnet-test\x86 - $(RepoRootDir)\tests\SOS.UnitTests\Scripts + $(RepoRootDir)\src\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)\tests\Debuggees + $(RepoRootDir)\src\tests\Debuggees $(RepoRootDir)\eng\AuxMsbuildFiles sdk.prebuilt $(RootBinDir) diff --git a/tests/SOS.UnitTests/DumpGenerationFixture.cs b/src/tests/SOS.UnitTests/DumpGenerationFixture.cs similarity index 100% rename from tests/SOS.UnitTests/DumpGenerationFixture.cs rename to src/tests/SOS.UnitTests/DumpGenerationFixture.cs diff --git a/tests/SOS.UnitTests/SOS.UnitTests.csproj b/src/tests/SOS.UnitTests/SOS.UnitTests.csproj similarity index 100% rename from tests/SOS.UnitTests/SOS.UnitTests.csproj rename to src/tests/SOS.UnitTests/SOS.UnitTests.csproj diff --git a/tests/SOS.UnitTests/SOS.cs b/src/tests/SOS.UnitTests/SOS.cs similarity index 100% rename from tests/SOS.UnitTests/SOS.cs rename to src/tests/SOS.UnitTests/SOS.cs diff --git a/tests/SOS.UnitTests/SOSRunner.cs b/src/tests/SOS.UnitTests/SOSRunner.cs similarity index 100% rename from tests/SOS.UnitTests/SOSRunner.cs rename to src/tests/SOS.UnitTests/SOSRunner.cs diff --git a/tests/SOS.UnitTests/Scripts/ClrStackWithNumberOfFrames.script b/src/tests/SOS.UnitTests/Scripts/ClrStackWithNumberOfFrames.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/ClrStackWithNumberOfFrames.script rename to src/tests/SOS.UnitTests/Scripts/ClrStackWithNumberOfFrames.script diff --git a/tests/SOS.UnitTests/Scripts/ConcurrentDictionaries.script b/src/tests/SOS.UnitTests/Scripts/ConcurrentDictionaries.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/ConcurrentDictionaries.script rename to src/tests/SOS.UnitTests/Scripts/ConcurrentDictionaries.script diff --git a/tests/SOS.UnitTests/Scripts/DivZero.script b/src/tests/SOS.UnitTests/Scripts/DivZero.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/DivZero.script rename to src/tests/SOS.UnitTests/Scripts/DivZero.script diff --git a/tests/SOS.UnitTests/Scripts/DualRuntimes.script b/src/tests/SOS.UnitTests/Scripts/DualRuntimes.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/DualRuntimes.script rename to src/tests/SOS.UnitTests/Scripts/DualRuntimes.script diff --git a/tests/SOS.UnitTests/Scripts/DumpGen.script b/src/tests/SOS.UnitTests/Scripts/DumpGen.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/DumpGen.script rename to src/tests/SOS.UnitTests/Scripts/DumpGen.script diff --git a/tests/SOS.UnitTests/Scripts/DynamicMethod.script b/src/tests/SOS.UnitTests/Scripts/DynamicMethod.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/DynamicMethod.script rename to src/tests/SOS.UnitTests/Scripts/DynamicMethod.script diff --git a/tests/SOS.UnitTests/Scripts/GCPOH.script b/src/tests/SOS.UnitTests/Scripts/GCPOH.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/GCPOH.script rename to src/tests/SOS.UnitTests/Scripts/GCPOH.script diff --git a/tests/SOS.UnitTests/Scripts/GCTests.script b/src/tests/SOS.UnitTests/Scripts/GCTests.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/GCTests.script rename to src/tests/SOS.UnitTests/Scripts/GCTests.script diff --git a/tests/SOS.UnitTests/Scripts/LineNums.script b/src/tests/SOS.UnitTests/Scripts/LineNums.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/LineNums.script rename to src/tests/SOS.UnitTests/Scripts/LineNums.script diff --git a/tests/SOS.UnitTests/Scripts/NestedExceptionTest.script b/src/tests/SOS.UnitTests/Scripts/NestedExceptionTest.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/NestedExceptionTest.script rename to src/tests/SOS.UnitTests/Scripts/NestedExceptionTest.script diff --git a/tests/SOS.UnitTests/Scripts/OtherCommands.script b/src/tests/SOS.UnitTests/Scripts/OtherCommands.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/OtherCommands.script rename to src/tests/SOS.UnitTests/Scripts/OtherCommands.script diff --git a/tests/SOS.UnitTests/Scripts/Overflow.script b/src/tests/SOS.UnitTests/Scripts/Overflow.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/Overflow.script rename to src/tests/SOS.UnitTests/Scripts/Overflow.script diff --git a/tests/SOS.UnitTests/Scripts/Reflection.script b/src/tests/SOS.UnitTests/Scripts/Reflection.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/Reflection.script rename to src/tests/SOS.UnitTests/Scripts/Reflection.script diff --git a/tests/SOS.UnitTests/Scripts/SimpleThrow.script b/src/tests/SOS.UnitTests/Scripts/SimpleThrow.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/SimpleThrow.script rename to src/tests/SOS.UnitTests/Scripts/SimpleThrow.script diff --git a/tests/SOS.UnitTests/Scripts/StackAndOtherTests.script b/src/tests/SOS.UnitTests/Scripts/StackAndOtherTests.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/StackAndOtherTests.script rename to src/tests/SOS.UnitTests/Scripts/StackAndOtherTests.script diff --git a/tests/SOS.UnitTests/Scripts/StackTests.script b/src/tests/SOS.UnitTests/Scripts/StackTests.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/StackTests.script rename to src/tests/SOS.UnitTests/Scripts/StackTests.script diff --git a/tests/SOS.UnitTests/Scripts/StackTraceFaultingExceptionFrame.script b/src/tests/SOS.UnitTests/Scripts/StackTraceFaultingExceptionFrame.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/StackTraceFaultingExceptionFrame.script rename to src/tests/SOS.UnitTests/Scripts/StackTraceFaultingExceptionFrame.script diff --git a/tests/SOS.UnitTests/Scripts/StackTraceSoftwareExceptionFrame.script b/src/tests/SOS.UnitTests/Scripts/StackTraceSoftwareExceptionFrame.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/StackTraceSoftwareExceptionFrame.script rename to src/tests/SOS.UnitTests/Scripts/StackTraceSoftwareExceptionFrame.script diff --git a/tests/SOS.UnitTests/Scripts/TaskNestedException.script b/src/tests/SOS.UnitTests/Scripts/TaskNestedException.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/TaskNestedException.script rename to src/tests/SOS.UnitTests/Scripts/TaskNestedException.script diff --git a/tests/SOS.UnitTests/Scripts/TestExtensions.script b/src/tests/SOS.UnitTests/Scripts/TestExtensions.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/TestExtensions.script rename to src/tests/SOS.UnitTests/Scripts/TestExtensions.script diff --git a/tests/SOS.UnitTests/Scripts/WebApp.script b/src/tests/SOS.UnitTests/Scripts/WebApp.script similarity index 100% rename from tests/SOS.UnitTests/Scripts/WebApp.script rename to src/tests/SOS.UnitTests/Scripts/WebApp.script diff --git a/tests/SOS.UnitTests/Scripts/lldbhelper.py b/src/tests/SOS.UnitTests/Scripts/lldbhelper.py similarity index 100% rename from tests/SOS.UnitTests/Scripts/lldbhelper.py rename to src/tests/SOS.UnitTests/Scripts/lldbhelper.py diff --git a/tests/Test.proj b/src/tests/Test.proj similarity index 100% rename from tests/Test.proj rename to src/tests/Test.proj diff --git a/tests/TestExtension/TestCommands.cs b/src/tests/TestExtension/TestCommands.cs similarity index 100% rename from tests/TestExtension/TestCommands.cs rename to src/tests/TestExtension/TestCommands.cs diff --git a/tests/TestExtension/TestExtension.csproj b/src/tests/TestExtension/TestExtension.csproj similarity index 52% rename from tests/TestExtension/TestExtension.csproj rename to src/tests/TestExtension/TestExtension.csproj index 4f299ccaa6..2bfb58c4ec 100644 --- a/tests/TestExtension/TestExtension.csproj +++ b/src/tests/TestExtension/TestExtension.csproj @@ -5,7 +5,7 @@ - + diff --git a/tests/TestHelpers/MaxStreamReadHelper.cs b/src/tests/TestHelpers/MaxStreamReadHelper.cs similarity index 100% rename from tests/TestHelpers/MaxStreamReadHelper.cs rename to src/tests/TestHelpers/MaxStreamReadHelper.cs diff --git a/tests/TestHelpers/TestHelpers.cs b/src/tests/TestHelpers/TestHelpers.cs similarity index 100% rename from tests/TestHelpers/TestHelpers.cs rename to src/tests/TestHelpers/TestHelpers.cs diff --git a/tests/TestHelpers/TestHelpers.csproj b/src/tests/TestHelpers/TestHelpers.csproj similarity index 61% rename from tests/TestHelpers/TestHelpers.csproj rename to src/tests/TestHelpers/TestHelpers.csproj index ea7e51f06d..78c0d0a8b0 100644 --- a/tests/TestHelpers/TestHelpers.csproj +++ b/src/tests/TestHelpers/TestHelpers.csproj @@ -5,6 +5,6 @@ - + diff --git a/tests/benchmarks/.gitignore b/src/tests/benchmarks/.gitignore similarity index 100% rename from tests/benchmarks/.gitignore rename to src/tests/benchmarks/.gitignore diff --git a/tests/benchmarks/Program.cs b/src/tests/benchmarks/Program.cs similarity index 100% rename from tests/benchmarks/Program.cs rename to src/tests/benchmarks/Program.cs diff --git a/tests/benchmarks/README.md b/src/tests/benchmarks/README.md similarity index 100% rename from tests/benchmarks/README.md rename to src/tests/benchmarks/README.md diff --git a/tests/benchmarks/RunBenchmarks.cmd b/src/tests/benchmarks/RunBenchmarks.cmd similarity index 100% rename from tests/benchmarks/RunBenchmarks.cmd rename to src/tests/benchmarks/RunBenchmarks.cmd diff --git a/tests/benchmarks/RunBenchmarks.sh b/src/tests/benchmarks/RunBenchmarks.sh similarity index 100% rename from tests/benchmarks/RunBenchmarks.sh rename to src/tests/benchmarks/RunBenchmarks.sh diff --git a/tests/benchmarks/benchmarks.csproj b/src/tests/benchmarks/benchmarks.csproj similarity index 100% rename from tests/benchmarks/benchmarks.csproj rename to src/tests/benchmarks/benchmarks.csproj diff --git a/tests/lldbplugin.tests/README.md b/src/tests/lldbplugin.tests/README.md similarity index 100% rename from tests/lldbplugin.tests/README.md rename to src/tests/lldbplugin.tests/README.md diff --git a/tests/lldbplugin.tests/t_cmd_bpmd_clear.py b/src/tests/lldbplugin.tests/t_cmd_bpmd_clear.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_bpmd_clear.py rename to src/tests/lldbplugin.tests/t_cmd_bpmd_clear.py diff --git a/tests/lldbplugin.tests/t_cmd_bpmd_clearall.py b/src/tests/lldbplugin.tests/t_cmd_bpmd_clearall.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_bpmd_clearall.py rename to src/tests/lldbplugin.tests/t_cmd_bpmd_clearall.py diff --git a/tests/lldbplugin.tests/t_cmd_bpmd_methoddesc.py b/src/tests/lldbplugin.tests/t_cmd_bpmd_methoddesc.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_bpmd_methoddesc.py rename to src/tests/lldbplugin.tests/t_cmd_bpmd_methoddesc.py diff --git a/tests/lldbplugin.tests/t_cmd_bpmd_module_function.py b/src/tests/lldbplugin.tests/t_cmd_bpmd_module_function.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_bpmd_module_function.py rename to src/tests/lldbplugin.tests/t_cmd_bpmd_module_function.py diff --git a/tests/lldbplugin.tests/t_cmd_bpmd_module_function_iloffset.py b/src/tests/lldbplugin.tests/t_cmd_bpmd_module_function_iloffset.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_bpmd_module_function_iloffset.py rename to src/tests/lldbplugin.tests/t_cmd_bpmd_module_function_iloffset.py diff --git a/tests/lldbplugin.tests/t_cmd_bpmd_nofuturemodule_module_function.py b/src/tests/lldbplugin.tests/t_cmd_bpmd_nofuturemodule_module_function.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_bpmd_nofuturemodule_module_function.py rename to src/tests/lldbplugin.tests/t_cmd_bpmd_nofuturemodule_module_function.py diff --git a/tests/lldbplugin.tests/t_cmd_clrstack.py b/src/tests/lldbplugin.tests/t_cmd_clrstack.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_clrstack.py rename to src/tests/lldbplugin.tests/t_cmd_clrstack.py diff --git a/tests/lldbplugin.tests/t_cmd_clrthreads.py b/src/tests/lldbplugin.tests/t_cmd_clrthreads.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_clrthreads.py rename to src/tests/lldbplugin.tests/t_cmd_clrthreads.py diff --git a/tests/lldbplugin.tests/t_cmd_clru.py b/src/tests/lldbplugin.tests/t_cmd_clru.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_clru.py rename to src/tests/lldbplugin.tests/t_cmd_clru.py diff --git a/tests/lldbplugin.tests/t_cmd_dso.py b/src/tests/lldbplugin.tests/t_cmd_dso.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_dso.py rename to src/tests/lldbplugin.tests/t_cmd_dso.py diff --git a/tests/lldbplugin.tests/t_cmd_dumpclass.py b/src/tests/lldbplugin.tests/t_cmd_dumpclass.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_dumpclass.py rename to src/tests/lldbplugin.tests/t_cmd_dumpclass.py diff --git a/tests/lldbplugin.tests/t_cmd_dumpheap.py b/src/tests/lldbplugin.tests/t_cmd_dumpheap.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_dumpheap.py rename to src/tests/lldbplugin.tests/t_cmd_dumpheap.py diff --git a/tests/lldbplugin.tests/t_cmd_dumpil.py b/src/tests/lldbplugin.tests/t_cmd_dumpil.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_dumpil.py rename to src/tests/lldbplugin.tests/t_cmd_dumpil.py diff --git a/tests/lldbplugin.tests/t_cmd_dumplog.py b/src/tests/lldbplugin.tests/t_cmd_dumplog.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_dumplog.py rename to src/tests/lldbplugin.tests/t_cmd_dumplog.py diff --git a/tests/lldbplugin.tests/t_cmd_dumpmd.py b/src/tests/lldbplugin.tests/t_cmd_dumpmd.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_dumpmd.py rename to src/tests/lldbplugin.tests/t_cmd_dumpmd.py diff --git a/tests/lldbplugin.tests/t_cmd_dumpmodule.py b/src/tests/lldbplugin.tests/t_cmd_dumpmodule.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_dumpmodule.py rename to src/tests/lldbplugin.tests/t_cmd_dumpmodule.py diff --git a/tests/lldbplugin.tests/t_cmd_dumpmt.py b/src/tests/lldbplugin.tests/t_cmd_dumpmt.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_dumpmt.py rename to src/tests/lldbplugin.tests/t_cmd_dumpmt.py diff --git a/tests/lldbplugin.tests/t_cmd_dumpobj.py b/src/tests/lldbplugin.tests/t_cmd_dumpobj.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_dumpobj.py rename to src/tests/lldbplugin.tests/t_cmd_dumpobj.py diff --git a/tests/lldbplugin.tests/t_cmd_dumpstack.py b/src/tests/lldbplugin.tests/t_cmd_dumpstack.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_dumpstack.py rename to src/tests/lldbplugin.tests/t_cmd_dumpstack.py diff --git a/tests/lldbplugin.tests/t_cmd_eeheap.py b/src/tests/lldbplugin.tests/t_cmd_eeheap.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_eeheap.py rename to src/tests/lldbplugin.tests/t_cmd_eeheap.py diff --git a/tests/lldbplugin.tests/t_cmd_eestack.py b/src/tests/lldbplugin.tests/t_cmd_eestack.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_eestack.py rename to src/tests/lldbplugin.tests/t_cmd_eestack.py diff --git a/tests/lldbplugin.tests/t_cmd_gcroot.py b/src/tests/lldbplugin.tests/t_cmd_gcroot.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_gcroot.py rename to src/tests/lldbplugin.tests/t_cmd_gcroot.py diff --git a/tests/lldbplugin.tests/t_cmd_histclear.py b/src/tests/lldbplugin.tests/t_cmd_histclear.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_histclear.py rename to src/tests/lldbplugin.tests/t_cmd_histclear.py diff --git a/tests/lldbplugin.tests/t_cmd_histinit.py b/src/tests/lldbplugin.tests/t_cmd_histinit.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_histinit.py rename to src/tests/lldbplugin.tests/t_cmd_histinit.py diff --git a/tests/lldbplugin.tests/t_cmd_histobj.py b/src/tests/lldbplugin.tests/t_cmd_histobj.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_histobj.py rename to src/tests/lldbplugin.tests/t_cmd_histobj.py diff --git a/tests/lldbplugin.tests/t_cmd_histobjfind.py b/src/tests/lldbplugin.tests/t_cmd_histobjfind.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_histobjfind.py rename to src/tests/lldbplugin.tests/t_cmd_histobjfind.py diff --git a/tests/lldbplugin.tests/t_cmd_histroot.py b/src/tests/lldbplugin.tests/t_cmd_histroot.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_histroot.py rename to src/tests/lldbplugin.tests/t_cmd_histroot.py diff --git a/tests/lldbplugin.tests/t_cmd_ip2md.py b/src/tests/lldbplugin.tests/t_cmd_ip2md.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_ip2md.py rename to src/tests/lldbplugin.tests/t_cmd_ip2md.py diff --git a/tests/lldbplugin.tests/t_cmd_name2ee.py b/src/tests/lldbplugin.tests/t_cmd_name2ee.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_name2ee.py rename to src/tests/lldbplugin.tests/t_cmd_name2ee.py diff --git a/tests/lldbplugin.tests/t_cmd_pe.py b/src/tests/lldbplugin.tests/t_cmd_pe.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_pe.py rename to src/tests/lldbplugin.tests/t_cmd_pe.py diff --git a/tests/lldbplugin.tests/t_cmd_sos.py b/src/tests/lldbplugin.tests/t_cmd_sos.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_sos.py rename to src/tests/lldbplugin.tests/t_cmd_sos.py diff --git a/tests/lldbplugin.tests/t_cmd_soshelp.py b/src/tests/lldbplugin.tests/t_cmd_soshelp.py similarity index 100% rename from tests/lldbplugin.tests/t_cmd_soshelp.py rename to src/tests/lldbplugin.tests/t_cmd_soshelp.py diff --git a/tests/lldbplugin.tests/test_libsosplugin.py b/src/tests/lldbplugin.tests/test_libsosplugin.py similarity index 100% rename from tests/lldbplugin.tests/test_libsosplugin.py rename to src/tests/lldbplugin.tests/test_libsosplugin.py diff --git a/tests/lldbplugin.tests/testsos.sh b/src/tests/lldbplugin.tests/testsos.sh similarity index 77% rename from tests/lldbplugin.tests/testsos.sh rename to src/tests/lldbplugin.tests/testsos.sh index 38fd76b690..ed968e85b4 100644 --- a/tests/lldbplugin.tests/testsos.sh +++ b/src/tests/lldbplugin.tests/testsos.sh @@ -26,6 +26,6 @@ fi log_dir=$results_dir/lldbplugin.tests_$(date +%Y_%m_%d_%H_%M_%S) mkdir -p $log_dir -cd $project_root/src/SOS/lldbplugin.tests/ +cd $project_root/src/tests/lldbplugin.tests/ rm -f StressLog.txt -python $project_root/src/SOS/lldbplugin.tests/test_libsosplugin.py --lldb $LLDB_PATH --host "$host" --plugin $plugin --logfiledir $log_dir --assembly $test_program +python $project_root/src/tests/lldbplugin.tests/test_libsosplugin.py --lldb $LLDB_PATH --host "$host" --plugin $plugin --logfiledir $log_dir --assembly $test_program diff --git a/tests/lldbplugin.tests/testutils.py b/src/tests/lldbplugin.tests/testutils.py similarity index 100% rename from tests/lldbplugin.tests/testutils.py rename to src/tests/lldbplugin.tests/testutils.py diff --git a/tests/runcommand/CMakeLists.txt b/src/tests/runcommand/CMakeLists.txt similarity index 100% rename from tests/runcommand/CMakeLists.txt rename to src/tests/runcommand/CMakeLists.txt diff --git a/tests/runcommand/runcommand.cpp b/src/tests/runcommand/runcommand.cpp similarity index 100% rename from tests/runcommand/runcommand.cpp rename to src/tests/runcommand/runcommand.cpp diff --git a/tests/Debuggees/WebApp3/Properties/launchSettings.json b/tests/Debuggees/WebApp3/Properties/launchSettings.json deleted file mode 100644 index d5965825cd..0000000000 --- a/tests/Debuggees/WebApp3/Properties/launchSettings.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "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/tests/Microsoft.Diagnostics.Monitoring.UnitTests/Microsoft.Diagnostics.Monitoring.UnitTests.csproj b/tests/Microsoft.Diagnostics.Monitoring.UnitTests/Microsoft.Diagnostics.Monitoring.UnitTests.csproj deleted file mode 100644 index 8f1ab8c3eb..0000000000 --- a/tests/Microsoft.Diagnostics.Monitoring.UnitTests/Microsoft.Diagnostics.Monitoring.UnitTests.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - $(SupportedXUnitTestTargetFrameworks) - - - - - - - - - - - - - diff --git a/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdb b/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdb deleted file mode 100644 index adea403b4e92a74506a22217eae5b8a63ff65c54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11776 zcmeHNU2GIp6h5=m((NB?tyLD&3x_;-*j0{cPu7J*U0)0bCuuW+q;Rh zvTpy0eF{>aS^wslPk(rN>}>6=f#=`r%=j5u#~h>|_ddQjDX5m=6@tK0{h#N<;P}sR zc4x6%AudWY>mVTOzYaJ}pqf9tcj(gUE3wn#G`IVs$cJBMcb)n5mv3XIhunC_2PY?E zr7N)uTZrb{MlW3Nd#HBcleM`w{<21kuWvup>tVFZ_^S8giyPvTKYbT@|KhEMxu5@j zy9wY6jf*(u5#-CzI3^vbi@?H-g&Vw(JIA?-PvxtQW;=P)DwInFV>&-&6{|CvS#k2O z>Q1#_s7|FirCaK@RC-5#k8QoA6`|Xy8HTmbvW=-=5b7g#VJ1;@8ZP-|zvMEPd{mSi z2tw_b%rA-U{R ze_nnq@9DXoxPCOSq~(DC_n!o9iLo_*cqRqs0Mu(MCyREGE9fS|eY7gZ_nim(d0F31 z8)GkwA9pI+4E5g*Co+~{V4Tn`(@8w1nVPK^sVATx)6G|K`yFW$+OZ0!#RK^!%C=UR z(#<1@iGnlj;MuLTjaphR5B+xOv;E(Xp5GLWd~x>NA-*q1!_X16z%aIzkGI&?`-E(z zTaYO*lY*b`2g{8jm8g?wmi_92jKVu+#;6S}@bJPa1 zW2i#z1kgv12GUYbq?pnn1jilfL+O}wN+Q4rsF?G)Z!bmu+JM(PZOF%Sb(784?0TrF z-us`E@H~md`Shq+vM6a5W;BPAj$KTau@2Yl!-iFyb`wgvp*hJ0&kq{gH86h%asq~n??Dj03Z4aXTi6U9gKjGTeil52IG?lifVtP*59Z#;y%6n4 m^vEbA?;E&1@pHJx@;-A7Skm%9pm%wgA+3-INCfTy0{;LU46FA5 diff --git a/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb b/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb deleted file mode 100644 index 57e63f5abf60529385502bcbdee1984d51241520..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5560 zcmZvg32+nF8OPtQPT!L8fhF6LeBc8kA7Fz4Lws@C@gdGM4UuI9L}ba9WU$D!i<1IP zCk4`w0j3m^PK}Fm&~}=Vw4G!^kE96+p}E>gI?S|bl7>k;Lo+#MlK#KdI(@vb%-^4W z@B8+>Z{M|V>F}-VkeI~i%7ps6I^4S&y$xCcGqF+p*pR_k`Q412hwTBE`x3EGWP6-q zY`DoyWve%??SgFp=cR!=!qFjcS3YA2^7juDYM0Dddg@m_W1mY4S;2W`L4gYGgU}4i zh6a(>HYT$-Vc&!Op(L>;mk&u*WSDJ7baAAFUF5%PJ#UfzCibgU;bj z3+`Ga8Q4YWE$DC1d(ai=D)a>;%LbMP*<>RNLWiNF&`D?tdR#WKub|%=Ozd6AYBaHG zXb>8K_CqJ2C!k+L7ofjFSD^nwvdP5Kpl8_1=fDS=N zp;OQ_bQU@XJqNu2U4-6-E<+zcpFmbK+JYLPR;V3X3k^V9AwLv?#-JpmLI2he|@&mhTSVrh^aDuO&v4b%v=LhaC6XaL#@`JoUr1|=cY zVrDNvZ$j@v|3KMC&{fE0MPESy=sxIS=touy`wU9QjJx)dm;qy-n%8-7$sE&MGjMDL z8#$)QX~MtR`yF62#}(IM3;Zj%{e)j*MpW zqvy}%nDU(?a3054uPmQqiZ9@}09=SwJ6k`k-MJhu1Q&6<2JGON{7#O^U(B)lI$Q!j zjWAsvNaRxZjk>=Wevw`9(+JZ=^TW+CjhBbxEN~gedI7!!gxg%Q3~z7r0K~1sv1;UXJPhdXCB8z%lt7Ii}}n5_qA&iv(^KxP@ct^~C}& z5x7<0r5scLE#sKx^KyaP1YRNVN{(s$-@q}|*Um9*E*%`xdg|nu=2sWTwb$Wp_|5u! zqyAha@M@0f`PK-$mSehq9mkaKdX8!QdIav}n8y1?f%`b7_WL=e`Ug0s`Ug2CzmH?O ze*?!9zma2Ve-p=a|7L-=2)tF`n*{!rz&8v0ZGmqQc$>ht3hWnnNZFN)^Do9Rjc1%=icfI$QT#Z^<=5d| z@LTlt;e}u1-SDUB{x;xa7@p4C!TLM zp5AYFaZK}(r@E|0tPLT)S11sSnj( zvn6sS&8nEps$~P6H#f=bCgc1pmT$y|Oo2IR7z#xU(V?A1n?sS|=#h!;|8n~8hu+x#pw>$kt(SbxIYeEhn(6as##f=4ja8c2RI8cZ2F>&>)Qs2ClJ@nG z=h7o%3dV!OzJxz;J32RKwsSGUdkgn^+^#LhAMCC>`RPcgzv{>j{`JKBAHMjGb@>kV z_%T;oRsN@!X~QU@LB=8|7J3vt8S;lid;Ez|G-8nUj#0|B_AD~R1)9lpYNo`UMYE;2 zGRwePjn)i&K_oHqa#BzBo0*+=uRnR}O7hvauAI61yC-g~Jh-jxwDaZ18b2AiN7e<%_h?w$w+#;MXGJ;n!)g%U|`KfcWa zp;3Q0SDLg*leN-hw=}s$njDcP54n)Oy9DXy8m$IaPo1*DoGfHHMp_ecvIhR9nrr;| z#-x#jj8+@#F(>DK9Z5AUXuT$Ky;#%A?rZ%2uW2h^6V@;*+>8;MOG#wY>MS(U-Yq9J zm;V~q0wZn1ax&k5GxUhvOk03~tutEfSTac(9>+wMmG#l1NyahSBny?jh%1xv4MeaH zP_FMADfdB?RLr^`0#xd5+IHQ_2|I;(lt=7ZQdHN`)?EhW^V0&CG0}!VW5QD357(_9|zyhh>AU_9@Tl_79qsl$RD!oTR+ml(H9eensOF<>C!gK2LeApR7l@w4Q94^5+#~iTT*dkMhr~G@3KCEXSxMTlqN4$OddS8>=&q72t)nRQU=q zoibjILo{XFMyxm-7S(hu&q39u*-CXz3zZkDc@1Q<)%-fLIckBItV1oVAe*nwb&;)B zi?sL()lpCERGpfwR*SX#E7g+4R9>c*E=k?z(t5l=b!)@pQaxHb4z*m1cc>MqepV~B zesQStmeYL>wMzF_>;4+u&e!AWbnDg28}#@ly?jwuDv#z=|Eev0DPFAgYni%aZHilU z|5Dw*Ot)=%+zQ>^pqF>(@m+fPssVdy$Mx#(g>P(T`wqAp>Tfl$&y^#`-rw_3zGcev zOxf#c7rIYB^1xC1<83pmKc+3SEThGMy+Paev$SoqHoKQ-flceuR&~JcG%>bX-Gqgq zEjI1d)Miea*)1}ghu9i*2)|T}Ds}@mj#_}wn zspORL9|@VpB%07-F||B6KliG4&c-^0+VtsYSMReMn3vYMo%VGa{e#-9Emt3cMVK?y zMcosD;3#dC-Mg?ax5u`}ztLIyXWXXgSHF0@DWm%3Z0EkGzxSInS38fqGJVg7e|c(h zN6+zc`*zw|>gb(hqk{)(r%sxaN9!QAWZ92*MwYKX8*(-O`;C{@)XY3}Gm6>f!bdU= r;9W+iz*dM(ZzL5Of~Y(KRYLU5KqtN;$ODltbrPgAV(LCBBN6`(x_+%f diff --git a/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.pdb b/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.pdb deleted file mode 100644 index 2fe974307b62a0632c85f6aba2d4f60a1b30d984..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5560 zcmZvg3vg7`8OP7P`_6MWWD~NR$8H|vLD+;q0zm@iWdsuQSe{nJ&1Qww&2F;0fh@l6 zC0d|%ENFp2rxbLiAtk=rjumY?I?{(P6sfN|*kPu%YGs_xP{+rN_W#|zv4~+f?4(6zf3ZsJU8{^}1v&}+3Oa>5 zEx79%$-vG+??QivK7=kpm!Pj9SvD{mWS5OB1U fsR4b(Bra+eGC1;U}7IYR-=j4 zKts?dv==%GJpug=Is?5AU4;G%$tDxafbt+0R1Gyi%b?XzFSH&CKw)ScN|xH zfsR8n&{NPU=mqE{=q&UebOHJp`W&*F(H68AYK7XNHP9fm1qwi6XdFsGDzpze03Csj zLo?7*&?)Ez=q2bZ^d58p`WX5T^d%%&Ow0y3pd!c%)k2G*R;V3X0}Vo3pa2wx#-S9X zTFmTK=pE<-=$|P26uJc2t>`N#2;B=EhJJ3furHwu%(%-hi5W2V>3N+Gm&`HEH3P?1 zu#sb$oF@F6yWa&ib6j}^w!lv_k1jK0<(Sr$P2dcHGX>5PI9uQxfpZ16b8JWZ4rDZ! zA3c8_$CU3pf%7@WdSy5&Y5x9qAdcJD~Uc)inzm{XlcOAzxe!T+saZKZVoxuGZQ~LuPQ~iS+Q~g66li$xV z-M^k=ir>I7wZD;Lx_^_vn+4t?@bv=!K;Rn$zER+t1l}s}%>oAm9u_#rG0mqDfkOh{ zBJehWw+kE=_*Q{$6F4I9sK8NyV*-!i1U5HcY5c}Hrui4=n8q`~F~ujj`Y3*aLS7ogCBrr7Kta+s*w=zhCOL63UA98HQHVzv-_*D@o@}o@u;A$*z`+n!R79)kH1e zL~Ed(h)yRGJ7=LRDKlKbiFiB|O|IV_4+Tb8Jd}t{#Dk&qDV;?FqoMUNe*;x&q07KZ$!NC0{U+b%SIyXW8?LN{X6SdY+3ee(|2YFJ9HS?1!f&cbOh-{^+6U zl{KHB z96$#$b7yRHG!`}ahmb_hToTI5Ma{}tPsgv%PkE2s_iXd6(}uyw1FL`XO4G%@Tw7_& zlh@@NP9Hf!mG7j)J(}tq z*x(xqMM8l@C?gt5(hvm3#`5&1P{-7yI$5GVfG0WX{p8MDrf22E`0O_ZZ;S0W!*6~% zv-Z-+>2GHKap3K}4{E(+(R#`6o=4PGs+oSTX8e_!*-)*SjdhyoYt&5t63zH5Ew=B5 zJdYk3Q!o)4@h1bp+t9hWbDfJ3-d(uc>nYp(@Ppm;$G#X14^$ue>A#=&=#!VvTUTyp zk3Uq_R_*-a0&N&YG{{&4#X^swC&PhAcvm19jzta9?r}=F&XG-~xIi;mZq1ZXxQ9OH-rL)PXXj?ea4v_UK=hl%eSN^(+Y_al| z)^54-b|0}@Ij=o)v2wv-rQW8V^D6(!w$YrSWjRhIIm&0*MmA`-+gZJNyZ|q(70S1W z>6Gzu9HuGbF=EBxu&8Eec@C*|%~q-NTBy8G&2J=|qdM!!=BfogvM#l-lB`pmUq-e@ zEz;sERaXPCTXk!;MlIIzuTo2vQF*yqx;%YfnbzY4sz)21GS#cK<5DZMc$Zq4?q{`1 z>lc^0U?tt>Qmb`;jqb12?Ls}SUbjBIyit#D(#w~2rSoV`_pjR0pXOy+zm}`Z*QB{s z_pi|XSLwD*k6WeNtM&2@J-$mXzh=;p-f?~Ud*OSV*`9r##)g{>>?`HaLm%xr=(J3m zo-2RLcBcEpBljP1Jl;0j^BHZK<(Vx8> Date: Thu, 4 Sep 2025 15:03:38 -0400 Subject: [PATCH 20/52] Add binaries and other ignored files that were in tree back --- .../WebApp3/Properties/launchSettings.json | 29 ++++++++++++++++++ .../TestBinaries/HelloWorld.pdb | Bin 0 -> 11776 bytes .../dir1/System.Threading.Thread.pdb | Bin 0 -> 5560 bytes .../dir2/System.Threading.Thread.pdb | Bin 0 -> 5560 bytes 4 files changed, 29 insertions(+) create mode 100644 src/tests/Debuggees/WebApp3/Properties/launchSettings.json create mode 100644 src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdb create mode 100644 src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb create mode 100644 src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.pdb diff --git a/src/tests/Debuggees/WebApp3/Properties/launchSettings.json b/src/tests/Debuggees/WebApp3/Properties/launchSettings.json new file mode 100644 index 0000000000..c8d7225000 --- /dev/null +++ b/src/tests/Debuggees/WebApp3/Properties/launchSettings.json @@ -0,0 +1,29 @@ +{ + "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/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdb b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdb new file mode 100644 index 0000000000000000000000000000000000000000..adea403b4e92a74506a22217eae5b8a63ff65c54 GIT binary patch literal 11776 zcmeHNU2GIp6h5=m((NB?tyLD&3x_;-*j0{cPu7J*U0)0bCuuW+q;Rh zvTpy0eF{>aS^wslPk(rN>}>6=f#=`r%=j5u#~h>|_ddQjDX5m=6@tK0{h#N<;P}sR zc4x6%AudWY>mVTOzYaJ}pqf9tcj(gUE3wn#G`IVs$cJBMcb)n5mv3XIhunC_2PY?E zr7N)uTZrb{MlW3Nd#HBcleM`w{<21kuWvup>tVFZ_^S8giyPvTKYbT@|KhEMxu5@j zy9wY6jf*(u5#-CzI3^vbi@?H-g&Vw(JIA?-PvxtQW;=P)DwInFV>&-&6{|CvS#k2O z>Q1#_s7|FirCaK@RC-5#k8QoA6`|Xy8HTmbvW=-=5b7g#VJ1;@8ZP-|zvMEPd{mSi z2tw_b%rA-U{R ze_nnq@9DXoxPCOSq~(DC_n!o9iLo_*cqRqs0Mu(MCyREGE9fS|eY7gZ_nim(d0F31 z8)GkwA9pI+4E5g*Co+~{V4Tn`(@8w1nVPK^sVATx)6G|K`yFW$+OZ0!#RK^!%C=UR z(#<1@iGnlj;MuLTjaphR5B+xOv;E(Xp5GLWd~x>NA-*q1!_X16z%aIzkGI&?`-E(z zTaYO*lY*b`2g{8jm8g?wmi_92jKVu+#;6S}@bJPa1 zW2i#z1kgv12GUYbq?pnn1jilfL+O}wN+Q4rsF?G)Z!bmu+JM(PZOF%Sb(784?0TrF z-us`E@H~md`Shq+vM6a5W;BPAj$KTau@2Yl!-iFyb`wgvp*hJ0&kq{gH86h%asq~n??Dj03Z4aXTi6U9gKjGTeil52IG?lifVtP*59Z#;y%6n4 m^vEbA?;E&1@pHJx@;-A7Skm%9pm%wgA+3-INCfTy0{;LU46FA5 literal 0 HcmV?d00001 diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb new file mode 100644 index 0000000000000000000000000000000000000000..57e63f5abf60529385502bcbdee1984d51241520 GIT binary patch literal 5560 zcmZvg32+nF8OPtQPT!L8fhF6LeBc8kA7Fz4Lws@C@gdGM4UuI9L}ba9WU$D!i<1IP zCk4`w0j3m^PK}Fm&~}=Vw4G!^kE96+p}E>gI?S|bl7>k;Lo+#MlK#KdI(@vb%-^4W z@B8+>Z{M|V>F}-VkeI~i%7ps6I^4S&y$xCcGqF+p*pR_k`Q412hwTBE`x3EGWP6-q zY`DoyWve%??SgFp=cR!=!qFjcS3YA2^7juDYM0Dddg@m_W1mY4S;2W`L4gYGgU}4i zh6a(>HYT$-Vc&!Op(L>;mk&u*WSDJ7baAAFUF5%PJ#UfzCibgU;bj z3+`Ga8Q4YWE$DC1d(ai=D)a>;%LbMP*<>RNLWiNF&`D?tdR#WKub|%=Ozd6AYBaHG zXb>8K_CqJ2C!k+L7ofjFSD^nwvdP5Kpl8_1=fDS=N zp;OQ_bQU@XJqNu2U4-6-E<+zcpFmbK+JYLPR;V3X3k^V9AwLv?#-JpmLI2he|@&mhTSVrh^aDuO&v4b%v=LhaC6XaL#@`JoUr1|=cY zVrDNvZ$j@v|3KMC&{fE0MPESy=sxIS=touy`wU9QjJx)dm;qy-n%8-7$sE&MGjMDL z8#$)QX~MtR`yF62#}(IM3;Zj%{e)j*MpW zqvy}%nDU(?a3054uPmQqiZ9@}09=SwJ6k`k-MJhu1Q&6<2JGON{7#O^U(B)lI$Q!j zjWAsvNaRxZjk>=Wevw`9(+JZ=^TW+CjhBbxEN~gedI7!!gxg%Q3~z7r0K~1sv1;UXJPhdXCB8z%lt7Ii}}n5_qA&iv(^KxP@ct^~C}& z5x7<0r5scLE#sKx^KyaP1YRNVN{(s$-@q}|*Um9*E*%`xdg|nu=2sWTwb$Wp_|5u! zqyAha@M@0f`PK-$mSehq9mkaKdX8!QdIav}n8y1?f%`b7_WL=e`Ug0s`Ug2CzmH?O ze*?!9zma2Ve-p=a|7L-=2)tF`n*{!rz&8v0ZGmqQc$>ht3hWnnNZFN)^Do9Rjc1%=icfI$QT#Z^<=5d| z@LTlt;e}u1-SDUB{x;xa7@p4C!TLM zp5AYFaZK}(r@E|0tPLT)S11sSnj( zvn6sS&8nEps$~P6H#f=bCgc1pmT$y|Oo2IR7z#xU(V?A1n?sS|=#h!;|8n~8hu+x#pw>$kt(SbxIYeEhn(6as##f=4ja8c2RI8cZ2F>&>)Qs2ClJ@nG z=h7o%3dV!OzJxz;J32RKwsSGUdkgn^+^#LhAMCC>`RPcgzv{>j{`JKBAHMjGb@>kV z_%T;oRsN@!X~QU@LB=8|7J3vt8S;lid;Ez|G-8nUj#0|B_AD~R1)9lpYNo`UMYE;2 zGRwePjn)i&K_oHqa#BzBo0*+=uRnR}O7hvauAI61yC-g~Jh-jxwDaZ18b2AiN7e<%_h?w$w+#;MXGJ;n!)g%U|`KfcWa zp;3Q0SDLg*leN-hw=}s$njDcP54n)Oy9DXy8m$IaPo1*DoGfHHMp_ecvIhR9nrr;| z#-x#jj8+@#F(>DK9Z5AUXuT$Ky;#%A?rZ%2uW2h^6V@;*+>8;MOG#wY>MS(U-Yq9J zm;V~q0wZn1ax&k5GxUhvOk03~tutEfSTac(9>+wMmG#l1NyahSBny?jh%1xv4MeaH zP_FMADfdB?RLr^`0#xd5+IHQ_2|I;(lt=7ZQdHN`)?EhW^V0&CG0}!VW5QD357(_9|zyhh>AU_9@Tl_79qsl$RD!oTR+ml(H9eensOF<>C!gK2LeApR7l@w4Q94^5+#~iTT*dkMhr~G@3KCEXSxMTlqN4$OddS8>=&q72t)nRQU=q zoibjILo{XFMyxm-7S(hu&q39u*-CXz3zZkDc@1Q<)%-fLIckBItV1oVAe*nwb&;)B zi?sL()lpCERGpfwR*SX#E7g+4R9>c*E=k?z(t5l=b!)@pQaxHb4z*m1cc>MqepV~B zesQStmeYL>wMzF_>;4+u&e!AWbnDg28}#@ly?jwuDv#z=|Eev0DPFAgYni%aZHilU z|5Dw*Ot)=%+zQ>^pqF>(@m+fPssVdy$Mx#(g>P(T`wqAp>Tfl$&y^#`-rw_3zGcev zOxf#c7rIYB^1xC1<83pmKc+3SEThGMy+Paev$SoqHoKQ-flceuR&~JcG%>bX-Gqgq zEjI1d)Miea*)1}ghu9i*2)|T}Ds}@mj#_}wn zspORL9|@VpB%07-F||B6KliG4&c-^0+VtsYSMReMn3vYMo%VGa{e#-9Emt3cMVK?y zMcosD;3#dC-Mg?ax5u`}ztLIyXWXXgSHF0@DWm%3Z0EkGzxSInS38fqGJVg7e|c(h zN6+zc`*zw|>gb(hqk{)(r%sxaN9!QAWZ92*MwYKX8*(-O`;C{@)XY3}Gm6>f!bdU= r;9W+iz*dM(ZzL5Of~Y(KRYLU5KqtN;$ODltbrPgAV(LCBBN6`(x_+%f literal 0 HcmV?d00001 diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.pdb b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.pdb new file mode 100644 index 0000000000000000000000000000000000000000..2fe974307b62a0632c85f6aba2d4f60a1b30d984 GIT binary patch literal 5560 zcmZvg3vg7`8OP7P`_6MWWD~NR$8H|vLD+;q0zm@iWdsuQSe{nJ&1Qww&2F;0fh@l6 zC0d|%ENFp2rxbLiAtk=rjumY?I?{(P6sfN|*kPu%YGs_xP{+rN_W#|zv4~+f?4(6zf3ZsJU8{^}1v&}+3Oa>5 zEx79%$-vG+??QivK7=kpm!Pj9SvD{mWS5OB1U fsR4b(Bra+eGC1;U}7IYR-=j4 zKts?dv==%GJpug=Is?5AU4;G%$tDxafbt+0R1Gyi%b?XzFSH&CKw)ScN|xH zfsR8n&{NPU=mqE{=q&UebOHJp`W&*F(H68AYK7XNHP9fm1qwi6XdFsGDzpze03Csj zLo?7*&?)Ez=q2bZ^d58p`WX5T^d%%&Ow0y3pd!c%)k2G*R;V3X0}Vo3pa2wx#-S9X zTFmTK=pE<-=$|P26uJc2t>`N#2;B=EhJJ3furHwu%(%-hi5W2V>3N+Gm&`HEH3P?1 zu#sb$oF@F6yWa&ib6j}^w!lv_k1jK0<(Sr$P2dcHGX>5PI9uQxfpZ16b8JWZ4rDZ! zA3c8_$CU3pf%7@WdSy5&Y5x9qAdcJD~Uc)inzm{XlcOAzxe!T+saZKZVoxuGZQ~LuPQ~iS+Q~g66li$xV z-M^k=ir>I7wZD;Lx_^_vn+4t?@bv=!K;Rn$zER+t1l}s}%>oAm9u_#rG0mqDfkOh{ zBJehWw+kE=_*Q{$6F4I9sK8NyV*-!i1U5HcY5c}Hrui4=n8q`~F~ujj`Y3*aLS7ogCBrr7Kta+s*w=zhCOL63UA98HQHVzv-_*D@o@}o@u;A$*z`+n!R79)kH1e zL~Ed(h)yRGJ7=LRDKlKbiFiB|O|IV_4+Tb8Jd}t{#Dk&qDV;?FqoMUNe*;x&q07KZ$!NC0{U+b%SIyXW8?LN{X6SdY+3ee(|2YFJ9HS?1!f&cbOh-{^+6U zl{KHB z96$#$b7yRHG!`}ahmb_hToTI5Ma{}tPsgv%PkE2s_iXd6(}uyw1FL`XO4G%@Tw7_& zlh@@NP9Hf!mG7j)J(}tq z*x(xqMM8l@C?gt5(hvm3#`5&1P{-7yI$5GVfG0WX{p8MDrf22E`0O_ZZ;S0W!*6~% zv-Z-+>2GHKap3K}4{E(+(R#`6o=4PGs+oSTX8e_!*-)*SjdhyoYt&5t63zH5Ew=B5 zJdYk3Q!o)4@h1bp+t9hWbDfJ3-d(uc>nYp(@Ppm;$G#X14^$ue>A#=&=#!VvTUTyp zk3Uq_R_*-a0&N&YG{{&4#X^swC&PhAcvm19jzta9?r}=F&XG-~xIi;mZq1ZXxQ9OH-rL)PXXj?ea4v_UK=hl%eSN^(+Y_al| z)^54-b|0}@Ij=o)v2wv-rQW8V^D6(!w$YrSWjRhIIm&0*MmA`-+gZJNyZ|q(70S1W z>6Gzu9HuGbF=EBxu&8Eec@C*|%~q-NTBy8G&2J=|qdM!!=BfogvM#l-lB`pmUq-e@ zEz;sERaXPCTXk!;MlIIzuTo2vQF*yqx;%YfnbzY4sz)21GS#cK<5DZMc$Zq4?q{`1 z>lc^0U?tt>Qmb`;jqb12?Ls}SUbjBIyit#D(#w~2rSoV`_pjR0pXOy+zm}`Z*QB{s z_pi|XSLwD*k6WeNtM&2@J-$mXzh=;p-f?~Ud*OSV*`9r##)g{>>?`HaLm%xr=(J3m zo-2RLcBcEpBljP1Jl;0j^BHZK<(Vx8> Date: Thu, 4 Sep 2025 15:55:23 -0400 Subject: [PATCH 21/52] Correct lldbplugin.tests location --- src/tests/SOS.UnitTests/SOS.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/SOS.UnitTests/SOS.cs b/src/tests/SOS.UnitTests/SOS.cs index 47e8a2f129..5556e7ea1b 100644 --- a/src/tests/SOS.UnitTests/SOS.cs +++ b/src/tests/SOS.UnitTests/SOS.cs @@ -589,7 +589,7 @@ public async Task LLDBPluginTests(TestConfiguration config) string repoRootDir = TestConfiguration.MakeCanonicalPath(config.AllSettings["RepoRootDir"]); // Get test python script path - string scriptDir = Path.Combine(repoRootDir, "tests", "lldbplugin.tests"); + string scriptDir = Path.Combine(repoRootDir, "src", "tests", "lldbplugin.tests"); arguments.Append(Path.Combine(scriptDir, "test_libsosplugin.py")); arguments.Append(' '); From ac4805a48e971b97e14765bc5fd32ad6e936cf41 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Mon, 29 Sep 2025 16:44:33 -0400 Subject: [PATCH 22/52] Revert changes intended for running tests standalone --- .../Unix/Debugger.Tests.Config.txt | 6 ++--- .../Windows/Debugger.Tests.Config.txt | 10 ++++----- .../DbgShim.UnitTests.csproj | 22 +++++++------------ .../TestConfiguration.cs | 2 +- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt index 7f4ca390eb..d15f246aa9 100644 --- a/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -1,10 +1,10 @@ - $(TestDotNetRoot) - + $(RepoRootDir)/.dotnet-test + $(RepoRootDir)/artifacts - $(TestNativeDir) + $(RootBinDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration) $(RootBinDir)/TestResults/$(TargetConfiguration)/dbgshim.unittests_$(Timestamp) ProjectK diff --git a/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt index 6becd1ba5e..fce2bfa31f 100644 --- a/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -1,15 +1,13 @@ - $(TestDotNetRoot) - - + $(RepoRootDir)\.dotnet-test + $(RepoRootDir)\.dotnet-test\x86 + $(RepoRootDir)\artifacts - $(TestNativeDir) - $(RootBinDir)\TestResults\$(TargetConfiguration)\dbgshim.unittests_$(Timestamp) + $(RootBinDir)\bin\Windows_NT.$(TargetArchitecture).$(TargetConfiguration) ProjectK $(RepoRootDir)\src\tests\Debuggees - $(RepoRootDir)\eng\AuxMsbuildFiles cli SimpleDebuggee diff --git a/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj b/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj index b610ebdc4b..4860f62e70 100644 --- a/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj +++ b/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj @@ -35,14 +35,11 @@ $(Configuration) - $(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 + $(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 ]]> @@ -58,12 +55,9 @@ $(Configuration) - $(TestDotNetRootDir) - $(TestRepoRoot) - $(TestNativeDir) - $(TestVersionConfigDir) - $(TestPackageArtifactsRootDir)\testassets.linux.x64.6.0\$(TestAssetsVersion)\content - $(TestPackageArtifactsRootDir)\testassets.linux.arm64.6.0\$(TestAssetsVersion)\content + $(RepoRoot) + $(NuGetPackageRoot)testassets.linux.x64.6.0/$(TestAssetsVersion)/content + $(NuGetPackageRoot)testassets.linux.arm64.6.0/$(TestAssetsVersion)/content ]]> diff --git a/src/tests/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs index 1d07780404..d6eb58c62d 100644 --- a/src/tests/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs +++ b/src/tests/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs @@ -825,7 +825,7 @@ public string DotNetRoot get { string dotnetRoot = GetValue("DotNetRoot"); - return (!string.IsNullOrEmpty(dotnetRoot)) ? MakeCanonicalPath(dotnetRoot) : MakeCanonicalPath(Environment.GetEnvironmentVariable("DOTNET_ROOT")); + return MakeCanonicalPath(dotnetRoot); } } From cd7353b31174199029f36a9568ade55849dfcd9b Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Tue, 30 Sep 2025 07:56:34 -0400 Subject: [PATCH 23/52] Rename .UnitTests to .Tests --- diagnostics.sln | 24 +++++++++--------- documentation/privatebuildtesting.md | 2 +- eng/testassets/writexml.cmd | 2 +- eng/testassets/writexml_x86.cmd | 2 +- eng/testsos.cmd | 2 +- eng/testsos.sh | 2 +- eng/testsoscdac.cmd | 2 +- eng/testsoscdac.sh | 2 +- ...ft.Diagnostics.Monitoring.EventPipe.csproj | 8 +++--- .../Microsoft.Diagnostics.Monitoring.csproj | 8 +++--- ...icrosoft.Diagnostics.NETCore.Client.csproj | 2 +- .../dotnet-counters/dotnet-counters.csproj | 2 +- src/Tools/dotnet-stack/dotnet-stack.csproj | 2 +- src/Tools/dotnet-trace/dotnet-trace.csproj | 2 +- .../Unix/Debugger.Tests.Config.txt | 2 +- .../Windows/Debugger.Tests.Config.txt | 2 +- .../Unix/Debugger.Tests.Config.txt | 2 +- .../Windows/Debugger.Tests.Config.txt | 0 .../DbgShim.Tests.csproj} | 0 .../DbgShimAPI.cs | 0 .../DbgShimTests.cs | 2 +- .../DebuggeeInfo.cs | 0 .../ICLRDebugging.cs | 0 .../ICorDebug.cs | 0 .../ICorDebugController.cs | 0 .../LibraryProviderWrapper.cs | 0 .../ManagedCallbackWrapper.cs | 0 .../EventPipeTracee/CustomMetrics.cs | 2 +- .../EventPipeTracee/EventPipeTracee.csproj | 2 +- src/tests/Directory.Build.props | 2 +- .../CSVExporterTests.cs | 2 +- .../ConsoleExporterTests.cs | 2 +- .../CounterMonitorPayloadTests.cs | 4 +-- .../CounterMonitorTests.cs | 2 +- .../DotnetCounters.Tests.csproj} | 0 .../JSONExporterTests.cs | 2 +- .../MockConsole.cs | 2 +- .../TestConstants.cs | 2 +- .../DotnetStack.Tests.csproj} | 0 .../StackTests.cs | 0 .../CLRProviderParsing.cs | 0 .../ChildProcessTests.cs | 0 .../DotnetTrace.Tests.csproj} | 0 .../ProfileProviderMerging.cs | 0 .../ProviderParsing.cs | 0 .../ContentionEvents.cs | 4 +-- .../CustomEvents.cs | 4 +-- .../EventPipe.Tests.csproj} | 0 .../GCEvents.cs | 4 +-- .../LoaderEvents.cs | 4 +-- .../MethodEvents.cs | 4 +-- .../README.md | 0 .../ThreadPoolEvents.cs | 4 +-- .../common/IpcTraceTest.cs | 2 +- .../common/RemoteTestExecutorHelper.cs | 2 +- .../common/StreamProxy.cs | 2 +- .../providers.cs | 4 +-- .../ClrmaTests.cs | 2 +- .../CommandServiceTests.cs | 2 +- .../Unix/Debugger.Tests.Config.txt | 0 .../Windows/Debugger.Tests.Config.txt | 0 .../DebugServicesTests.cs | 2 +- ...ft.Diagnostics.DebugServices.Tests.csproj} | 0 .../RunTests.cs | 2 +- .../ServiceEventTests.cs | 2 +- .../SymbolServiceTests.cs | 2 +- .../TestCommands.cs | 2 +- .../TestDbgEng.cs | 2 +- .../WriteTestData.cs | 2 +- .../AspNetTriggerUnitTests.cs | 2 +- .../DistributedTracesPipelineUnitTests.cs | 2 +- .../EventCounterConstants.cs | 2 +- .../EventCounterPipelineUnitTests.cs | 2 +- .../EventCounterTriggerTests.cs | 2 +- .../EventLogsPipelineUnitTests.cs | 2 +- .../EventTracePipelineUnitTests.cs | 2 +- .../GlobMatcherTests.cs | 2 +- .../LogsPipelineUnitTests.cs | 2 +- ...nostics.Monitoring.EventPipe.Tests.csproj} | 0 .../PipelineTestUtilities.cs | 2 +- .../SlidingWindowTests.cs | 2 +- .../TestStreamingLogger.cs | 2 +- ...osoft.Diagnostics.Monitoring.Tests.csproj} | 0 .../PipelineTests.cs | 2 +- .../DiagnosticsClientApiShim.cs | 0 .../DiagnosticsClientApiShimExtensions.cs | 0 .../EventPipeProviderTests.cs | 0 .../EventPipeSessionTests.cs | 0 .../GetProcessEnvironmentTests.cs | 0 .../GetProcessInfoTests.cs | 0 .../GetPublishedProcessesTests.cs | 0 .../HandleableCollectionTests.cs | 0 ...t.Diagnostics.NETCore.Client.Tests.csproj} | 0 .../PerfMapTests.cs | 0 .../ReversedServerTests.cs | 0 .../AddressSpace.cs | 0 .../ELF/Tests.cs | 0 .../Layouts.cs | 0 .../MachO/Tests.cs | 0 .../Microsoft.FileFormats.Tests.csproj} | 0 .../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.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 .../TestBinaries/HelloWorld.pdb | Bin 11776 -> 0 bytes .../KeyGeneratorTests.cs | 0 .../Microsoft.SymbolStore.Tests.csproj} | 24 +++++++++--------- .../PEFileKeyGenerationTests.cs | 0 .../SymbolStoreTests.cs | 0 .../StackTraceSymbols.CoreCLR.cs.gz | Bin .../TestBinaries/coreclr.dll.gz | Bin .../dir1/System.Threading.Thread.dll | Bin .../dir2/System.Threading.Thread.dll | 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 .../Tracer.cs | 0 .../dir1/System.Threading.Thread.pdb | Bin 5560 -> 0 bytes .../dir2/System.Threading.Thread.pdb | Bin 5560 -> 0 bytes .../Unix/Debugger.Tests.Config.txt | 4 +-- .../Windows/Debugger.Tests.Config.txt | 4 +-- .../DumpGenerationFixture.cs | 0 .../SOS.Tests.csproj} | 0 src/tests/{SOS.UnitTests => SOS.Tests}/SOS.cs | 0 .../{SOS.UnitTests => SOS.Tests}/SOSRunner.cs | 0 .../Scripts/ClrStackWithNumberOfFrames.script | 0 .../Scripts/ConcurrentDictionaries.script | 0 .../Scripts/DivZero.script | 0 .../Scripts/DualRuntimes.script | 0 .../Scripts/DumpGen.script | 0 .../Scripts/DynamicMethod.script | 0 .../Scripts/GCPOH.script | 0 .../Scripts/GCTests.script | 0 .../Scripts/LineNums.script | 0 .../Scripts/NestedExceptionTest.script | 0 .../Scripts/OtherCommands.script | 0 .../Scripts/Overflow.script | 0 .../Scripts/Reflection.script | 0 .../Scripts/SimpleThrow.script | 0 .../Scripts/StackAndOtherTests.script | 0 .../Scripts/StackTests.script | 0 .../StackTraceFaultingExceptionFrame.script | 0 .../StackTraceSoftwareExceptionFrame.script | 0 .../Scripts/TaskNestedException.script | 0 .../Scripts/TestExtensions.script | 0 .../Scripts/WebApp.script | 0 .../Scripts/lldbhelper.py | 0 src/tests/Test.proj | 24 +++++++++--------- 172 files changed, 113 insertions(+), 113 deletions(-) rename src/tests/{DbgShim.UnitTests => DbgShim.Tests}/ConfigFiles/Unix/Debugger.Tests.Config.txt (99%) rename src/tests/{DbgShim.UnitTests => DbgShim.Tests}/ConfigFiles/Windows/Debugger.Tests.Config.txt (100%) rename src/tests/{DbgShim.UnitTests/DbgShim.UnitTests.csproj => DbgShim.Tests/DbgShim.Tests.csproj} (100%) rename src/tests/{DbgShim.UnitTests => DbgShim.Tests}/DbgShimAPI.cs (100%) rename src/tests/{DbgShim.UnitTests => DbgShim.Tests}/DbgShimTests.cs (99%) rename src/tests/{DbgShim.UnitTests => DbgShim.Tests}/DebuggeeInfo.cs (100%) rename src/tests/{DbgShim.UnitTests => DbgShim.Tests}/ICLRDebugging.cs (100%) rename src/tests/{DbgShim.UnitTests => DbgShim.Tests}/ICorDebug.cs (100%) rename src/tests/{DbgShim.UnitTests => DbgShim.Tests}/ICorDebugController.cs (100%) rename src/tests/{DbgShim.UnitTests => DbgShim.Tests}/LibraryProviderWrapper.cs (100%) rename src/tests/{DbgShim.UnitTests => DbgShim.Tests}/ManagedCallbackWrapper.cs (100%) rename src/tests/{DotnetCounters.UnitTests => DotnetCounters.Tests}/CSVExporterTests.cs (99%) rename src/tests/{DotnetCounters.UnitTests => DotnetCounters.Tests}/ConsoleExporterTests.cs (99%) rename src/tests/{DotnetCounters.UnitTests => DotnetCounters.Tests}/CounterMonitorPayloadTests.cs (99%) rename src/tests/{DotnetCounters.UnitTests => DotnetCounters.Tests}/CounterMonitorTests.cs (99%) rename src/tests/{DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj => DotnetCounters.Tests/DotnetCounters.Tests.csproj} (100%) rename src/tests/{DotnetCounters.UnitTests => DotnetCounters.Tests}/JSONExporterTests.cs (99%) rename src/tests/{DotnetCounters.UnitTests => DotnetCounters.Tests}/MockConsole.cs (99%) rename src/tests/{DotnetCounters.UnitTests => DotnetCounters.Tests}/TestConstants.cs (97%) rename src/tests/{DotnetStack.UnitTests/DotnetStack.UnitTests.csproj => DotnetStack.Tests/DotnetStack.Tests.csproj} (100%) rename src/tests/{DotnetStack.UnitTests => DotnetStack.Tests}/StackTests.cs (100%) rename src/tests/{DotnetTrace.UnitTests => DotnetTrace.Tests}/CLRProviderParsing.cs (100%) rename src/tests/{DotnetTrace.UnitTests => DotnetTrace.Tests}/ChildProcessTests.cs (100%) rename src/tests/{DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj => DotnetTrace.Tests/DotnetTrace.Tests.csproj} (100%) rename src/tests/{DotnetTrace.UnitTests => DotnetTrace.Tests}/ProfileProviderMerging.cs (100%) rename src/tests/{DotnetTrace.UnitTests => DotnetTrace.Tests}/ProviderParsing.cs (100%) rename src/tests/{EventPipe.UnitTests => EventPipe.Tests}/ContentionEvents.cs (97%) rename src/tests/{EventPipe.UnitTests => EventPipe.Tests}/CustomEvents.cs (95%) rename src/tests/{EventPipe.UnitTests/EventPipe.UnitTests.csproj => EventPipe.Tests/EventPipe.Tests.csproj} (100%) rename src/tests/{EventPipe.UnitTests => EventPipe.Tests}/GCEvents.cs (99%) rename src/tests/{EventPipe.UnitTests => EventPipe.Tests}/LoaderEvents.cs (98%) rename src/tests/{EventPipe.UnitTests => EventPipe.Tests}/MethodEvents.cs (98%) rename src/tests/{EventPipe.UnitTests => EventPipe.Tests}/README.md (100%) rename src/tests/{EventPipe.UnitTests => EventPipe.Tests}/ThreadPoolEvents.cs (97%) rename src/tests/{EventPipe.UnitTests => EventPipe.Tests}/common/IpcTraceTest.cs (99%) rename src/tests/{EventPipe.UnitTests => EventPipe.Tests}/common/RemoteTestExecutorHelper.cs (97%) rename src/tests/{EventPipe.UnitTests => EventPipe.Tests}/common/StreamProxy.cs (99%) rename src/tests/{EventPipe.UnitTests => EventPipe.Tests}/providers.cs (96%) rename src/tests/{Microsoft.Diagnostics.DebugServices.UnitTests => Microsoft.Diagnostics.DebugServices.Tests}/ClrmaTests.cs (99%) rename src/tests/{Microsoft.Diagnostics.DebugServices.UnitTests => Microsoft.Diagnostics.DebugServices.Tests}/CommandServiceTests.cs (98%) rename src/tests/{Microsoft.Diagnostics.DebugServices.UnitTests => Microsoft.Diagnostics.DebugServices.Tests}/ConfigFiles/Unix/Debugger.Tests.Config.txt (100%) rename src/tests/{Microsoft.Diagnostics.DebugServices.UnitTests => Microsoft.Diagnostics.DebugServices.Tests}/ConfigFiles/Windows/Debugger.Tests.Config.txt (100%) rename src/tests/{Microsoft.Diagnostics.DebugServices.UnitTests => Microsoft.Diagnostics.DebugServices.Tests}/DebugServicesTests.cs (99%) rename src/tests/{Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj => Microsoft.Diagnostics.DebugServices.Tests/Microsoft.Diagnostics.DebugServices.Tests.csproj} (100%) rename src/tests/{Microsoft.Diagnostics.DebugServices.UnitTests => Microsoft.Diagnostics.DebugServices.Tests}/RunTests.cs (99%) rename src/tests/{Microsoft.Diagnostics.DebugServices.UnitTests => Microsoft.Diagnostics.DebugServices.Tests}/ServiceEventTests.cs (98%) rename src/tests/{Microsoft.Diagnostics.DebugServices.UnitTests => Microsoft.Diagnostics.DebugServices.Tests}/SymbolServiceTests.cs (99%) rename src/tests/{Microsoft.Diagnostics.DebugServices.UnitTests => Microsoft.Diagnostics.DebugServices.Tests}/TestCommands.cs (97%) rename src/tests/{Microsoft.Diagnostics.DebugServices.UnitTests => Microsoft.Diagnostics.DebugServices.Tests}/TestDbgEng.cs (99%) rename src/tests/{Microsoft.Diagnostics.DebugServices.UnitTests => Microsoft.Diagnostics.DebugServices.Tests}/WriteTestData.cs (94%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests => Microsoft.Diagnostics.Monitoring.EventPipe.Tests}/AspNetTriggerUnitTests.cs (99%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests => Microsoft.Diagnostics.Monitoring.EventPipe.Tests}/DistributedTracesPipelineUnitTests.cs (98%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests => Microsoft.Diagnostics.Monitoring.EventPipe.Tests}/EventCounterConstants.cs (89%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests => Microsoft.Diagnostics.Monitoring.EventPipe.Tests}/EventCounterPipelineUnitTests.cs (99%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests => Microsoft.Diagnostics.Monitoring.EventPipe.Tests}/EventCounterTriggerTests.cs (99%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests => Microsoft.Diagnostics.Monitoring.EventPipe.Tests}/EventLogsPipelineUnitTests.cs (99%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests => Microsoft.Diagnostics.Monitoring.EventPipe.Tests}/EventTracePipelineUnitTests.cs (98%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests => Microsoft.Diagnostics.Monitoring.EventPipe.Tests}/GlobMatcherTests.cs (97%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests => Microsoft.Diagnostics.Monitoring.EventPipe.Tests}/LogsPipelineUnitTests.cs (98%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj => Microsoft.Diagnostics.Monitoring.EventPipe.Tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests.csproj} (100%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests => Microsoft.Diagnostics.Monitoring.EventPipe.Tests}/PipelineTestUtilities.cs (98%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests => Microsoft.Diagnostics.Monitoring.EventPipe.Tests}/SlidingWindowTests.cs (95%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests => Microsoft.Diagnostics.Monitoring.EventPipe.Tests}/TestStreamingLogger.cs (98%) rename src/tests/{Microsoft.Diagnostics.Monitoring.UnitTests/Microsoft.Diagnostics.Monitoring.UnitTests.csproj => Microsoft.Diagnostics.Monitoring.Tests/Microsoft.Diagnostics.Monitoring.Tests.csproj} (100%) rename src/tests/{Microsoft.Diagnostics.Monitoring.UnitTests => Microsoft.Diagnostics.Monitoring.Tests}/PipelineTests.cs (98%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.UnitTests => Microsoft.Diagnostics.NETCore.Client.Tests}/DiagnosticsClientApiShim.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.UnitTests => Microsoft.Diagnostics.NETCore.Client.Tests}/DiagnosticsClientApiShimExtensions.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.UnitTests => Microsoft.Diagnostics.NETCore.Client.Tests}/EventPipeProviderTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.UnitTests => Microsoft.Diagnostics.NETCore.Client.Tests}/EventPipeSessionTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.UnitTests => Microsoft.Diagnostics.NETCore.Client.Tests}/GetProcessEnvironmentTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.UnitTests => Microsoft.Diagnostics.NETCore.Client.Tests}/GetProcessInfoTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.UnitTests => Microsoft.Diagnostics.NETCore.Client.Tests}/GetPublishedProcessesTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.UnitTests => Microsoft.Diagnostics.NETCore.Client.Tests}/HandleableCollectionTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.UnitTests/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj => Microsoft.Diagnostics.NETCore.Client.Tests/Microsoft.Diagnostics.NETCore.Client.Tests.csproj} (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.UnitTests => Microsoft.Diagnostics.NETCore.Client.Tests}/PerfMapTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.UnitTests => Microsoft.Diagnostics.NETCore.Client.Tests}/ReversedServerTests.cs (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/AddressSpace.cs (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/ELF/Tests.cs (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/Layouts.cs (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/MachO/Tests.cs (100%) rename src/tests/{Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj => Microsoft.FileFormats.Tests/Microsoft.FileFormats.Tests.csproj} (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/Minidump/Tests.cs (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/PDB/Tests.cs (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/PE/Tests.cs (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/PerfMap/Tests.cs (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/PrimitiveTypes.cs (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/TestBinaries/HelloWorld.exe (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/TestBinaries/HelloWorld.pdz (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.ni.r2rmap (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/TestBinaries/System.Diagnostics.StackTrace.dll (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/TestBinaries/apphost.gz (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/TestBinaries/core.gz (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/TestBinaries/ilasm.dbg (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/TestBinaries/libclrjit.dylib.dwarf.gz (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/TestBinaries/libcoreclr.dylib.gz (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/TestBinaries/libcoreclr.so.gz (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/TestBinaries/minidump_x64.dmp.gz (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/TestBinaries/minidump_x86.dmp.gz (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/TestBinaries/renamed_build_id_section (100%) rename src/tests/{Microsoft.FileFormats.UnitTests => Microsoft.FileFormats.Tests}/TestBinaries/triagedump.gz (100%) delete mode 100644 src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdb rename src/tests/{Microsoft.SymbolStore.UnitTests => Microsoft.SymbolStore.Tests}/KeyGeneratorTests.cs (100%) rename src/tests/{Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj => Microsoft.SymbolStore.Tests/Microsoft.SymbolStore.Tests.csproj} (80%) rename src/tests/{Microsoft.SymbolStore.UnitTests => Microsoft.SymbolStore.Tests}/PEFileKeyGenerationTests.cs (100%) rename src/tests/{Microsoft.SymbolStore.UnitTests => Microsoft.SymbolStore.Tests}/SymbolStoreTests.cs (100%) rename src/tests/{Microsoft.SymbolStore.UnitTests => Microsoft.SymbolStore.Tests}/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz (100%) rename src/tests/{Microsoft.SymbolStore.UnitTests => Microsoft.SymbolStore.Tests}/TestBinaries/coreclr.dll.gz (100%) rename src/tests/{Microsoft.SymbolStore.UnitTests => Microsoft.SymbolStore.Tests}/TestBinaries/dir1/System.Threading.Thread.dll (100%) rename src/tests/{Microsoft.SymbolStore.UnitTests => Microsoft.SymbolStore.Tests}/TestBinaries/dir2/System.Threading.Thread.dll (100%) rename src/tests/{Microsoft.SymbolStore.UnitTests => Microsoft.SymbolStore.Tests}/TestBinaries/libSystem.Security.Cryptography.Native.Apple.dylib.gz (100%) rename src/tests/{Microsoft.SymbolStore.UnitTests => Microsoft.SymbolStore.Tests}/TestBinaries/md5_build_id (100%) rename src/tests/{Microsoft.SymbolStore.UnitTests => Microsoft.SymbolStore.Tests}/TestBinaries/mockclr_amd64.dll (100%) rename src/tests/{Microsoft.SymbolStore.UnitTests => Microsoft.SymbolStore.Tests}/TestBinaries/mockclr_arm64.dll (100%) rename src/tests/{Microsoft.SymbolStore.UnitTests => Microsoft.SymbolStore.Tests}/TestBinaries/mockclr_i386.dll (100%) rename src/tests/{Microsoft.SymbolStore.UnitTests => Microsoft.SymbolStore.Tests}/TestBinaries/mockdac.dll (100%) rename src/tests/{Microsoft.SymbolStore.UnitTests => Microsoft.SymbolStore.Tests}/TestBinaries/mockdbi.dll (100%) rename src/tests/{Microsoft.SymbolStore.UnitTests => Microsoft.SymbolStore.Tests}/TestBinaries/mocksos.dll (100%) rename src/tests/{Microsoft.SymbolStore.UnitTests => Microsoft.SymbolStore.Tests}/TestBinaries/stripped_executable (100%) rename src/tests/{Microsoft.SymbolStore.UnitTests => Microsoft.SymbolStore.Tests}/TestBinaries/symbolized_executable (100%) rename src/tests/{Microsoft.SymbolStore.UnitTests => Microsoft.SymbolStore.Tests}/Tracer.cs (100%) delete mode 100644 src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb delete mode 100644 src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.pdb rename src/tests/{SOS.UnitTests => SOS.Tests}/ConfigFiles/Unix/Debugger.Tests.Config.txt (98%) rename src/tests/{SOS.UnitTests => SOS.Tests}/ConfigFiles/Windows/Debugger.Tests.Config.txt (98%) rename src/tests/{SOS.UnitTests => SOS.Tests}/DumpGenerationFixture.cs (100%) rename src/tests/{SOS.UnitTests/SOS.UnitTests.csproj => SOS.Tests/SOS.Tests.csproj} (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/SOS.cs (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/SOSRunner.cs (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/ClrStackWithNumberOfFrames.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/ConcurrentDictionaries.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/DivZero.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/DualRuntimes.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/DumpGen.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/DynamicMethod.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/GCPOH.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/GCTests.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/LineNums.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/NestedExceptionTest.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/OtherCommands.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/Overflow.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/Reflection.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/SimpleThrow.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/StackAndOtherTests.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/StackTests.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/StackTraceFaultingExceptionFrame.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/StackTraceSoftwareExceptionFrame.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/TaskNestedException.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/TestExtensions.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/WebApp.script (100%) rename src/tests/{SOS.UnitTests => SOS.Tests}/Scripts/lldbhelper.py (100%) diff --git a/diagnostics.sln b/diagnostics.sln index ee9a69073b..40eec911f5 100644 --- a/diagnostics.sln +++ b/diagnostics.sln @@ -10,7 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SOS", "SOS", "{41638A4C-0DA src\SOS\CMakeLists.txt = src\SOS\CMakeLists.txt EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SOS.UnitTests", "src\tests\SOS.UnitTests\SOS.UnitTests.csproj", "{1532DB3C-7DCD-45C6-B697-62B8378A16A2}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SOS.Tests", "src\tests\SOS.Tests\SOS.Tests.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,17 +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\DotnetTrace.UnitTests\DotnetTrace.UnitTests.csproj", "{AEDCCF5B-5AD0-4D64-BF73-5CF468E07D22}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetTrace.Tests", "src\tests\DotnetTrace.Tests\DotnetTrace.Tests.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\DotnetCounters.UnitTests\DotnetCounters.UnitTests.csproj", "{E5A7DC6C-BF8D-418A-BCBD-094EB748FA82}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetCounters.Tests", "src\tests\DotnetCounters.Tests\DotnetCounters.Tests.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.UnitTests\Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj", "{6F4DD2F8-1C7B-4A87-B7E5-1BEE9F5AC128}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.NETCore.Client.Tests", "src\tests\Microsoft.Diagnostics.NETCore.Client.Tests\Microsoft.Diagnostics.NETCore.Client.Tests.csproj", "{6F4DD2F8-1C7B-4A87-B7E5-1BEE9F5AC128}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventPipe.UnitTests", "src\tests\EventPipe.UnitTests\EventPipe.UnitTests.csproj", "{CED9ABBA-861E-4C0A-9359-22351208EF27}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EventPipe.Tests", "src\tests\EventPipe.Tests\EventPipe.Tests.csproj", "{CED9ABBA-861E-4C0A-9359-22351208EF27}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{298AE119-6625-4604-BDE5-0765DC34C856}" ProjectSection(SolutionItems) = preProject @@ -190,11 +190,11 @@ 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", "tests\Microsoft.Diagnostics.Monitoring.UnitTests\Microsoft.Diagnostics.Monitoring.UnitTests.csproj", "{6419BA04-6F1A-4D2F-8DE4-5C359E0364A3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.Tests", "tests\Microsoft.Diagnostics.Monitoring.Tests\Microsoft.Diagnostics.Monitoring.Tests.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", "tests\Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests\Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj", "{A58B7F72-E9DF-4962-9E15-300EF4C53ABB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Monitoring.EventPipe.Tests", "tests\Microsoft.Diagnostics.Monitoring.EventPipe.Tests\Microsoft.Diagnostics.Monitoring.EventPipe.Tests.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 @@ -224,7 +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", "tests\Microsoft.Diagnostics.DebugServices.UnitTests\Microsoft.Diagnostics.DebugServices.UnitTests.csproj", "{064BC7DD-D44C-400E-9215-7546E092AB98}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.DebugServices.Tests", "tests\Microsoft.Diagnostics.DebugServices.Tests\Microsoft.Diagnostics.DebugServices.Tests.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 @@ -245,11 +245,11 @@ 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", "tests\DbgShim.UnitTests\DbgShim.UnitTests.csproj", "{DD60B7C4-BECC-4C7D-A53B-FCDD4C92B728}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DbgShim.Tests", "tests\DbgShim.Tests\DbgShim.Tests.csproj", "{DD60B7C4-BECC-4C7D-A53B-FCDD4C92B728}" EndProject 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", "tests\DotnetStack.UnitTests\DotnetStack.UnitTests.csproj", "{E8F133F8-4D20-475D-9D16-2BA236DAB65F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotnetStack.Tests", "tests\DotnetStack.Tests\DotnetStack.Tests.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 @@ -263,9 +263,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-symbol", "src\Tools\ EndProject 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", "tests\Microsoft.FileFormats.UnitTests\Microsoft.FileFormats.UnitTests.csproj", "{44F93947-8FD4-4946-8AE5-EF6D25970CC7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.FileFormats.Tests", "tests\Microsoft.FileFormats.Tests\Microsoft.FileFormats.Tests.csproj", "{44F93947-8FD4-4946-8AE5-EF6D25970CC7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SymbolStore.UnitTests", "tests\Microsoft.SymbolStore.UnitTests\Microsoft.SymbolStore.UnitTests.csproj", "{C2422836-BA25-4751-9060-7C7890085869}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.SymbolStore.Tests", "tests\Microsoft.SymbolStore.Tests\Microsoft.SymbolStore.Tests.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 diff --git a/documentation/privatebuildtesting.md b/documentation/privatebuildtesting.md index 1753392531..28aa5d3dc6 100644 --- a/documentation/privatebuildtesting.md +++ b/documentation/privatebuildtesting.md @@ -9,7 +9,7 @@ Here are some instructions on how to run the diagnostics repo's tests against a 4. On Windows 11 (this doesn't work on Windows 10), add the following DWORD registry key: `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\MiniDumpSettings\DisableAuxProviderSignatureCheck` and set it to 1. This allows the unsigned privately built DAC to be used to generate dumps. 5. Copy the private runtime binaries over the test SDK/runtimes installed in `.dotnet-test`. This step is hard to automate because there are usually 3 versions of the runtime installed: one as part of the .NET SDK, one as part of the AspNetCore runtime and one from latest runtime DARC update. 6. Run the diagnostics repo tests either: - a. `test.cmd` or `test.sh` - this runs all the diagnostics tests including SOS's. A html test report will be generated in `artifacts/TestResults/{Debug,Release}/SOS.UnitTests_net8.0_x64.html`. + a. `test.cmd` or `test.sh` - this runs all the diagnostics tests including SOS's. A html test report will be generated in `artifacts/TestResults/{Debug,Release}/SOS.Tests_net8.0_x64.html`. b. Use the VS Test Explorer to run all the SOS tests or a specific one. c. Use `eng\testsos.cmd` or `eng/testsos.sh` to run just the SOS tests. The html test report isn't generated in this case, but the SOS test logs are in artifacts/TestResults/{Debug,Release}/sos_*. diff --git a/eng/testassets/writexml.cmd b/eng/testassets/writexml.cmd index 03eaa8969e..cc769f3af3 100644 --- a/eng/testassets/writexml.cmd +++ b/eng/testassets/writexml.cmd @@ -3,6 +3,6 @@ set _REPOROOT_=%~dp0..\.. set _DUMPPATH_=%1 set _XMLPATH_=%1.xml set _DEBUGGEEPATH_=%2 -set DOTNET_DIAGNOSTIC_EXTENSIONS=%_REPOROOT_%\artifacts\bin\Microsoft.Diagnostics.DebugServices.UnitTests\Debug\net6.0\Microsoft.Diagnostics.DebugServices.UnitTests.dll +set DOTNET_DIAGNOSTIC_EXTENSIONS=%_REPOROOT_%\artifacts\bin\Microsoft.Diagnostics.DebugServices.Tests\Debug\net6.0\Microsoft.Diagnostics.DebugServices.Tests.dll %_REPOROOT_%\.dotnet\dotnet.exe --fx-version 6.0.8 %_REPOROOT_%\artifacts\bin\dotnet-dump\Debug\netcoreapp3.1\publish\dotnet-dump.dll analyze %_DUMPPATH_% -c "setsymbolserver -directory %_DEBUGGEEPATH_%" -c "writetestdata %_XMLPATH_%" -c "exit" diff --git a/eng/testassets/writexml_x86.cmd b/eng/testassets/writexml_x86.cmd index 63cf2dd35e..d10611ee67 100644 --- a/eng/testassets/writexml_x86.cmd +++ b/eng/testassets/writexml_x86.cmd @@ -3,6 +3,6 @@ set _REPOROOT_=%~dp0..\.. set _DUMPPATH_=%1 set _XMLPATH_=%1.xml set _DEBUGGEEPATH_=%2 -set DOTNET_DIAGNOSTIC_EXTENSIONS=%_REPOROOT_%\artifacts\bin\Microsoft.Diagnostics.DebugServices.UnitTests\Debug\net6.0\Microsoft.Diagnostics.DebugServices.UnitTests.dll +set DOTNET_DIAGNOSTIC_EXTENSIONS=%_REPOROOT_%\artifacts\bin\Microsoft.Diagnostics.DebugServices.Tests\Debug\net6.0\Microsoft.Diagnostics.DebugServices.Tests.dll %_REPOROOT_%\.dotnet\x86\dotnet.exe --fx-version 6.0.8 %_REPOROOT_%\artifacts\bin\dotnet-dump\Debug\netcoreapp3.1\publish\dotnet-dump.dll analyze %_DUMPPATH_% -c "setsymbolserver -directory %_DEBUGGEEPATH_%" -c "writetestdata %_XMLPATH_%" -c "exit" diff --git a/eng/testsos.cmd b/eng/testsos.cmd index 640638a32d..4a39c3bcb3 100644 --- a/eng/testsos.cmd +++ b/eng/testsos.cmd @@ -1 +1 @@ -%~dp0..\.dotnet\dotnet.exe test --no-build --logger "console;verbosity=detailed" %~dp0..\src\tests\SOS.UnitTests\SOS.UnitTests.csproj +%~dp0..\.dotnet\dotnet.exe test --no-build --logger "console;verbosity=detailed" %~dp0..\src\tests\SOS.Tests\SOS.Tests.csproj diff --git a/eng/testsos.sh b/eng/testsos.sh index aa911d7a16..264136357f 100755 --- a/eng/testsos.sh +++ b/eng/testsos.sh @@ -14,4 +14,4 @@ done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" export LLDB_PATH=/usr/bin/lldb -$scriptroot/../.dotnet/dotnet test --no-build --logger "console;verbosity=detailed" $scriptroot/../src/tests/SOS.UnitTests/SOS.UnitTests.csproj +$scriptroot/../.dotnet/dotnet test --no-build --logger "console;verbosity=detailed" $scriptroot/../src/tests/SOS.Tests/SOS.Tests.csproj diff --git a/eng/testsoscdac.cmd b/eng/testsoscdac.cmd index c499ffaecb..126f5fbee4 100644 --- a/eng/testsoscdac.cmd +++ b/eng/testsoscdac.cmd @@ -1,2 +1,2 @@ set SOS_TEST_CDAC=true -%~dp0..\.dotnet\dotnet.exe test --no-build --logger "console;verbosity=detailed" %~dp0..\src\tests\SOS.UnitTests\SOS.UnitTests.csproj --filter "Category=CDACCompatible" +%~dp0..\.dotnet\dotnet.exe test --no-build --logger "console;verbosity=detailed" %~dp0..\src\tests\SOS.Tests\SOS.Tests.csproj --filter "Category=CDACCompatible" diff --git a/eng/testsoscdac.sh b/eng/testsoscdac.sh index bafe751021..99f44c5b1a 100644 --- a/eng/testsoscdac.sh +++ b/eng/testsoscdac.sh @@ -15,4 +15,4 @@ done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" export LLDB_PATH=/usr/bin/lldb export SOS_TEST_CDAC=true -$scriptroot/../.dotnet/dotnet test --no-build --logger "console;verbosity=detailed" $scriptroot/../src/tests/SOS.UnitTests/SOS.UnitTests.csproj --filter "Category=CDACCompatible" +$scriptroot/../.dotnet/dotnet test --no-build --logger "console;verbosity=detailed" $scriptroot/../src/tests/SOS.Tests/SOS.Tests.csproj --filter "Category=CDACCompatible" diff --git a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj index 4558b2ed0c..a64222d228 100644 --- a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj +++ b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj @@ -41,10 +41,10 @@ - - + + - - + + diff --git a/src/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.csproj b/src/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.csproj index a4fff0796f..7cc0ef9b22 100644 --- a/src/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.csproj +++ b/src/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.csproj @@ -27,11 +27,11 @@ - + - - - + + + diff --git a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj index c006330b90..3acac562dc 100644 --- a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj +++ b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj @@ -46,7 +46,7 @@ - + diff --git a/src/Tools/dotnet-counters/dotnet-counters.csproj b/src/Tools/dotnet-counters/dotnet-counters.csproj index 95bf4c4060..c41bde7b0a 100644 --- a/src/Tools/dotnet-counters/dotnet-counters.csproj +++ b/src/Tools/dotnet-counters/dotnet-counters.csproj @@ -35,7 +35,7 @@ - + diff --git a/src/Tools/dotnet-stack/dotnet-stack.csproj b/src/Tools/dotnet-stack/dotnet-stack.csproj index f58adf089f..63e3e523bd 100644 --- a/src/Tools/dotnet-stack/dotnet-stack.csproj +++ b/src/Tools/dotnet-stack/dotnet-stack.csproj @@ -29,7 +29,7 @@ - + diff --git a/src/Tools/dotnet-trace/dotnet-trace.csproj b/src/Tools/dotnet-trace/dotnet-trace.csproj index 71b6aacb2e..fb5a894186 100644 --- a/src/Tools/dotnet-trace/dotnet-trace.csproj +++ b/src/Tools/dotnet-trace/dotnet-trace.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt index e168348f44..07bbfe5185 100644 --- a/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -5,7 +5,7 @@ $(RepoRootDir)/artifacts $(RootBinDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration) - $(RootBinDir)/TestResults/$(TargetConfiguration)/common.unittests_$(Timestamp) + $(RootBinDir)/TestResults/$(TargetConfiguration)/common.Tests_$(Timestamp) ProjectK $(RepoRootDir)/src/tests diff --git a/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt index e3a408fbbf..c18048a9a6 100644 --- a/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -6,7 +6,7 @@ $(RepoRootDir)\artifacts $(RootBinDir)\bin\Windows_NT.$(TargetArchitecture).$(TargetConfiguration) - $(RootBinDir)\TestResults\$(TargetConfiguration)\common.unittests_$(Timestamp) + $(RootBinDir)\TestResults\$(TargetConfiguration)\common.Tests_$(Timestamp) ProjectK $(RepoRootDir)\src\tests diff --git a/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/DbgShim.Tests/ConfigFiles/Unix/Debugger.Tests.Config.txt similarity index 99% rename from src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt rename to src/tests/DbgShim.Tests/ConfigFiles/Unix/Debugger.Tests.Config.txt index d15f246aa9..3a6b7f4299 100644 --- a/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/src/tests/DbgShim.Tests/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -5,7 +5,7 @@ $(RepoRootDir)/artifacts $(RootBinDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration) - $(RootBinDir)/TestResults/$(TargetConfiguration)/dbgshim.unittests_$(Timestamp) + $(RootBinDir)/TestResults/$(TargetConfiguration)/dbgshim.Tests_$(Timestamp) ProjectK $(RepoRootDir)/src/tests/Debuggees diff --git a/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/DbgShim.Tests/ConfigFiles/Windows/Debugger.Tests.Config.txt similarity index 100% rename from src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt rename to src/tests/DbgShim.Tests/ConfigFiles/Windows/Debugger.Tests.Config.txt diff --git a/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj b/src/tests/DbgShim.Tests/DbgShim.Tests.csproj similarity index 100% rename from src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj rename to src/tests/DbgShim.Tests/DbgShim.Tests.csproj diff --git a/src/tests/DbgShim.UnitTests/DbgShimAPI.cs b/src/tests/DbgShim.Tests/DbgShimAPI.cs similarity index 100% rename from src/tests/DbgShim.UnitTests/DbgShimAPI.cs rename to src/tests/DbgShim.Tests/DbgShimAPI.cs diff --git a/src/tests/DbgShim.UnitTests/DbgShimTests.cs b/src/tests/DbgShim.Tests/DbgShimTests.cs similarity index 99% rename from src/tests/DbgShim.UnitTests/DbgShimTests.cs rename to src/tests/DbgShim.Tests/DbgShimTests.cs index 118cf2527c..fc02b760cd 100644 --- a/src/tests/DbgShim.UnitTests/DbgShimTests.cs +++ b/src/tests/DbgShim.Tests/DbgShimTests.cs @@ -528,7 +528,7 @@ private static void TestICorDebug(DebuggeeInfo debuggeeInfo, ICorDebug corDebug) private async Task RemoteInvoke(TestConfiguration config, string testName, Func> method) { string singlefile = config.PublishSingleFile ? ".SingleFile" : ""; - testName = $"DbgShim.UnitTests{singlefile}.{testName}"; + testName = $"DbgShim.Tests{singlefile}.{testName}"; string dumpPath = Path.Combine(config.LogDirPath, testName + ".dmp"); using TestRunner.OutputHelper output = TestRunner.ConfigureLogging(config, Output, testName); int exitCode = await RemoteExecutorHelper.RemoteInvoke(output, config, TimeSpan.FromMinutes(5), dumpPath, method); diff --git a/src/tests/DbgShim.UnitTests/DebuggeeInfo.cs b/src/tests/DbgShim.Tests/DebuggeeInfo.cs similarity index 100% rename from src/tests/DbgShim.UnitTests/DebuggeeInfo.cs rename to src/tests/DbgShim.Tests/DebuggeeInfo.cs diff --git a/src/tests/DbgShim.UnitTests/ICLRDebugging.cs b/src/tests/DbgShim.Tests/ICLRDebugging.cs similarity index 100% rename from src/tests/DbgShim.UnitTests/ICLRDebugging.cs rename to src/tests/DbgShim.Tests/ICLRDebugging.cs diff --git a/src/tests/DbgShim.UnitTests/ICorDebug.cs b/src/tests/DbgShim.Tests/ICorDebug.cs similarity index 100% rename from src/tests/DbgShim.UnitTests/ICorDebug.cs rename to src/tests/DbgShim.Tests/ICorDebug.cs diff --git a/src/tests/DbgShim.UnitTests/ICorDebugController.cs b/src/tests/DbgShim.Tests/ICorDebugController.cs similarity index 100% rename from src/tests/DbgShim.UnitTests/ICorDebugController.cs rename to src/tests/DbgShim.Tests/ICorDebugController.cs diff --git a/src/tests/DbgShim.UnitTests/LibraryProviderWrapper.cs b/src/tests/DbgShim.Tests/LibraryProviderWrapper.cs similarity index 100% rename from src/tests/DbgShim.UnitTests/LibraryProviderWrapper.cs rename to src/tests/DbgShim.Tests/LibraryProviderWrapper.cs diff --git a/src/tests/DbgShim.UnitTests/ManagedCallbackWrapper.cs b/src/tests/DbgShim.Tests/ManagedCallbackWrapper.cs similarity index 100% rename from src/tests/DbgShim.UnitTests/ManagedCallbackWrapper.cs rename to src/tests/DbgShim.Tests/ManagedCallbackWrapper.cs diff --git a/src/tests/Debuggees/EventPipeTracee/CustomMetrics.cs b/src/tests/Debuggees/EventPipeTracee/CustomMetrics.cs index 4f93e6c530..bf2e3db804 100644 --- a/src/tests/Debuggees/EventPipeTracee/CustomMetrics.cs +++ b/src/tests/Debuggees/EventPipeTracee/CustomMetrics.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.Metrics; -using Constants = DotnetCounters.UnitTests.TestConstants; +using Constants = DotnetCounters.Tests.TestConstants; namespace EventPipeTracee { diff --git a/src/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj b/src/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj index c8df61e29b..098218e2b7 100644 --- a/src/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj +++ b/src/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props index 3bd4d6e9da..009d9facee 100644 --- a/src/tests/Directory.Build.props +++ b/src/tests/Directory.Build.props @@ -26,7 +26,7 @@ - true + true true diff --git a/src/tests/DotnetCounters.UnitTests/CSVExporterTests.cs b/src/tests/DotnetCounters.Tests/CSVExporterTests.cs similarity index 99% rename from src/tests/DotnetCounters.UnitTests/CSVExporterTests.cs rename to src/tests/DotnetCounters.Tests/CSVExporterTests.cs index a8c4d3decf..9ae61bd940 100644 --- a/src/tests/DotnetCounters.UnitTests/CSVExporterTests.cs +++ b/src/tests/DotnetCounters.Tests/CSVExporterTests.cs @@ -10,7 +10,7 @@ using Microsoft.Diagnostics.Monitoring.EventPipe; using Xunit; -namespace DotnetCounters.UnitTests +namespace DotnetCounters.Tests { /// /// These test the some of the known providers that we provide as a default configuration for customers to use. diff --git a/src/tests/DotnetCounters.UnitTests/ConsoleExporterTests.cs b/src/tests/DotnetCounters.Tests/ConsoleExporterTests.cs similarity index 99% rename from src/tests/DotnetCounters.UnitTests/ConsoleExporterTests.cs rename to src/tests/DotnetCounters.Tests/ConsoleExporterTests.cs index 4ce49e3586..c57dcbcfc0 100644 --- a/src/tests/DotnetCounters.UnitTests/ConsoleExporterTests.cs +++ b/src/tests/DotnetCounters.Tests/ConsoleExporterTests.cs @@ -10,7 +10,7 @@ using Microsoft.Diagnostics.Tools.Counters.Exporters; using Xunit; -namespace DotnetCounters.UnitTests +namespace DotnetCounters.Tests { public class ConsoleExporterTests { diff --git a/src/tests/DotnetCounters.UnitTests/CounterMonitorPayloadTests.cs b/src/tests/DotnetCounters.Tests/CounterMonitorPayloadTests.cs similarity index 99% rename from src/tests/DotnetCounters.UnitTests/CounterMonitorPayloadTests.cs rename to src/tests/DotnetCounters.Tests/CounterMonitorPayloadTests.cs index f1f6b554c0..5d1f0459bc 100644 --- a/src/tests/DotnetCounters.UnitTests/CounterMonitorPayloadTests.cs +++ b/src/tests/DotnetCounters.Tests/CounterMonitorPayloadTests.cs @@ -16,9 +16,9 @@ using Xunit.Abstractions; using Xunit.Extensions; using TestRunner = Microsoft.Diagnostics.CommonTestRunner.TestRunner; -using Constants = DotnetCounters.UnitTests.TestConstants; +using Constants = DotnetCounters.Tests.TestConstants; -namespace DotnetCounters.UnitTests +namespace DotnetCounters.Tests { /// /// Tests the behavior of CounterMonitor's Collect command. diff --git a/src/tests/DotnetCounters.UnitTests/CounterMonitorTests.cs b/src/tests/DotnetCounters.Tests/CounterMonitorTests.cs similarity index 99% rename from src/tests/DotnetCounters.UnitTests/CounterMonitorTests.cs rename to src/tests/DotnetCounters.Tests/CounterMonitorTests.cs index 30e7bbb816..bb938c616b 100644 --- a/src/tests/DotnetCounters.UnitTests/CounterMonitorTests.cs +++ b/src/tests/DotnetCounters.Tests/CounterMonitorTests.cs @@ -9,7 +9,7 @@ using Microsoft.Diagnostics.Tools.Counters; using Xunit; -namespace DotnetCounters.UnitTests +namespace DotnetCounters.Tests { /// /// These test the various internal logic in CounterMonitor diff --git a/src/tests/DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj b/src/tests/DotnetCounters.Tests/DotnetCounters.Tests.csproj similarity index 100% rename from src/tests/DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj rename to src/tests/DotnetCounters.Tests/DotnetCounters.Tests.csproj diff --git a/src/tests/DotnetCounters.UnitTests/JSONExporterTests.cs b/src/tests/DotnetCounters.Tests/JSONExporterTests.cs similarity index 99% rename from src/tests/DotnetCounters.UnitTests/JSONExporterTests.cs rename to src/tests/DotnetCounters.Tests/JSONExporterTests.cs index 929825df1d..a778bacbdb 100644 --- a/src/tests/DotnetCounters.UnitTests/JSONExporterTests.cs +++ b/src/tests/DotnetCounters.Tests/JSONExporterTests.cs @@ -12,7 +12,7 @@ #pragma warning disable CA1507 // Use nameof to express symbol names -namespace DotnetCounters.UnitTests +namespace DotnetCounters.Tests { /// /// These test the some of the known providers that we provide as a default configuration for customers to use. diff --git a/src/tests/DotnetCounters.UnitTests/MockConsole.cs b/src/tests/DotnetCounters.Tests/MockConsole.cs similarity index 99% rename from src/tests/DotnetCounters.UnitTests/MockConsole.cs rename to src/tests/DotnetCounters.Tests/MockConsole.cs index 57d41fc13f..989db1a06b 100644 --- a/src/tests/DotnetCounters.UnitTests/MockConsole.cs +++ b/src/tests/DotnetCounters.Tests/MockConsole.cs @@ -6,7 +6,7 @@ using Microsoft.Diagnostics.Tools.Counters.Exporters; using Xunit; -namespace DotnetCounters.UnitTests +namespace DotnetCounters.Tests { internal class MockConsole : IConsole { diff --git a/src/tests/DotnetCounters.UnitTests/TestConstants.cs b/src/tests/DotnetCounters.Tests/TestConstants.cs similarity index 97% rename from src/tests/DotnetCounters.UnitTests/TestConstants.cs rename to src/tests/DotnetCounters.Tests/TestConstants.cs index 911b157b97..ec53fefff1 100644 --- a/src/tests/DotnetCounters.UnitTests/TestConstants.cs +++ b/src/tests/DotnetCounters.Tests/TestConstants.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace DotnetCounters.UnitTests +namespace DotnetCounters.Tests { public static class TestConstants { diff --git a/src/tests/DotnetStack.UnitTests/DotnetStack.UnitTests.csproj b/src/tests/DotnetStack.Tests/DotnetStack.Tests.csproj similarity index 100% rename from src/tests/DotnetStack.UnitTests/DotnetStack.UnitTests.csproj rename to src/tests/DotnetStack.Tests/DotnetStack.Tests.csproj diff --git a/src/tests/DotnetStack.UnitTests/StackTests.cs b/src/tests/DotnetStack.Tests/StackTests.cs similarity index 100% rename from src/tests/DotnetStack.UnitTests/StackTests.cs rename to src/tests/DotnetStack.Tests/StackTests.cs diff --git a/src/tests/DotnetTrace.UnitTests/CLRProviderParsing.cs b/src/tests/DotnetTrace.Tests/CLRProviderParsing.cs similarity index 100% rename from src/tests/DotnetTrace.UnitTests/CLRProviderParsing.cs rename to src/tests/DotnetTrace.Tests/CLRProviderParsing.cs diff --git a/src/tests/DotnetTrace.UnitTests/ChildProcessTests.cs b/src/tests/DotnetTrace.Tests/ChildProcessTests.cs similarity index 100% rename from src/tests/DotnetTrace.UnitTests/ChildProcessTests.cs rename to src/tests/DotnetTrace.Tests/ChildProcessTests.cs diff --git a/src/tests/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj b/src/tests/DotnetTrace.Tests/DotnetTrace.Tests.csproj similarity index 100% rename from src/tests/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj rename to src/tests/DotnetTrace.Tests/DotnetTrace.Tests.csproj diff --git a/src/tests/DotnetTrace.UnitTests/ProfileProviderMerging.cs b/src/tests/DotnetTrace.Tests/ProfileProviderMerging.cs similarity index 100% rename from src/tests/DotnetTrace.UnitTests/ProfileProviderMerging.cs rename to src/tests/DotnetTrace.Tests/ProfileProviderMerging.cs diff --git a/src/tests/DotnetTrace.UnitTests/ProviderParsing.cs b/src/tests/DotnetTrace.Tests/ProviderParsing.cs similarity index 100% rename from src/tests/DotnetTrace.UnitTests/ProviderParsing.cs rename to src/tests/DotnetTrace.Tests/ProviderParsing.cs diff --git a/src/tests/EventPipe.UnitTests/ContentionEvents.cs b/src/tests/EventPipe.Tests/ContentionEvents.cs similarity index 97% rename from src/tests/EventPipe.UnitTests/ContentionEvents.cs rename to src/tests/EventPipe.Tests/ContentionEvents.cs index 2e41c356a3..904efb43f6 100644 --- a/src/tests/EventPipe.UnitTests/ContentionEvents.cs +++ b/src/tests/EventPipe.Tests/ContentionEvents.cs @@ -6,13 +6,13 @@ using System.Diagnostics.Tracing; using System.Threading; using System.Threading.Tasks; -using EventPipe.UnitTests.Common; +using EventPipe.Tests.Common; using Microsoft.Diagnostics.NETCore.Client; using Microsoft.Diagnostics.Tracing; using Xunit; using Xunit.Abstractions; -namespace EventPipe.UnitTests.ContentionValidation +namespace EventPipe.Tests.ContentionValidation { public class TestClass diff --git a/src/tests/EventPipe.UnitTests/CustomEvents.cs b/src/tests/EventPipe.Tests/CustomEvents.cs similarity index 95% rename from src/tests/EventPipe.UnitTests/CustomEvents.cs rename to src/tests/EventPipe.Tests/CustomEvents.cs index bb81f5fd5f..429f75a83d 100644 --- a/src/tests/EventPipe.UnitTests/CustomEvents.cs +++ b/src/tests/EventPipe.Tests/CustomEvents.cs @@ -5,12 +5,12 @@ using System.Collections.Generic; using System.Diagnostics.Tracing; using System.Threading.Tasks; -using EventPipe.UnitTests.Common; +using EventPipe.Tests.Common; using Microsoft.Diagnostics.NETCore.Client; using Xunit; using Xunit.Abstractions; -namespace EventPipe.UnitTests.CustomEventsValidation +namespace EventPipe.Tests.CustomEventsValidation { public class MyEventSource : EventSource { diff --git a/src/tests/EventPipe.UnitTests/EventPipe.UnitTests.csproj b/src/tests/EventPipe.Tests/EventPipe.Tests.csproj similarity index 100% rename from src/tests/EventPipe.UnitTests/EventPipe.UnitTests.csproj rename to src/tests/EventPipe.Tests/EventPipe.Tests.csproj diff --git a/src/tests/EventPipe.UnitTests/GCEvents.cs b/src/tests/EventPipe.Tests/GCEvents.cs similarity index 99% rename from src/tests/EventPipe.UnitTests/GCEvents.cs rename to src/tests/EventPipe.Tests/GCEvents.cs index c4374ff0a5..79fafdba41 100644 --- a/src/tests/EventPipe.UnitTests/GCEvents.cs +++ b/src/tests/EventPipe.Tests/GCEvents.cs @@ -6,13 +6,13 @@ using System.Diagnostics.Tracing; using System.Runtime.InteropServices; using System.Threading.Tasks; -using EventPipe.UnitTests.Common; +using EventPipe.Tests.Common; using Microsoft.Diagnostics.NETCore.Client; using Microsoft.Diagnostics.Tracing; using Xunit; using Xunit.Abstractions; -namespace EventPipe.UnitTests.GCEventsValidation +namespace EventPipe.Tests.GCEventsValidation { public class TestClass diff --git a/src/tests/EventPipe.UnitTests/LoaderEvents.cs b/src/tests/EventPipe.Tests/LoaderEvents.cs similarity index 98% rename from src/tests/EventPipe.UnitTests/LoaderEvents.cs rename to src/tests/EventPipe.Tests/LoaderEvents.cs index a54cfea294..85dd07cd4e 100644 --- a/src/tests/EventPipe.UnitTests/LoaderEvents.cs +++ b/src/tests/EventPipe.Tests/LoaderEvents.cs @@ -9,13 +9,13 @@ using System.Runtime.Loader; using System.Threading; using System.Threading.Tasks; -using EventPipe.UnitTests.Common; +using EventPipe.Tests.Common; using Microsoft.Diagnostics.NETCore.Client; using Microsoft.Diagnostics.Tracing; using Xunit; using Xunit.Abstractions; -namespace EventPipe.UnitTests.LoaderEventsValidation +namespace EventPipe.Tests.LoaderEventsValidation { public class AssemblyLoad : AssemblyLoadContext { diff --git a/src/tests/EventPipe.UnitTests/MethodEvents.cs b/src/tests/EventPipe.Tests/MethodEvents.cs similarity index 98% rename from src/tests/EventPipe.UnitTests/MethodEvents.cs rename to src/tests/EventPipe.Tests/MethodEvents.cs index ef1daf66f3..b50901cce8 100644 --- a/src/tests/EventPipe.UnitTests/MethodEvents.cs +++ b/src/tests/EventPipe.Tests/MethodEvents.cs @@ -6,13 +6,13 @@ using System.Diagnostics.Tracing; using System.Threading; using System.Threading.Tasks; -using EventPipe.UnitTests.Common; +using EventPipe.Tests.Common; using Microsoft.Diagnostics.NETCore.Client; using Microsoft.Diagnostics.Tracing; using Xunit; using Xunit.Abstractions; -namespace EventPipe.UnitTests.MethodEventsValidation +namespace EventPipe.Tests.MethodEventsValidation { public class M_verbose : IDisposable { diff --git a/src/tests/EventPipe.UnitTests/README.md b/src/tests/EventPipe.Tests/README.md similarity index 100% rename from src/tests/EventPipe.UnitTests/README.md rename to src/tests/EventPipe.Tests/README.md diff --git a/src/tests/EventPipe.UnitTests/ThreadPoolEvents.cs b/src/tests/EventPipe.Tests/ThreadPoolEvents.cs similarity index 97% rename from src/tests/EventPipe.UnitTests/ThreadPoolEvents.cs rename to src/tests/EventPipe.Tests/ThreadPoolEvents.cs index 3561aab0eb..5863d558f0 100644 --- a/src/tests/EventPipe.UnitTests/ThreadPoolEvents.cs +++ b/src/tests/EventPipe.Tests/ThreadPoolEvents.cs @@ -6,13 +6,13 @@ using System.Diagnostics.Tracing; using System.Threading; using System.Threading.Tasks; -using EventPipe.UnitTests.Common; +using EventPipe.Tests.Common; using Microsoft.Diagnostics.NETCore.Client; using Microsoft.Diagnostics.Tracing; using Xunit; using Xunit.Abstractions; -namespace EventPipe.UnitTests.ThreadPoolValidation +namespace EventPipe.Tests.ThreadPoolValidation { public class ThreadPoolEventsTests { diff --git a/src/tests/EventPipe.UnitTests/common/IpcTraceTest.cs b/src/tests/EventPipe.Tests/common/IpcTraceTest.cs similarity index 99% rename from src/tests/EventPipe.UnitTests/common/IpcTraceTest.cs rename to src/tests/EventPipe.Tests/common/IpcTraceTest.cs index 28e72a8572..ec92f4d1e2 100644 --- a/src/tests/EventPipe.UnitTests/common/IpcTraceTest.cs +++ b/src/tests/EventPipe.Tests/common/IpcTraceTest.cs @@ -14,7 +14,7 @@ using Microsoft.Diagnostics.NETCore.Client; using Microsoft.Diagnostics.Tracing; -namespace EventPipe.UnitTests.Common +namespace EventPipe.Tests.Common { public class Logger { diff --git a/src/tests/EventPipe.UnitTests/common/RemoteTestExecutorHelper.cs b/src/tests/EventPipe.Tests/common/RemoteTestExecutorHelper.cs similarity index 97% rename from src/tests/EventPipe.UnitTests/common/RemoteTestExecutorHelper.cs rename to src/tests/EventPipe.Tests/common/RemoteTestExecutorHelper.cs index 92ee3e7b6b..42049572b6 100644 --- a/src/tests/EventPipe.UnitTests/common/RemoteTestExecutorHelper.cs +++ b/src/tests/EventPipe.Tests/common/RemoteTestExecutorHelper.cs @@ -7,7 +7,7 @@ using Microsoft.DotNet.RemoteExecutor; using Xunit.Abstractions; -namespace EventPipe.UnitTests.Common +namespace EventPipe.Tests.Common { public static class RemoteTestExecutorHelper { diff --git a/src/tests/EventPipe.UnitTests/common/StreamProxy.cs b/src/tests/EventPipe.Tests/common/StreamProxy.cs similarity index 99% rename from src/tests/EventPipe.UnitTests/common/StreamProxy.cs rename to src/tests/EventPipe.Tests/common/StreamProxy.cs index b38d6421b0..8743cbc351 100644 --- a/src/tests/EventPipe.UnitTests/common/StreamProxy.cs +++ b/src/tests/EventPipe.Tests/common/StreamProxy.cs @@ -5,7 +5,7 @@ using System.Buffers; using System.IO; -namespace EventPipe.UnitTests.Common +namespace EventPipe.Tests.Common { // This Stream implementation takes one stream // and proxies the Stream API to it while diff --git a/src/tests/EventPipe.UnitTests/providers.cs b/src/tests/EventPipe.Tests/providers.cs similarity index 96% rename from src/tests/EventPipe.UnitTests/providers.cs rename to src/tests/EventPipe.Tests/providers.cs index ffde173d9b..aee79d4767 100644 --- a/src/tests/EventPipe.UnitTests/providers.cs +++ b/src/tests/EventPipe.Tests/providers.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Diagnostics.Tracing; using System.Threading.Tasks; -using EventPipe.UnitTests.Common; +using EventPipe.Tests.Common; using Microsoft.Diagnostics.NETCore.Client; using Xunit; using Xunit.Abstractions; @@ -13,7 +13,7 @@ // Use this test as an example of how to write tests for EventPipe in // the dotnet/diagnostics repo -namespace EventPipe.UnitTests.ProviderValidation +namespace EventPipe.Tests.ProviderValidation { public sealed class MyEventSource : EventSource { diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ClrmaTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/ClrmaTests.cs similarity index 99% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ClrmaTests.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.Tests/ClrmaTests.cs index 3be29ffc2c..dd194d16f3 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ClrmaTests.cs +++ b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/ClrmaTests.cs @@ -15,7 +15,7 @@ // Avoid unnecessary zero-length array allocations. Use Array.Empty() instead. #pragma warning disable CA1825 -namespace Microsoft.Diagnostics.DebugServices.UnitTests +namespace Microsoft.Diagnostics.DebugServices.Tests { public class ClrmaTests : IDisposable { diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/CommandServiceTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/CommandServiceTests.cs similarity index 98% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/CommandServiceTests.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.Tests/CommandServiceTests.cs index e70a57ced8..4712cd5d09 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/CommandServiceTests.cs +++ b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/CommandServiceTests.cs @@ -12,7 +12,7 @@ [assembly: SuppressMessage("Performance", "CA1825:Avoid zero-length array allocations.", Justification = "")] -namespace Microsoft.Diagnostics.DebugServices.UnitTests +namespace Microsoft.Diagnostics.DebugServices.Tests { public class CommandServiceTests : IDisposable { diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/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 src/tests/Microsoft.Diagnostics.DebugServices.Tests/ConfigFiles/Unix/Debugger.Tests.Config.txt diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/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 src/tests/Microsoft.Diagnostics.DebugServices.Tests/ConfigFiles/Windows/Debugger.Tests.Config.txt diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/DebugServicesTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/DebugServicesTests.cs similarity index 99% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/DebugServicesTests.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.Tests/DebugServicesTests.cs index 9c56848cd8..e175dfb34d 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/DebugServicesTests.cs +++ b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/DebugServicesTests.cs @@ -18,7 +18,7 @@ // Avoid unnecessary zero-length array allocations. Use Array.Empty() instead. #pragma warning disable CA1825 -namespace Microsoft.Diagnostics.DebugServices.UnitTests +namespace Microsoft.Diagnostics.DebugServices.Tests { public class DebugServicesTests : IDisposable { diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/Microsoft.Diagnostics.DebugServices.Tests.csproj similarity index 100% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj rename to src/tests/Microsoft.Diagnostics.DebugServices.Tests/Microsoft.Diagnostics.DebugServices.Tests.csproj diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/RunTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/RunTests.cs similarity index 99% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/RunTests.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.Tests/RunTests.cs index c2299c85bf..0f08ee0c55 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/RunTests.cs +++ b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/RunTests.cs @@ -15,7 +15,7 @@ using Xunit.Abstractions; using Xunit.Extensions; -namespace Microsoft.Diagnostics.DebugServices.UnitTests +namespace Microsoft.Diagnostics.DebugServices.Tests { [Command(Name = "runtests", Help = "Runs the debug services xunit tests.")] public class RunTestsCommand : CommandBase, ITestOutputHelper diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ServiceEventTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/ServiceEventTests.cs similarity index 98% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ServiceEventTests.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.Tests/ServiceEventTests.cs index b3edc6d27d..7ac546c134 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ServiceEventTests.cs +++ b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/ServiceEventTests.cs @@ -5,7 +5,7 @@ using Microsoft.Diagnostics.DebugServices.Implementation; using Xunit; -namespace Microsoft.Diagnostics.DebugServices.UnitTests +namespace Microsoft.Diagnostics.DebugServices.Tests { /// /// Test the service event implementation diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/SymbolServiceTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/SymbolServiceTests.cs similarity index 99% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/SymbolServiceTests.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.Tests/SymbolServiceTests.cs index 27d279f978..ba1366b1db 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/SymbolServiceTests.cs +++ b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/SymbolServiceTests.cs @@ -8,7 +8,7 @@ using Microsoft.Diagnostics.DebugServices.Implementation; using Xunit; -namespace Microsoft.Diagnostics.DebugServices.UnitTests +namespace Microsoft.Diagnostics.DebugServices.Tests { /// /// Test the service event implementation diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestCommands.cs b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/TestCommands.cs similarity index 97% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestCommands.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.Tests/TestCommands.cs index 920190d72d..628222bbbb 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestCommands.cs +++ b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/TestCommands.cs @@ -5,7 +5,7 @@ using System; using Xunit; -namespace Microsoft.Diagnostics.DebugServices.UnitTests +namespace Microsoft.Diagnostics.DebugServices.Tests { [Command(Name = "testcommand", Help = "Test command #1")] public class TestCommand1 : CommandBase diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestDbgEng.cs b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/TestDbgEng.cs similarity index 99% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestDbgEng.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.Tests/TestDbgEng.cs index f63f5a17f4..2b45cf2674 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestDbgEng.cs +++ b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/TestDbgEng.cs @@ -14,7 +14,7 @@ using SOS.Hosting; using SOS.Hosting.DbgEng.Interop; -namespace Microsoft.Diagnostics.DebugServices.UnitTests +namespace Microsoft.Diagnostics.DebugServices.Tests { public class TestDbgEng : TestHost { diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/WriteTestData.cs b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/WriteTestData.cs similarity index 94% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/WriteTestData.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.Tests/WriteTestData.cs index d0a17cd26b..0b09ac4b5a 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/WriteTestData.cs +++ b/src/tests/Microsoft.Diagnostics.DebugServices.Tests/WriteTestData.cs @@ -4,7 +4,7 @@ using System; using Microsoft.Diagnostics.TestHelpers; -namespace Microsoft.Diagnostics.DebugServices.UnitTests +namespace Microsoft.Diagnostics.DebugServices.Tests { [Command(Name = "writetestdata", Help = "Writes the test data xml file.")] public class WriteTestDataCommand : CommandBase diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/AspNetTriggerUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/AspNetTriggerUnitTests.cs similarity index 99% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/AspNetTriggerUnitTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/AspNetTriggerUnitTests.cs index c29c1ee092..33c919d0dc 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/AspNetTriggerUnitTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/AspNetTriggerUnitTests.cs @@ -7,7 +7,7 @@ using Xunit; using Xunit.Abstractions; -namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests { public class AspNetTriggerUnitTests { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/DistributedTracesPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/DistributedTracesPipelineUnitTests.cs similarity index 98% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/DistributedTracesPipelineUnitTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/DistributedTracesPipelineUnitTests.cs index 31e910bfa7..c355746f40 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/DistributedTracesPipelineUnitTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/DistributedTracesPipelineUnitTests.cs @@ -16,7 +16,7 @@ using Xunit.Extensions; using TestRunner = Microsoft.Diagnostics.CommonTestRunner.TestRunner; -namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests { public class DistributedTracesPipelineUnitTests { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterConstants.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterConstants.cs similarity index 89% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterConstants.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterConstants.cs index b264662f61..2e4b30667c 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterConstants.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterConstants.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests { internal static class EventCounterConstants { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterPipelineUnitTests.cs similarity index 99% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterPipelineUnitTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterPipelineUnitTests.cs index 2fb091ea9b..e370bdd4c3 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterPipelineUnitTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterPipelineUnitTests.cs @@ -16,7 +16,7 @@ // Avoid unnecessary zero-length array allocations. Use Array.Empty() instead. #pragma warning disable CA1825 -namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests { public class EventCounterPipelineUnitTests { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterTriggerTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterTriggerTests.cs similarity index 99% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterTriggerTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterTriggerTests.cs index def5d754ab..9ebf47212d 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventCounterTriggerTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterTriggerTests.cs @@ -20,7 +20,7 @@ // Avoid unnecessary zero-length array allocations. Use Array.Empty() instead. #pragma warning disable CA1825 -namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests { public class EventCounterTriggerTests { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventLogsPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventLogsPipelineUnitTests.cs similarity index 99% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventLogsPipelineUnitTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventLogsPipelineUnitTests.cs index b087b93833..0f9c3734b2 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventLogsPipelineUnitTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventLogsPipelineUnitTests.cs @@ -20,7 +20,7 @@ // Avoid unnecessary zero-length array allocations. Use Array.Empty() instead. #pragma warning disable CA1825 -namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests { public class EventLogsPipelineUnitTests { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventTracePipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventTracePipelineUnitTests.cs similarity index 98% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventTracePipelineUnitTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventTracePipelineUnitTests.cs index 304d5d520c..78b734e51a 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/EventTracePipelineUnitTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventTracePipelineUnitTests.cs @@ -19,7 +19,7 @@ // Avoid unnecessary zero-length array allocations. Use Array.Empty() instead. #pragma warning disable CA1825 -namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests { public class EventTracePipelineUnitTests { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/GlobMatcherTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/GlobMatcherTests.cs similarity index 97% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/GlobMatcherTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/GlobMatcherTests.cs index 88317be47b..bdfc0a3e2e 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/GlobMatcherTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/GlobMatcherTests.cs @@ -8,7 +8,7 @@ using Xunit; using Xunit.Abstractions; -namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests { public class GlobMatcherTests { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/LogsPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/LogsPipelineUnitTests.cs similarity index 98% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/LogsPipelineUnitTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/LogsPipelineUnitTests.cs index 0b11d899be..30a3d67f93 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/LogsPipelineUnitTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/LogsPipelineUnitTests.cs @@ -17,7 +17,7 @@ using Xunit.Extensions; using TestRunner = Microsoft.Diagnostics.CommonTestRunner.TestRunner; -namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests { public class LogsPipelineUnitTests { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests.csproj similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests.csproj diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/PipelineTestUtilities.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/PipelineTestUtilities.cs similarity index 98% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/PipelineTestUtilities.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/PipelineTestUtilities.cs index 5630f2dd71..cc21e1ad76 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/PipelineTestUtilities.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/PipelineTestUtilities.cs @@ -9,7 +9,7 @@ using Xunit.Abstractions; using TestRunner = Microsoft.Diagnostics.CommonTestRunner.TestRunner; -namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests { internal static class PipelineTestUtilities { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/SlidingWindowTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/SlidingWindowTests.cs similarity index 95% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/SlidingWindowTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/SlidingWindowTests.cs index 81d1b830e1..424d5ea506 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/SlidingWindowTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/SlidingWindowTests.cs @@ -5,7 +5,7 @@ using Microsoft.Diagnostics.Monitoring.EventPipe.Triggers; using Xunit; -namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests { public class SlidingWindowTests { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/TestStreamingLogger.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/TestStreamingLogger.cs similarity index 98% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/TestStreamingLogger.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/TestStreamingLogger.cs index 54afee3baf..263cb16cbd 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests/TestStreamingLogger.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/TestStreamingLogger.cs @@ -8,7 +8,7 @@ using System.Text.Json; using Microsoft.Extensions.Logging; -namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests { /// /// CONSIDER We can't reuse StreamingLoggerProvider from using Microsoft.Diagnostics.Monitoring.WebApi. diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.UnitTests/Microsoft.Diagnostics.Monitoring.UnitTests.csproj b/src/tests/Microsoft.Diagnostics.Monitoring.Tests/Microsoft.Diagnostics.Monitoring.Tests.csproj similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.UnitTests/Microsoft.Diagnostics.Monitoring.UnitTests.csproj rename to src/tests/Microsoft.Diagnostics.Monitoring.Tests/Microsoft.Diagnostics.Monitoring.Tests.csproj diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.UnitTests/PipelineTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.Tests/PipelineTests.cs similarity index 98% rename from src/tests/Microsoft.Diagnostics.Monitoring.UnitTests/PipelineTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.Tests/PipelineTests.cs index 071eb7622f..d4aacb1b31 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.UnitTests/PipelineTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.Tests/PipelineTests.cs @@ -7,7 +7,7 @@ using Xunit; using Xunit.Abstractions; -namespace Microsoft.Diagnostics.Monitoring.UnitTests +namespace Microsoft.Diagnostics.Monitoring.Tests { public class PipelineTests { diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/DiagnosticsClientApiShim.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/DiagnosticsClientApiShim.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/DiagnosticsClientApiShim.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/DiagnosticsClientApiShim.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/DiagnosticsClientApiShimExtensions.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/DiagnosticsClientApiShimExtensions.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/DiagnosticsClientApiShimExtensions.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/DiagnosticsClientApiShimExtensions.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/EventPipeProviderTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/EventPipeProviderTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/EventPipeProviderTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/EventPipeProviderTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/EventPipeSessionTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/EventPipeSessionTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/EventPipeSessionTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/EventPipeSessionTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetProcessEnvironmentTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/GetProcessEnvironmentTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetProcessEnvironmentTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/GetProcessEnvironmentTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetProcessInfoTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/GetProcessInfoTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetProcessInfoTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/GetProcessInfoTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetPublishedProcessesTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/GetPublishedProcessesTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/GetPublishedProcessesTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/GetPublishedProcessesTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/HandleableCollectionTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/HandleableCollectionTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/HandleableCollectionTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/HandleableCollectionTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj b/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/Microsoft.Diagnostics.NETCore.Client.Tests.csproj similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj rename to src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/Microsoft.Diagnostics.NETCore.Client.Tests.csproj diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/PerfMapTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/PerfMapTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/PerfMapTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/PerfMapTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/ReversedServerTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/ReversedServerTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.UnitTests/ReversedServerTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/ReversedServerTests.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/AddressSpace.cs b/src/tests/Microsoft.FileFormats.Tests/AddressSpace.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/AddressSpace.cs rename to src/tests/Microsoft.FileFormats.Tests/AddressSpace.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/ELF/Tests.cs b/src/tests/Microsoft.FileFormats.Tests/ELF/Tests.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/ELF/Tests.cs rename to src/tests/Microsoft.FileFormats.Tests/ELF/Tests.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/Layouts.cs b/src/tests/Microsoft.FileFormats.Tests/Layouts.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/Layouts.cs rename to src/tests/Microsoft.FileFormats.Tests/Layouts.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/MachO/Tests.cs b/src/tests/Microsoft.FileFormats.Tests/MachO/Tests.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/MachO/Tests.cs rename to src/tests/Microsoft.FileFormats.Tests/MachO/Tests.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj b/src/tests/Microsoft.FileFormats.Tests/Microsoft.FileFormats.Tests.csproj similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj rename to src/tests/Microsoft.FileFormats.Tests/Microsoft.FileFormats.Tests.csproj diff --git a/src/tests/Microsoft.FileFormats.UnitTests/Minidump/Tests.cs b/src/tests/Microsoft.FileFormats.Tests/Minidump/Tests.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/Minidump/Tests.cs rename to src/tests/Microsoft.FileFormats.Tests/Minidump/Tests.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/PDB/Tests.cs b/src/tests/Microsoft.FileFormats.Tests/PDB/Tests.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/PDB/Tests.cs rename to src/tests/Microsoft.FileFormats.Tests/PDB/Tests.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/PE/Tests.cs b/src/tests/Microsoft.FileFormats.Tests/PE/Tests.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/PE/Tests.cs rename to src/tests/Microsoft.FileFormats.Tests/PE/Tests.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/PerfMap/Tests.cs b/src/tests/Microsoft.FileFormats.Tests/PerfMap/Tests.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/PerfMap/Tests.cs rename to src/tests/Microsoft.FileFormats.Tests/PerfMap/Tests.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/PrimitiveTypes.cs b/src/tests/Microsoft.FileFormats.Tests/PrimitiveTypes.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/PrimitiveTypes.cs rename to src/tests/Microsoft.FileFormats.Tests/PrimitiveTypes.cs diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.exe b/src/tests/Microsoft.FileFormats.Tests/TestBinaries/HelloWorld.exe similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.exe rename to src/tests/Microsoft.FileFormats.Tests/TestBinaries/HelloWorld.exe diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdz b/src/tests/Microsoft.FileFormats.Tests/TestBinaries/HelloWorld.pdz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdz rename to src/tests/Microsoft.FileFormats.Tests/TestBinaries/HelloWorld.pdz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll b/src/tests/Microsoft.FileFormats.Tests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll rename to src/tests/Microsoft.FileFormats.Tests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.ni.r2rmap b/src/tests/Microsoft.FileFormats.Tests/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 src/tests/Microsoft.FileFormats.Tests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.ni.r2rmap diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/System.Diagnostics.StackTrace.dll b/src/tests/Microsoft.FileFormats.Tests/TestBinaries/System.Diagnostics.StackTrace.dll similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/System.Diagnostics.StackTrace.dll rename to src/tests/Microsoft.FileFormats.Tests/TestBinaries/System.Diagnostics.StackTrace.dll diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/apphost.gz b/src/tests/Microsoft.FileFormats.Tests/TestBinaries/apphost.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/apphost.gz rename to src/tests/Microsoft.FileFormats.Tests/TestBinaries/apphost.gz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/core.gz b/src/tests/Microsoft.FileFormats.Tests/TestBinaries/core.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/core.gz rename to src/tests/Microsoft.FileFormats.Tests/TestBinaries/core.gz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/ilasm.dbg b/src/tests/Microsoft.FileFormats.Tests/TestBinaries/ilasm.dbg similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/ilasm.dbg rename to src/tests/Microsoft.FileFormats.Tests/TestBinaries/ilasm.dbg diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libclrjit.dylib.dwarf.gz b/src/tests/Microsoft.FileFormats.Tests/TestBinaries/libclrjit.dylib.dwarf.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libclrjit.dylib.dwarf.gz rename to src/tests/Microsoft.FileFormats.Tests/TestBinaries/libclrjit.dylib.dwarf.gz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.dylib.gz b/src/tests/Microsoft.FileFormats.Tests/TestBinaries/libcoreclr.dylib.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.dylib.gz rename to src/tests/Microsoft.FileFormats.Tests/TestBinaries/libcoreclr.dylib.gz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.so.gz b/src/tests/Microsoft.FileFormats.Tests/TestBinaries/libcoreclr.so.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.so.gz rename to src/tests/Microsoft.FileFormats.Tests/TestBinaries/libcoreclr.so.gz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz b/src/tests/Microsoft.FileFormats.Tests/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz rename to src/tests/Microsoft.FileFormats.Tests/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x64.dmp.gz b/src/tests/Microsoft.FileFormats.Tests/TestBinaries/minidump_x64.dmp.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x64.dmp.gz rename to src/tests/Microsoft.FileFormats.Tests/TestBinaries/minidump_x64.dmp.gz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x86.dmp.gz b/src/tests/Microsoft.FileFormats.Tests/TestBinaries/minidump_x86.dmp.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x86.dmp.gz rename to src/tests/Microsoft.FileFormats.Tests/TestBinaries/minidump_x86.dmp.gz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/renamed_build_id_section b/src/tests/Microsoft.FileFormats.Tests/TestBinaries/renamed_build_id_section similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/renamed_build_id_section rename to src/tests/Microsoft.FileFormats.Tests/TestBinaries/renamed_build_id_section diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/triagedump.gz b/src/tests/Microsoft.FileFormats.Tests/TestBinaries/triagedump.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/triagedump.gz rename to src/tests/Microsoft.FileFormats.Tests/TestBinaries/triagedump.gz diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdb b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdb deleted file mode 100644 index adea403b4e92a74506a22217eae5b8a63ff65c54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11776 zcmeHNU2GIp6h5=m((NB?tyLD&3x_;-*j0{cPu7J*U0)0bCuuW+q;Rh zvTpy0eF{>aS^wslPk(rN>}>6=f#=`r%=j5u#~h>|_ddQjDX5m=6@tK0{h#N<;P}sR zc4x6%AudWY>mVTOzYaJ}pqf9tcj(gUE3wn#G`IVs$cJBMcb)n5mv3XIhunC_2PY?E zr7N)uTZrb{MlW3Nd#HBcleM`w{<21kuWvup>tVFZ_^S8giyPvTKYbT@|KhEMxu5@j zy9wY6jf*(u5#-CzI3^vbi@?H-g&Vw(JIA?-PvxtQW;=P)DwInFV>&-&6{|CvS#k2O z>Q1#_s7|FirCaK@RC-5#k8QoA6`|Xy8HTmbvW=-=5b7g#VJ1;@8ZP-|zvMEPd{mSi z2tw_b%rA-U{R ze_nnq@9DXoxPCOSq~(DC_n!o9iLo_*cqRqs0Mu(MCyREGE9fS|eY7gZ_nim(d0F31 z8)GkwA9pI+4E5g*Co+~{V4Tn`(@8w1nVPK^sVATx)6G|K`yFW$+OZ0!#RK^!%C=UR z(#<1@iGnlj;MuLTjaphR5B+xOv;E(Xp5GLWd~x>NA-*q1!_X16z%aIzkGI&?`-E(z zTaYO*lY*b`2g{8jm8g?wmi_92jKVu+#;6S}@bJPa1 zW2i#z1kgv12GUYbq?pnn1jilfL+O}wN+Q4rsF?G)Z!bmu+JM(PZOF%Sb(784?0TrF z-us`E@H~md`Shq+vM6a5W;BPAj$KTau@2Yl!-iFyb`wgvp*hJ0&kq{gH86h%asq~n??Dj03Z4aXTi6U9gKjGTeil52IG?lifVtP*59Z#;y%6n4 m^vEbA?;E&1@pHJx@;-A7Skm%9pm%wgA+3-INCfTy0{;LU46FA5 diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/KeyGeneratorTests.cs b/src/tests/Microsoft.SymbolStore.Tests/KeyGeneratorTests.cs similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/KeyGeneratorTests.cs rename to src/tests/Microsoft.SymbolStore.Tests/KeyGeneratorTests.cs diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj b/src/tests/Microsoft.SymbolStore.Tests/Microsoft.SymbolStore.Tests.csproj similarity index 80% rename from src/tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj rename to src/tests/Microsoft.SymbolStore.Tests/Microsoft.SymbolStore.Tests.csproj index 32816c8a84..1bf524a76c 100644 --- a/src/tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj +++ b/src/tests/Microsoft.SymbolStore.Tests/Microsoft.SymbolStore.Tests.csproj @@ -32,40 +32,40 @@ - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/PEFileKeyGenerationTests.cs b/src/tests/Microsoft.SymbolStore.Tests/PEFileKeyGenerationTests.cs similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/PEFileKeyGenerationTests.cs rename to src/tests/Microsoft.SymbolStore.Tests/PEFileKeyGenerationTests.cs diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs b/src/tests/Microsoft.SymbolStore.Tests/SymbolStoreTests.cs similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs rename to src/tests/Microsoft.SymbolStore.Tests/SymbolStoreTests.cs diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz b/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz rename to src/tests/Microsoft.SymbolStore.Tests/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/coreclr.dll.gz b/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/coreclr.dll.gz similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/coreclr.dll.gz rename to src/tests/Microsoft.SymbolStore.Tests/TestBinaries/coreclr.dll.gz diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.dll b/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/dir1/System.Threading.Thread.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.dll rename to src/tests/Microsoft.SymbolStore.Tests/TestBinaries/dir1/System.Threading.Thread.dll diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.dll b/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/dir2/System.Threading.Thread.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.dll rename to src/tests/Microsoft.SymbolStore.Tests/TestBinaries/dir2/System.Threading.Thread.dll diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/libSystem.Security.Cryptography.Native.Apple.dylib.gz b/src/tests/Microsoft.SymbolStore.Tests/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 src/tests/Microsoft.SymbolStore.Tests/TestBinaries/libSystem.Security.Cryptography.Native.Apple.dylib.gz diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/md5_build_id b/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/md5_build_id similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/md5_build_id rename to src/tests/Microsoft.SymbolStore.Tests/TestBinaries/md5_build_id diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_amd64.dll b/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockclr_amd64.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_amd64.dll rename to src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockclr_amd64.dll diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_arm64.dll b/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockclr_arm64.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_arm64.dll rename to src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockclr_arm64.dll diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_i386.dll b/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockclr_i386.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_i386.dll rename to src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockclr_i386.dll diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdac.dll b/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockdac.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdac.dll rename to src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockdac.dll diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdbi.dll b/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockdbi.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdbi.dll rename to src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockdbi.dll diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mocksos.dll b/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mocksos.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mocksos.dll rename to src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mocksos.dll diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/stripped_executable b/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/stripped_executable similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/stripped_executable rename to src/tests/Microsoft.SymbolStore.Tests/TestBinaries/stripped_executable diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/symbolized_executable b/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/symbolized_executable similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/symbolized_executable rename to src/tests/Microsoft.SymbolStore.Tests/TestBinaries/symbolized_executable diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/Tracer.cs b/src/tests/Microsoft.SymbolStore.Tests/Tracer.cs similarity index 100% rename from src/tests/Microsoft.SymbolStore.UnitTests/Tracer.cs rename to src/tests/Microsoft.SymbolStore.Tests/Tracer.cs diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb deleted file mode 100644 index 57e63f5abf60529385502bcbdee1984d51241520..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5560 zcmZvg32+nF8OPtQPT!L8fhF6LeBc8kA7Fz4Lws@C@gdGM4UuI9L}ba9WU$D!i<1IP zCk4`w0j3m^PK}Fm&~}=Vw4G!^kE96+p}E>gI?S|bl7>k;Lo+#MlK#KdI(@vb%-^4W z@B8+>Z{M|V>F}-VkeI~i%7ps6I^4S&y$xCcGqF+p*pR_k`Q412hwTBE`x3EGWP6-q zY`DoyWve%??SgFp=cR!=!qFjcS3YA2^7juDYM0Dddg@m_W1mY4S;2W`L4gYGgU}4i zh6a(>HYT$-Vc&!Op(L>;mk&u*WSDJ7baAAFUF5%PJ#UfzCibgU;bj z3+`Ga8Q4YWE$DC1d(ai=D)a>;%LbMP*<>RNLWiNF&`D?tdR#WKub|%=Ozd6AYBaHG zXb>8K_CqJ2C!k+L7ofjFSD^nwvdP5Kpl8_1=fDS=N zp;OQ_bQU@XJqNu2U4-6-E<+zcpFmbK+JYLPR;V3X3k^V9AwLv?#-JpmLI2he|@&mhTSVrh^aDuO&v4b%v=LhaC6XaL#@`JoUr1|=cY zVrDNvZ$j@v|3KMC&{fE0MPESy=sxIS=touy`wU9QjJx)dm;qy-n%8-7$sE&MGjMDL z8#$)QX~MtR`yF62#}(IM3;Zj%{e)j*MpW zqvy}%nDU(?a3054uPmQqiZ9@}09=SwJ6k`k-MJhu1Q&6<2JGON{7#O^U(B)lI$Q!j zjWAsvNaRxZjk>=Wevw`9(+JZ=^TW+CjhBbxEN~gedI7!!gxg%Q3~z7r0K~1sv1;UXJPhdXCB8z%lt7Ii}}n5_qA&iv(^KxP@ct^~C}& z5x7<0r5scLE#sKx^KyaP1YRNVN{(s$-@q}|*Um9*E*%`xdg|nu=2sWTwb$Wp_|5u! zqyAha@M@0f`PK-$mSehq9mkaKdX8!QdIav}n8y1?f%`b7_WL=e`Ug0s`Ug2CzmH?O ze*?!9zma2Ve-p=a|7L-=2)tF`n*{!rz&8v0ZGmqQc$>ht3hWnnNZFN)^Do9Rjc1%=icfI$QT#Z^<=5d| z@LTlt;e}u1-SDUB{x;xa7@p4C!TLM zp5AYFaZK}(r@E|0tPLT)S11sSnj( zvn6sS&8nEps$~P6H#f=bCgc1pmT$y|Oo2IR7z#xU(V?A1n?sS|=#h!;|8n~8hu+x#pw>$kt(SbxIYeEhn(6as##f=4ja8c2RI8cZ2F>&>)Qs2ClJ@nG z=h7o%3dV!OzJxz;J32RKwsSGUdkgn^+^#LhAMCC>`RPcgzv{>j{`JKBAHMjGb@>kV z_%T;oRsN@!X~QU@LB=8|7J3vt8S;lid;Ez|G-8nUj#0|B_AD~R1)9lpYNo`UMYE;2 zGRwePjn)i&K_oHqa#BzBo0*+=uRnR}O7hvauAI61yC-g~Jh-jxwDaZ18b2AiN7e<%_h?w$w+#;MXGJ;n!)g%U|`KfcWa zp;3Q0SDLg*leN-hw=}s$njDcP54n)Oy9DXy8m$IaPo1*DoGfHHMp_ecvIhR9nrr;| z#-x#jj8+@#F(>DK9Z5AUXuT$Ky;#%A?rZ%2uW2h^6V@;*+>8;MOG#wY>MS(U-Yq9J zm;V~q0wZn1ax&k5GxUhvOk03~tutEfSTac(9>+wMmG#l1NyahSBny?jh%1xv4MeaH zP_FMADfdB?RLr^`0#xd5+IHQ_2|I;(lt=7ZQdHN`)?EhW^V0&CG0}!VW5QD357(_9|zyhh>AU_9@Tl_79qsl$RD!oTR+ml(H9eensOF<>C!gK2LeApR7l@w4Q94^5+#~iTT*dkMhr~G@3KCEXSxMTlqN4$OddS8>=&q72t)nRQU=q zoibjILo{XFMyxm-7S(hu&q39u*-CXz3zZkDc@1Q<)%-fLIckBItV1oVAe*nwb&;)B zi?sL()lpCERGpfwR*SX#E7g+4R9>c*E=k?z(t5l=b!)@pQaxHb4z*m1cc>MqepV~B zesQStmeYL>wMzF_>;4+u&e!AWbnDg28}#@ly?jwuDv#z=|Eev0DPFAgYni%aZHilU z|5Dw*Ot)=%+zQ>^pqF>(@m+fPssVdy$Mx#(g>P(T`wqAp>Tfl$&y^#`-rw_3zGcev zOxf#c7rIYB^1xC1<83pmKc+3SEThGMy+Paev$SoqHoKQ-flceuR&~JcG%>bX-Gqgq zEjI1d)Miea*)1}ghu9i*2)|T}Ds}@mj#_}wn zspORL9|@VpB%07-F||B6KliG4&c-^0+VtsYSMReMn3vYMo%VGa{e#-9Emt3cMVK?y zMcosD;3#dC-Mg?ax5u`}ztLIyXWXXgSHF0@DWm%3Z0EkGzxSInS38fqGJVg7e|c(h zN6+zc`*zw|>gb(hqk{)(r%sxaN9!QAWZ92*MwYKX8*(-O`;C{@)XY3}Gm6>f!bdU= r;9W+iz*dM(ZzL5Of~Y(KRYLU5KqtN;$ODltbrPgAV(LCBBN6`(x_+%f diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.pdb b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.pdb deleted file mode 100644 index 2fe974307b62a0632c85f6aba2d4f60a1b30d984..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5560 zcmZvg3vg7`8OP7P`_6MWWD~NR$8H|vLD+;q0zm@iWdsuQSe{nJ&1Qww&2F;0fh@l6 zC0d|%ENFp2rxbLiAtk=rjumY?I?{(P6sfN|*kPu%YGs_xP{+rN_W#|zv4~+f?4(6zf3ZsJU8{^}1v&}+3Oa>5 zEx79%$-vG+??QivK7=kpm!Pj9SvD{mWS5OB1U fsR4b(Bra+eGC1;U}7IYR-=j4 zKts?dv==%GJpug=Is?5AU4;G%$tDxafbt+0R1Gyi%b?XzFSH&CKw)ScN|xH zfsR8n&{NPU=mqE{=q&UebOHJp`W&*F(H68AYK7XNHP9fm1qwi6XdFsGDzpze03Csj zLo?7*&?)Ez=q2bZ^d58p`WX5T^d%%&Ow0y3pd!c%)k2G*R;V3X0}Vo3pa2wx#-S9X zTFmTK=pE<-=$|P26uJc2t>`N#2;B=EhJJ3furHwu%(%-hi5W2V>3N+Gm&`HEH3P?1 zu#sb$oF@F6yWa&ib6j}^w!lv_k1jK0<(Sr$P2dcHGX>5PI9uQxfpZ16b8JWZ4rDZ! zA3c8_$CU3pf%7@WdSy5&Y5x9qAdcJD~Uc)inzm{XlcOAzxe!T+saZKZVoxuGZQ~LuPQ~iS+Q~g66li$xV z-M^k=ir>I7wZD;Lx_^_vn+4t?@bv=!K;Rn$zER+t1l}s}%>oAm9u_#rG0mqDfkOh{ zBJehWw+kE=_*Q{$6F4I9sK8NyV*-!i1U5HcY5c}Hrui4=n8q`~F~ujj`Y3*aLS7ogCBrr7Kta+s*w=zhCOL63UA98HQHVzv-_*D@o@}o@u;A$*z`+n!R79)kH1e zL~Ed(h)yRGJ7=LRDKlKbiFiB|O|IV_4+Tb8Jd}t{#Dk&qDV;?FqoMUNe*;x&q07KZ$!NC0{U+b%SIyXW8?LN{X6SdY+3ee(|2YFJ9HS?1!f&cbOh-{^+6U zl{KHB z96$#$b7yRHG!`}ahmb_hToTI5Ma{}tPsgv%PkE2s_iXd6(}uyw1FL`XO4G%@Tw7_& zlh@@NP9Hf!mG7j)J(}tq z*x(xqMM8l@C?gt5(hvm3#`5&1P{-7yI$5GVfG0WX{p8MDrf22E`0O_ZZ;S0W!*6~% zv-Z-+>2GHKap3K}4{E(+(R#`6o=4PGs+oSTX8e_!*-)*SjdhyoYt&5t63zH5Ew=B5 zJdYk3Q!o)4@h1bp+t9hWbDfJ3-d(uc>nYp(@Ppm;$G#X14^$ue>A#=&=#!VvTUTyp zk3Uq_R_*-a0&N&YG{{&4#X^swC&PhAcvm19jzta9?r}=F&XG-~xIi;mZq1ZXxQ9OH-rL)PXXj?ea4v_UK=hl%eSN^(+Y_al| z)^54-b|0}@Ij=o)v2wv-rQW8V^D6(!w$YrSWjRhIIm&0*MmA`-+gZJNyZ|q(70S1W z>6Gzu9HuGbF=EBxu&8Eec@C*|%~q-NTBy8G&2J=|qdM!!=BfogvM#l-lB`pmUq-e@ zEz;sERaXPCTXk!;MlIIzuTo2vQF*yqx;%YfnbzY4sz)21GS#cK<5DZMc$Zq4?q{`1 z>lc^0U?tt>Qmb`;jqb12?Ls}SUbjBIyit#D(#w~2rSoV`_pjR0pXOy+zm}`Z*QB{s z_pi|XSLwD*k6WeNtM&2@J-$mXzh=;p-f?~Ud*OSV*`9r##)g{>>?`HaLm%xr=(J3m zo-2RLcBcEpBljP1Jl;0j^BHZK<(Vx8> ProjectK - $(RepoRootDir)/src/tests/SOS.UnitTests/Scripts + $(RepoRootDir)/src/tests/SOS.Tests/Scripts $(RepoRootDir)/artifacts $(RootBinDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration) - $(RootBinDir)/TestResults/$(TargetConfiguration)/sos.unittests_$(Timestamp) + $(RootBinDir)/TestResults/$(TargetConfiguration)/sos.Tests_$(Timestamp) $(RootBinDir)/tmp/$(TargetConfiguration)\dumps true diff --git a/src/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/SOS.Tests/ConfigFiles/Windows/Debugger.Tests.Config.txt similarity index 98% rename from src/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt rename to src/tests/SOS.Tests/ConfigFiles/Windows/Debugger.Tests.Config.txt index c5f05c49e6..b703eacdf8 100644 --- a/src/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/src/tests/SOS.Tests/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -13,10 +13,10 @@ $(RepoRootDir)\.dotnet-test\x86 - $(RepoRootDir)\src\tests\SOS.UnitTests\Scripts + $(RepoRootDir)\src\tests\SOS.Tests\Scripts $(RepoRootDir)\artifacts $(RootBinDir)\bin\Windows_NT.$(TargetArchitecture).$(TargetConfiguration) - $(RootBinDir)\TestResults\$(TargetConfiguration)\sos.unittests_$(Timestamp) + $(RootBinDir)\TestResults\$(TargetConfiguration)\sos.Tests_$(Timestamp) $(RootBinDir)\tmp\$(TargetConfiguration)\dumps $(InstallDir)\runcommand.dll $(DotNetRoot)\shared\Microsoft.NETCore.App\ diff --git a/src/tests/SOS.UnitTests/DumpGenerationFixture.cs b/src/tests/SOS.Tests/DumpGenerationFixture.cs similarity index 100% rename from src/tests/SOS.UnitTests/DumpGenerationFixture.cs rename to src/tests/SOS.Tests/DumpGenerationFixture.cs diff --git a/src/tests/SOS.UnitTests/SOS.UnitTests.csproj b/src/tests/SOS.Tests/SOS.Tests.csproj similarity index 100% rename from src/tests/SOS.UnitTests/SOS.UnitTests.csproj rename to src/tests/SOS.Tests/SOS.Tests.csproj diff --git a/src/tests/SOS.UnitTests/SOS.cs b/src/tests/SOS.Tests/SOS.cs similarity index 100% rename from src/tests/SOS.UnitTests/SOS.cs rename to src/tests/SOS.Tests/SOS.cs diff --git a/src/tests/SOS.UnitTests/SOSRunner.cs b/src/tests/SOS.Tests/SOSRunner.cs similarity index 100% rename from src/tests/SOS.UnitTests/SOSRunner.cs rename to src/tests/SOS.Tests/SOSRunner.cs diff --git a/src/tests/SOS.UnitTests/Scripts/ClrStackWithNumberOfFrames.script b/src/tests/SOS.Tests/Scripts/ClrStackWithNumberOfFrames.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/ClrStackWithNumberOfFrames.script rename to src/tests/SOS.Tests/Scripts/ClrStackWithNumberOfFrames.script diff --git a/src/tests/SOS.UnitTests/Scripts/ConcurrentDictionaries.script b/src/tests/SOS.Tests/Scripts/ConcurrentDictionaries.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/ConcurrentDictionaries.script rename to src/tests/SOS.Tests/Scripts/ConcurrentDictionaries.script diff --git a/src/tests/SOS.UnitTests/Scripts/DivZero.script b/src/tests/SOS.Tests/Scripts/DivZero.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/DivZero.script rename to src/tests/SOS.Tests/Scripts/DivZero.script diff --git a/src/tests/SOS.UnitTests/Scripts/DualRuntimes.script b/src/tests/SOS.Tests/Scripts/DualRuntimes.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/DualRuntimes.script rename to src/tests/SOS.Tests/Scripts/DualRuntimes.script diff --git a/src/tests/SOS.UnitTests/Scripts/DumpGen.script b/src/tests/SOS.Tests/Scripts/DumpGen.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/DumpGen.script rename to src/tests/SOS.Tests/Scripts/DumpGen.script diff --git a/src/tests/SOS.UnitTests/Scripts/DynamicMethod.script b/src/tests/SOS.Tests/Scripts/DynamicMethod.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/DynamicMethod.script rename to src/tests/SOS.Tests/Scripts/DynamicMethod.script diff --git a/src/tests/SOS.UnitTests/Scripts/GCPOH.script b/src/tests/SOS.Tests/Scripts/GCPOH.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/GCPOH.script rename to src/tests/SOS.Tests/Scripts/GCPOH.script diff --git a/src/tests/SOS.UnitTests/Scripts/GCTests.script b/src/tests/SOS.Tests/Scripts/GCTests.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/GCTests.script rename to src/tests/SOS.Tests/Scripts/GCTests.script diff --git a/src/tests/SOS.UnitTests/Scripts/LineNums.script b/src/tests/SOS.Tests/Scripts/LineNums.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/LineNums.script rename to src/tests/SOS.Tests/Scripts/LineNums.script diff --git a/src/tests/SOS.UnitTests/Scripts/NestedExceptionTest.script b/src/tests/SOS.Tests/Scripts/NestedExceptionTest.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/NestedExceptionTest.script rename to src/tests/SOS.Tests/Scripts/NestedExceptionTest.script diff --git a/src/tests/SOS.UnitTests/Scripts/OtherCommands.script b/src/tests/SOS.Tests/Scripts/OtherCommands.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/OtherCommands.script rename to src/tests/SOS.Tests/Scripts/OtherCommands.script diff --git a/src/tests/SOS.UnitTests/Scripts/Overflow.script b/src/tests/SOS.Tests/Scripts/Overflow.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/Overflow.script rename to src/tests/SOS.Tests/Scripts/Overflow.script diff --git a/src/tests/SOS.UnitTests/Scripts/Reflection.script b/src/tests/SOS.Tests/Scripts/Reflection.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/Reflection.script rename to src/tests/SOS.Tests/Scripts/Reflection.script diff --git a/src/tests/SOS.UnitTests/Scripts/SimpleThrow.script b/src/tests/SOS.Tests/Scripts/SimpleThrow.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/SimpleThrow.script rename to src/tests/SOS.Tests/Scripts/SimpleThrow.script diff --git a/src/tests/SOS.UnitTests/Scripts/StackAndOtherTests.script b/src/tests/SOS.Tests/Scripts/StackAndOtherTests.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/StackAndOtherTests.script rename to src/tests/SOS.Tests/Scripts/StackAndOtherTests.script diff --git a/src/tests/SOS.UnitTests/Scripts/StackTests.script b/src/tests/SOS.Tests/Scripts/StackTests.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/StackTests.script rename to src/tests/SOS.Tests/Scripts/StackTests.script diff --git a/src/tests/SOS.UnitTests/Scripts/StackTraceFaultingExceptionFrame.script b/src/tests/SOS.Tests/Scripts/StackTraceFaultingExceptionFrame.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/StackTraceFaultingExceptionFrame.script rename to src/tests/SOS.Tests/Scripts/StackTraceFaultingExceptionFrame.script diff --git a/src/tests/SOS.UnitTests/Scripts/StackTraceSoftwareExceptionFrame.script b/src/tests/SOS.Tests/Scripts/StackTraceSoftwareExceptionFrame.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/StackTraceSoftwareExceptionFrame.script rename to src/tests/SOS.Tests/Scripts/StackTraceSoftwareExceptionFrame.script diff --git a/src/tests/SOS.UnitTests/Scripts/TaskNestedException.script b/src/tests/SOS.Tests/Scripts/TaskNestedException.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/TaskNestedException.script rename to src/tests/SOS.Tests/Scripts/TaskNestedException.script diff --git a/src/tests/SOS.UnitTests/Scripts/TestExtensions.script b/src/tests/SOS.Tests/Scripts/TestExtensions.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/TestExtensions.script rename to src/tests/SOS.Tests/Scripts/TestExtensions.script diff --git a/src/tests/SOS.UnitTests/Scripts/WebApp.script b/src/tests/SOS.Tests/Scripts/WebApp.script similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/WebApp.script rename to src/tests/SOS.Tests/Scripts/WebApp.script diff --git a/src/tests/SOS.UnitTests/Scripts/lldbhelper.py b/src/tests/SOS.Tests/Scripts/lldbhelper.py similarity index 100% rename from src/tests/SOS.UnitTests/Scripts/lldbhelper.py rename to src/tests/SOS.Tests/Scripts/lldbhelper.py diff --git a/src/tests/Test.proj b/src/tests/Test.proj index 8b86c321d9..fcad286142 100644 --- a/src/tests/Test.proj +++ b/src/tests/Test.proj @@ -1,22 +1,22 @@ - - - - - - - - - + + + + + + + + + - + - - + + From 6cd41d839263331fcd38170b2d073c03a63863b7 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Wed, 8 Oct 2025 15:11:51 -0400 Subject: [PATCH 24/52] fix merge issues --- debuggees.slnx | 101 +++------- src/tests/Common/MockConsole.cs | 187 ++++++++++++++++++ .../Debuggees/DumpGCData/DumpGCData.csproj | 0 .../Debuggees/DumpGCData/Program.cs | 0 .../FindRootsOlderGeneration.csproj | 0 .../FindRootsOlderGeneration/Program.cs | 0 .../VarargPInvokeInteropMD/Program.cs | 0 .../VarargPInvokeInteropMD.csproj | 0 src/tests/Directory.Build.props | 2 +- .../DotnetCounters.Tests.csproj | 4 + .../dotnet-trace/DotnetTrace.UnitTests.csproj | 16 ++ 11 files changed, 230 insertions(+), 80 deletions(-) create mode 100644 src/tests/Common/MockConsole.cs rename src/{SOS/SOS.UnitTests => tests}/Debuggees/DumpGCData/DumpGCData.csproj (100%) rename src/{SOS/SOS.UnitTests => tests}/Debuggees/DumpGCData/Program.cs (100%) rename src/{SOS/SOS.UnitTests => tests}/Debuggees/FindRootsOlderGeneration/FindRootsOlderGeneration.csproj (100%) rename src/{SOS/SOS.UnitTests => tests}/Debuggees/FindRootsOlderGeneration/Program.cs (100%) rename src/{SOS/SOS.UnitTests => tests}/Debuggees/VarargPInvokeInteropMD/Program.cs (100%) rename src/{SOS/SOS.UnitTests => tests}/Debuggees/VarargPInvokeInteropMD/VarargPInvokeInteropMD.csproj (100%) create mode 100644 src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj diff --git a/debuggees.slnx b/debuggees.slnx index 4c7e2688af..62dbf195a1 100644 --- a/debuggees.slnx +++ b/debuggees.slnx @@ -10,84 +10,27 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/tests/Common/MockConsole.cs b/src/tests/Common/MockConsole.cs new file mode 100644 index 0000000000..f21858dddc --- /dev/null +++ b/src/tests/Common/MockConsole.cs @@ -0,0 +1,187 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Diagnostics; +using System.IO; +using System.Text; +using Microsoft.Diagnostics.Tools.Common; +using Xunit; + +namespace Microsoft.Diagnostics.Tests.Common +{ + internal class MockConsole : TextWriter, IConsole + { + char[][] _chars; + + int _cursorLeft; + + public MockConsole(int width, int height) + { + WindowWidth = BufferWidth = width; + WindowHeight = height; + Clear(); + } + + public override Encoding Encoding => Encoding.UTF8; + + public int WindowHeight { get; init; } + + public int WindowWidth { get; init; } + + public bool CursorVisible { get; set; } + + public int CursorLeft { get; private set; } + + public int CursorTop { get; private set; } + + public int BufferWidth { get; private set; } + + public int BufferHeight { get; private set; } + + public bool IsOutputRedirected { get; set; } + + public bool IsInputRedirected { get; private set; } + + public bool KeyAvailable { get; private set; } + + public TextWriter Out => this; + + public TextWriter Error => this; + + public void Clear() + { + _chars = new char[WindowHeight][]; + for(int i = 0; i < WindowHeight; i++) + { + _chars[i] = new char[WindowWidth]; + for(int j = 0; j < WindowWidth; j++) + { + _chars[i][j] = ' '; + } + } + CursorTop = 0; + _cursorLeft = 0; + } + public void SetCursorPosition(int col, int row) + { + CursorTop = row; + _cursorLeft = col; + } + public override void Write(string text) + { + for(int textPos = 0; textPos < text.Length; ) + { + // This attempts to mirror the behavior of System.Console + // if the console width is X then it is possible to write X characters and still have the console + // report you are on the same line. If the X+1'th character isn't a newline then the console automatically + // wraps and writes that character at the beginning of the next line leaving the cursor at index 1. If + // the X+1'th character is a newline then the cursor moves to the next line at index 0. + Debug.Assert(_cursorLeft <= WindowWidth); + if(text.AsSpan(textPos).StartsWith(Environment.NewLine)) + { + textPos += Environment.NewLine.Length; + _cursorLeft = 0; + CursorTop++; + } + else + { + if (_cursorLeft == WindowWidth) + { + _cursorLeft = 0; + CursorTop++; + } + // make sure we are writing inside the legal buffer area, if not we'll hit the exception below + if (CursorTop < WindowHeight) + { + _chars[CursorTop][_cursorLeft] = text[textPos]; + textPos++; + _cursorLeft++; + } + } + if (CursorTop >= WindowHeight) + { + // For now we assume that no test case intentionally scrolls the buffer. If we want to have tests that + // scroll the buffer by design then update this implementation. + throw new Exception("Writing beyond the end of the console buffer would have caused text to scroll."); + } + } + } + public override void WriteLine(string text) + { + Write(text); + Write(Environment.NewLine); + } + public override void WriteLine() => Write(Environment.NewLine); + + public string GetLineText(int row) => new string(_chars[row]).TrimEnd(); + + public ConsoleKeyInfo ReadKey() => Console.ReadKey(); + + public ConsoleKeyInfo ReadKey(bool intercept) => Console.ReadKey(intercept); + + public string[] Lines + { + get + { + string[] lines = new string[WindowHeight]; + for(int i = 0; i < WindowHeight; i++) + { + lines[i] = GetLineText(i); + } + return lines; + } + } + + public void AssertLinesEqual(params string[] expectedLines) => AssertLinesEqual(0, expectedLines); + + public void AssertLinesEqual(int startLine, params string[] expectedLines) + { + if (startLine + expectedLines.Length > Lines.Length) + { + Assert.Fail("MockConsole output had fewer output lines than expected." + Environment.NewLine + + $"Expected line count: {expectedLines.Length}" + Environment.NewLine + + $"Actual line count: {Lines.Length}"); + } + for (int i = 0; i < expectedLines.Length; i++) + { + + string actualLine = GetLineText(startLine+i); + string expectedLine = expectedLines[i]; + if(actualLine != expectedLine) + { + Assert.Fail("MockConsole output did not match expected output." + Environment.NewLine + + $"Expected line {startLine + i,2}: {expectedLine}" + Environment.NewLine + + $"Actual line : {actualLine}"); + } + + } + } + + public void AssertSanitizedLinesEqual(Func sanitizer, params string[] expectedLines) + { + string[] actualLines = Lines; + if (sanitizer is not null) + { + actualLines = sanitizer(actualLines); + } + Assert.True(actualLines.Length >= expectedLines.Length, "Sanitized console output had fewer lines than expected." + Environment.NewLine + + $"Expected line count: {expectedLines.Length}" + Environment.NewLine + + $"Actual line count: {actualLines.Length}"); + + for (int i = 0; i < expectedLines.Length; i++) + { + if (!string.Equals(expectedLines[i], actualLines[i], StringComparison.Ordinal)) + { + Assert.Fail("Sanitized console output mismatch." + Environment.NewLine + + $"Line {i,2} Expected: {expectedLines[i]}" + Environment.NewLine + + $"Line {i,2} Actual : {actualLines[i]}"); + } + } + for (int i = expectedLines.Length; i < actualLines.Length; i++) + { + Assert.True(string.IsNullOrEmpty(actualLines[i]), $"Actual line #{i} beyond expected lines is not empty: {actualLines[i]}"); + } + } + } +} diff --git a/src/SOS/SOS.UnitTests/Debuggees/DumpGCData/DumpGCData.csproj b/src/tests/Debuggees/DumpGCData/DumpGCData.csproj similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/DumpGCData/DumpGCData.csproj rename to src/tests/Debuggees/DumpGCData/DumpGCData.csproj diff --git a/src/SOS/SOS.UnitTests/Debuggees/DumpGCData/Program.cs b/src/tests/Debuggees/DumpGCData/Program.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/DumpGCData/Program.cs rename to src/tests/Debuggees/DumpGCData/Program.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/FindRootsOlderGeneration/FindRootsOlderGeneration.csproj b/src/tests/Debuggees/FindRootsOlderGeneration/FindRootsOlderGeneration.csproj similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/FindRootsOlderGeneration/FindRootsOlderGeneration.csproj rename to src/tests/Debuggees/FindRootsOlderGeneration/FindRootsOlderGeneration.csproj diff --git a/src/SOS/SOS.UnitTests/Debuggees/FindRootsOlderGeneration/Program.cs b/src/tests/Debuggees/FindRootsOlderGeneration/Program.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/FindRootsOlderGeneration/Program.cs rename to src/tests/Debuggees/FindRootsOlderGeneration/Program.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/VarargPInvokeInteropMD/Program.cs b/src/tests/Debuggees/VarargPInvokeInteropMD/Program.cs similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/VarargPInvokeInteropMD/Program.cs rename to src/tests/Debuggees/VarargPInvokeInteropMD/Program.cs diff --git a/src/SOS/SOS.UnitTests/Debuggees/VarargPInvokeInteropMD/VarargPInvokeInteropMD.csproj b/src/tests/Debuggees/VarargPInvokeInteropMD/VarargPInvokeInteropMD.csproj similarity index 100% rename from src/SOS/SOS.UnitTests/Debuggees/VarargPInvokeInteropMD/VarargPInvokeInteropMD.csproj rename to src/tests/Debuggees/VarargPInvokeInteropMD/VarargPInvokeInteropMD.csproj diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props index 009d9facee..933f9c5fe2 100644 --- a/src/tests/Directory.Build.props +++ b/src/tests/Directory.Build.props @@ -1,5 +1,5 @@ - + diff --git a/src/tests/DotnetCounters.Tests/DotnetCounters.Tests.csproj b/src/tests/DotnetCounters.Tests/DotnetCounters.Tests.csproj index cdac1c6ae6..4391f2fd89 100644 --- a/src/tests/DotnetCounters.Tests/DotnetCounters.Tests.csproj +++ b/src/tests/DotnetCounters.Tests/DotnetCounters.Tests.csproj @@ -10,6 +10,10 @@ + + + + diff --git a/src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj b/src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj new file mode 100644 index 0000000000..d1518411ff --- /dev/null +++ b/src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj @@ -0,0 +1,16 @@ + + + + $(NetCoreAppMinTargetFramework) + + + + + + + + + + + + From cdd97310ecfe9b3b0e00229e9b6081ddfe0c45e2 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Wed, 8 Oct 2025 15:24:35 -0400 Subject: [PATCH 25/52] fix slnx file --- diagnostics.slnx | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/diagnostics.slnx b/diagnostics.slnx index 7ff2a2aee8..7eb351876e 100644 --- a/diagnostics.slnx +++ b/diagnostics.slnx @@ -47,10 +47,6 @@ - - - - @@ -320,10 +316,6 @@ - - - - @@ -354,61 +346,69 @@ - + - + - + - + - + - + - + - + - + - + - + - + + + + + - + - + + + + + @@ -420,7 +420,7 @@ - + From 17d06335998a2d2483116f6c532eb179ab6ace89 Mon Sep 17 00:00:00 2001 From: Steve Pfister Date: Wed, 8 Oct 2025 15:43:31 -0400 Subject: [PATCH 26/52] Add back test binaries --- .../TestBinaries/HelloWorld.pdb | Bin 0 -> 11776 bytes .../dir1/System.Threading.Thread.pdb | Bin 0 -> 5560 bytes .../dir2/System.Threading.Thread.pdb | Bin 0 -> 5560 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/tests/Microsoft.FileFormats.Tests/TestBinaries/HelloWorld.pdb create mode 100644 src/tests/Microsoft.SymbolStore.Tests/TestBinaries/dir1/System.Threading.Thread.pdb create mode 100644 src/tests/Microsoft.SymbolStore.Tests/TestBinaries/dir2/System.Threading.Thread.pdb diff --git a/src/tests/Microsoft.FileFormats.Tests/TestBinaries/HelloWorld.pdb b/src/tests/Microsoft.FileFormats.Tests/TestBinaries/HelloWorld.pdb new file mode 100644 index 0000000000000000000000000000000000000000..adea403b4e92a74506a22217eae5b8a63ff65c54 GIT binary patch literal 11776 zcmeHNU2GIp6h5=m((NB?tyLD&3x_;-*j0{cPu7J*U0)0bCuuW+q;Rh zvTpy0eF{>aS^wslPk(rN>}>6=f#=`r%=j5u#~h>|_ddQjDX5m=6@tK0{h#N<;P}sR zc4x6%AudWY>mVTOzYaJ}pqf9tcj(gUE3wn#G`IVs$cJBMcb)n5mv3XIhunC_2PY?E zr7N)uTZrb{MlW3Nd#HBcleM`w{<21kuWvup>tVFZ_^S8giyPvTKYbT@|KhEMxu5@j zy9wY6jf*(u5#-CzI3^vbi@?H-g&Vw(JIA?-PvxtQW;=P)DwInFV>&-&6{|CvS#k2O z>Q1#_s7|FirCaK@RC-5#k8QoA6`|Xy8HTmbvW=-=5b7g#VJ1;@8ZP-|zvMEPd{mSi z2tw_b%rA-U{R ze_nnq@9DXoxPCOSq~(DC_n!o9iLo_*cqRqs0Mu(MCyREGE9fS|eY7gZ_nim(d0F31 z8)GkwA9pI+4E5g*Co+~{V4Tn`(@8w1nVPK^sVATx)6G|K`yFW$+OZ0!#RK^!%C=UR z(#<1@iGnlj;MuLTjaphR5B+xOv;E(Xp5GLWd~x>NA-*q1!_X16z%aIzkGI&?`-E(z zTaYO*lY*b`2g{8jm8g?wmi_92jKVu+#;6S}@bJPa1 zW2i#z1kgv12GUYbq?pnn1jilfL+O}wN+Q4rsF?G)Z!bmu+JM(PZOF%Sb(784?0TrF z-us`E@H~md`Shq+vM6a5W;BPAj$KTau@2Yl!-iFyb`wgvp*hJ0&kq{gH86h%asq~n??Dj03Z4aXTi6U9gKjGTeil52IG?lifVtP*59Z#;y%6n4 m^vEbA?;E&1@pHJx@;-A7Skm%9pm%wgA+3-INCfTy0{;LU46FA5 literal 0 HcmV?d00001 diff --git a/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/dir1/System.Threading.Thread.pdb b/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/dir1/System.Threading.Thread.pdb new file mode 100644 index 0000000000000000000000000000000000000000..2fe974307b62a0632c85f6aba2d4f60a1b30d984 GIT binary patch literal 5560 zcmZvg3vg7`8OP7P`_6MWWD~NR$8H|vLD+;q0zm@iWdsuQSe{nJ&1Qww&2F;0fh@l6 zC0d|%ENFp2rxbLiAtk=rjumY?I?{(P6sfN|*kPu%YGs_xP{+rN_W#|zv4~+f?4(6zf3ZsJU8{^}1v&}+3Oa>5 zEx79%$-vG+??QivK7=kpm!Pj9SvD{mWS5OB1U fsR4b(Bra+eGC1;U}7IYR-=j4 zKts?dv==%GJpug=Is?5AU4;G%$tDxafbt+0R1Gyi%b?XzFSH&CKw)ScN|xH zfsR8n&{NPU=mqE{=q&UebOHJp`W&*F(H68AYK7XNHP9fm1qwi6XdFsGDzpze03Csj zLo?7*&?)Ez=q2bZ^d58p`WX5T^d%%&Ow0y3pd!c%)k2G*R;V3X0}Vo3pa2wx#-S9X zTFmTK=pE<-=$|P26uJc2t>`N#2;B=EhJJ3furHwu%(%-hi5W2V>3N+Gm&`HEH3P?1 zu#sb$oF@F6yWa&ib6j}^w!lv_k1jK0<(Sr$P2dcHGX>5PI9uQxfpZ16b8JWZ4rDZ! zA3c8_$CU3pf%7@WdSy5&Y5x9qAdcJD~Uc)inzm{XlcOAzxe!T+saZKZVoxuGZQ~LuPQ~iS+Q~g66li$xV z-M^k=ir>I7wZD;Lx_^_vn+4t?@bv=!K;Rn$zER+t1l}s}%>oAm9u_#rG0mqDfkOh{ zBJehWw+kE=_*Q{$6F4I9sK8NyV*-!i1U5HcY5c}Hrui4=n8q`~F~ujj`Y3*aLS7ogCBrr7Kta+s*w=zhCOL63UA98HQHVzv-_*D@o@}o@u;A$*z`+n!R79)kH1e zL~Ed(h)yRGJ7=LRDKlKbiFiB|O|IV_4+Tb8Jd}t{#Dk&qDV;?FqoMUNe*;x&q07KZ$!NC0{U+b%SIyXW8?LN{X6SdY+3ee(|2YFJ9HS?1!f&cbOh-{^+6U zl{KHB z96$#$b7yRHG!`}ahmb_hToTI5Ma{}tPsgv%PkE2s_iXd6(}uyw1FL`XO4G%@Tw7_& zlh@@NP9Hf!mG7j)J(}tq z*x(xqMM8l@C?gt5(hvm3#`5&1P{-7yI$5GVfG0WX{p8MDrf22E`0O_ZZ;S0W!*6~% zv-Z-+>2GHKap3K}4{E(+(R#`6o=4PGs+oSTX8e_!*-)*SjdhyoYt&5t63zH5Ew=B5 zJdYk3Q!o)4@h1bp+t9hWbDfJ3-d(uc>nYp(@Ppm;$G#X14^$ue>A#=&=#!VvTUTyp zk3Uq_R_*-a0&N&YG{{&4#X^swC&PhAcvm19jzta9?r}=F&XG-~xIi;mZq1ZXxQ9OH-rL)PXXj?ea4v_UK=hl%eSN^(+Y_al| z)^54-b|0}@Ij=o)v2wv-rQW8V^D6(!w$YrSWjRhIIm&0*MmA`-+gZJNyZ|q(70S1W z>6Gzu9HuGbF=EBxu&8Eec@C*|%~q-NTBy8G&2J=|qdM!!=BfogvM#l-lB`pmUq-e@ zEz;sERaXPCTXk!;MlIIzuTo2vQF*yqx;%YfnbzY4sz)21GS#cK<5DZMc$Zq4?q{`1 z>lc^0U?tt>Qmb`;jqb12?Ls}SUbjBIyit#D(#w~2rSoV`_pjR0pXOy+zm}`Z*QB{s z_pi|XSLwD*k6WeNtM&2@J-$mXzh=;p-f?~Ud*OSV*`9r##)g{>>?`HaLm%xr=(J3m zo-2RLcBcEpBljP1Jl;0j^BHZK<(Vx8>~+f?4(6zf3ZsJU8{^}1v&}+3Oa>5 zEx79%$-vG+??QivK7=kpm!Pj9SvD{mWS5OB1U fsR4b(Bra+eGC1;U}7IYR-=j4 zKts?dv==%GJpug=Is?5AU4;G%$tDxafbt+0R1Gyi%b?XzFSH&CKw)ScN|xH zfsR8n&{NPU=mqE{=q&UebOHJp`W&*F(H68AYK7XNHP9fm1qwi6XdFsGDzpze03Csj zLo?7*&?)Ez=q2bZ^d58p`WX5T^d%%&Ow0y3pd!c%)k2G*R;V3X0}Vo3pa2wx#-S9X zTFmTK=pE<-=$|P26uJc2t>`N#2;B=EhJJ3furHwu%(%-hi5W2V>3N+Gm&`HEH3P?1 zu#sb$oF@F6yWa&ib6j}^w!lv_k1jK0<(Sr$P2dcHGX>5PI9uQxfpZ16b8JWZ4rDZ! zA3c8_$CU3pf%7@WdSy5&Y5x9qAdcJD~Uc)inzm{XlcOAzxe!T+saZKZVoxuGZQ~LuPQ~iS+Q~g66li$xV z-M^k=ir>I7wZD;Lx_^_vn+4t?@bv=!K;Rn$zER+t1l}s}%>oAm9u_#rG0mqDfkOh{ zBJehWw+kE=_*Q{$6F4I9sK8NyV*-!i1U5HcY5c}Hrui4=n8q`~F~ujj`Y3*aLS7ogCBrr7Kta+s*w=zhCOL63UA98HQHVzv-_*D@o@}o@u;A$*z`+n!R79)kH1e zL~Ed(h)yRGJ7=LRDKlKbiFiB|O|IV_4+Tb8Jd}t{#Dk&qDV;?FqoMUNe*;x&q07KZ$!NC0{U+b%SIyXW8?LN{X6SdY+3ee(|2YFJ9HS?1!f&cbOh-{^+6U zl{KHB z96$#$b7yRHG!`}ahmb_hToTI5Ma{}tPsgv%PkE2s_iXd6(}uyw1FL`XO4G%@Tw7_& zlh@@NP9Hf!mG7j)J(}tq z*x(xqMM8l@C?gt5(hvm3#`5&1P{-7yI$5GVfG0WX{p8MDrf22E`0O_ZZ;S0W!*6~% zv-Z-+>2GHKap3K}4{E(+(R#`6o=4PGs+oSTX8e_!*-)*SjdhyoYt&5t63zH5Ew=B5 zJdYk3Q!o)4@h1bp+t9hWbDfJ3-d(uc>nYp(@Ppm;$G#X14^$ue>A#=&=#!VvTUTyp zk3Uq_R_*-a0&N&YG{{&4#X^swC&PhAcvm19jzta9?r}=F&XG-~xIi;mZq1ZXxQ9OH-rL)PXXj?ea4v_UK=hl%eSN^(+Y_al| z)^54-b|0}@Ij=o)v2wv-rQW8V^D6(!w$YrSWjRhIIm&0*MmA`-+gZJNyZ|q(70S1W z>6Gzu9HuGbF=EBxu&8Eec@C*|%~q-NTBy8G&2J=|qdM!!=BfogvM#l-lB`pmUq-e@ zEz;sERaXPCTXk!;MlIIzuTo2vQF*yqx;%YfnbzY4sz)21GS#cK<5DZMc$Zq4?q{`1 z>lc^0U?tt>Qmb`;jqb12?Ls}SUbjBIyit#D(#w~2rSoV`_pjR0pXOy+zm}`Z*QB{s z_pi|XSLwD*k6WeNtM&2@J-$mXzh=;p-f?~Ud*OSV*`9r##)g{>>?`HaLm%xr=(J3m zo-2RLcBcEpBljP1Jl;0j^BHZK<(Vx8> Date: Wed, 8 Oct 2025 18:43:26 -0400 Subject: [PATCH 27/52] update .gitignore to ignore dirs.slnx --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 74094e8ce1..2dff8a06ff 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ .vs/ *.VC.db .venv/ +dirs.slnx # Build results [Aa]rtifacts/ From 521f47dea9ae3a4103567d5de34ff048e4626739 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Wed, 8 Oct 2025 18:44:03 -0400 Subject: [PATCH 28/52] use slngen/dirs.proj for build --- Build.proj | 34 -------------- dirs.proj | 12 +++++ eng/Build.props | 7 +-- generate-slnx.ps1 | 112 ++++++++++++++++++++++++++++++++++++++++++++ src/dirs.proj | 23 +++++++++ src/tests/Test.proj | 44 ----------------- src/tests/dirs.proj | 11 +++++ 7 files changed, 159 insertions(+), 84 deletions(-) delete mode 100644 Build.proj create mode 100644 dirs.proj create mode 100644 generate-slnx.ps1 create mode 100644 src/dirs.proj delete mode 100644 src/tests/Test.proj create mode 100644 src/tests/dirs.proj diff --git a/Build.proj b/Build.proj deleted file mode 100644 index fca5743862..0000000000 --- a/Build.proj +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dirs.proj b/dirs.proj new file mode 100644 index 0000000000..ea8d280abf --- /dev/null +++ b/dirs.proj @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/eng/Build.props b/eng/Build.props index a25a1e704b..82799c7c39 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -1,10 +1,5 @@ - - - - - - + diff --git a/generate-slnx.ps1 b/generate-slnx.ps1 new file mode 100644 index 0000000000..74069096a9 --- /dev/null +++ b/generate-slnx.ps1 @@ -0,0 +1,112 @@ +#!/usr/bin/env pwsh + +<# +.SYNOPSIS + Generates and migrates Visual Studio solution files for the diagnostics repository. + +.DESCRIPTION + This script generates solution files using SlnGen tool and migrates the legacy + dirs.sln file to the new .slnx format, then cleans up the old file. + +.EXAMPLE + .\generate-slnx.ps1 +#> + +[CmdletBinding()] +param() + +Set-StrictMode -Version Latest +$ErrorActionPreference = "Stop" + +# Determine local dotnet path (must exist) +$scriptRoot = Split-Path -Parent $MyInvocation.MyCommand.Path +$localDotNet = Join-Path $scriptRoot ".dotnet" +$dotnetExe = Join-Path $localDotNet "dotnet.exe" +if (-not (Test-Path $dotnetExe)) { + Write-Host "[ERROR] Local dotnet not found at $dotnetExe" -ForegroundColor Red + Write-Host "Ensure .dotnet is bootstrapped (e.g. run build/restore scripts) before running this generator." -ForegroundColor Yellow + exit 1 +} + +function Write-Step { + param([string]$Message) + Write-Host "==> $Message" -ForegroundColor Cyan +} + +function Write-Success { + param([string]$Message) + Write-Host "[SUCCESS] $Message" -ForegroundColor Green +} + +function Write-Warning { + param([string]$Message) + Write-Host "[WARNING] $Message" -ForegroundColor Yellow +} + +function Write-ErrorMessage { + param([string]$Message) + Write-Host "[ERROR] $Message" -ForegroundColor Red +} + +try { + Write-Host "Diagnostics Solution Generator" -ForegroundColor Magenta + Write-Host "==============================" -ForegroundColor Magenta + + # Step 1: Generate solution files with SlnGen + Write-Step "Generating solution files with SlnGen..." + try { + # Use local dotnet to execute SlnGen tool + & $dotnetExe tool exec Microsoft.VisualStudio.SlnGen.Tool --collapsefolders true --folders true --launch false + $slngenExit = $LASTEXITCODE + if ($slngenExit -ne 0) { + throw "SlnGen tool exited with non-zero exit code $slngenExit" + } + Write-Success "Solution files generated successfully" + } + catch { + Write-ErrorMessage "Failed to generate solution files with SlnGen" + Write-Host "Error details: $($_.Exception.Message)" -ForegroundColor Red + exit 1 + } + + # Step 2: Check if dirs.sln exists before migration + if (Test-Path "dirs.sln") { + Write-Step "Migrating dirs.sln to new format..." + try { + & $dotnetExe sln dirs.sln migrate + $migrateExit = $LASTEXITCODE + if ($migrateExit -ne 0) { throw "dotnet sln migrate exited with $migrateExit" } + Write-Success "Migration completed successfully" + } + catch { + Write-ErrorMessage "Failed to migrate dirs.sln" + Write-Host "Error details: $($_.Exception.Message)" -ForegroundColor Red + Write-Warning "Continuing with cleanup..." + } + + # Step 3: Clean up old solution file + Write-Step "Cleaning up old dirs.sln file..." + try { + Remove-Item "dirs.sln" -Force + Write-Success "Old solution file removed" + } + catch { + Write-Warning "Could not remove dirs.sln: $($_.Exception.Message)" + Write-Host "You may need to remove it manually" -ForegroundColor Yellow + } + } + else { + Write-Warning "dirs.sln not found, skipping migration step" + } + + Write-Host "" + Write-Success "Solution generation and migration completed successfully!" + Write-Host "You can now open the generated .slnx files in Visual Studio." -ForegroundColor Gray +} +catch { + Write-ErrorMessage "Script execution failed with unexpected error" + Write-Host "Error details: $($_.Exception.Message)" -ForegroundColor Red + Write-Host "Stack trace:" -ForegroundColor Gray + Write-Host $_.ScriptStackTrace -ForegroundColor Gray + exit 1 +} diff --git a/src/dirs.proj b/src/dirs.proj new file mode 100644 index 0000000000..eb520de8f2 --- /dev/null +++ b/src/dirs.proj @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/tests/Test.proj b/src/tests/Test.proj deleted file mode 100644 index fcad286142..0000000000 --- a/src/tests/Test.proj +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/tests/dirs.proj b/src/tests/dirs.proj new file mode 100644 index 0000000000..cb2e448c9d --- /dev/null +++ b/src/tests/dirs.proj @@ -0,0 +1,11 @@ + + + + + + + + + + + From a61dae8970bcb7d78d3f0e0bc637cd48709b6a15 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Wed, 8 Oct 2025 18:44:19 -0400 Subject: [PATCH 29/52] reduce diff --- .../dotnet-counters/dotnet-counters.csproj | 2 +- src/Tools/dotnet-stack/dotnet-stack.csproj | 2 +- src/Tools/dotnet-trace/dotnet-trace.csproj | 2 +- src/tests/DotnetCounters.Tests/MockConsole.cs | 191 ------------------ .../CSVExporterTests.cs | 2 +- .../ConsoleExporterTests.cs | 2 +- .../CounterMonitorPayloadTests.cs | 6 +- .../CounterMonitorTests.cs | 2 +- .../DotnetCounters.UnitTests.csproj} | 0 .../JSONExporterTests.cs | 2 +- .../TestConstants.cs | 2 +- .../DotnetStack.UnitTests.csproj} | 0 .../StackTests.cs | 0 .../CLRProviderParsing.cs | 0 .../ChildProcessTests.cs | 0 .../CollectCommandFunctionalTests.cs | 0 .../DotnetTrace.UnitTests.csproj} | 4 + .../ProfileProviderMerging.cs | 0 .../ProviderParsing.cs | 0 src/tests/EventPipe.Tests/ContentionEvents.cs | 4 +- src/tests/EventPipe.Tests/CustomEvents.cs | 4 +- src/tests/EventPipe.Tests/GCEvents.cs | 4 +- src/tests/EventPipe.Tests/LoaderEvents.cs | 4 +- src/tests/EventPipe.Tests/MethodEvents.cs | 4 +- src/tests/EventPipe.Tests/ThreadPoolEvents.cs | 4 +- .../EventPipe.Tests/common/IpcTraceTest.cs | 2 +- .../common/RemoteTestExecutorHelper.cs | 2 +- .../EventPipe.Tests/common/StreamProxy.cs | 2 +- src/tests/EventPipe.Tests/providers.cs | 4 +- src/tests/Grape/Grape.csproj | 2 +- .../ClrmaTests.cs | 2 +- .../CommandServiceTests.cs | 2 +- .../Unix/Debugger.Tests.Config.txt | 0 .../Windows/Debugger.Tests.Config.txt | 0 .../DebugServicesTests.cs | 2 +- ...oft.Diagnostics.DebugServices.Tests.csproj | 0 .../RunTests.cs | 2 +- .../ServiceEventTests.cs | 2 +- .../SymbolServiceTests.cs | 2 +- .../TestCommands.cs | 2 +- .../TestDbgEng.cs | 2 +- .../WriteTestData.cs | 2 +- .../AspNetTriggerUnitTests.cs | 2 +- .../DistributedTracesPipelineUnitTests.cs | 2 +- .../EventCounterConstants.cs | 2 +- .../EventCounterPipelineUnitTests.cs | 2 +- .../EventCounterTriggerTests.cs | 6 +- .../EventLogsPipelineUnitTests.cs | 2 +- .../EventTracePipelineUnitTests.cs | 2 +- .../GlobMatcherTests.cs | 2 +- .../LogsPipelineUnitTests.cs | 2 +- .../PipelineTestUtilities.cs | 2 +- .../SlidingWindowTests.cs | 2 +- .../TestStreamingLogger.cs | 2 +- .../PipelineTests.cs | 2 +- .../TestBinaries/HelloWorld.pdb | Bin 11776 -> 0 bytes .../AddressSpace.cs | 0 .../ELF/Tests.cs | 0 .../Layouts.cs | 0 .../MachO/Tests.cs | 0 .../Microsoft.FileFormats.UnitTests.csproj} | 0 .../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.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 .../dir1/System.Threading.Thread.pdb | Bin 5560 -> 0 bytes .../dir2/System.Threading.Thread.pdb | Bin 5560 -> 0 bytes .../KeyGeneratorTests.cs | 0 .../Microsoft.SymbolStore.UnitTests.csproj} | 24 +-- .../PEFileKeyGenerationTests.cs | 0 .../SymbolStoreTests.cs | 0 .../StackTraceSymbols.CoreCLR.cs.gz | Bin .../TestBinaries/coreclr.dll.gz | Bin .../dir1/System.Threading.Thread.dll | Bin .../dir2/System.Threading.Thread.dll | 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 .../Tracer.cs | 0 .../EventPipeTracee/CustomMetrics.cs | 2 +- .../EventPipeTracee/DuplicateNameMetrics.cs | 0 .../EventPipeTracee/EventPipeTracee.csproj | 0 .../EventPipeTracee/Program.cs | 0 .../ExitCodeTracee/ExitCodeTracee.csproj | 0 .../ExitCodeTracee/Program.cs | 0 .../StackTracee/Program.cs | 0 .../StackTracee/StackTracee.csproj | 0 .../{Debuggees => Tracees}/Tracee/Program.cs | 0 .../Tracee/Tracee.csproj | 0 .../dotnet-trace/DotnetTrace.UnitTests.csproj | 16 -- 114 files changed, 70 insertions(+), 273 deletions(-) delete mode 100644 src/tests/DotnetCounters.Tests/MockConsole.cs rename src/tests/{DotnetCounters.Tests => DotnetCounters.UnitTests}/CSVExporterTests.cs (99%) rename src/tests/{DotnetCounters.Tests => DotnetCounters.UnitTests}/ConsoleExporterTests.cs (99%) rename src/tests/{DotnetCounters.Tests => DotnetCounters.UnitTests}/CounterMonitorPayloadTests.cs (98%) rename src/tests/{DotnetCounters.Tests => DotnetCounters.UnitTests}/CounterMonitorTests.cs (99%) rename src/tests/{DotnetCounters.Tests/DotnetCounters.Tests.csproj => DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj} (100%) rename src/tests/{DotnetCounters.Tests => DotnetCounters.UnitTests}/JSONExporterTests.cs (99%) rename src/tests/{DotnetCounters.Tests => DotnetCounters.UnitTests}/TestConstants.cs (97%) rename src/tests/{DotnetStack.Tests/DotnetStack.Tests.csproj => DotnetStack.UnitTests/DotnetStack.UnitTests.csproj} (100%) rename src/tests/{DotnetStack.Tests => DotnetStack.UnitTests}/StackTests.cs (100%) rename src/tests/{DotnetTrace.Tests => DotnetTrace.UnitTests}/CLRProviderParsing.cs (100%) rename src/tests/{DotnetTrace.Tests => DotnetTrace.UnitTests}/ChildProcessTests.cs (100%) rename src/tests/{DotnetTrace.Tests => DotnetTrace.UnitTests}/CollectCommandFunctionalTests.cs (100%) rename src/tests/{DotnetTrace.Tests/DotnetTrace.Tests.csproj => DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj} (78%) rename src/tests/{DotnetTrace.Tests => DotnetTrace.UnitTests}/ProfileProviderMerging.cs (100%) rename src/tests/{DotnetTrace.Tests => DotnetTrace.UnitTests}/ProviderParsing.cs (100%) rename src/tests/{Microsoft.Diagnostics.DebugServices.Tests => Microsoft.Diagnostics.DebugServices.UnitTests}/ClrmaTests.cs (99%) rename src/tests/{Microsoft.Diagnostics.DebugServices.Tests => Microsoft.Diagnostics.DebugServices.UnitTests}/CommandServiceTests.cs (98%) rename src/tests/{Microsoft.Diagnostics.DebugServices.Tests => Microsoft.Diagnostics.DebugServices.UnitTests}/ConfigFiles/Unix/Debugger.Tests.Config.txt (100%) rename src/tests/{Microsoft.Diagnostics.DebugServices.Tests => Microsoft.Diagnostics.DebugServices.UnitTests}/ConfigFiles/Windows/Debugger.Tests.Config.txt (100%) rename src/tests/{Microsoft.Diagnostics.DebugServices.Tests => Microsoft.Diagnostics.DebugServices.UnitTests}/DebugServicesTests.cs (99%) rename src/tests/{Microsoft.Diagnostics.DebugServices.Tests => Microsoft.Diagnostics.DebugServices.UnitTests}/Microsoft.Diagnostics.DebugServices.Tests.csproj (100%) rename src/tests/{Microsoft.Diagnostics.DebugServices.Tests => Microsoft.Diagnostics.DebugServices.UnitTests}/RunTests.cs (99%) rename src/tests/{Microsoft.Diagnostics.DebugServices.Tests => Microsoft.Diagnostics.DebugServices.UnitTests}/ServiceEventTests.cs (98%) rename src/tests/{Microsoft.Diagnostics.DebugServices.Tests => Microsoft.Diagnostics.DebugServices.UnitTests}/SymbolServiceTests.cs (99%) rename src/tests/{Microsoft.Diagnostics.DebugServices.Tests => Microsoft.Diagnostics.DebugServices.UnitTests}/TestCommands.cs (97%) rename src/tests/{Microsoft.Diagnostics.DebugServices.Tests => Microsoft.Diagnostics.DebugServices.UnitTests}/TestDbgEng.cs (99%) rename src/tests/{Microsoft.Diagnostics.DebugServices.Tests => Microsoft.Diagnostics.DebugServices.UnitTests}/WriteTestData.cs (94%) delete mode 100644 src/tests/Microsoft.FileFormats.Tests/TestBinaries/HelloWorld.pdb rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/AddressSpace.cs (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/ELF/Tests.cs (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/Layouts.cs (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/MachO/Tests.cs (100%) rename src/tests/{Microsoft.FileFormats.Tests/Microsoft.FileFormats.Tests.csproj => Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj} (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/Minidump/Tests.cs (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/PDB/Tests.cs (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/PE/Tests.cs (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/PerfMap/Tests.cs (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/PrimitiveTypes.cs (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/TestBinaries/HelloWorld.exe (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/TestBinaries/HelloWorld.pdz (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.ni.r2rmap (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/TestBinaries/System.Diagnostics.StackTrace.dll (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/TestBinaries/apphost.gz (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/TestBinaries/core.gz (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/TestBinaries/ilasm.dbg (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/TestBinaries/libclrjit.dylib.dwarf.gz (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/TestBinaries/libcoreclr.dylib.gz (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/TestBinaries/libcoreclr.so.gz (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/TestBinaries/minidump_x64.dmp.gz (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/TestBinaries/minidump_x86.dmp.gz (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/TestBinaries/renamed_build_id_section (100%) rename src/tests/{Microsoft.FileFormats.Tests => Microsoft.FileFormats.UnitTests}/TestBinaries/triagedump.gz (100%) delete mode 100644 src/tests/Microsoft.SymbolStore.Tests/TestBinaries/dir1/System.Threading.Thread.pdb delete mode 100644 src/tests/Microsoft.SymbolStore.Tests/TestBinaries/dir2/System.Threading.Thread.pdb rename src/tests/{Microsoft.SymbolStore.Tests => Microsoft.SymbolStore.UnitTests}/KeyGeneratorTests.cs (100%) rename src/tests/{Microsoft.SymbolStore.Tests/Microsoft.SymbolStore.Tests.csproj => Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj} (80%) rename src/tests/{Microsoft.SymbolStore.Tests => Microsoft.SymbolStore.UnitTests}/PEFileKeyGenerationTests.cs (100%) rename src/tests/{Microsoft.SymbolStore.Tests => Microsoft.SymbolStore.UnitTests}/SymbolStoreTests.cs (100%) rename src/tests/{Microsoft.SymbolStore.Tests => Microsoft.SymbolStore.UnitTests}/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz (100%) rename src/tests/{Microsoft.SymbolStore.Tests => Microsoft.SymbolStore.UnitTests}/TestBinaries/coreclr.dll.gz (100%) rename src/tests/{Microsoft.SymbolStore.Tests => Microsoft.SymbolStore.UnitTests}/TestBinaries/dir1/System.Threading.Thread.dll (100%) rename src/tests/{Microsoft.SymbolStore.Tests => Microsoft.SymbolStore.UnitTests}/TestBinaries/dir2/System.Threading.Thread.dll (100%) rename src/tests/{Microsoft.SymbolStore.Tests => Microsoft.SymbolStore.UnitTests}/TestBinaries/libSystem.Security.Cryptography.Native.Apple.dylib.gz (100%) rename src/tests/{Microsoft.SymbolStore.Tests => Microsoft.SymbolStore.UnitTests}/TestBinaries/md5_build_id (100%) rename src/tests/{Microsoft.SymbolStore.Tests => Microsoft.SymbolStore.UnitTests}/TestBinaries/mockclr_amd64.dll (100%) rename src/tests/{Microsoft.SymbolStore.Tests => Microsoft.SymbolStore.UnitTests}/TestBinaries/mockclr_arm64.dll (100%) rename src/tests/{Microsoft.SymbolStore.Tests => Microsoft.SymbolStore.UnitTests}/TestBinaries/mockclr_i386.dll (100%) rename src/tests/{Microsoft.SymbolStore.Tests => Microsoft.SymbolStore.UnitTests}/TestBinaries/mockdac.dll (100%) rename src/tests/{Microsoft.SymbolStore.Tests => Microsoft.SymbolStore.UnitTests}/TestBinaries/mockdbi.dll (100%) rename src/tests/{Microsoft.SymbolStore.Tests => Microsoft.SymbolStore.UnitTests}/TestBinaries/mocksos.dll (100%) rename src/tests/{Microsoft.SymbolStore.Tests => Microsoft.SymbolStore.UnitTests}/TestBinaries/stripped_executable (100%) rename src/tests/{Microsoft.SymbolStore.Tests => Microsoft.SymbolStore.UnitTests}/TestBinaries/symbolized_executable (100%) rename src/tests/{Microsoft.SymbolStore.Tests => Microsoft.SymbolStore.UnitTests}/Tracer.cs (100%) rename src/tests/{Debuggees => Tracees}/EventPipeTracee/CustomMetrics.cs (97%) rename src/tests/{Debuggees => Tracees}/EventPipeTracee/DuplicateNameMetrics.cs (100%) rename src/tests/{Debuggees => Tracees}/EventPipeTracee/EventPipeTracee.csproj (100%) rename src/tests/{Debuggees => Tracees}/EventPipeTracee/Program.cs (100%) rename src/tests/{Debuggees => Tracees}/ExitCodeTracee/ExitCodeTracee.csproj (100%) rename src/tests/{Debuggees => Tracees}/ExitCodeTracee/Program.cs (100%) rename src/tests/{Debuggees => Tracees}/StackTracee/Program.cs (100%) rename src/tests/{Debuggees => Tracees}/StackTracee/StackTracee.csproj (100%) rename src/tests/{Debuggees => Tracees}/Tracee/Program.cs (100%) rename src/tests/{Debuggees => Tracees}/Tracee/Tracee.csproj (100%) delete mode 100644 src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj diff --git a/src/Tools/dotnet-counters/dotnet-counters.csproj b/src/Tools/dotnet-counters/dotnet-counters.csproj index 3859d119ba..1702d0213c 100644 --- a/src/Tools/dotnet-counters/dotnet-counters.csproj +++ b/src/Tools/dotnet-counters/dotnet-counters.csproj @@ -37,7 +37,7 @@ - + diff --git a/src/Tools/dotnet-stack/dotnet-stack.csproj b/src/Tools/dotnet-stack/dotnet-stack.csproj index d766e89899..beacb323f4 100644 --- a/src/Tools/dotnet-stack/dotnet-stack.csproj +++ b/src/Tools/dotnet-stack/dotnet-stack.csproj @@ -30,7 +30,7 @@ - + diff --git a/src/Tools/dotnet-trace/dotnet-trace.csproj b/src/Tools/dotnet-trace/dotnet-trace.csproj index fb5a894186..71b6aacb2e 100644 --- a/src/Tools/dotnet-trace/dotnet-trace.csproj +++ b/src/Tools/dotnet-trace/dotnet-trace.csproj @@ -26,7 +26,7 @@ - + diff --git a/src/tests/DotnetCounters.Tests/MockConsole.cs b/src/tests/DotnetCounters.Tests/MockConsole.cs deleted file mode 100644 index c763a25974..0000000000 --- a/src/tests/DotnetCounters.Tests/MockConsole.cs +++ /dev/null @@ -1,191 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. - -using System; -using System.Diagnostics; -using System.IO; -using System.Text; -using Microsoft.Diagnostics.Tools.Common; -using Xunit; - -<<<<<<<< HEAD:src/tests/DotnetCounters.Tests/MockConsole.cs -namespace DotnetCounters.Tests -======== -namespace Microsoft.Diagnostics.Tests.Common ->>>>>>>> origin/main:src/tests/Common/MockConsole.cs -{ - internal class MockConsole : TextWriter, IConsole - { - char[][] _chars; - - int _cursorLeft; - - public MockConsole(int width, int height) - { - WindowWidth = BufferWidth = width; - WindowHeight = height; - Clear(); - } - - public override Encoding Encoding => Encoding.UTF8; - - public int WindowHeight { get; init; } - - public int WindowWidth { get; init; } - - public bool CursorVisible { get; set; } - - public int CursorLeft { get; private set; } - - public int CursorTop { get; private set; } - - public int BufferWidth { get; private set; } - - public int BufferHeight { get; private set; } - - public bool IsOutputRedirected { get; set; } - - public bool IsInputRedirected { get; private set; } - - public bool KeyAvailable { get; private set; } - - public TextWriter Out => this; - - public TextWriter Error => this; - - public void Clear() - { - _chars = new char[WindowHeight][]; - for(int i = 0; i < WindowHeight; i++) - { - _chars[i] = new char[WindowWidth]; - for(int j = 0; j < WindowWidth; j++) - { - _chars[i][j] = ' '; - } - } - CursorTop = 0; - _cursorLeft = 0; - } - public void SetCursorPosition(int col, int row) - { - CursorTop = row; - _cursorLeft = col; - } - public override void Write(string text) - { - for(int textPos = 0; textPos < text.Length; ) - { - // This attempts to mirror the behavior of System.Console - // if the console width is X then it is possible to write X characters and still have the console - // report you are on the same line. If the X+1'th character isn't a newline then the console automatically - // wraps and writes that character at the beginning of the next line leaving the cursor at index 1. If - // the X+1'th character is a newline then the cursor moves to the next line at index 0. - Debug.Assert(_cursorLeft <= WindowWidth); - if(text.AsSpan(textPos).StartsWith(Environment.NewLine)) - { - textPos += Environment.NewLine.Length; - _cursorLeft = 0; - CursorTop++; - } - else - { - if (_cursorLeft == WindowWidth) - { - _cursorLeft = 0; - CursorTop++; - } - // make sure we are writing inside the legal buffer area, if not we'll hit the exception below - if (CursorTop < WindowHeight) - { - _chars[CursorTop][_cursorLeft] = text[textPos]; - textPos++; - _cursorLeft++; - } - } - if (CursorTop >= WindowHeight) - { - // For now we assume that no test case intentionally scrolls the buffer. If we want to have tests that - // scroll the buffer by design then update this implementation. - throw new Exception("Writing beyond the end of the console buffer would have caused text to scroll."); - } - } - } - public override void WriteLine(string text) - { - Write(text); - Write(Environment.NewLine); - } - public override void WriteLine() => Write(Environment.NewLine); - - public string GetLineText(int row) => new string(_chars[row]).TrimEnd(); - - public ConsoleKeyInfo ReadKey() => Console.ReadKey(); - - public ConsoleKeyInfo ReadKey(bool intercept) => Console.ReadKey(intercept); - - public string[] Lines - { - get - { - string[] lines = new string[WindowHeight]; - for(int i = 0; i < WindowHeight; i++) - { - lines[i] = GetLineText(i); - } - return lines; - } - } - - public void AssertLinesEqual(params string[] expectedLines) => AssertLinesEqual(0, expectedLines); - - public void AssertLinesEqual(int startLine, params string[] expectedLines) - { - if (startLine + expectedLines.Length > Lines.Length) - { - Assert.Fail("MockConsole output had fewer output lines than expected." + Environment.NewLine + - $"Expected line count: {expectedLines.Length}" + Environment.NewLine + - $"Actual line count: {Lines.Length}"); - } - for (int i = 0; i < expectedLines.Length; i++) - { - - string actualLine = GetLineText(startLine+i); - string expectedLine = expectedLines[i]; - if(actualLine != expectedLine) - { - Assert.Fail("MockConsole output did not match expected output." + Environment.NewLine + - $"Expected line {startLine + i,2}: {expectedLine}" + Environment.NewLine + - $"Actual line : {actualLine}"); - } - - } - } - - public void AssertSanitizedLinesEqual(Func sanitizer, params string[] expectedLines) - { - string[] actualLines = Lines; - if (sanitizer is not null) - { - actualLines = sanitizer(actualLines); - } - Assert.True(actualLines.Length >= expectedLines.Length, "Sanitized console output had fewer lines than expected." + Environment.NewLine + - $"Expected line count: {expectedLines.Length}" + Environment.NewLine + - $"Actual line count: {actualLines.Length}"); - - for (int i = 0; i < expectedLines.Length; i++) - { - if (!string.Equals(expectedLines[i], actualLines[i], StringComparison.Ordinal)) - { - Assert.Fail("Sanitized console output mismatch." + Environment.NewLine + - $"Line {i,2} Expected: {expectedLines[i]}" + Environment.NewLine + - $"Line {i,2} Actual : {actualLines[i]}"); - } - } - for (int i = expectedLines.Length; i < actualLines.Length; i++) - { - Assert.True(string.IsNullOrEmpty(actualLines[i]), $"Actual line #{i} beyond expected lines is not empty: {actualLines[i]}"); - } - } - } -} diff --git a/src/tests/DotnetCounters.Tests/CSVExporterTests.cs b/src/tests/DotnetCounters.UnitTests/CSVExporterTests.cs similarity index 99% rename from src/tests/DotnetCounters.Tests/CSVExporterTests.cs rename to src/tests/DotnetCounters.UnitTests/CSVExporterTests.cs index 9ae61bd940..a8c4d3decf 100644 --- a/src/tests/DotnetCounters.Tests/CSVExporterTests.cs +++ b/src/tests/DotnetCounters.UnitTests/CSVExporterTests.cs @@ -10,7 +10,7 @@ using Microsoft.Diagnostics.Monitoring.EventPipe; using Xunit; -namespace DotnetCounters.Tests +namespace DotnetCounters.UnitTests { /// /// These test the some of the known providers that we provide as a default configuration for customers to use. diff --git a/src/tests/DotnetCounters.Tests/ConsoleExporterTests.cs b/src/tests/DotnetCounters.UnitTests/ConsoleExporterTests.cs similarity index 99% rename from src/tests/DotnetCounters.Tests/ConsoleExporterTests.cs rename to src/tests/DotnetCounters.UnitTests/ConsoleExporterTests.cs index 3e359070f5..53e1ca1706 100644 --- a/src/tests/DotnetCounters.Tests/ConsoleExporterTests.cs +++ b/src/tests/DotnetCounters.UnitTests/ConsoleExporterTests.cs @@ -11,7 +11,7 @@ using Microsoft.Diagnostics.Tools.Counters.Exporters; using Xunit; -namespace DotnetCounters.Tests +namespace DotnetCounters.UnitTests { public class ConsoleExporterTests { diff --git a/src/tests/DotnetCounters.Tests/CounterMonitorPayloadTests.cs b/src/tests/DotnetCounters.UnitTests/CounterMonitorPayloadTests.cs similarity index 98% rename from src/tests/DotnetCounters.Tests/CounterMonitorPayloadTests.cs rename to src/tests/DotnetCounters.UnitTests/CounterMonitorPayloadTests.cs index 5d1f0459bc..7a93ce5bc4 100644 --- a/src/tests/DotnetCounters.Tests/CounterMonitorPayloadTests.cs +++ b/src/tests/DotnetCounters.UnitTests/CounterMonitorPayloadTests.cs @@ -16,12 +16,12 @@ using Xunit.Abstractions; using Xunit.Extensions; using TestRunner = Microsoft.Diagnostics.CommonTestRunner.TestRunner; -using Constants = DotnetCounters.Tests.TestConstants; +using Constants = DotnetCounters.UnitTests.TestConstants; -namespace DotnetCounters.Tests +namespace DotnetCounters.UnitTests { /// - /// Tests the behavior of CounterMonitor's Collect command. + /// UnitTests the behavior of CounterMonitor's Collect command. /// public class CounterMonitorPayloadTests { diff --git a/src/tests/DotnetCounters.Tests/CounterMonitorTests.cs b/src/tests/DotnetCounters.UnitTests/CounterMonitorTests.cs similarity index 99% rename from src/tests/DotnetCounters.Tests/CounterMonitorTests.cs rename to src/tests/DotnetCounters.UnitTests/CounterMonitorTests.cs index bb938c616b..30e7bbb816 100644 --- a/src/tests/DotnetCounters.Tests/CounterMonitorTests.cs +++ b/src/tests/DotnetCounters.UnitTests/CounterMonitorTests.cs @@ -9,7 +9,7 @@ using Microsoft.Diagnostics.Tools.Counters; using Xunit; -namespace DotnetCounters.Tests +namespace DotnetCounters.UnitTests { /// /// These test the various internal logic in CounterMonitor diff --git a/src/tests/DotnetCounters.Tests/DotnetCounters.Tests.csproj b/src/tests/DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj similarity index 100% rename from src/tests/DotnetCounters.Tests/DotnetCounters.Tests.csproj rename to src/tests/DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj diff --git a/src/tests/DotnetCounters.Tests/JSONExporterTests.cs b/src/tests/DotnetCounters.UnitTests/JSONExporterTests.cs similarity index 99% rename from src/tests/DotnetCounters.Tests/JSONExporterTests.cs rename to src/tests/DotnetCounters.UnitTests/JSONExporterTests.cs index a778bacbdb..929825df1d 100644 --- a/src/tests/DotnetCounters.Tests/JSONExporterTests.cs +++ b/src/tests/DotnetCounters.UnitTests/JSONExporterTests.cs @@ -12,7 +12,7 @@ #pragma warning disable CA1507 // Use nameof to express symbol names -namespace DotnetCounters.Tests +namespace DotnetCounters.UnitTests { /// /// These test the some of the known providers that we provide as a default configuration for customers to use. diff --git a/src/tests/DotnetCounters.Tests/TestConstants.cs b/src/tests/DotnetCounters.UnitTests/TestConstants.cs similarity index 97% rename from src/tests/DotnetCounters.Tests/TestConstants.cs rename to src/tests/DotnetCounters.UnitTests/TestConstants.cs index ec53fefff1..911b157b97 100644 --- a/src/tests/DotnetCounters.Tests/TestConstants.cs +++ b/src/tests/DotnetCounters.UnitTests/TestConstants.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace DotnetCounters.Tests +namespace DotnetCounters.UnitTests { public static class TestConstants { diff --git a/src/tests/DotnetStack.Tests/DotnetStack.Tests.csproj b/src/tests/DotnetStack.UnitTests/DotnetStack.UnitTests.csproj similarity index 100% rename from src/tests/DotnetStack.Tests/DotnetStack.Tests.csproj rename to src/tests/DotnetStack.UnitTests/DotnetStack.UnitTests.csproj diff --git a/src/tests/DotnetStack.Tests/StackTests.cs b/src/tests/DotnetStack.UnitTests/StackTests.cs similarity index 100% rename from src/tests/DotnetStack.Tests/StackTests.cs rename to src/tests/DotnetStack.UnitTests/StackTests.cs diff --git a/src/tests/DotnetTrace.Tests/CLRProviderParsing.cs b/src/tests/DotnetTrace.UnitTests/CLRProviderParsing.cs similarity index 100% rename from src/tests/DotnetTrace.Tests/CLRProviderParsing.cs rename to src/tests/DotnetTrace.UnitTests/CLRProviderParsing.cs diff --git a/src/tests/DotnetTrace.Tests/ChildProcessTests.cs b/src/tests/DotnetTrace.UnitTests/ChildProcessTests.cs similarity index 100% rename from src/tests/DotnetTrace.Tests/ChildProcessTests.cs rename to src/tests/DotnetTrace.UnitTests/ChildProcessTests.cs diff --git a/src/tests/DotnetTrace.Tests/CollectCommandFunctionalTests.cs b/src/tests/DotnetTrace.UnitTests/CollectCommandFunctionalTests.cs similarity index 100% rename from src/tests/DotnetTrace.Tests/CollectCommandFunctionalTests.cs rename to src/tests/DotnetTrace.UnitTests/CollectCommandFunctionalTests.cs diff --git a/src/tests/DotnetTrace.Tests/DotnetTrace.Tests.csproj b/src/tests/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj similarity index 78% rename from src/tests/DotnetTrace.Tests/DotnetTrace.Tests.csproj rename to src/tests/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj index ec9aefd278..7f2d9b0160 100644 --- a/src/tests/DotnetTrace.Tests/DotnetTrace.Tests.csproj +++ b/src/tests/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj @@ -9,4 +9,8 @@ + + + + diff --git a/src/tests/DotnetTrace.Tests/ProfileProviderMerging.cs b/src/tests/DotnetTrace.UnitTests/ProfileProviderMerging.cs similarity index 100% rename from src/tests/DotnetTrace.Tests/ProfileProviderMerging.cs rename to src/tests/DotnetTrace.UnitTests/ProfileProviderMerging.cs diff --git a/src/tests/DotnetTrace.Tests/ProviderParsing.cs b/src/tests/DotnetTrace.UnitTests/ProviderParsing.cs similarity index 100% rename from src/tests/DotnetTrace.Tests/ProviderParsing.cs rename to src/tests/DotnetTrace.UnitTests/ProviderParsing.cs diff --git a/src/tests/EventPipe.Tests/ContentionEvents.cs b/src/tests/EventPipe.Tests/ContentionEvents.cs index 904efb43f6..2e41c356a3 100644 --- a/src/tests/EventPipe.Tests/ContentionEvents.cs +++ b/src/tests/EventPipe.Tests/ContentionEvents.cs @@ -6,13 +6,13 @@ using System.Diagnostics.Tracing; using System.Threading; using System.Threading.Tasks; -using EventPipe.Tests.Common; +using EventPipe.UnitTests.Common; using Microsoft.Diagnostics.NETCore.Client; using Microsoft.Diagnostics.Tracing; using Xunit; using Xunit.Abstractions; -namespace EventPipe.Tests.ContentionValidation +namespace EventPipe.UnitTests.ContentionValidation { public class TestClass diff --git a/src/tests/EventPipe.Tests/CustomEvents.cs b/src/tests/EventPipe.Tests/CustomEvents.cs index 429f75a83d..bb81f5fd5f 100644 --- a/src/tests/EventPipe.Tests/CustomEvents.cs +++ b/src/tests/EventPipe.Tests/CustomEvents.cs @@ -5,12 +5,12 @@ using System.Collections.Generic; using System.Diagnostics.Tracing; using System.Threading.Tasks; -using EventPipe.Tests.Common; +using EventPipe.UnitTests.Common; using Microsoft.Diagnostics.NETCore.Client; using Xunit; using Xunit.Abstractions; -namespace EventPipe.Tests.CustomEventsValidation +namespace EventPipe.UnitTests.CustomEventsValidation { public class MyEventSource : EventSource { diff --git a/src/tests/EventPipe.Tests/GCEvents.cs b/src/tests/EventPipe.Tests/GCEvents.cs index 79fafdba41..c4374ff0a5 100644 --- a/src/tests/EventPipe.Tests/GCEvents.cs +++ b/src/tests/EventPipe.Tests/GCEvents.cs @@ -6,13 +6,13 @@ using System.Diagnostics.Tracing; using System.Runtime.InteropServices; using System.Threading.Tasks; -using EventPipe.Tests.Common; +using EventPipe.UnitTests.Common; using Microsoft.Diagnostics.NETCore.Client; using Microsoft.Diagnostics.Tracing; using Xunit; using Xunit.Abstractions; -namespace EventPipe.Tests.GCEventsValidation +namespace EventPipe.UnitTests.GCEventsValidation { public class TestClass diff --git a/src/tests/EventPipe.Tests/LoaderEvents.cs b/src/tests/EventPipe.Tests/LoaderEvents.cs index 85dd07cd4e..a54cfea294 100644 --- a/src/tests/EventPipe.Tests/LoaderEvents.cs +++ b/src/tests/EventPipe.Tests/LoaderEvents.cs @@ -9,13 +9,13 @@ using System.Runtime.Loader; using System.Threading; using System.Threading.Tasks; -using EventPipe.Tests.Common; +using EventPipe.UnitTests.Common; using Microsoft.Diagnostics.NETCore.Client; using Microsoft.Diagnostics.Tracing; using Xunit; using Xunit.Abstractions; -namespace EventPipe.Tests.LoaderEventsValidation +namespace EventPipe.UnitTests.LoaderEventsValidation { public class AssemblyLoad : AssemblyLoadContext { diff --git a/src/tests/EventPipe.Tests/MethodEvents.cs b/src/tests/EventPipe.Tests/MethodEvents.cs index b50901cce8..ef1daf66f3 100644 --- a/src/tests/EventPipe.Tests/MethodEvents.cs +++ b/src/tests/EventPipe.Tests/MethodEvents.cs @@ -6,13 +6,13 @@ using System.Diagnostics.Tracing; using System.Threading; using System.Threading.Tasks; -using EventPipe.Tests.Common; +using EventPipe.UnitTests.Common; using Microsoft.Diagnostics.NETCore.Client; using Microsoft.Diagnostics.Tracing; using Xunit; using Xunit.Abstractions; -namespace EventPipe.Tests.MethodEventsValidation +namespace EventPipe.UnitTests.MethodEventsValidation { public class M_verbose : IDisposable { diff --git a/src/tests/EventPipe.Tests/ThreadPoolEvents.cs b/src/tests/EventPipe.Tests/ThreadPoolEvents.cs index 5863d558f0..3561aab0eb 100644 --- a/src/tests/EventPipe.Tests/ThreadPoolEvents.cs +++ b/src/tests/EventPipe.Tests/ThreadPoolEvents.cs @@ -6,13 +6,13 @@ using System.Diagnostics.Tracing; using System.Threading; using System.Threading.Tasks; -using EventPipe.Tests.Common; +using EventPipe.UnitTests.Common; using Microsoft.Diagnostics.NETCore.Client; using Microsoft.Diagnostics.Tracing; using Xunit; using Xunit.Abstractions; -namespace EventPipe.Tests.ThreadPoolValidation +namespace EventPipe.UnitTests.ThreadPoolValidation { public class ThreadPoolEventsTests { diff --git a/src/tests/EventPipe.Tests/common/IpcTraceTest.cs b/src/tests/EventPipe.Tests/common/IpcTraceTest.cs index ec92f4d1e2..28e72a8572 100644 --- a/src/tests/EventPipe.Tests/common/IpcTraceTest.cs +++ b/src/tests/EventPipe.Tests/common/IpcTraceTest.cs @@ -14,7 +14,7 @@ using Microsoft.Diagnostics.NETCore.Client; using Microsoft.Diagnostics.Tracing; -namespace EventPipe.Tests.Common +namespace EventPipe.UnitTests.Common { public class Logger { diff --git a/src/tests/EventPipe.Tests/common/RemoteTestExecutorHelper.cs b/src/tests/EventPipe.Tests/common/RemoteTestExecutorHelper.cs index 42049572b6..92ee3e7b6b 100644 --- a/src/tests/EventPipe.Tests/common/RemoteTestExecutorHelper.cs +++ b/src/tests/EventPipe.Tests/common/RemoteTestExecutorHelper.cs @@ -7,7 +7,7 @@ using Microsoft.DotNet.RemoteExecutor; using Xunit.Abstractions; -namespace EventPipe.Tests.Common +namespace EventPipe.UnitTests.Common { public static class RemoteTestExecutorHelper { diff --git a/src/tests/EventPipe.Tests/common/StreamProxy.cs b/src/tests/EventPipe.Tests/common/StreamProxy.cs index 8743cbc351..b38d6421b0 100644 --- a/src/tests/EventPipe.Tests/common/StreamProxy.cs +++ b/src/tests/EventPipe.Tests/common/StreamProxy.cs @@ -5,7 +5,7 @@ using System.Buffers; using System.IO; -namespace EventPipe.Tests.Common +namespace EventPipe.UnitTests.Common { // This Stream implementation takes one stream // and proxies the Stream API to it while diff --git a/src/tests/EventPipe.Tests/providers.cs b/src/tests/EventPipe.Tests/providers.cs index aee79d4767..ffde173d9b 100644 --- a/src/tests/EventPipe.Tests/providers.cs +++ b/src/tests/EventPipe.Tests/providers.cs @@ -5,7 +5,7 @@ using System.Collections.Generic; using System.Diagnostics.Tracing; using System.Threading.Tasks; -using EventPipe.Tests.Common; +using EventPipe.UnitTests.Common; using Microsoft.Diagnostics.NETCore.Client; using Xunit; using Xunit.Abstractions; @@ -13,7 +13,7 @@ // Use this test as an example of how to write tests for EventPipe in // the dotnet/diagnostics repo -namespace EventPipe.Tests.ProviderValidation +namespace EventPipe.UnitTests.ProviderValidation { public sealed class MyEventSource : EventSource { diff --git a/src/tests/Grape/Grape.csproj b/src/tests/Grape/Grape.csproj index f37e603eb4..4fe3ab6e49 100644 --- a/src/tests/Grape/Grape.csproj +++ b/src/tests/Grape/Grape.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/ClrmaTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ClrmaTests.cs similarity index 99% rename from src/tests/Microsoft.Diagnostics.DebugServices.Tests/ClrmaTests.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ClrmaTests.cs index dd194d16f3..3be29ffc2c 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/ClrmaTests.cs +++ b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ClrmaTests.cs @@ -15,7 +15,7 @@ // Avoid unnecessary zero-length array allocations. Use Array.Empty() instead. #pragma warning disable CA1825 -namespace Microsoft.Diagnostics.DebugServices.Tests +namespace Microsoft.Diagnostics.DebugServices.UnitTests { public class ClrmaTests : IDisposable { diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/CommandServiceTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/CommandServiceTests.cs similarity index 98% rename from src/tests/Microsoft.Diagnostics.DebugServices.Tests/CommandServiceTests.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/CommandServiceTests.cs index 4712cd5d09..e70a57ced8 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/CommandServiceTests.cs +++ b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/CommandServiceTests.cs @@ -12,7 +12,7 @@ [assembly: SuppressMessage("Performance", "CA1825:Avoid zero-length array allocations.", Justification = "")] -namespace Microsoft.Diagnostics.DebugServices.Tests +namespace Microsoft.Diagnostics.DebugServices.UnitTests { public class CommandServiceTests : IDisposable { diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt similarity index 100% rename from src/tests/Microsoft.Diagnostics.DebugServices.Tests/ConfigFiles/Unix/Debugger.Tests.Config.txt rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt similarity index 100% rename from src/tests/Microsoft.Diagnostics.DebugServices.Tests/ConfigFiles/Windows/Debugger.Tests.Config.txt rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/DebugServicesTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/DebugServicesTests.cs similarity index 99% rename from src/tests/Microsoft.Diagnostics.DebugServices.Tests/DebugServicesTests.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/DebugServicesTests.cs index e175dfb34d..9c56848cd8 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/DebugServicesTests.cs +++ b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/DebugServicesTests.cs @@ -18,7 +18,7 @@ // Avoid unnecessary zero-length array allocations. Use Array.Empty() instead. #pragma warning disable CA1825 -namespace Microsoft.Diagnostics.DebugServices.Tests +namespace Microsoft.Diagnostics.DebugServices.UnitTests { public class DebugServicesTests : IDisposable { diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/Microsoft.Diagnostics.DebugServices.Tests.csproj b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.Tests.csproj similarity index 100% rename from src/tests/Microsoft.Diagnostics.DebugServices.Tests/Microsoft.Diagnostics.DebugServices.Tests.csproj rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.Tests.csproj diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/RunTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/RunTests.cs similarity index 99% rename from src/tests/Microsoft.Diagnostics.DebugServices.Tests/RunTests.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/RunTests.cs index 0f08ee0c55..c2299c85bf 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/RunTests.cs +++ b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/RunTests.cs @@ -15,7 +15,7 @@ using Xunit.Abstractions; using Xunit.Extensions; -namespace Microsoft.Diagnostics.DebugServices.Tests +namespace Microsoft.Diagnostics.DebugServices.UnitTests { [Command(Name = "runtests", Help = "Runs the debug services xunit tests.")] public class RunTestsCommand : CommandBase, ITestOutputHelper diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/ServiceEventTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ServiceEventTests.cs similarity index 98% rename from src/tests/Microsoft.Diagnostics.DebugServices.Tests/ServiceEventTests.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ServiceEventTests.cs index 7ac546c134..b3edc6d27d 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/ServiceEventTests.cs +++ b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/ServiceEventTests.cs @@ -5,7 +5,7 @@ using Microsoft.Diagnostics.DebugServices.Implementation; using Xunit; -namespace Microsoft.Diagnostics.DebugServices.Tests +namespace Microsoft.Diagnostics.DebugServices.UnitTests { /// /// Test the service event implementation diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/SymbolServiceTests.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/SymbolServiceTests.cs similarity index 99% rename from src/tests/Microsoft.Diagnostics.DebugServices.Tests/SymbolServiceTests.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/SymbolServiceTests.cs index ba1366b1db..27d279f978 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/SymbolServiceTests.cs +++ b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/SymbolServiceTests.cs @@ -8,7 +8,7 @@ using Microsoft.Diagnostics.DebugServices.Implementation; using Xunit; -namespace Microsoft.Diagnostics.DebugServices.Tests +namespace Microsoft.Diagnostics.DebugServices.UnitTests { /// /// Test the service event implementation diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/TestCommands.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestCommands.cs similarity index 97% rename from src/tests/Microsoft.Diagnostics.DebugServices.Tests/TestCommands.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestCommands.cs index 628222bbbb..920190d72d 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/TestCommands.cs +++ b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestCommands.cs @@ -5,7 +5,7 @@ using System; using Xunit; -namespace Microsoft.Diagnostics.DebugServices.Tests +namespace Microsoft.Diagnostics.DebugServices.UnitTests { [Command(Name = "testcommand", Help = "Test command #1")] public class TestCommand1 : CommandBase diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/TestDbgEng.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestDbgEng.cs similarity index 99% rename from src/tests/Microsoft.Diagnostics.DebugServices.Tests/TestDbgEng.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestDbgEng.cs index 2b45cf2674..f63f5a17f4 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/TestDbgEng.cs +++ b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/TestDbgEng.cs @@ -14,7 +14,7 @@ using SOS.Hosting; using SOS.Hosting.DbgEng.Interop; -namespace Microsoft.Diagnostics.DebugServices.Tests +namespace Microsoft.Diagnostics.DebugServices.UnitTests { public class TestDbgEng : TestHost { diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/WriteTestData.cs b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/WriteTestData.cs similarity index 94% rename from src/tests/Microsoft.Diagnostics.DebugServices.Tests/WriteTestData.cs rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/WriteTestData.cs index 0b09ac4b5a..d0a17cd26b 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.Tests/WriteTestData.cs +++ b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/WriteTestData.cs @@ -4,7 +4,7 @@ using System; using Microsoft.Diagnostics.TestHelpers; -namespace Microsoft.Diagnostics.DebugServices.Tests +namespace Microsoft.Diagnostics.DebugServices.UnitTests { [Command(Name = "writetestdata", Help = "Writes the test data xml file.")] public class WriteTestDataCommand : CommandBase diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/AspNetTriggerUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/AspNetTriggerUnitTests.cs index 33c919d0dc..c29c1ee092 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/AspNetTriggerUnitTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/AspNetTriggerUnitTests.cs @@ -7,7 +7,7 @@ using Xunit; using Xunit.Abstractions; -namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests { public class AspNetTriggerUnitTests { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/DistributedTracesPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/DistributedTracesPipelineUnitTests.cs index c355746f40..31e910bfa7 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/DistributedTracesPipelineUnitTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/DistributedTracesPipelineUnitTests.cs @@ -16,7 +16,7 @@ using Xunit.Extensions; using TestRunner = Microsoft.Diagnostics.CommonTestRunner.TestRunner; -namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests { public class DistributedTracesPipelineUnitTests { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterConstants.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterConstants.cs index 2e4b30667c..b264662f61 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterConstants.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterConstants.cs @@ -1,7 +1,7 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests { internal static class EventCounterConstants { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterPipelineUnitTests.cs index e370bdd4c3..2fb091ea9b 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterPipelineUnitTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterPipelineUnitTests.cs @@ -16,7 +16,7 @@ // Avoid unnecessary zero-length array allocations. Use Array.Empty() instead. #pragma warning disable CA1825 -namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests { public class EventCounterPipelineUnitTests { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterTriggerTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterTriggerTests.cs index 9ebf47212d..f171fc9441 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterTriggerTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterTriggerTests.cs @@ -20,7 +20,7 @@ // Avoid unnecessary zero-length array allocations. Use Array.Empty() instead. #pragma warning disable CA1825 -namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests { public class EventCounterTriggerTests { @@ -34,7 +34,7 @@ public EventCounterTriggerTests(ITestOutputHelper output) } /// - /// Tests the validation of the fields of the trigger settings. + /// UnitTests the validation of the fields of the trigger settings. /// [Fact] public void EventCounterTriggerSettingsValidationTest() @@ -318,7 +318,7 @@ public void EventCounterTriggerDropTest() } /// - /// Tests that the trigger condition can be detected on a live application + /// UnitTests that the trigger condition can be detected on a live application /// using the EventPipeTriggerPipeline. /// [SkippableTheory(Skip = "https://github.com/dotnet/diagnostics/issues/4782"), MemberData(nameof(Configurations))] diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventLogsPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventLogsPipelineUnitTests.cs index 0f9c3734b2..b087b93833 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventLogsPipelineUnitTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventLogsPipelineUnitTests.cs @@ -20,7 +20,7 @@ // Avoid unnecessary zero-length array allocations. Use Array.Empty() instead. #pragma warning disable CA1825 -namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests { public class EventLogsPipelineUnitTests { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventTracePipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventTracePipelineUnitTests.cs index 78b734e51a..304d5d520c 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventTracePipelineUnitTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventTracePipelineUnitTests.cs @@ -19,7 +19,7 @@ // Avoid unnecessary zero-length array allocations. Use Array.Empty() instead. #pragma warning disable CA1825 -namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests { public class EventTracePipelineUnitTests { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/GlobMatcherTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/GlobMatcherTests.cs index bdfc0a3e2e..88317be47b 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/GlobMatcherTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/GlobMatcherTests.cs @@ -8,7 +8,7 @@ using Xunit; using Xunit.Abstractions; -namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests { public class GlobMatcherTests { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/LogsPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/LogsPipelineUnitTests.cs index 30a3d67f93..0b11d899be 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/LogsPipelineUnitTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/LogsPipelineUnitTests.cs @@ -17,7 +17,7 @@ using Xunit.Extensions; using TestRunner = Microsoft.Diagnostics.CommonTestRunner.TestRunner; -namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests { public class LogsPipelineUnitTests { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/PipelineTestUtilities.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/PipelineTestUtilities.cs index cc21e1ad76..5630f2dd71 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/PipelineTestUtilities.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/PipelineTestUtilities.cs @@ -9,7 +9,7 @@ using Xunit.Abstractions; using TestRunner = Microsoft.Diagnostics.CommonTestRunner.TestRunner; -namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests { internal static class PipelineTestUtilities { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/SlidingWindowTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/SlidingWindowTests.cs index 424d5ea506..81d1b830e1 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/SlidingWindowTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/SlidingWindowTests.cs @@ -5,7 +5,7 @@ using Microsoft.Diagnostics.Monitoring.EventPipe.Triggers; using Xunit; -namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests { public class SlidingWindowTests { diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/TestStreamingLogger.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/TestStreamingLogger.cs index 263cb16cbd..54afee3baf 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/TestStreamingLogger.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/TestStreamingLogger.cs @@ -8,7 +8,7 @@ using System.Text.Json; using Microsoft.Extensions.Logging; -namespace Microsoft.Diagnostics.Monitoring.EventPipe.Tests +namespace Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests { /// /// CONSIDER We can't reuse StreamingLoggerProvider from using Microsoft.Diagnostics.Monitoring.WebApi. diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.Tests/PipelineTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.Tests/PipelineTests.cs index d4aacb1b31..071eb7622f 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.Tests/PipelineTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.Tests/PipelineTests.cs @@ -7,7 +7,7 @@ using Xunit; using Xunit.Abstractions; -namespace Microsoft.Diagnostics.Monitoring.Tests +namespace Microsoft.Diagnostics.Monitoring.UnitTests { public class PipelineTests { diff --git a/src/tests/Microsoft.FileFormats.Tests/TestBinaries/HelloWorld.pdb b/src/tests/Microsoft.FileFormats.Tests/TestBinaries/HelloWorld.pdb deleted file mode 100644 index adea403b4e92a74506a22217eae5b8a63ff65c54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11776 zcmeHNU2GIp6h5=m((NB?tyLD&3x_;-*j0{cPu7J*U0)0bCuuW+q;Rh zvTpy0eF{>aS^wslPk(rN>}>6=f#=`r%=j5u#~h>|_ddQjDX5m=6@tK0{h#N<;P}sR zc4x6%AudWY>mVTOzYaJ}pqf9tcj(gUE3wn#G`IVs$cJBMcb)n5mv3XIhunC_2PY?E zr7N)uTZrb{MlW3Nd#HBcleM`w{<21kuWvup>tVFZ_^S8giyPvTKYbT@|KhEMxu5@j zy9wY6jf*(u5#-CzI3^vbi@?H-g&Vw(JIA?-PvxtQW;=P)DwInFV>&-&6{|CvS#k2O z>Q1#_s7|FirCaK@RC-5#k8QoA6`|Xy8HTmbvW=-=5b7g#VJ1;@8ZP-|zvMEPd{mSi z2tw_b%rA-U{R ze_nnq@9DXoxPCOSq~(DC_n!o9iLo_*cqRqs0Mu(MCyREGE9fS|eY7gZ_nim(d0F31 z8)GkwA9pI+4E5g*Co+~{V4Tn`(@8w1nVPK^sVATx)6G|K`yFW$+OZ0!#RK^!%C=UR z(#<1@iGnlj;MuLTjaphR5B+xOv;E(Xp5GLWd~x>NA-*q1!_X16z%aIzkGI&?`-E(z zTaYO*lY*b`2g{8jm8g?wmi_92jKVu+#;6S}@bJPa1 zW2i#z1kgv12GUYbq?pnn1jilfL+O}wN+Q4rsF?G)Z!bmu+JM(PZOF%Sb(784?0TrF z-us`E@H~md`Shq+vM6a5W;BPAj$KTau@2Yl!-iFyb`wgvp*hJ0&kq{gH86h%asq~n??Dj03Z4aXTi6U9gKjGTeil52IG?lifVtP*59Z#;y%6n4 m^vEbA?;E&1@pHJx@;-A7Skm%9pm%wgA+3-INCfTy0{;LU46FA5 diff --git a/src/tests/Microsoft.FileFormats.Tests/AddressSpace.cs b/src/tests/Microsoft.FileFormats.UnitTests/AddressSpace.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/AddressSpace.cs rename to src/tests/Microsoft.FileFormats.UnitTests/AddressSpace.cs diff --git a/src/tests/Microsoft.FileFormats.Tests/ELF/Tests.cs b/src/tests/Microsoft.FileFormats.UnitTests/ELF/Tests.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/ELF/Tests.cs rename to src/tests/Microsoft.FileFormats.UnitTests/ELF/Tests.cs diff --git a/src/tests/Microsoft.FileFormats.Tests/Layouts.cs b/src/tests/Microsoft.FileFormats.UnitTests/Layouts.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/Layouts.cs rename to src/tests/Microsoft.FileFormats.UnitTests/Layouts.cs diff --git a/src/tests/Microsoft.FileFormats.Tests/MachO/Tests.cs b/src/tests/Microsoft.FileFormats.UnitTests/MachO/Tests.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/MachO/Tests.cs rename to src/tests/Microsoft.FileFormats.UnitTests/MachO/Tests.cs diff --git a/src/tests/Microsoft.FileFormats.Tests/Microsoft.FileFormats.Tests.csproj b/src/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/Microsoft.FileFormats.Tests.csproj rename to src/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj diff --git a/src/tests/Microsoft.FileFormats.Tests/Minidump/Tests.cs b/src/tests/Microsoft.FileFormats.UnitTests/Minidump/Tests.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/Minidump/Tests.cs rename to src/tests/Microsoft.FileFormats.UnitTests/Minidump/Tests.cs diff --git a/src/tests/Microsoft.FileFormats.Tests/PDB/Tests.cs b/src/tests/Microsoft.FileFormats.UnitTests/PDB/Tests.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/PDB/Tests.cs rename to src/tests/Microsoft.FileFormats.UnitTests/PDB/Tests.cs diff --git a/src/tests/Microsoft.FileFormats.Tests/PE/Tests.cs b/src/tests/Microsoft.FileFormats.UnitTests/PE/Tests.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/PE/Tests.cs rename to src/tests/Microsoft.FileFormats.UnitTests/PE/Tests.cs diff --git a/src/tests/Microsoft.FileFormats.Tests/PerfMap/Tests.cs b/src/tests/Microsoft.FileFormats.UnitTests/PerfMap/Tests.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/PerfMap/Tests.cs rename to src/tests/Microsoft.FileFormats.UnitTests/PerfMap/Tests.cs diff --git a/src/tests/Microsoft.FileFormats.Tests/PrimitiveTypes.cs b/src/tests/Microsoft.FileFormats.UnitTests/PrimitiveTypes.cs similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/PrimitiveTypes.cs rename to src/tests/Microsoft.FileFormats.UnitTests/PrimitiveTypes.cs diff --git a/src/tests/Microsoft.FileFormats.Tests/TestBinaries/HelloWorld.exe b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.exe similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/TestBinaries/HelloWorld.exe rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.exe diff --git a/src/tests/Microsoft.FileFormats.Tests/TestBinaries/HelloWorld.pdz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdz similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/TestBinaries/HelloWorld.pdz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdz diff --git a/src/tests/Microsoft.FileFormats.Tests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.dll diff --git a/src/tests/Microsoft.FileFormats.Tests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.ni.r2rmap b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.ni.r2rmap similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.ni.r2rmap rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/PerfMapEnabled/System.ComponentModel.EventBasedAsync.ni.r2rmap diff --git a/src/tests/Microsoft.FileFormats.Tests/TestBinaries/System.Diagnostics.StackTrace.dll b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/System.Diagnostics.StackTrace.dll similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/TestBinaries/System.Diagnostics.StackTrace.dll rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/System.Diagnostics.StackTrace.dll diff --git a/src/tests/Microsoft.FileFormats.Tests/TestBinaries/apphost.gz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/apphost.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/TestBinaries/apphost.gz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/apphost.gz diff --git a/src/tests/Microsoft.FileFormats.Tests/TestBinaries/core.gz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/core.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/TestBinaries/core.gz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/core.gz diff --git a/src/tests/Microsoft.FileFormats.Tests/TestBinaries/ilasm.dbg b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/ilasm.dbg similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/TestBinaries/ilasm.dbg rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/ilasm.dbg diff --git a/src/tests/Microsoft.FileFormats.Tests/TestBinaries/libclrjit.dylib.dwarf.gz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libclrjit.dylib.dwarf.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/TestBinaries/libclrjit.dylib.dwarf.gz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libclrjit.dylib.dwarf.gz diff --git a/src/tests/Microsoft.FileFormats.Tests/TestBinaries/libcoreclr.dylib.gz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.dylib.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/TestBinaries/libcoreclr.dylib.gz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.dylib.gz diff --git a/src/tests/Microsoft.FileFormats.Tests/TestBinaries/libcoreclr.so.gz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.so.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/TestBinaries/libcoreclr.so.gz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclr.so.gz diff --git a/src/tests/Microsoft.FileFormats.Tests/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/libcoreclrtraceptprovider.so.dbg.gz diff --git a/src/tests/Microsoft.FileFormats.Tests/TestBinaries/minidump_x64.dmp.gz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x64.dmp.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/TestBinaries/minidump_x64.dmp.gz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x64.dmp.gz diff --git a/src/tests/Microsoft.FileFormats.Tests/TestBinaries/minidump_x86.dmp.gz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x86.dmp.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/TestBinaries/minidump_x86.dmp.gz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/minidump_x86.dmp.gz diff --git a/src/tests/Microsoft.FileFormats.Tests/TestBinaries/renamed_build_id_section b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/renamed_build_id_section similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/TestBinaries/renamed_build_id_section rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/renamed_build_id_section diff --git a/src/tests/Microsoft.FileFormats.Tests/TestBinaries/triagedump.gz b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/triagedump.gz similarity index 100% rename from src/tests/Microsoft.FileFormats.Tests/TestBinaries/triagedump.gz rename to src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/triagedump.gz diff --git a/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/dir1/System.Threading.Thread.pdb b/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/dir1/System.Threading.Thread.pdb deleted file mode 100644 index 2fe974307b62a0632c85f6aba2d4f60a1b30d984..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5560 zcmZvg3vg7`8OP7P`_6MWWD~NR$8H|vLD+;q0zm@iWdsuQSe{nJ&1Qww&2F;0fh@l6 zC0d|%ENFp2rxbLiAtk=rjumY?I?{(P6sfN|*kPu%YGs_xP{+rN_W#|zv4~+f?4(6zf3ZsJU8{^}1v&}+3Oa>5 zEx79%$-vG+??QivK7=kpm!Pj9SvD{mWS5OB1U fsR4b(Bra+eGC1;U}7IYR-=j4 zKts?dv==%GJpug=Is?5AU4;G%$tDxafbt+0R1Gyi%b?XzFSH&CKw)ScN|xH zfsR8n&{NPU=mqE{=q&UebOHJp`W&*F(H68AYK7XNHP9fm1qwi6XdFsGDzpze03Csj zLo?7*&?)Ez=q2bZ^d58p`WX5T^d%%&Ow0y3pd!c%)k2G*R;V3X0}Vo3pa2wx#-S9X zTFmTK=pE<-=$|P26uJc2t>`N#2;B=EhJJ3furHwu%(%-hi5W2V>3N+Gm&`HEH3P?1 zu#sb$oF@F6yWa&ib6j}^w!lv_k1jK0<(Sr$P2dcHGX>5PI9uQxfpZ16b8JWZ4rDZ! zA3c8_$CU3pf%7@WdSy5&Y5x9qAdcJD~Uc)inzm{XlcOAzxe!T+saZKZVoxuGZQ~LuPQ~iS+Q~g66li$xV z-M^k=ir>I7wZD;Lx_^_vn+4t?@bv=!K;Rn$zER+t1l}s}%>oAm9u_#rG0mqDfkOh{ zBJehWw+kE=_*Q{$6F4I9sK8NyV*-!i1U5HcY5c}Hrui4=n8q`~F~ujj`Y3*aLS7ogCBrr7Kta+s*w=zhCOL63UA98HQHVzv-_*D@o@}o@u;A$*z`+n!R79)kH1e zL~Ed(h)yRGJ7=LRDKlKbiFiB|O|IV_4+Tb8Jd}t{#Dk&qDV;?FqoMUNe*;x&q07KZ$!NC0{U+b%SIyXW8?LN{X6SdY+3ee(|2YFJ9HS?1!f&cbOh-{^+6U zl{KHB z96$#$b7yRHG!`}ahmb_hToTI5Ma{}tPsgv%PkE2s_iXd6(}uyw1FL`XO4G%@Tw7_& zlh@@NP9Hf!mG7j)J(}tq z*x(xqMM8l@C?gt5(hvm3#`5&1P{-7yI$5GVfG0WX{p8MDrf22E`0O_ZZ;S0W!*6~% zv-Z-+>2GHKap3K}4{E(+(R#`6o=4PGs+oSTX8e_!*-)*SjdhyoYt&5t63zH5Ew=B5 zJdYk3Q!o)4@h1bp+t9hWbDfJ3-d(uc>nYp(@Ppm;$G#X14^$ue>A#=&=#!VvTUTyp zk3Uq_R_*-a0&N&YG{{&4#X^swC&PhAcvm19jzta9?r}=F&XG-~xIi;mZq1ZXxQ9OH-rL)PXXj?ea4v_UK=hl%eSN^(+Y_al| z)^54-b|0}@Ij=o)v2wv-rQW8V^D6(!w$YrSWjRhIIm&0*MmA`-+gZJNyZ|q(70S1W z>6Gzu9HuGbF=EBxu&8Eec@C*|%~q-NTBy8G&2J=|qdM!!=BfogvM#l-lB`pmUq-e@ zEz;sERaXPCTXk!;MlIIzuTo2vQF*yqx;%YfnbzY4sz)21GS#cK<5DZMc$Zq4?q{`1 z>lc^0U?tt>Qmb`;jqb12?Ls}SUbjBIyit#D(#w~2rSoV`_pjR0pXOy+zm}`Z*QB{s z_pi|XSLwD*k6WeNtM&2@J-$mXzh=;p-f?~Ud*OSV*`9r##)g{>>?`HaLm%xr=(J3m zo-2RLcBcEpBljP1Jl;0j^BHZK<(Vx8>~+f?4(6zf3ZsJU8{^}1v&}+3Oa>5 zEx79%$-vG+??QivK7=kpm!Pj9SvD{mWS5OB1U fsR4b(Bra+eGC1;U}7IYR-=j4 zKts?dv==%GJpug=Is?5AU4;G%$tDxafbt+0R1Gyi%b?XzFSH&CKw)ScN|xH zfsR8n&{NPU=mqE{=q&UebOHJp`W&*F(H68AYK7XNHP9fm1qwi6XdFsGDzpze03Csj zLo?7*&?)Ez=q2bZ^d58p`WX5T^d%%&Ow0y3pd!c%)k2G*R;V3X0}Vo3pa2wx#-S9X zTFmTK=pE<-=$|P26uJc2t>`N#2;B=EhJJ3furHwu%(%-hi5W2V>3N+Gm&`HEH3P?1 zu#sb$oF@F6yWa&ib6j}^w!lv_k1jK0<(Sr$P2dcHGX>5PI9uQxfpZ16b8JWZ4rDZ! zA3c8_$CU3pf%7@WdSy5&Y5x9qAdcJD~Uc)inzm{XlcOAzxe!T+saZKZVoxuGZQ~LuPQ~iS+Q~g66li$xV z-M^k=ir>I7wZD;Lx_^_vn+4t?@bv=!K;Rn$zER+t1l}s}%>oAm9u_#rG0mqDfkOh{ zBJehWw+kE=_*Q{$6F4I9sK8NyV*-!i1U5HcY5c}Hrui4=n8q`~F~ujj`Y3*aLS7ogCBrr7Kta+s*w=zhCOL63UA98HQHVzv-_*D@o@}o@u;A$*z`+n!R79)kH1e zL~Ed(h)yRGJ7=LRDKlKbiFiB|O|IV_4+Tb8Jd}t{#Dk&qDV;?FqoMUNe*;x&q07KZ$!NC0{U+b%SIyXW8?LN{X6SdY+3ee(|2YFJ9HS?1!f&cbOh-{^+6U zl{KHB z96$#$b7yRHG!`}ahmb_hToTI5Ma{}tPsgv%PkE2s_iXd6(}uyw1FL`XO4G%@Tw7_& zlh@@NP9Hf!mG7j)J(}tq z*x(xqMM8l@C?gt5(hvm3#`5&1P{-7yI$5GVfG0WX{p8MDrf22E`0O_ZZ;S0W!*6~% zv-Z-+>2GHKap3K}4{E(+(R#`6o=4PGs+oSTX8e_!*-)*SjdhyoYt&5t63zH5Ew=B5 zJdYk3Q!o)4@h1bp+t9hWbDfJ3-d(uc>nYp(@Ppm;$G#X14^$ue>A#=&=#!VvTUTyp zk3Uq_R_*-a0&N&YG{{&4#X^swC&PhAcvm19jzta9?r}=F&XG-~xIi;mZq1ZXxQ9OH-rL)PXXj?ea4v_UK=hl%eSN^(+Y_al| z)^54-b|0}@Ij=o)v2wv-rQW8V^D6(!w$YrSWjRhIIm&0*MmA`-+gZJNyZ|q(70S1W z>6Gzu9HuGbF=EBxu&8Eec@C*|%~q-NTBy8G&2J=|qdM!!=BfogvM#l-lB`pmUq-e@ zEz;sERaXPCTXk!;MlIIzuTo2vQF*yqx;%YfnbzY4sz)21GS#cK<5DZMc$Zq4?q{`1 z>lc^0U?tt>Qmb`;jqb12?Ls}SUbjBIyit#D(#w~2rSoV`_pjR0pXOy+zm}`Z*QB{s z_pi|XSLwD*k6WeNtM&2@J-$mXzh=;p-f?~Ud*OSV*`9r##)g{>>?`HaLm%xr=(J3m zo-2RLcBcEpBljP1Jl;0j^BHZK<(Vx8> - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest diff --git a/src/tests/Microsoft.SymbolStore.Tests/PEFileKeyGenerationTests.cs b/src/tests/Microsoft.SymbolStore.UnitTests/PEFileKeyGenerationTests.cs similarity index 100% rename from src/tests/Microsoft.SymbolStore.Tests/PEFileKeyGenerationTests.cs rename to src/tests/Microsoft.SymbolStore.UnitTests/PEFileKeyGenerationTests.cs diff --git a/src/tests/Microsoft.SymbolStore.Tests/SymbolStoreTests.cs b/src/tests/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs similarity index 100% rename from src/tests/Microsoft.SymbolStore.Tests/SymbolStoreTests.cs rename to src/tests/Microsoft.SymbolStore.UnitTests/SymbolStoreTests.cs diff --git a/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz similarity index 100% rename from src/tests/Microsoft.SymbolStore.Tests/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/StackTraceSymbols.CoreCLR.cs.gz diff --git a/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/coreclr.dll.gz b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/coreclr.dll.gz similarity index 100% rename from src/tests/Microsoft.SymbolStore.Tests/TestBinaries/coreclr.dll.gz rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/coreclr.dll.gz diff --git a/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/dir1/System.Threading.Thread.dll b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.Tests/TestBinaries/dir1/System.Threading.Thread.dll rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.dll diff --git a/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/dir2/System.Threading.Thread.dll b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.Tests/TestBinaries/dir2/System.Threading.Thread.dll rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.dll diff --git a/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/libSystem.Security.Cryptography.Native.Apple.dylib.gz b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/libSystem.Security.Cryptography.Native.Apple.dylib.gz similarity index 100% rename from src/tests/Microsoft.SymbolStore.Tests/TestBinaries/libSystem.Security.Cryptography.Native.Apple.dylib.gz rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/libSystem.Security.Cryptography.Native.Apple.dylib.gz diff --git a/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/md5_build_id b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/md5_build_id similarity index 100% rename from src/tests/Microsoft.SymbolStore.Tests/TestBinaries/md5_build_id rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/md5_build_id diff --git a/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockclr_amd64.dll b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_amd64.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockclr_amd64.dll rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_amd64.dll diff --git a/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockclr_arm64.dll b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_arm64.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockclr_arm64.dll rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_arm64.dll diff --git a/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockclr_i386.dll b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_i386.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockclr_i386.dll rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockclr_i386.dll diff --git a/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockdac.dll b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdac.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockdac.dll rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdac.dll diff --git a/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockdbi.dll b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdbi.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mockdbi.dll rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mockdbi.dll diff --git a/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mocksos.dll b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mocksos.dll similarity index 100% rename from src/tests/Microsoft.SymbolStore.Tests/TestBinaries/mocksos.dll rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/mocksos.dll diff --git a/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/stripped_executable b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/stripped_executable similarity index 100% rename from src/tests/Microsoft.SymbolStore.Tests/TestBinaries/stripped_executable rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/stripped_executable diff --git a/src/tests/Microsoft.SymbolStore.Tests/TestBinaries/symbolized_executable b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/symbolized_executable similarity index 100% rename from src/tests/Microsoft.SymbolStore.Tests/TestBinaries/symbolized_executable rename to src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/symbolized_executable diff --git a/src/tests/Microsoft.SymbolStore.Tests/Tracer.cs b/src/tests/Microsoft.SymbolStore.UnitTests/Tracer.cs similarity index 100% rename from src/tests/Microsoft.SymbolStore.Tests/Tracer.cs rename to src/tests/Microsoft.SymbolStore.UnitTests/Tracer.cs diff --git a/src/tests/Debuggees/EventPipeTracee/CustomMetrics.cs b/src/tests/Tracees/EventPipeTracee/CustomMetrics.cs similarity index 97% rename from src/tests/Debuggees/EventPipeTracee/CustomMetrics.cs rename to src/tests/Tracees/EventPipeTracee/CustomMetrics.cs index bf2e3db804..4f93e6c530 100644 --- a/src/tests/Debuggees/EventPipeTracee/CustomMetrics.cs +++ b/src/tests/Tracees/EventPipeTracee/CustomMetrics.cs @@ -4,7 +4,7 @@ using System; using System.Collections.Generic; using System.Diagnostics.Metrics; -using Constants = DotnetCounters.Tests.TestConstants; +using Constants = DotnetCounters.UnitTests.TestConstants; namespace EventPipeTracee { diff --git a/src/tests/Debuggees/EventPipeTracee/DuplicateNameMetrics.cs b/src/tests/Tracees/EventPipeTracee/DuplicateNameMetrics.cs similarity index 100% rename from src/tests/Debuggees/EventPipeTracee/DuplicateNameMetrics.cs rename to src/tests/Tracees/EventPipeTracee/DuplicateNameMetrics.cs diff --git a/src/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj b/src/tests/Tracees/EventPipeTracee/EventPipeTracee.csproj similarity index 100% rename from src/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj rename to src/tests/Tracees/EventPipeTracee/EventPipeTracee.csproj diff --git a/src/tests/Debuggees/EventPipeTracee/Program.cs b/src/tests/Tracees/EventPipeTracee/Program.cs similarity index 100% rename from src/tests/Debuggees/EventPipeTracee/Program.cs rename to src/tests/Tracees/EventPipeTracee/Program.cs diff --git a/src/tests/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj b/src/tests/Tracees/ExitCodeTracee/ExitCodeTracee.csproj similarity index 100% rename from src/tests/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj rename to src/tests/Tracees/ExitCodeTracee/ExitCodeTracee.csproj diff --git a/src/tests/Debuggees/ExitCodeTracee/Program.cs b/src/tests/Tracees/ExitCodeTracee/Program.cs similarity index 100% rename from src/tests/Debuggees/ExitCodeTracee/Program.cs rename to src/tests/Tracees/ExitCodeTracee/Program.cs diff --git a/src/tests/Debuggees/StackTracee/Program.cs b/src/tests/Tracees/StackTracee/Program.cs similarity index 100% rename from src/tests/Debuggees/StackTracee/Program.cs rename to src/tests/Tracees/StackTracee/Program.cs diff --git a/src/tests/Debuggees/StackTracee/StackTracee.csproj b/src/tests/Tracees/StackTracee/StackTracee.csproj similarity index 100% rename from src/tests/Debuggees/StackTracee/StackTracee.csproj rename to src/tests/Tracees/StackTracee/StackTracee.csproj diff --git a/src/tests/Debuggees/Tracee/Program.cs b/src/tests/Tracees/Tracee/Program.cs similarity index 100% rename from src/tests/Debuggees/Tracee/Program.cs rename to src/tests/Tracees/Tracee/Program.cs diff --git a/src/tests/Debuggees/Tracee/Tracee.csproj b/src/tests/Tracees/Tracee/Tracee.csproj similarity index 100% rename from src/tests/Debuggees/Tracee/Tracee.csproj rename to src/tests/Tracees/Tracee/Tracee.csproj diff --git a/src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj b/src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj deleted file mode 100644 index d1518411ff..0000000000 --- a/src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - $(NetCoreAppMinTargetFramework) - - - - - - - - - - - - From a264bacea5ef3fd2774a012f99077d06ab3c77b5 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 9 Oct 2025 09:08:35 -0400 Subject: [PATCH 30/52] reduce diff --- eng/InstallRuntimes.proj | 10 ++++++++++ eng/ci-prepare-artifacts.cmd | 2 +- eng/testassets/writexml.cmd | 2 +- eng/testassets/writexml_x86.cmd | 2 +- .../Microsoft.Diagnostics.Monitoring.EventPipe.csproj | 8 ++++---- .../Microsoft.Diagnostics.Monitoring.csproj | 8 ++++---- .../Microsoft.Diagnostics.NETCore.Client.csproj | 2 +- .../ConfigFiles/Unix/Debugger.Tests.Config.txt | 2 +- .../ConfigFiles/Windows/Debugger.Tests.Config.txt | 2 +- .../ConfigFiles/Unix/Debugger.Tests.Config.txt | 2 +- .../ConfigFiles/Windows/Debugger.Tests.Config.txt | 2 ++ .../DbgShim.UnitTests.csproj} | 10 ++++++++++ .../{DbgShim.Tests => DbgShim.UnitTests}/DbgShimAPI.cs | 0 .../DbgShimTests.cs | 2 +- .../DebuggeeInfo.cs | 0 .../ICLRDebugging.cs | 0 .../{DbgShim.Tests => DbgShim.UnitTests}/ICorDebug.cs | 0 .../ICorDebugController.cs | 0 .../LibraryProviderWrapper.cs | 0 .../ManagedCallbackWrapper.cs | 0 ...crosoft.Diagnostics.DebugServices.UnitTests.csproj} | 0 .../AspNetTriggerUnitTests.cs | 0 .../DistributedTracesPipelineUnitTests.cs | 0 .../EventCounterConstants.cs | 0 .../EventCounterPipelineUnitTests.cs | 0 .../EventCounterTriggerTests.cs | 4 ++-- .../EventLogsPipelineUnitTests.cs | 0 .../EventTracePipelineUnitTests.cs | 0 .../GlobMatcherTests.cs | 0 .../LogsPipelineUnitTests.cs | 0 ...osoft.Diagnostics.Monitoring.EventPipe.Tests.csproj | 0 .../PipelineTestUtilities.cs | 0 .../SlidingWindowTests.cs | 0 .../TestStreamingLogger.cs | 0 .../CSVExporterTests.cs | 0 .../ConsoleExporterTests.cs | 0 .../CounterMonitorPayloadTests.cs | 2 +- .../CounterMonitorTests.cs | 0 .../DotnetCounters.UnitTests.csproj | 0 .../JSONExporterTests.cs | 0 .../TestConstants.cs | 0 .../DotnetStack.UnitTests.csproj | 0 .../StackTests.cs | 0 .../CLRProviderParsing.cs | 0 .../ChildProcessTests.cs | 0 .../CollectCommandFunctionalTests.cs | 0 .../DotnetTrace.UnitTests.csproj | 0 .../ProfileProviderMerging.cs | 0 .../ProviderParsing.cs | 0 .../{EventPipe.Tests => eventpipe}/ContentionEvents.cs | 0 .../{EventPipe.Tests => eventpipe}/CustomEvents.cs | 0 .../EventPipe.Tests.csproj | 0 src/tests/{EventPipe.Tests => eventpipe}/GCEvents.cs | 0 .../{EventPipe.Tests => eventpipe}/LoaderEvents.cs | 0 .../{EventPipe.Tests => eventpipe}/MethodEvents.cs | 0 src/tests/{EventPipe.Tests => eventpipe}/README.md | 0 .../{EventPipe.Tests => eventpipe}/ThreadPoolEvents.cs | 0 .../common/IpcTraceTest.cs | 0 .../common/RemoteTestExecutorHelper.cs | 0 .../common/StreamProxy.cs | 0 src/tests/{EventPipe.Tests => eventpipe}/providers.cs | 0 61 files changed, 41 insertions(+), 19 deletions(-) rename src/tests/{DbgShim.Tests => DbgShim.UnitTests}/ConfigFiles/Unix/Debugger.Tests.Config.txt (99%) rename src/tests/{DbgShim.Tests => DbgShim.UnitTests}/ConfigFiles/Windows/Debugger.Tests.Config.txt (97%) rename src/tests/{DbgShim.Tests/DbgShim.Tests.csproj => DbgShim.UnitTests/DbgShim.UnitTests.csproj} (87%) rename src/tests/{DbgShim.Tests => DbgShim.UnitTests}/DbgShimAPI.cs (100%) rename src/tests/{DbgShim.Tests => DbgShim.UnitTests}/DbgShimTests.cs (99%) rename src/tests/{DbgShim.Tests => DbgShim.UnitTests}/DebuggeeInfo.cs (100%) rename src/tests/{DbgShim.Tests => DbgShim.UnitTests}/ICLRDebugging.cs (100%) rename src/tests/{DbgShim.Tests => DbgShim.UnitTests}/ICorDebug.cs (100%) rename src/tests/{DbgShim.Tests => DbgShim.UnitTests}/ICorDebugController.cs (100%) rename src/tests/{DbgShim.Tests => DbgShim.UnitTests}/LibraryProviderWrapper.cs (100%) rename src/tests/{DbgShim.Tests => DbgShim.UnitTests}/ManagedCallbackWrapper.cs (100%) rename src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/{Microsoft.Diagnostics.DebugServices.Tests.csproj => Microsoft.Diagnostics.DebugServices.UnitTests.csproj} (100%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.Tests => Microsoft.Diagnostics.Monitoring.EventPipe}/AspNetTriggerUnitTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.Tests => Microsoft.Diagnostics.Monitoring.EventPipe}/DistributedTracesPipelineUnitTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.Tests => Microsoft.Diagnostics.Monitoring.EventPipe}/EventCounterConstants.cs (100%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.Tests => Microsoft.Diagnostics.Monitoring.EventPipe}/EventCounterPipelineUnitTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.Tests => Microsoft.Diagnostics.Monitoring.EventPipe}/EventCounterTriggerTests.cs (99%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.Tests => Microsoft.Diagnostics.Monitoring.EventPipe}/EventLogsPipelineUnitTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.Tests => Microsoft.Diagnostics.Monitoring.EventPipe}/EventTracePipelineUnitTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.Tests => Microsoft.Diagnostics.Monitoring.EventPipe}/GlobMatcherTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.Tests => Microsoft.Diagnostics.Monitoring.EventPipe}/LogsPipelineUnitTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.Tests => Microsoft.Diagnostics.Monitoring.EventPipe}/Microsoft.Diagnostics.Monitoring.EventPipe.Tests.csproj (100%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.Tests => Microsoft.Diagnostics.Monitoring.EventPipe}/PipelineTestUtilities.cs (100%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.Tests => Microsoft.Diagnostics.Monitoring.EventPipe}/SlidingWindowTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.Monitoring.EventPipe.Tests => Microsoft.Diagnostics.Monitoring.EventPipe}/TestStreamingLogger.cs (100%) rename src/tests/{DotnetCounters.UnitTests => dotnet-counters}/CSVExporterTests.cs (100%) rename src/tests/{DotnetCounters.UnitTests => dotnet-counters}/ConsoleExporterTests.cs (100%) rename src/tests/{DotnetCounters.UnitTests => dotnet-counters}/CounterMonitorPayloadTests.cs (99%) rename src/tests/{DotnetCounters.UnitTests => dotnet-counters}/CounterMonitorTests.cs (100%) rename src/tests/{DotnetCounters.UnitTests => dotnet-counters}/DotnetCounters.UnitTests.csproj (100%) rename src/tests/{DotnetCounters.UnitTests => dotnet-counters}/JSONExporterTests.cs (100%) rename src/tests/{DotnetCounters.UnitTests => dotnet-counters}/TestConstants.cs (100%) rename src/tests/{DotnetStack.UnitTests => dotnet-stack}/DotnetStack.UnitTests.csproj (100%) rename src/tests/{DotnetStack.UnitTests => dotnet-stack}/StackTests.cs (100%) rename src/tests/{DotnetTrace.UnitTests => dotnet-trace}/CLRProviderParsing.cs (100%) rename src/tests/{DotnetTrace.UnitTests => dotnet-trace}/ChildProcessTests.cs (100%) rename src/tests/{DotnetTrace.UnitTests => dotnet-trace}/CollectCommandFunctionalTests.cs (100%) rename src/tests/{DotnetTrace.UnitTests => dotnet-trace}/DotnetTrace.UnitTests.csproj (100%) rename src/tests/{DotnetTrace.UnitTests => dotnet-trace}/ProfileProviderMerging.cs (100%) rename src/tests/{DotnetTrace.UnitTests => dotnet-trace}/ProviderParsing.cs (100%) rename src/tests/{EventPipe.Tests => eventpipe}/ContentionEvents.cs (100%) rename src/tests/{EventPipe.Tests => eventpipe}/CustomEvents.cs (100%) rename src/tests/{EventPipe.Tests => eventpipe}/EventPipe.Tests.csproj (100%) rename src/tests/{EventPipe.Tests => eventpipe}/GCEvents.cs (100%) rename src/tests/{EventPipe.Tests => eventpipe}/LoaderEvents.cs (100%) rename src/tests/{EventPipe.Tests => eventpipe}/MethodEvents.cs (100%) rename src/tests/{EventPipe.Tests => eventpipe}/README.md (100%) rename src/tests/{EventPipe.Tests => eventpipe}/ThreadPoolEvents.cs (100%) rename src/tests/{EventPipe.Tests => eventpipe}/common/IpcTraceTest.cs (100%) rename src/tests/{EventPipe.Tests => eventpipe}/common/RemoteTestExecutorHelper.cs (100%) rename src/tests/{EventPipe.Tests => eventpipe}/common/StreamProxy.cs (100%) rename src/tests/{EventPipe.Tests => eventpipe}/providers.cs (100%) diff --git a/eng/InstallRuntimes.proj b/eng/InstallRuntimes.proj index 1e2b86ccca..d817ad01f9 100644 --- a/eng/InstallRuntimes.proj +++ b/eng/InstallRuntimes.proj @@ -22,6 +22,16 @@ $([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/ci-prepare-artifacts.cmd b/eng/ci-prepare-artifacts.cmd index ec47985367..c410d53cb2 100644 --- a/eng/ci-prepare-artifacts.cmd +++ b/eng/ci-prepare-artifacts.cmd @@ -5,7 +5,7 @@ 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' -projects %~dp0..\diagnostics.sln %*" +powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0common\Build.ps1""" %_commonArgs% -pack -noBl /bl:'%_logDir%Pack.binlog' if NOT '%ERRORLEVEL%' == '0' goto ExitWithCode echo Creating bundles diff --git a/eng/testassets/writexml.cmd b/eng/testassets/writexml.cmd index cc769f3af3..03eaa8969e 100644 --- a/eng/testassets/writexml.cmd +++ b/eng/testassets/writexml.cmd @@ -3,6 +3,6 @@ set _REPOROOT_=%~dp0..\.. set _DUMPPATH_=%1 set _XMLPATH_=%1.xml set _DEBUGGEEPATH_=%2 -set DOTNET_DIAGNOSTIC_EXTENSIONS=%_REPOROOT_%\artifacts\bin\Microsoft.Diagnostics.DebugServices.Tests\Debug\net6.0\Microsoft.Diagnostics.DebugServices.Tests.dll +set DOTNET_DIAGNOSTIC_EXTENSIONS=%_REPOROOT_%\artifacts\bin\Microsoft.Diagnostics.DebugServices.UnitTests\Debug\net6.0\Microsoft.Diagnostics.DebugServices.UnitTests.dll %_REPOROOT_%\.dotnet\dotnet.exe --fx-version 6.0.8 %_REPOROOT_%\artifacts\bin\dotnet-dump\Debug\netcoreapp3.1\publish\dotnet-dump.dll analyze %_DUMPPATH_% -c "setsymbolserver -directory %_DEBUGGEEPATH_%" -c "writetestdata %_XMLPATH_%" -c "exit" diff --git a/eng/testassets/writexml_x86.cmd b/eng/testassets/writexml_x86.cmd index d10611ee67..63cf2dd35e 100644 --- a/eng/testassets/writexml_x86.cmd +++ b/eng/testassets/writexml_x86.cmd @@ -3,6 +3,6 @@ set _REPOROOT_=%~dp0..\.. set _DUMPPATH_=%1 set _XMLPATH_=%1.xml set _DEBUGGEEPATH_=%2 -set DOTNET_DIAGNOSTIC_EXTENSIONS=%_REPOROOT_%\artifacts\bin\Microsoft.Diagnostics.DebugServices.Tests\Debug\net6.0\Microsoft.Diagnostics.DebugServices.Tests.dll +set DOTNET_DIAGNOSTIC_EXTENSIONS=%_REPOROOT_%\artifacts\bin\Microsoft.Diagnostics.DebugServices.UnitTests\Debug\net6.0\Microsoft.Diagnostics.DebugServices.UnitTests.dll %_REPOROOT_%\.dotnet\x86\dotnet.exe --fx-version 6.0.8 %_REPOROOT_%\artifacts\bin\dotnet-dump\Debug\netcoreapp3.1\publish\dotnet-dump.dll analyze %_DUMPPATH_% -c "setsymbolserver -directory %_DEBUGGEEPATH_%" -c "writetestdata %_XMLPATH_%" -c "exit" diff --git a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj index a64222d228..4558b2ed0c 100644 --- a/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj +++ b/src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj @@ -41,10 +41,10 @@ - - + + - - + + diff --git a/src/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.csproj b/src/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.csproj index 7cc0ef9b22..a4fff0796f 100644 --- a/src/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.csproj +++ b/src/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.csproj @@ -27,11 +27,11 @@ - + - - - + + + diff --git a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj index 3acac562dc..c006330b90 100644 --- a/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj +++ b/src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj @@ -46,7 +46,7 @@ - + diff --git a/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt index 07bbfe5185..e168348f44 100644 --- a/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -5,7 +5,7 @@ $(RepoRootDir)/artifacts $(RootBinDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration) - $(RootBinDir)/TestResults/$(TargetConfiguration)/common.Tests_$(Timestamp) + $(RootBinDir)/TestResults/$(TargetConfiguration)/common.unittests_$(Timestamp) ProjectK $(RepoRootDir)/src/tests diff --git a/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt index c18048a9a6..e3a408fbbf 100644 --- a/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -6,7 +6,7 @@ $(RepoRootDir)\artifacts $(RootBinDir)\bin\Windows_NT.$(TargetArchitecture).$(TargetConfiguration) - $(RootBinDir)\TestResults\$(TargetConfiguration)\common.Tests_$(Timestamp) + $(RootBinDir)\TestResults\$(TargetConfiguration)\common.unittests_$(Timestamp) ProjectK $(RepoRootDir)\src\tests diff --git a/src/tests/DbgShim.Tests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt similarity index 99% rename from src/tests/DbgShim.Tests/ConfigFiles/Unix/Debugger.Tests.Config.txt rename to src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt index 3a6b7f4299..d15f246aa9 100644 --- a/src/tests/DbgShim.Tests/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -5,7 +5,7 @@ $(RepoRootDir)/artifacts $(RootBinDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration) - $(RootBinDir)/TestResults/$(TargetConfiguration)/dbgshim.Tests_$(Timestamp) + $(RootBinDir)/TestResults/$(TargetConfiguration)/dbgshim.unittests_$(Timestamp) ProjectK $(RepoRootDir)/src/tests/Debuggees diff --git a/src/tests/DbgShim.Tests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt similarity index 97% rename from src/tests/DbgShim.Tests/ConfigFiles/Windows/Debugger.Tests.Config.txt rename to src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt index fce2bfa31f..58b51e78a0 100644 --- a/src/tests/DbgShim.Tests/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -5,8 +5,10 @@ $(RepoRootDir)\artifacts $(RootBinDir)\bin\Windows_NT.$(TargetArchitecture).$(TargetConfiguration) + $(RootBinDir)\TestResults\$(TargetConfiguration)\dbgshim.unittests_$(Timestamp) ProjectK + $(RepoRootDir)\eng\AuxMsbuildFiles $(RepoRootDir)\src\tests\Debuggees cli SimpleDebuggee diff --git a/src/tests/DbgShim.Tests/DbgShim.Tests.csproj b/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj similarity index 87% rename from src/tests/DbgShim.Tests/DbgShim.Tests.csproj rename to src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj index 4860f62e70..e58f360614 100644 --- a/src/tests/DbgShim.Tests/DbgShim.Tests.csproj +++ b/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj @@ -26,6 +26,16 @@ + + + + + + + + + + diff --git a/src/tests/DbgShim.Tests/DbgShimAPI.cs b/src/tests/DbgShim.UnitTests/DbgShimAPI.cs similarity index 100% rename from src/tests/DbgShim.Tests/DbgShimAPI.cs rename to src/tests/DbgShim.UnitTests/DbgShimAPI.cs diff --git a/src/tests/DbgShim.Tests/DbgShimTests.cs b/src/tests/DbgShim.UnitTests/DbgShimTests.cs similarity index 99% rename from src/tests/DbgShim.Tests/DbgShimTests.cs rename to src/tests/DbgShim.UnitTests/DbgShimTests.cs index fc02b760cd..118cf2527c 100644 --- a/src/tests/DbgShim.Tests/DbgShimTests.cs +++ b/src/tests/DbgShim.UnitTests/DbgShimTests.cs @@ -528,7 +528,7 @@ private static void TestICorDebug(DebuggeeInfo debuggeeInfo, ICorDebug corDebug) private async Task RemoteInvoke(TestConfiguration config, string testName, Func> method) { string singlefile = config.PublishSingleFile ? ".SingleFile" : ""; - testName = $"DbgShim.Tests{singlefile}.{testName}"; + testName = $"DbgShim.UnitTests{singlefile}.{testName}"; string dumpPath = Path.Combine(config.LogDirPath, testName + ".dmp"); using TestRunner.OutputHelper output = TestRunner.ConfigureLogging(config, Output, testName); int exitCode = await RemoteExecutorHelper.RemoteInvoke(output, config, TimeSpan.FromMinutes(5), dumpPath, method); diff --git a/src/tests/DbgShim.Tests/DebuggeeInfo.cs b/src/tests/DbgShim.UnitTests/DebuggeeInfo.cs similarity index 100% rename from src/tests/DbgShim.Tests/DebuggeeInfo.cs rename to src/tests/DbgShim.UnitTests/DebuggeeInfo.cs diff --git a/src/tests/DbgShim.Tests/ICLRDebugging.cs b/src/tests/DbgShim.UnitTests/ICLRDebugging.cs similarity index 100% rename from src/tests/DbgShim.Tests/ICLRDebugging.cs rename to src/tests/DbgShim.UnitTests/ICLRDebugging.cs diff --git a/src/tests/DbgShim.Tests/ICorDebug.cs b/src/tests/DbgShim.UnitTests/ICorDebug.cs similarity index 100% rename from src/tests/DbgShim.Tests/ICorDebug.cs rename to src/tests/DbgShim.UnitTests/ICorDebug.cs diff --git a/src/tests/DbgShim.Tests/ICorDebugController.cs b/src/tests/DbgShim.UnitTests/ICorDebugController.cs similarity index 100% rename from src/tests/DbgShim.Tests/ICorDebugController.cs rename to src/tests/DbgShim.UnitTests/ICorDebugController.cs diff --git a/src/tests/DbgShim.Tests/LibraryProviderWrapper.cs b/src/tests/DbgShim.UnitTests/LibraryProviderWrapper.cs similarity index 100% rename from src/tests/DbgShim.Tests/LibraryProviderWrapper.cs rename to src/tests/DbgShim.UnitTests/LibraryProviderWrapper.cs diff --git a/src/tests/DbgShim.Tests/ManagedCallbackWrapper.cs b/src/tests/DbgShim.UnitTests/ManagedCallbackWrapper.cs similarity index 100% rename from src/tests/DbgShim.Tests/ManagedCallbackWrapper.cs rename to src/tests/DbgShim.UnitTests/ManagedCallbackWrapper.cs diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.Tests.csproj b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj similarity index 100% rename from src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.Tests.csproj rename to src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/AspNetTriggerUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/AspNetTriggerUnitTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/AspNetTriggerUnitTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/AspNetTriggerUnitTests.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/DistributedTracesPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/DistributedTracesPipelineUnitTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/DistributedTracesPipelineUnitTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/DistributedTracesPipelineUnitTests.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterConstants.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterConstants.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterConstants.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterConstants.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterPipelineUnitTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterPipelineUnitTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterPipelineUnitTests.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterTriggerTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs similarity index 99% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterTriggerTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs index f171fc9441..def5d754ab 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventCounterTriggerTests.cs +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventCounterTriggerTests.cs @@ -34,7 +34,7 @@ public EventCounterTriggerTests(ITestOutputHelper output) } /// - /// UnitTests the validation of the fields of the trigger settings. + /// Tests the validation of the fields of the trigger settings. /// [Fact] public void EventCounterTriggerSettingsValidationTest() @@ -318,7 +318,7 @@ public void EventCounterTriggerDropTest() } /// - /// UnitTests that the trigger condition can be detected on a live application + /// Tests that the trigger condition can be detected on a live application /// using the EventPipeTriggerPipeline. /// [SkippableTheory(Skip = "https://github.com/dotnet/diagnostics/issues/4782"), MemberData(nameof(Configurations))] diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventLogsPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventLogsPipelineUnitTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventLogsPipelineUnitTests.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventTracePipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventTracePipelineUnitTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/EventTracePipelineUnitTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/EventTracePipelineUnitTests.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/GlobMatcherTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/GlobMatcherTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/GlobMatcherTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/GlobMatcherTests.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/LogsPipelineUnitTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/LogsPipelineUnitTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/LogsPipelineUnitTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/LogsPipelineUnitTests.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests.csproj b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.Tests.csproj similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests.csproj rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.Tests.csproj diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/PipelineTestUtilities.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/PipelineTestUtilities.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/PipelineTestUtilities.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/PipelineTestUtilities.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/SlidingWindowTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/SlidingWindowTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/SlidingWindowTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/SlidingWindowTests.cs diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/TestStreamingLogger.cs b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/TestStreamingLogger.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.EventPipe.Tests/TestStreamingLogger.cs rename to src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/TestStreamingLogger.cs diff --git a/src/tests/DotnetCounters.UnitTests/CSVExporterTests.cs b/src/tests/dotnet-counters/CSVExporterTests.cs similarity index 100% rename from src/tests/DotnetCounters.UnitTests/CSVExporterTests.cs rename to src/tests/dotnet-counters/CSVExporterTests.cs diff --git a/src/tests/DotnetCounters.UnitTests/ConsoleExporterTests.cs b/src/tests/dotnet-counters/ConsoleExporterTests.cs similarity index 100% rename from src/tests/DotnetCounters.UnitTests/ConsoleExporterTests.cs rename to src/tests/dotnet-counters/ConsoleExporterTests.cs diff --git a/src/tests/DotnetCounters.UnitTests/CounterMonitorPayloadTests.cs b/src/tests/dotnet-counters/CounterMonitorPayloadTests.cs similarity index 99% rename from src/tests/DotnetCounters.UnitTests/CounterMonitorPayloadTests.cs rename to src/tests/dotnet-counters/CounterMonitorPayloadTests.cs index 7a93ce5bc4..f1f6b554c0 100644 --- a/src/tests/DotnetCounters.UnitTests/CounterMonitorPayloadTests.cs +++ b/src/tests/dotnet-counters/CounterMonitorPayloadTests.cs @@ -21,7 +21,7 @@ namespace DotnetCounters.UnitTests { /// - /// UnitTests the behavior of CounterMonitor's Collect command. + /// Tests the behavior of CounterMonitor's Collect command. /// public class CounterMonitorPayloadTests { diff --git a/src/tests/DotnetCounters.UnitTests/CounterMonitorTests.cs b/src/tests/dotnet-counters/CounterMonitorTests.cs similarity index 100% rename from src/tests/DotnetCounters.UnitTests/CounterMonitorTests.cs rename to src/tests/dotnet-counters/CounterMonitorTests.cs diff --git a/src/tests/DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj b/src/tests/dotnet-counters/DotnetCounters.UnitTests.csproj similarity index 100% rename from src/tests/DotnetCounters.UnitTests/DotnetCounters.UnitTests.csproj rename to src/tests/dotnet-counters/DotnetCounters.UnitTests.csproj diff --git a/src/tests/DotnetCounters.UnitTests/JSONExporterTests.cs b/src/tests/dotnet-counters/JSONExporterTests.cs similarity index 100% rename from src/tests/DotnetCounters.UnitTests/JSONExporterTests.cs rename to src/tests/dotnet-counters/JSONExporterTests.cs diff --git a/src/tests/DotnetCounters.UnitTests/TestConstants.cs b/src/tests/dotnet-counters/TestConstants.cs similarity index 100% rename from src/tests/DotnetCounters.UnitTests/TestConstants.cs rename to src/tests/dotnet-counters/TestConstants.cs diff --git a/src/tests/DotnetStack.UnitTests/DotnetStack.UnitTests.csproj b/src/tests/dotnet-stack/DotnetStack.UnitTests.csproj similarity index 100% rename from src/tests/DotnetStack.UnitTests/DotnetStack.UnitTests.csproj rename to src/tests/dotnet-stack/DotnetStack.UnitTests.csproj diff --git a/src/tests/DotnetStack.UnitTests/StackTests.cs b/src/tests/dotnet-stack/StackTests.cs similarity index 100% rename from src/tests/DotnetStack.UnitTests/StackTests.cs rename to src/tests/dotnet-stack/StackTests.cs diff --git a/src/tests/DotnetTrace.UnitTests/CLRProviderParsing.cs b/src/tests/dotnet-trace/CLRProviderParsing.cs similarity index 100% rename from src/tests/DotnetTrace.UnitTests/CLRProviderParsing.cs rename to src/tests/dotnet-trace/CLRProviderParsing.cs diff --git a/src/tests/DotnetTrace.UnitTests/ChildProcessTests.cs b/src/tests/dotnet-trace/ChildProcessTests.cs similarity index 100% rename from src/tests/DotnetTrace.UnitTests/ChildProcessTests.cs rename to src/tests/dotnet-trace/ChildProcessTests.cs diff --git a/src/tests/DotnetTrace.UnitTests/CollectCommandFunctionalTests.cs b/src/tests/dotnet-trace/CollectCommandFunctionalTests.cs similarity index 100% rename from src/tests/DotnetTrace.UnitTests/CollectCommandFunctionalTests.cs rename to src/tests/dotnet-trace/CollectCommandFunctionalTests.cs diff --git a/src/tests/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj b/src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj similarity index 100% rename from src/tests/DotnetTrace.UnitTests/DotnetTrace.UnitTests.csproj rename to src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj diff --git a/src/tests/DotnetTrace.UnitTests/ProfileProviderMerging.cs b/src/tests/dotnet-trace/ProfileProviderMerging.cs similarity index 100% rename from src/tests/DotnetTrace.UnitTests/ProfileProviderMerging.cs rename to src/tests/dotnet-trace/ProfileProviderMerging.cs diff --git a/src/tests/DotnetTrace.UnitTests/ProviderParsing.cs b/src/tests/dotnet-trace/ProviderParsing.cs similarity index 100% rename from src/tests/DotnetTrace.UnitTests/ProviderParsing.cs rename to src/tests/dotnet-trace/ProviderParsing.cs diff --git a/src/tests/EventPipe.Tests/ContentionEvents.cs b/src/tests/eventpipe/ContentionEvents.cs similarity index 100% rename from src/tests/EventPipe.Tests/ContentionEvents.cs rename to src/tests/eventpipe/ContentionEvents.cs diff --git a/src/tests/EventPipe.Tests/CustomEvents.cs b/src/tests/eventpipe/CustomEvents.cs similarity index 100% rename from src/tests/EventPipe.Tests/CustomEvents.cs rename to src/tests/eventpipe/CustomEvents.cs diff --git a/src/tests/EventPipe.Tests/EventPipe.Tests.csproj b/src/tests/eventpipe/EventPipe.Tests.csproj similarity index 100% rename from src/tests/EventPipe.Tests/EventPipe.Tests.csproj rename to src/tests/eventpipe/EventPipe.Tests.csproj diff --git a/src/tests/EventPipe.Tests/GCEvents.cs b/src/tests/eventpipe/GCEvents.cs similarity index 100% rename from src/tests/EventPipe.Tests/GCEvents.cs rename to src/tests/eventpipe/GCEvents.cs diff --git a/src/tests/EventPipe.Tests/LoaderEvents.cs b/src/tests/eventpipe/LoaderEvents.cs similarity index 100% rename from src/tests/EventPipe.Tests/LoaderEvents.cs rename to src/tests/eventpipe/LoaderEvents.cs diff --git a/src/tests/EventPipe.Tests/MethodEvents.cs b/src/tests/eventpipe/MethodEvents.cs similarity index 100% rename from src/tests/EventPipe.Tests/MethodEvents.cs rename to src/tests/eventpipe/MethodEvents.cs diff --git a/src/tests/EventPipe.Tests/README.md b/src/tests/eventpipe/README.md similarity index 100% rename from src/tests/EventPipe.Tests/README.md rename to src/tests/eventpipe/README.md diff --git a/src/tests/EventPipe.Tests/ThreadPoolEvents.cs b/src/tests/eventpipe/ThreadPoolEvents.cs similarity index 100% rename from src/tests/EventPipe.Tests/ThreadPoolEvents.cs rename to src/tests/eventpipe/ThreadPoolEvents.cs diff --git a/src/tests/EventPipe.Tests/common/IpcTraceTest.cs b/src/tests/eventpipe/common/IpcTraceTest.cs similarity index 100% rename from src/tests/EventPipe.Tests/common/IpcTraceTest.cs rename to src/tests/eventpipe/common/IpcTraceTest.cs diff --git a/src/tests/EventPipe.Tests/common/RemoteTestExecutorHelper.cs b/src/tests/eventpipe/common/RemoteTestExecutorHelper.cs similarity index 100% rename from src/tests/EventPipe.Tests/common/RemoteTestExecutorHelper.cs rename to src/tests/eventpipe/common/RemoteTestExecutorHelper.cs diff --git a/src/tests/EventPipe.Tests/common/StreamProxy.cs b/src/tests/eventpipe/common/StreamProxy.cs similarity index 100% rename from src/tests/EventPipe.Tests/common/StreamProxy.cs rename to src/tests/eventpipe/common/StreamProxy.cs diff --git a/src/tests/EventPipe.Tests/providers.cs b/src/tests/eventpipe/providers.cs similarity index 100% rename from src/tests/EventPipe.Tests/providers.cs rename to src/tests/eventpipe/providers.cs From 5a968abe181f8cf4448b1d73dc4b8f29003cd55c Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 9 Oct 2025 09:24:32 -0400 Subject: [PATCH 31/52] reduce diff --- eng/InstallRuntimes.proj | 10 ---------- .../Microsoft.Diagnostics.Monitoring.UnitTests.csproj} | 0 .../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 .../Microsoft.Diagnostics.NETCore.Client.Tests.csproj | 0 .../PerfMapTests.cs | 0 .../ReversedServerTests.cs | 0 .../ConfigFiles/Unix/Debugger.Tests.Config.txt | 4 ++-- .../ConfigFiles/Windows/Debugger.Tests.Config.txt | 4 ++-- .../DumpGenerationFixture.cs | 0 .../{SOS.Tests => SOS.UnitTests}/SOS.Tests.csproj | 0 src/tests/{SOS.Tests => SOS.UnitTests}/SOS.cs | 0 src/tests/{SOS.Tests => SOS.UnitTests}/SOSRunner.cs | 0 .../Scripts/ClrStackWithNumberOfFrames.script | 0 .../Scripts/ConcurrentDictionaries.script | 0 .../Scripts/DivZero.script | 0 .../Scripts/DualRuntimes.script | 0 .../Scripts/DumpGCData.script | 0 .../Scripts/DumpGen.script | 0 .../Scripts/DynamicMethod.script | 0 .../Scripts/FindRootsOlderGeneration.script | 0 .../{SOS.Tests => SOS.UnitTests}/Scripts/GCPOH.script | 0 .../Scripts/GCTests.script | 0 .../Scripts/LineNums.script | 0 .../Scripts/NestedExceptionTest.script | 0 .../Scripts/OtherCommands.script | 0 .../Scripts/Overflow.script | 0 .../Scripts/Reflection.script | 0 .../Scripts/SimpleThrow.script | 0 .../Scripts/StackAndOtherTests.script | 0 .../Scripts/StackTests.script | 0 .../Scripts/StackTraceFaultingExceptionFrame.script | 0 .../Scripts/StackTraceSoftwareExceptionFrame.script | 0 .../Scripts/TaskNestedException.script | 0 .../Scripts/TestExtensions.script | 0 .../Scripts/VarargPInvokeInteropMD.script | 0 .../{SOS.Tests => SOS.UnitTests}/Scripts/WebApp.script | 0 .../{SOS.Tests => SOS.UnitTests}/Scripts/lldbhelper.py | 0 test.sh | 1 + 46 files changed, 5 insertions(+), 14 deletions(-) rename src/tests/{Microsoft.Diagnostics.Monitoring.Tests/Microsoft.Diagnostics.Monitoring.Tests.csproj => Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.UnitTests.csproj} (100%) rename src/tests/{Microsoft.Diagnostics.Monitoring.Tests => Microsoft.Diagnostics.Monitoring}/PipelineTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.Tests => Microsoft.Diagnostics.NETCore.Client}/DiagnosticsClientApiShim.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.Tests => Microsoft.Diagnostics.NETCore.Client}/DiagnosticsClientApiShimExtensions.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.Tests => Microsoft.Diagnostics.NETCore.Client}/EventPipeProviderTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.Tests => Microsoft.Diagnostics.NETCore.Client}/EventPipeSessionTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.Tests => Microsoft.Diagnostics.NETCore.Client}/GetProcessEnvironmentTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.Tests => Microsoft.Diagnostics.NETCore.Client}/GetProcessInfoTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.Tests => Microsoft.Diagnostics.NETCore.Client}/GetPublishedProcessesTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.Tests => Microsoft.Diagnostics.NETCore.Client}/HandleableCollectionTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.Tests => Microsoft.Diagnostics.NETCore.Client}/Microsoft.Diagnostics.NETCore.Client.Tests.csproj (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.Tests => Microsoft.Diagnostics.NETCore.Client}/PerfMapTests.cs (100%) rename src/tests/{Microsoft.Diagnostics.NETCore.Client.Tests => Microsoft.Diagnostics.NETCore.Client}/ReversedServerTests.cs (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/ConfigFiles/Unix/Debugger.Tests.Config.txt (98%) rename src/tests/{SOS.Tests => SOS.UnitTests}/ConfigFiles/Windows/Debugger.Tests.Config.txt (98%) rename src/tests/{SOS.Tests => SOS.UnitTests}/DumpGenerationFixture.cs (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/SOS.Tests.csproj (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/SOS.cs (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/SOSRunner.cs (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/ClrStackWithNumberOfFrames.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/ConcurrentDictionaries.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/DivZero.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/DualRuntimes.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/DumpGCData.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/DumpGen.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/DynamicMethod.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/FindRootsOlderGeneration.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/GCPOH.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/GCTests.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/LineNums.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/NestedExceptionTest.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/OtherCommands.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/Overflow.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/Reflection.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/SimpleThrow.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/StackAndOtherTests.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/StackTests.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/StackTraceFaultingExceptionFrame.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/StackTraceSoftwareExceptionFrame.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/TaskNestedException.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/TestExtensions.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/VarargPInvokeInteropMD.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/WebApp.script (100%) rename src/tests/{SOS.Tests => SOS.UnitTests}/Scripts/lldbhelper.py (100%) 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/src/tests/Microsoft.Diagnostics.Monitoring.Tests/Microsoft.Diagnostics.Monitoring.Tests.csproj b/src/tests/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.UnitTests.csproj similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.Tests/Microsoft.Diagnostics.Monitoring.Tests.csproj rename to src/tests/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.UnitTests.csproj diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.Tests/PipelineTests.cs b/src/tests/Microsoft.Diagnostics.Monitoring/PipelineTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.Monitoring.Tests/PipelineTests.cs rename to src/tests/Microsoft.Diagnostics.Monitoring/PipelineTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/DiagnosticsClientApiShim.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClientApiShim.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/DiagnosticsClientApiShim.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClientApiShim.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/DiagnosticsClientApiShimExtensions.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClientApiShimExtensions.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/DiagnosticsClientApiShimExtensions.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client/DiagnosticsClientApiShimExtensions.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/EventPipeProviderTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client/EventPipeProviderTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/EventPipeProviderTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client/EventPipeProviderTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/EventPipeSessionTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client/EventPipeSessionTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/EventPipeSessionTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client/EventPipeSessionTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/GetProcessEnvironmentTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client/GetProcessEnvironmentTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/GetProcessEnvironmentTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client/GetProcessEnvironmentTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/GetProcessInfoTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client/GetProcessInfoTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/GetProcessInfoTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client/GetProcessInfoTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/GetPublishedProcessesTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client/GetPublishedProcessesTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/GetPublishedProcessesTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client/GetPublishedProcessesTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/HandleableCollectionTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client/HandleableCollectionTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/HandleableCollectionTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client/HandleableCollectionTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/Microsoft.Diagnostics.NETCore.Client.Tests.csproj b/src/tests/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.Tests.csproj similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/Microsoft.Diagnostics.NETCore.Client.Tests.csproj rename to src/tests/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.Tests.csproj diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/PerfMapTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client/PerfMapTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/PerfMapTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client/PerfMapTests.cs diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/ReversedServerTests.cs b/src/tests/Microsoft.Diagnostics.NETCore.Client/ReversedServerTests.cs similarity index 100% rename from src/tests/Microsoft.Diagnostics.NETCore.Client.Tests/ReversedServerTests.cs rename to src/tests/Microsoft.Diagnostics.NETCore.Client/ReversedServerTests.cs diff --git a/src/tests/SOS.Tests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt similarity index 98% rename from src/tests/SOS.Tests/ConfigFiles/Unix/Debugger.Tests.Config.txt rename to src/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt index 982e182a55..2f591d4a23 100644 --- a/src/tests/SOS.Tests/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/src/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -13,10 +13,10 @@ ProjectK - $(RepoRootDir)/src/tests/SOS.Tests/Scripts + $(RepoRootDir)/src/tests/SOS.UnitTests/Scripts $(RepoRootDir)/artifacts $(RootBinDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration) - $(RootBinDir)/TestResults/$(TargetConfiguration)/sos.Tests_$(Timestamp) + $(RootBinDir)/TestResults/$(TargetConfiguration)/sos.unittests_$(Timestamp) $(RootBinDir)/tmp/$(TargetConfiguration)\dumps true diff --git a/src/tests/SOS.Tests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt similarity index 98% rename from src/tests/SOS.Tests/ConfigFiles/Windows/Debugger.Tests.Config.txt rename to src/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt index b703eacdf8..c5f05c49e6 100644 --- a/src/tests/SOS.Tests/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/src/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -13,10 +13,10 @@ $(RepoRootDir)\.dotnet-test\x86 - $(RepoRootDir)\src\tests\SOS.Tests\Scripts + $(RepoRootDir)\src\tests\SOS.UnitTests\Scripts $(RepoRootDir)\artifacts $(RootBinDir)\bin\Windows_NT.$(TargetArchitecture).$(TargetConfiguration) - $(RootBinDir)\TestResults\$(TargetConfiguration)\sos.Tests_$(Timestamp) + $(RootBinDir)\TestResults\$(TargetConfiguration)\sos.unittests_$(Timestamp) $(RootBinDir)\tmp\$(TargetConfiguration)\dumps $(InstallDir)\runcommand.dll $(DotNetRoot)\shared\Microsoft.NETCore.App\ diff --git a/src/tests/SOS.Tests/DumpGenerationFixture.cs b/src/tests/SOS.UnitTests/DumpGenerationFixture.cs similarity index 100% rename from src/tests/SOS.Tests/DumpGenerationFixture.cs rename to src/tests/SOS.UnitTests/DumpGenerationFixture.cs diff --git a/src/tests/SOS.Tests/SOS.Tests.csproj b/src/tests/SOS.UnitTests/SOS.Tests.csproj similarity index 100% rename from src/tests/SOS.Tests/SOS.Tests.csproj rename to src/tests/SOS.UnitTests/SOS.Tests.csproj diff --git a/src/tests/SOS.Tests/SOS.cs b/src/tests/SOS.UnitTests/SOS.cs similarity index 100% rename from src/tests/SOS.Tests/SOS.cs rename to src/tests/SOS.UnitTests/SOS.cs diff --git a/src/tests/SOS.Tests/SOSRunner.cs b/src/tests/SOS.UnitTests/SOSRunner.cs similarity index 100% rename from src/tests/SOS.Tests/SOSRunner.cs rename to src/tests/SOS.UnitTests/SOSRunner.cs diff --git a/src/tests/SOS.Tests/Scripts/ClrStackWithNumberOfFrames.script b/src/tests/SOS.UnitTests/Scripts/ClrStackWithNumberOfFrames.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/ClrStackWithNumberOfFrames.script rename to src/tests/SOS.UnitTests/Scripts/ClrStackWithNumberOfFrames.script diff --git a/src/tests/SOS.Tests/Scripts/ConcurrentDictionaries.script b/src/tests/SOS.UnitTests/Scripts/ConcurrentDictionaries.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/ConcurrentDictionaries.script rename to src/tests/SOS.UnitTests/Scripts/ConcurrentDictionaries.script diff --git a/src/tests/SOS.Tests/Scripts/DivZero.script b/src/tests/SOS.UnitTests/Scripts/DivZero.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/DivZero.script rename to src/tests/SOS.UnitTests/Scripts/DivZero.script diff --git a/src/tests/SOS.Tests/Scripts/DualRuntimes.script b/src/tests/SOS.UnitTests/Scripts/DualRuntimes.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/DualRuntimes.script rename to src/tests/SOS.UnitTests/Scripts/DualRuntimes.script diff --git a/src/tests/SOS.Tests/Scripts/DumpGCData.script b/src/tests/SOS.UnitTests/Scripts/DumpGCData.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/DumpGCData.script rename to src/tests/SOS.UnitTests/Scripts/DumpGCData.script diff --git a/src/tests/SOS.Tests/Scripts/DumpGen.script b/src/tests/SOS.UnitTests/Scripts/DumpGen.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/DumpGen.script rename to src/tests/SOS.UnitTests/Scripts/DumpGen.script diff --git a/src/tests/SOS.Tests/Scripts/DynamicMethod.script b/src/tests/SOS.UnitTests/Scripts/DynamicMethod.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/DynamicMethod.script rename to src/tests/SOS.UnitTests/Scripts/DynamicMethod.script diff --git a/src/tests/SOS.Tests/Scripts/FindRootsOlderGeneration.script b/src/tests/SOS.UnitTests/Scripts/FindRootsOlderGeneration.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/FindRootsOlderGeneration.script rename to src/tests/SOS.UnitTests/Scripts/FindRootsOlderGeneration.script diff --git a/src/tests/SOS.Tests/Scripts/GCPOH.script b/src/tests/SOS.UnitTests/Scripts/GCPOH.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/GCPOH.script rename to src/tests/SOS.UnitTests/Scripts/GCPOH.script diff --git a/src/tests/SOS.Tests/Scripts/GCTests.script b/src/tests/SOS.UnitTests/Scripts/GCTests.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/GCTests.script rename to src/tests/SOS.UnitTests/Scripts/GCTests.script diff --git a/src/tests/SOS.Tests/Scripts/LineNums.script b/src/tests/SOS.UnitTests/Scripts/LineNums.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/LineNums.script rename to src/tests/SOS.UnitTests/Scripts/LineNums.script diff --git a/src/tests/SOS.Tests/Scripts/NestedExceptionTest.script b/src/tests/SOS.UnitTests/Scripts/NestedExceptionTest.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/NestedExceptionTest.script rename to src/tests/SOS.UnitTests/Scripts/NestedExceptionTest.script diff --git a/src/tests/SOS.Tests/Scripts/OtherCommands.script b/src/tests/SOS.UnitTests/Scripts/OtherCommands.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/OtherCommands.script rename to src/tests/SOS.UnitTests/Scripts/OtherCommands.script diff --git a/src/tests/SOS.Tests/Scripts/Overflow.script b/src/tests/SOS.UnitTests/Scripts/Overflow.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/Overflow.script rename to src/tests/SOS.UnitTests/Scripts/Overflow.script diff --git a/src/tests/SOS.Tests/Scripts/Reflection.script b/src/tests/SOS.UnitTests/Scripts/Reflection.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/Reflection.script rename to src/tests/SOS.UnitTests/Scripts/Reflection.script diff --git a/src/tests/SOS.Tests/Scripts/SimpleThrow.script b/src/tests/SOS.UnitTests/Scripts/SimpleThrow.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/SimpleThrow.script rename to src/tests/SOS.UnitTests/Scripts/SimpleThrow.script diff --git a/src/tests/SOS.Tests/Scripts/StackAndOtherTests.script b/src/tests/SOS.UnitTests/Scripts/StackAndOtherTests.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/StackAndOtherTests.script rename to src/tests/SOS.UnitTests/Scripts/StackAndOtherTests.script diff --git a/src/tests/SOS.Tests/Scripts/StackTests.script b/src/tests/SOS.UnitTests/Scripts/StackTests.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/StackTests.script rename to src/tests/SOS.UnitTests/Scripts/StackTests.script diff --git a/src/tests/SOS.Tests/Scripts/StackTraceFaultingExceptionFrame.script b/src/tests/SOS.UnitTests/Scripts/StackTraceFaultingExceptionFrame.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/StackTraceFaultingExceptionFrame.script rename to src/tests/SOS.UnitTests/Scripts/StackTraceFaultingExceptionFrame.script diff --git a/src/tests/SOS.Tests/Scripts/StackTraceSoftwareExceptionFrame.script b/src/tests/SOS.UnitTests/Scripts/StackTraceSoftwareExceptionFrame.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/StackTraceSoftwareExceptionFrame.script rename to src/tests/SOS.UnitTests/Scripts/StackTraceSoftwareExceptionFrame.script diff --git a/src/tests/SOS.Tests/Scripts/TaskNestedException.script b/src/tests/SOS.UnitTests/Scripts/TaskNestedException.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/TaskNestedException.script rename to src/tests/SOS.UnitTests/Scripts/TaskNestedException.script diff --git a/src/tests/SOS.Tests/Scripts/TestExtensions.script b/src/tests/SOS.UnitTests/Scripts/TestExtensions.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/TestExtensions.script rename to src/tests/SOS.UnitTests/Scripts/TestExtensions.script diff --git a/src/tests/SOS.Tests/Scripts/VarargPInvokeInteropMD.script b/src/tests/SOS.UnitTests/Scripts/VarargPInvokeInteropMD.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/VarargPInvokeInteropMD.script rename to src/tests/SOS.UnitTests/Scripts/VarargPInvokeInteropMD.script diff --git a/src/tests/SOS.Tests/Scripts/WebApp.script b/src/tests/SOS.UnitTests/Scripts/WebApp.script similarity index 100% rename from src/tests/SOS.Tests/Scripts/WebApp.script rename to src/tests/SOS.UnitTests/Scripts/WebApp.script diff --git a/src/tests/SOS.Tests/Scripts/lldbhelper.py b/src/tests/SOS.UnitTests/Scripts/lldbhelper.py similarity index 100% rename from src/tests/SOS.Tests/Scripts/lldbhelper.py rename to src/tests/SOS.UnitTests/Scripts/lldbhelper.py diff --git a/test.sh b/test.sh index be0705bcdf..65eb42dd00 100755 --- a/test.sh +++ b/test.sh @@ -14,3 +14,4 @@ done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" "$scriptroot/eng/build.sh" -test -skipmanaged -skipnative $@ + From 769f338a074f3c00ddcbb51dd494927baa32c423 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 9 Oct 2025 09:41:32 -0400 Subject: [PATCH 32/52] reduce diff --- documentation/privatebuildtesting.md | 2 +- eng/ci-prepare-artifacts.cmd | 2 +- eng/testsos.cmd | 2 +- eng/testsos.sh | 2 +- eng/testsoscdac.cmd | 2 +- eng/testsoscdac.sh | 2 +- .../{Tracees => Debuggees}/EventPipeTracee/CustomMetrics.cs | 0 .../EventPipeTracee/DuplicateNameMetrics.cs | 0 .../EventPipeTracee/EventPipeTracee.csproj | 2 +- src/tests/{Tracees => Debuggees}/EventPipeTracee/Program.cs | 0 .../{Tracees => Debuggees}/ExitCodeTracee/ExitCodeTracee.csproj | 0 src/tests/{Tracees => Debuggees}/ExitCodeTracee/Program.cs | 0 src/tests/{Tracees => Debuggees}/StackTracee/Program.cs | 0 src/tests/{Tracees => Debuggees}/StackTracee/StackTracee.csproj | 0 src/tests/{Tracees => Debuggees}/Tracee/Program.cs | 0 src/tests/{Tracees => Debuggees}/Tracee/Tracee.csproj | 0 src/tests/Grape/Grape.csproj | 2 +- .../Microsoft.Diagnostics.DebugServices.UnitTests.csproj | 2 +- .../Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs | 2 +- src/tests/SOS.UnitTests/SOS.Tests.csproj | 2 +- src/tests/dirs.proj | 1 - 21 files changed, 11 insertions(+), 12 deletions(-) rename src/tests/{Tracees => Debuggees}/EventPipeTracee/CustomMetrics.cs (100%) rename src/tests/{Tracees => Debuggees}/EventPipeTracee/DuplicateNameMetrics.cs (100%) rename src/tests/{Tracees => Debuggees}/EventPipeTracee/EventPipeTracee.csproj (81%) rename src/tests/{Tracees => Debuggees}/EventPipeTracee/Program.cs (100%) rename src/tests/{Tracees => Debuggees}/ExitCodeTracee/ExitCodeTracee.csproj (100%) rename src/tests/{Tracees => Debuggees}/ExitCodeTracee/Program.cs (100%) rename src/tests/{Tracees => Debuggees}/StackTracee/Program.cs (100%) rename src/tests/{Tracees => Debuggees}/StackTracee/StackTracee.csproj (100%) rename src/tests/{Tracees => Debuggees}/Tracee/Program.cs (100%) rename src/tests/{Tracees => Debuggees}/Tracee/Tracee.csproj (100%) diff --git a/documentation/privatebuildtesting.md b/documentation/privatebuildtesting.md index 28aa5d3dc6..1753392531 100644 --- a/documentation/privatebuildtesting.md +++ b/documentation/privatebuildtesting.md @@ -9,7 +9,7 @@ Here are some instructions on how to run the diagnostics repo's tests against a 4. On Windows 11 (this doesn't work on Windows 10), add the following DWORD registry key: `HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\MiniDumpSettings\DisableAuxProviderSignatureCheck` and set it to 1. This allows the unsigned privately built DAC to be used to generate dumps. 5. Copy the private runtime binaries over the test SDK/runtimes installed in `.dotnet-test`. This step is hard to automate because there are usually 3 versions of the runtime installed: one as part of the .NET SDK, one as part of the AspNetCore runtime and one from latest runtime DARC update. 6. Run the diagnostics repo tests either: - a. `test.cmd` or `test.sh` - this runs all the diagnostics tests including SOS's. A html test report will be generated in `artifacts/TestResults/{Debug,Release}/SOS.Tests_net8.0_x64.html`. + a. `test.cmd` or `test.sh` - this runs all the diagnostics tests including SOS's. A html test report will be generated in `artifacts/TestResults/{Debug,Release}/SOS.UnitTests_net8.0_x64.html`. b. Use the VS Test Explorer to run all the SOS tests or a specific one. c. Use `eng\testsos.cmd` or `eng/testsos.sh` to run just the SOS tests. The html test report isn't generated in this case, but the SOS test logs are in artifacts/TestResults/{Debug,Release}/sos_*. diff --git a/eng/ci-prepare-artifacts.cmd b/eng/ci-prepare-artifacts.cmd index c410d53cb2..af95f7c3aa 100644 --- a/eng/ci-prepare-artifacts.cmd +++ b/eng/ci-prepare-artifacts.cmd @@ -5,7 +5,7 @@ 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' %*" if NOT '%ERRORLEVEL%' == '0' goto ExitWithCode echo Creating bundles diff --git a/eng/testsos.cmd b/eng/testsos.cmd index 4a39c3bcb3..640638a32d 100644 --- a/eng/testsos.cmd +++ b/eng/testsos.cmd @@ -1 +1 @@ -%~dp0..\.dotnet\dotnet.exe test --no-build --logger "console;verbosity=detailed" %~dp0..\src\tests\SOS.Tests\SOS.Tests.csproj +%~dp0..\.dotnet\dotnet.exe test --no-build --logger "console;verbosity=detailed" %~dp0..\src\tests\SOS.UnitTests\SOS.UnitTests.csproj diff --git a/eng/testsos.sh b/eng/testsos.sh index 264136357f..aa911d7a16 100755 --- a/eng/testsos.sh +++ b/eng/testsos.sh @@ -14,4 +14,4 @@ done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" export LLDB_PATH=/usr/bin/lldb -$scriptroot/../.dotnet/dotnet test --no-build --logger "console;verbosity=detailed" $scriptroot/../src/tests/SOS.Tests/SOS.Tests.csproj +$scriptroot/../.dotnet/dotnet test --no-build --logger "console;verbosity=detailed" $scriptroot/../src/tests/SOS.UnitTests/SOS.UnitTests.csproj diff --git a/eng/testsoscdac.cmd b/eng/testsoscdac.cmd index 126f5fbee4..c499ffaecb 100644 --- a/eng/testsoscdac.cmd +++ b/eng/testsoscdac.cmd @@ -1,2 +1,2 @@ set SOS_TEST_CDAC=true -%~dp0..\.dotnet\dotnet.exe test --no-build --logger "console;verbosity=detailed" %~dp0..\src\tests\SOS.Tests\SOS.Tests.csproj --filter "Category=CDACCompatible" +%~dp0..\.dotnet\dotnet.exe test --no-build --logger "console;verbosity=detailed" %~dp0..\src\tests\SOS.UnitTests\SOS.UnitTests.csproj --filter "Category=CDACCompatible" diff --git a/eng/testsoscdac.sh b/eng/testsoscdac.sh index 99f44c5b1a..bafe751021 100644 --- a/eng/testsoscdac.sh +++ b/eng/testsoscdac.sh @@ -15,4 +15,4 @@ done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" export LLDB_PATH=/usr/bin/lldb export SOS_TEST_CDAC=true -$scriptroot/../.dotnet/dotnet test --no-build --logger "console;verbosity=detailed" $scriptroot/../src/tests/SOS.Tests/SOS.Tests.csproj --filter "Category=CDACCompatible" +$scriptroot/../.dotnet/dotnet test --no-build --logger "console;verbosity=detailed" $scriptroot/../src/tests/SOS.UnitTests/SOS.UnitTests.csproj --filter "Category=CDACCompatible" diff --git a/src/tests/Tracees/EventPipeTracee/CustomMetrics.cs b/src/tests/Debuggees/EventPipeTracee/CustomMetrics.cs similarity index 100% rename from src/tests/Tracees/EventPipeTracee/CustomMetrics.cs rename to src/tests/Debuggees/EventPipeTracee/CustomMetrics.cs diff --git a/src/tests/Tracees/EventPipeTracee/DuplicateNameMetrics.cs b/src/tests/Debuggees/EventPipeTracee/DuplicateNameMetrics.cs similarity index 100% rename from src/tests/Tracees/EventPipeTracee/DuplicateNameMetrics.cs rename to src/tests/Debuggees/EventPipeTracee/DuplicateNameMetrics.cs diff --git a/src/tests/Tracees/EventPipeTracee/EventPipeTracee.csproj b/src/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj similarity index 81% rename from src/tests/Tracees/EventPipeTracee/EventPipeTracee.csproj rename to src/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj index 098218e2b7..ddec55b529 100644 --- a/src/tests/Tracees/EventPipeTracee/EventPipeTracee.csproj +++ b/src/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/tests/Tracees/EventPipeTracee/Program.cs b/src/tests/Debuggees/EventPipeTracee/Program.cs similarity index 100% rename from src/tests/Tracees/EventPipeTracee/Program.cs rename to src/tests/Debuggees/EventPipeTracee/Program.cs diff --git a/src/tests/Tracees/ExitCodeTracee/ExitCodeTracee.csproj b/src/tests/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj similarity index 100% rename from src/tests/Tracees/ExitCodeTracee/ExitCodeTracee.csproj rename to src/tests/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj diff --git a/src/tests/Tracees/ExitCodeTracee/Program.cs b/src/tests/Debuggees/ExitCodeTracee/Program.cs similarity index 100% rename from src/tests/Tracees/ExitCodeTracee/Program.cs rename to src/tests/Debuggees/ExitCodeTracee/Program.cs diff --git a/src/tests/Tracees/StackTracee/Program.cs b/src/tests/Debuggees/StackTracee/Program.cs similarity index 100% rename from src/tests/Tracees/StackTracee/Program.cs rename to src/tests/Debuggees/StackTracee/Program.cs diff --git a/src/tests/Tracees/StackTracee/StackTracee.csproj b/src/tests/Debuggees/StackTracee/StackTracee.csproj similarity index 100% rename from src/tests/Tracees/StackTracee/StackTracee.csproj rename to src/tests/Debuggees/StackTracee/StackTracee.csproj diff --git a/src/tests/Tracees/Tracee/Program.cs b/src/tests/Debuggees/Tracee/Program.cs similarity index 100% rename from src/tests/Tracees/Tracee/Program.cs rename to src/tests/Debuggees/Tracee/Program.cs diff --git a/src/tests/Tracees/Tracee/Tracee.csproj b/src/tests/Debuggees/Tracee/Tracee.csproj similarity index 100% rename from src/tests/Tracees/Tracee/Tracee.csproj rename to src/tests/Debuggees/Tracee/Tracee.csproj diff --git a/src/tests/Grape/Grape.csproj b/src/tests/Grape/Grape.csproj index 4fe3ab6e49..7a617a31d9 100644 --- a/src/tests/Grape/Grape.csproj +++ b/src/tests/Grape/Grape.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj index 78f6120344..2d462fbe2d 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj +++ b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/tests/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs b/src/tests/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs index d6eb58c62d..5d3fc3436b 100644 --- a/src/tests/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs +++ b/src/tests/Microsoft.Diagnostics.TestHelpers/TestConfiguration.cs @@ -81,7 +81,7 @@ private void ParseConfigFile(string path) ["TargetArchitecture"] = OS.TargetArchitecture.ToString().ToLowerInvariant(), ["NuGetPackageCacheDir"] = nugetPackages, ["TestCDAC"] = Environment.GetEnvironmentVariable("SOS_TEST_CDAC"), - ["DotNetRoot"] = Environment.GetEnvironmentVariable("DOTNET_ROOT") + ["DotNetRoot"] = Environment.GetEnvironmentVariable("DOTNET_ROOT"), }; if (OS.Kind == OSKind.Windows) { diff --git a/src/tests/SOS.UnitTests/SOS.Tests.csproj b/src/tests/SOS.UnitTests/SOS.Tests.csproj index 15fa53a130..bea650de36 100644 --- a/src/tests/SOS.UnitTests/SOS.Tests.csproj +++ b/src/tests/SOS.UnitTests/SOS.Tests.csproj @@ -28,7 +28,7 @@ - + diff --git a/src/tests/dirs.proj b/src/tests/dirs.proj index cb2e448c9d..00feaef02d 100644 --- a/src/tests/dirs.proj +++ b/src/tests/dirs.proj @@ -3,7 +3,6 @@ - From 4ac823d9cabf849f6893292673af47136664ac95 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 9 Oct 2025 10:01:34 -0400 Subject: [PATCH 33/52] add back pdb files --- .../TestBinaries/HelloWorld.pdb | Bin 0 -> 11776 bytes .../dir1/System.Threading.Thread.pdb | Bin 0 -> 5560 bytes .../dir2/System.Threading.Thread.pdb | Bin 0 -> 5560 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdb create mode 100644 src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb create mode 100644 src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir2/System.Threading.Thread.pdb diff --git a/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdb b/src/tests/Microsoft.FileFormats.UnitTests/TestBinaries/HelloWorld.pdb new file mode 100644 index 0000000000000000000000000000000000000000..adea403b4e92a74506a22217eae5b8a63ff65c54 GIT binary patch literal 11776 zcmeHNU2GIp6h5=m((NB?tyLD&3x_;-*j0{cPu7J*U0)0bCuuW+q;Rh zvTpy0eF{>aS^wslPk(rN>}>6=f#=`r%=j5u#~h>|_ddQjDX5m=6@tK0{h#N<;P}sR zc4x6%AudWY>mVTOzYaJ}pqf9tcj(gUE3wn#G`IVs$cJBMcb)n5mv3XIhunC_2PY?E zr7N)uTZrb{MlW3Nd#HBcleM`w{<21kuWvup>tVFZ_^S8giyPvTKYbT@|KhEMxu5@j zy9wY6jf*(u5#-CzI3^vbi@?H-g&Vw(JIA?-PvxtQW;=P)DwInFV>&-&6{|CvS#k2O z>Q1#_s7|FirCaK@RC-5#k8QoA6`|Xy8HTmbvW=-=5b7g#VJ1;@8ZP-|zvMEPd{mSi z2tw_b%rA-U{R ze_nnq@9DXoxPCOSq~(DC_n!o9iLo_*cqRqs0Mu(MCyREGE9fS|eY7gZ_nim(d0F31 z8)GkwA9pI+4E5g*Co+~{V4Tn`(@8w1nVPK^sVATx)6G|K`yFW$+OZ0!#RK^!%C=UR z(#<1@iGnlj;MuLTjaphR5B+xOv;E(Xp5GLWd~x>NA-*q1!_X16z%aIzkGI&?`-E(z zTaYO*lY*b`2g{8jm8g?wmi_92jKVu+#;6S}@bJPa1 zW2i#z1kgv12GUYbq?pnn1jilfL+O}wN+Q4rsF?G)Z!bmu+JM(PZOF%Sb(784?0TrF z-us`E@H~md`Shq+vM6a5W;BPAj$KTau@2Yl!-iFyb`wgvp*hJ0&kq{gH86h%asq~n??Dj03Z4aXTi6U9gKjGTeil52IG?lifVtP*59Z#;y%6n4 m^vEbA?;E&1@pHJx@;-A7Skm%9pm%wgA+3-INCfTy0{;LU46FA5 literal 0 HcmV?d00001 diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb new file mode 100644 index 0000000000000000000000000000000000000000..2fe974307b62a0632c85f6aba2d4f60a1b30d984 GIT binary patch literal 5560 zcmZvg3vg7`8OP7P`_6MWWD~NR$8H|vLD+;q0zm@iWdsuQSe{nJ&1Qww&2F;0fh@l6 zC0d|%ENFp2rxbLiAtk=rjumY?I?{(P6sfN|*kPu%YGs_xP{+rN_W#|zv4~+f?4(6zf3ZsJU8{^}1v&}+3Oa>5 zEx79%$-vG+??QivK7=kpm!Pj9SvD{mWS5OB1U fsR4b(Bra+eGC1;U}7IYR-=j4 zKts?dv==%GJpug=Is?5AU4;G%$tDxafbt+0R1Gyi%b?XzFSH&CKw)ScN|xH zfsR8n&{NPU=mqE{=q&UebOHJp`W&*F(H68AYK7XNHP9fm1qwi6XdFsGDzpze03Csj zLo?7*&?)Ez=q2bZ^d58p`WX5T^d%%&Ow0y3pd!c%)k2G*R;V3X0}Vo3pa2wx#-S9X zTFmTK=pE<-=$|P26uJc2t>`N#2;B=EhJJ3furHwu%(%-hi5W2V>3N+Gm&`HEH3P?1 zu#sb$oF@F6yWa&ib6j}^w!lv_k1jK0<(Sr$P2dcHGX>5PI9uQxfpZ16b8JWZ4rDZ! zA3c8_$CU3pf%7@WdSy5&Y5x9qAdcJD~Uc)inzm{XlcOAzxe!T+saZKZVoxuGZQ~LuPQ~iS+Q~g66li$xV z-M^k=ir>I7wZD;Lx_^_vn+4t?@bv=!K;Rn$zER+t1l}s}%>oAm9u_#rG0mqDfkOh{ zBJehWw+kE=_*Q{$6F4I9sK8NyV*-!i1U5HcY5c}Hrui4=n8q`~F~ujj`Y3*aLS7ogCBrr7Kta+s*w=zhCOL63UA98HQHVzv-_*D@o@}o@u;A$*z`+n!R79)kH1e zL~Ed(h)yRGJ7=LRDKlKbiFiB|O|IV_4+Tb8Jd}t{#Dk&qDV;?FqoMUNe*;x&q07KZ$!NC0{U+b%SIyXW8?LN{X6SdY+3ee(|2YFJ9HS?1!f&cbOh-{^+6U zl{KHB z96$#$b7yRHG!`}ahmb_hToTI5Ma{}tPsgv%PkE2s_iXd6(}uyw1FL`XO4G%@Tw7_& zlh@@NP9Hf!mG7j)J(}tq z*x(xqMM8l@C?gt5(hvm3#`5&1P{-7yI$5GVfG0WX{p8MDrf22E`0O_ZZ;S0W!*6~% zv-Z-+>2GHKap3K}4{E(+(R#`6o=4PGs+oSTX8e_!*-)*SjdhyoYt&5t63zH5Ew=B5 zJdYk3Q!o)4@h1bp+t9hWbDfJ3-d(uc>nYp(@Ppm;$G#X14^$ue>A#=&=#!VvTUTyp zk3Uq_R_*-a0&N&YG{{&4#X^swC&PhAcvm19jzta9?r}=F&XG-~xIi;mZq1ZXxQ9OH-rL)PXXj?ea4v_UK=hl%eSN^(+Y_al| z)^54-b|0}@Ij=o)v2wv-rQW8V^D6(!w$YrSWjRhIIm&0*MmA`-+gZJNyZ|q(70S1W z>6Gzu9HuGbF=EBxu&8Eec@C*|%~q-NTBy8G&2J=|qdM!!=BfogvM#l-lB`pmUq-e@ zEz;sERaXPCTXk!;MlIIzuTo2vQF*yqx;%YfnbzY4sz)21GS#cK<5DZMc$Zq4?q{`1 z>lc^0U?tt>Qmb`;jqb12?Ls}SUbjBIyit#D(#w~2rSoV`_pjR0pXOy+zm}`Z*QB{s z_pi|XSLwD*k6WeNtM&2@J-$mXzh=;p-f?~Ud*OSV*`9r##)g{>>?`HaLm%xr=(J3m zo-2RLcBcEpBljP1Jl;0j^BHZK<(Vx8>~+f?4(6zf3ZsJU8{^}1v&}+3Oa>5 zEx79%$-vG+??QivK7=kpm!Pj9SvD{mWS5OB1U fsR4b(Bra+eGC1;U}7IYR-=j4 zKts?dv==%GJpug=Is?5AU4;G%$tDxafbt+0R1Gyi%b?XzFSH&CKw)ScN|xH zfsR8n&{NPU=mqE{=q&UebOHJp`W&*F(H68AYK7XNHP9fm1qwi6XdFsGDzpze03Csj zLo?7*&?)Ez=q2bZ^d58p`WX5T^d%%&Ow0y3pd!c%)k2G*R;V3X0}Vo3pa2wx#-S9X zTFmTK=pE<-=$|P26uJc2t>`N#2;B=EhJJ3furHwu%(%-hi5W2V>3N+Gm&`HEH3P?1 zu#sb$oF@F6yWa&ib6j}^w!lv_k1jK0<(Sr$P2dcHGX>5PI9uQxfpZ16b8JWZ4rDZ! zA3c8_$CU3pf%7@WdSy5&Y5x9qAdcJD~Uc)inzm{XlcOAzxe!T+saZKZVoxuGZQ~LuPQ~iS+Q~g66li$xV z-M^k=ir>I7wZD;Lx_^_vn+4t?@bv=!K;Rn$zER+t1l}s}%>oAm9u_#rG0mqDfkOh{ zBJehWw+kE=_*Q{$6F4I9sK8NyV*-!i1U5HcY5c}Hrui4=n8q`~F~ujj`Y3*aLS7ogCBrr7Kta+s*w=zhCOL63UA98HQHVzv-_*D@o@}o@u;A$*z`+n!R79)kH1e zL~Ed(h)yRGJ7=LRDKlKbiFiB|O|IV_4+Tb8Jd}t{#Dk&qDV;?FqoMUNe*;x&q07KZ$!NC0{U+b%SIyXW8?LN{X6SdY+3ee(|2YFJ9HS?1!f&cbOh-{^+6U zl{KHB z96$#$b7yRHG!`}ahmb_hToTI5Ma{}tPsgv%PkE2s_iXd6(}uyw1FL`XO4G%@Tw7_& zlh@@NP9Hf!mG7j)J(}tq z*x(xqMM8l@C?gt5(hvm3#`5&1P{-7yI$5GVfG0WX{p8MDrf22E`0O_ZZ;S0W!*6~% zv-Z-+>2GHKap3K}4{E(+(R#`6o=4PGs+oSTX8e_!*-)*SjdhyoYt&5t63zH5Ew=B5 zJdYk3Q!o)4@h1bp+t9hWbDfJ3-d(uc>nYp(@Ppm;$G#X14^$ue>A#=&=#!VvTUTyp zk3Uq_R_*-a0&N&YG{{&4#X^swC&PhAcvm19jzta9?r}=F&XG-~xIi;mZq1ZXxQ9OH-rL)PXXj?ea4v_UK=hl%eSN^(+Y_al| z)^54-b|0}@Ij=o)v2wv-rQW8V^D6(!w$YrSWjRhIIm&0*MmA`-+gZJNyZ|q(70S1W z>6Gzu9HuGbF=EBxu&8Eec@C*|%~q-NTBy8G&2J=|qdM!!=BfogvM#l-lB`pmUq-e@ zEz;sERaXPCTXk!;MlIIzuTo2vQF*yqx;%YfnbzY4sz)21GS#cK<5DZMc$Zq4?q{`1 z>lc^0U?tt>Qmb`;jqb12?Ls}SUbjBIyit#D(#w~2rSoV`_pjR0pXOy+zm}`Z*QB{s z_pi|XSLwD*k6WeNtM&2@J-$mXzh=;p-f?~Ud*OSV*`9r##)g{>>?`HaLm%xr=(J3m zo-2RLcBcEpBljP1Jl;0j^BHZK<(Vx8> Date: Thu, 9 Oct 2025 10:35:49 -0400 Subject: [PATCH 34/52] fix issues --- src/tests/DacCompareNativeTypes/DwarfParse.cs | 2 +- .../DbgShim.UnitTests/DbgShim.UnitTests.csproj | 10 ---------- src/tests/Directory.Build.targets | 15 +++++---------- ...nostics.Monitoring.EventPipe.UnitTests.csproj} | 0 ...t.Diagnostics.NETCore.Client.UnitTests.csproj} | 0 src/tests/dirs.proj | 3 +++ ...pe.Tests.csproj => EventPipe.UnitTests.csproj} | 0 7 files changed, 9 insertions(+), 21 deletions(-) rename src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/{Microsoft.Diagnostics.Monitoring.EventPipe.Tests.csproj => Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj} (100%) rename src/tests/Microsoft.Diagnostics.NETCore.Client/{Microsoft.Diagnostics.NETCore.Client.Tests.csproj => Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj} (100%) rename src/tests/eventpipe/{EventPipe.Tests.csproj => EventPipe.UnitTests.csproj} (100%) diff --git a/src/tests/DacCompareNativeTypes/DwarfParse.cs b/src/tests/DacCompareNativeTypes/DwarfParse.cs index 0e3ca4e13f..65de722ed4 100644 --- a/src/tests/DacCompareNativeTypes/DwarfParse.cs +++ b/src/tests/DacCompareNativeTypes/DwarfParse.cs @@ -36,7 +36,7 @@ private static void FinishType(Type type) { if (type.Parent != null) { - Match typeMatch = typeRegEx.Match(type.SourceLine); + Match typeMatch = typeRegEx.Match(type.SourceLine ?? string.Empty); if (typeMatch.Success) { diff --git a/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj b/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj index e58f360614..4860f62e70 100644 --- a/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj +++ b/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj @@ -26,16 +26,6 @@ - - - - - - - - - - diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets index caa65d4941..023ab0b2ad 100644 --- a/src/tests/Directory.Build.targets +++ b/src/tests/Directory.Build.targets @@ -12,22 +12,17 @@ - + - - + + - - + + + + + diff --git a/src/tests/eventpipe/EventPipe.Tests.csproj b/src/tests/eventpipe/EventPipe.UnitTests.csproj similarity index 100% rename from src/tests/eventpipe/EventPipe.Tests.csproj rename to src/tests/eventpipe/EventPipe.UnitTests.csproj From 3af8a20b4c59ae9364e6d8ed9b2c27c9d677e8e2 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 9 Oct 2025 11:00:19 -0400 Subject: [PATCH 35/52] convert to use slngen --- debuggees.slnx | 36 ---- diagnostics.slnx | 468 ----------------------------------------------- start-vs.cmd | 27 ++- 3 files changed, 22 insertions(+), 509 deletions(-) delete mode 100644 debuggees.slnx delete mode 100644 diagnostics.slnx diff --git a/debuggees.slnx b/debuggees.slnx deleted file mode 100644 index 62dbf195a1..0000000000 --- a/debuggees.slnx +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/diagnostics.slnx b/diagnostics.slnx deleted file mode 100644 index 7eb351876e..0000000000 --- a/diagnostics.slnx +++ /dev/null @@ -1,468 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/start-vs.cmd b/start-vs.cmd index cd08940d0e..18a47a828c 100644 --- a/start-vs.cmd +++ b/start-vs.cmd @@ -3,11 +3,6 @@ setlocal enabledelayedexpansion set "SDK_LOC=%~dp0.dotnet" -if "%1" == "" ( - set "SLN_OR_PROJ=%~dp0diagnostics.slnx" -) else ( - set "SLN_OR_PROJ=%1" -) set "DOTNET_ROOT=%SDK_LOC%" set "DOTNET_ROOT(x86)=%SDK_LOC%\x86" @@ -22,6 +17,28 @@ IF NOT EXIST "%DOTNET_ROOT%\dotnet.exe" ( exit /b 1 ) +if "%1" == "" ( + set "SLN_OR_PROJ=%~dp0dirs.slnx" + set "_USE_DEFAULT=1" +) else ( + set "SLN_OR_PROJ=%~1" +) + +:: If using default and file missing, generate it +if defined _USE_DEFAULT if not exist "%SLN_OR_PROJ%" ( + echo [INFO] dirs.slnx not found. Generating via generate-slnx.ps1... + powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -File "%~dp0generate-slnx.ps1" + if errorlevel 1 ( + echo [ERROR] Failed to generate dirs.slnx + exit /b 1 + ) + if not exist "%SLN_OR_PROJ%" ( + echo [ERROR] dirs.slnx still not found after generation attempt. + exit /b 1 + ) + echo [INFO] Successfully generated dirs.slnx +) + set "DEVENV=%DevEnvDir%devenv.exe" if exist "%DEVENV%" ( From 270e23aab87e3d7db40237e5c60b1b0fd58ef0c0 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 9 Oct 2025 11:11:56 -0400 Subject: [PATCH 36/52] update dirs.proj to respect BuildTests paramter --- dirs.proj | 16 ++++++++++------ src/tests/Directory.Build.targets | 6 +++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dirs.proj b/dirs.proj index ea8d280abf..886d45b2d0 100644 --- a/dirs.proj +++ b/dirs.proj @@ -1,12 +1,16 @@ - - - + + + + - + + + - - + + + diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets index 023ab0b2ad..09a564cb6f 100644 --- a/src/tests/Directory.Build.targets +++ b/src/tests/Directory.Build.targets @@ -11,16 +11,16 @@ - + - + - + From 16bb93dbbe23f234bf74663815e22f34745f161a Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 9 Oct 2025 11:23:08 -0400 Subject: [PATCH 37/52] fix build.props condition --- eng/Build.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Build.props b/eng/Build.props index 82799c7c39..6562b3e58d 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -1,5 +1,5 @@ - + From a2d1953321942382b4360c013b0fc357427ed12d Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 9 Oct 2025 11:32:05 -0400 Subject: [PATCH 38/52] fix pdb --- .../dir1/System.Threading.Thread.pdb | Bin 5560 -> 5560 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb b/src/tests/Microsoft.SymbolStore.UnitTests/TestBinaries/dir1/System.Threading.Thread.pdb index 2fe974307b62a0632c85f6aba2d4f60a1b30d984..57e63f5abf60529385502bcbdee1984d51241520 100644 GIT binary patch delta 41 xcmdm?y+eD0Ef2GyfyHJA9u`iKA`9y!S$Q_z8#CoiKU_QGp}A&z%;X5s1OOi_4)g#3 delta 41 xcmdm?y+eD0Ef2Gih1q5Y9u`iK`fXy*sv6ncTW%|KoZcZi?XD Date: Thu, 9 Oct 2025 11:39:25 -0400 Subject: [PATCH 39/52] invert test conditions to include tests in local solution --- dirs.proj | 2 +- eng/build.ps1 | 4 ++-- eng/build.sh | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dirs.proj b/dirs.proj index 886d45b2d0..329e1a676c 100644 --- a/dirs.proj +++ b/dirs.proj @@ -2,7 +2,7 @@ - + diff --git a/eng/build.ps1 b/eng/build.ps1 index 4c9a39fd62..effd57112b 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -68,8 +68,8 @@ if (-not $skipnative) { # Install sdk for building, restore and build managed components. if (-not $skipmanaged) { - if (-not $skiptest) { - $remainingargs = "/p:BuildTests=true " + $remainingargs + if ($skiptest) { + $remainingargs = "/p:SkipTests=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 0e981ef1c2..1372352f6b 100755 --- a/eng/build.sh +++ b/eng/build.sh @@ -225,8 +225,8 @@ if [[ "$__ManagedBuild" == 1 ]]; then # __CommonMSBuildArgs contains TargetOS property echo "Commencing managed build for $__BuildType in $__RootBinDir/bin" - if [[ "$__TestBuild" == 1 ]]; then - __ManagedBuildArgs="$__ManagedBuildArgs /p:BuildTests=true" + if [[ "$__TestBuild" != 1 ]]; then + __ManagedBuildArgs="$__ManagedBuildArgs /p:SkipTests=true" fi "$__RepoRootDir/eng/common/build.sh" \ From 0ce31fe0f95340202cb63942f6d77b2833c77c18 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 9 Oct 2025 11:57:32 -0400 Subject: [PATCH 40/52] fix SourceBuild --- dirs.proj | 12 ++---------- eng/Build.props | 11 ++++++++++- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dirs.proj b/dirs.proj index 329e1a676c..b6269051a3 100644 --- a/dirs.proj +++ b/dirs.proj @@ -1,16 +1,8 @@ - + - - - - - - - - - + diff --git a/eng/Build.props b/eng/Build.props index 6562b3e58d..9e51b89ad5 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -1,5 +1,14 @@ - + + + + + + + + + + From 3a3b60a4b63682180c7a7985c3592ed969623038 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu, 9 Oct 2025 12:03:49 -0400 Subject: [PATCH 41/52] include missing debuggee csprojs --- src/tests/dirs.proj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/tests/dirs.proj b/src/tests/dirs.proj index 84e356a351..0732e5b4f8 100644 --- a/src/tests/dirs.proj +++ b/src/tests/dirs.proj @@ -1,8 +1,7 @@ - - + From dbdac94073d795a7ecbdd3fe5f35635e61846859 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri, 10 Oct 2025 15:07:37 -0400 Subject: [PATCH 42/52] fix --- .../CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt | 2 +- .../ConfigFiles/Windows/Debugger.Tests.Config.txt | 2 +- src/tests/Directory.Build.props | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt index e168348f44..d83bee3fa2 100644 --- a/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -8,7 +8,7 @@ $(RootBinDir)/TestResults/$(TargetConfiguration)/common.unittests_$(Timestamp) ProjectK - $(RepoRootDir)/src/tests + $(RepoRootDir)/src/tests/debuggees $(RepoRootDir)/eng/AuxMsbuildFiles cli sdk.prebuilt diff --git a/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt index e3a408fbbf..536751380d 100644 --- a/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -9,7 +9,7 @@ $(RootBinDir)\TestResults\$(TargetConfiguration)\common.unittests_$(Timestamp) ProjectK - $(RepoRootDir)\src\tests + $(RepoRootDir)\src\tests\debuggees $(RepoRootDir)\eng\AuxMsbuildFiles sdk.prebuilt $(RootBinDir) diff --git a/src/tests/Directory.Build.props b/src/tests/Directory.Build.props index 933f9c5fe2..b5ed35f629 100644 --- a/src/tests/Directory.Build.props +++ b/src/tests/Directory.Build.props @@ -26,7 +26,7 @@ - true + true true From fa4a163ed7734bef840e3eae951742cb2cab244d Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri, 10 Oct 2025 15:19:22 -0400 Subject: [PATCH 43/52] de-centralize debuggees --- .../Unix/Debugger.Tests.Config.txt | 2 +- .../Windows/Debugger.Tests.Config.txt | 2 +- .../Debuggees/Directory.Build.props | 2 +- .../EventPipeTracee/CustomMetrics.cs | 0 .../EventPipeTracee/DuplicateNameMetrics.cs | 0 .../EventPipeTracee/EventPipeTracee.csproj | 0 .../Debuggees/EventPipeTracee/Program.cs | 0 .../ExitCodeTracee/ExitCodeTracee.csproj | 0 .../Debuggees/ExitCodeTracee/Program.cs | 0 .../Debuggees/StackTracee/Program.cs | 0 .../Debuggees/StackTracee/StackTracee.csproj | 0 .../Debuggees/Tracee/Program.cs | 0 .../Debuggees/Tracee/Tracee.csproj | 0 .../Unix/Debugger.Tests.Config.txt | 2 +- .../Windows/Debugger.Tests.Config.txt | 2 +- .../Debuggees/Directory.Build.props | 16 ++++++++++ .../SimpleDebuggee/SimpleDebuggee.cs | 0 .../SimpleDebuggee/SimpleDebuggee.csproj | 0 .../runtimeconfig.template.json | 0 .../WebApp3/Properties/launchSettings.json | 29 ------------------- src/tests/Grape/Grape.csproj | 2 +- .../Unix/Debugger.Tests.Config.txt | 2 +- .../Windows/Debugger.Tests.Config.txt | 2 +- .../Debuggees/Directory.Build.props | 16 ++++++++++ .../Debuggees/DivZero/DivZero.cs | 0 .../Debuggees/DivZero/DivZero.csproj | 0 .../DotnetDumpCommands.csproj | 0 .../Debuggees/DotnetDumpCommands/Program.cs | 0 .../Debuggees/DumpGCData/DumpGCData.csproj | 0 .../Debuggees/DumpGCData/Program.cs | 0 .../DynamicMethod/DynamicMethod.csproj | 0 .../Debuggees/DynamicMethod/Program.cs | 0 .../FindRootsOlderGeneration.csproj | 0 .../FindRootsOlderGeneration/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 .../Debuggees/SimpleThrow/SimpleThrow.cs | 0 .../Debuggees/SimpleThrow/SimpleThrow.csproj | 0 .../Debuggees/SimpleThrow/UserObject.cs | 0 .../SymbolTestApp/SymbolTestApp.slnx | 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.slnx | 0 .../TaskNestedException.cs | 0 .../TaskNestedException.csproj | 0 .../Debuggees/TestDebuggee/Test.cs | 0 .../TestDebuggee/TestDebuggee.csproj | 0 .../VarargPInvokeInteropMD/Program.cs | 0 .../VarargPInvokeInteropMD.csproj | 0 .../Debuggees/WebApp3/Program.cs | 0 .../Debuggees/WebApp3/Startup.cs | 0 .../Debuggees/WebApp3/WebApp3.csproj | 0 .../WebApp3/appsettings.Development.json | 0 .../Debuggees/WebApp3/appsettings.json | 0 68 files changed, 40 insertions(+), 37 deletions(-) rename src/tests/{ => CommonTestRunner}/Debuggees/Directory.Build.props (88%) rename src/tests/{ => CommonTestRunner}/Debuggees/EventPipeTracee/CustomMetrics.cs (100%) rename src/tests/{ => CommonTestRunner}/Debuggees/EventPipeTracee/DuplicateNameMetrics.cs (100%) rename src/tests/{ => CommonTestRunner}/Debuggees/EventPipeTracee/EventPipeTracee.csproj (100%) rename src/tests/{ => CommonTestRunner}/Debuggees/EventPipeTracee/Program.cs (100%) rename src/tests/{ => CommonTestRunner}/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj (100%) rename src/tests/{ => CommonTestRunner}/Debuggees/ExitCodeTracee/Program.cs (100%) rename src/tests/{ => CommonTestRunner}/Debuggees/StackTracee/Program.cs (100%) rename src/tests/{ => CommonTestRunner}/Debuggees/StackTracee/StackTracee.csproj (100%) rename src/tests/{ => CommonTestRunner}/Debuggees/Tracee/Program.cs (100%) rename src/tests/{ => CommonTestRunner}/Debuggees/Tracee/Tracee.csproj (100%) create mode 100644 src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props rename src/tests/{ => DbgShim.UnitTests}/Debuggees/SimpleDebuggee/SimpleDebuggee.cs (100%) rename src/tests/{ => DbgShim.UnitTests}/Debuggees/SimpleDebuggee/SimpleDebuggee.csproj (100%) rename src/tests/{ => DbgShim.UnitTests}/Debuggees/SimpleDebuggee/runtimeconfig.template.json (100%) delete mode 100644 src/tests/Debuggees/WebApp3/Properties/launchSettings.json create mode 100644 src/tests/SOS.UnitTests/Debuggees/Directory.Build.props rename src/tests/{ => SOS.UnitTests}/Debuggees/DivZero/DivZero.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/DivZero/DivZero.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/DotnetDumpCommands/Program.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/DumpGCData/DumpGCData.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/DumpGCData/Program.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/DynamicMethod/DynamicMethod.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/DynamicMethod/Program.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/FindRootsOlderGeneration/FindRootsOlderGeneration.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/FindRootsOlderGeneration/Program.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/GCPOH/GCPOH.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/GCPOH/GCPOH.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/GCWhere/GCWhere.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/GCWhere/GCWhere.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/LineNums/LineNums.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/LineNums/Program.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/NestedExceptionTest/NestedExceptionTest.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/Overflow/Overflow.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/Overflow/Overflow.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/ReflectionTest/ReflectionTest.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/ReflectionTest/ReflectionTest.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/SimpleThrow/SimpleThrow.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/SimpleThrow/SimpleThrow.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/SimpleThrow/UserObject.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/SymbolTestApp/SymbolTestApp.slnx (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/SymbolTestApp/SymbolTestDll/TestClass.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserTask.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/TaskNestedException/TaskNestedException.slnx (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/TestDebuggee/Test.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/TestDebuggee/TestDebuggee.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/VarargPInvokeInteropMD/Program.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/VarargPInvokeInteropMD/VarargPInvokeInteropMD.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/WebApp3/Program.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/WebApp3/Startup.cs (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/WebApp3/WebApp3.csproj (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/WebApp3/appsettings.Development.json (100%) rename src/tests/{ => SOS.UnitTests}/Debuggees/WebApp3/appsettings.json (100%) diff --git a/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt index d83bee3fa2..b356ab7e65 100644 --- a/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -8,7 +8,7 @@ $(RootBinDir)/TestResults/$(TargetConfiguration)/common.unittests_$(Timestamp) ProjectK - $(RepoRootDir)/src/tests/debuggees + $(RepoRootDir)/src/tests/CommonTestRunner/Debuggees $(RepoRootDir)/eng/AuxMsbuildFiles cli sdk.prebuilt diff --git a/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt index 536751380d..5a588bc466 100644 --- a/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -9,7 +9,7 @@ $(RootBinDir)\TestResults\$(TargetConfiguration)\common.unittests_$(Timestamp) ProjectK - $(RepoRootDir)\src\tests\debuggees + $(RepoRootDir)\src\tests\CommonTestRunner\Debuggees $(RepoRootDir)\eng\AuxMsbuildFiles sdk.prebuilt $(RootBinDir) diff --git a/src/tests/Debuggees/Directory.Build.props b/src/tests/CommonTestRunner/Debuggees/Directory.Build.props similarity index 88% rename from src/tests/Debuggees/Directory.Build.props rename to src/tests/CommonTestRunner/Debuggees/Directory.Build.props index ada0b8bc45..0a9a25f5ef 100644 --- a/src/tests/Debuggees/Directory.Build.props +++ b/src/tests/CommonTestRunner/Debuggees/Directory.Build.props @@ -1,5 +1,5 @@ - + false diff --git a/src/tests/Debuggees/EventPipeTracee/CustomMetrics.cs b/src/tests/CommonTestRunner/Debuggees/EventPipeTracee/CustomMetrics.cs similarity index 100% rename from src/tests/Debuggees/EventPipeTracee/CustomMetrics.cs rename to src/tests/CommonTestRunner/Debuggees/EventPipeTracee/CustomMetrics.cs diff --git a/src/tests/Debuggees/EventPipeTracee/DuplicateNameMetrics.cs b/src/tests/CommonTestRunner/Debuggees/EventPipeTracee/DuplicateNameMetrics.cs similarity index 100% rename from src/tests/Debuggees/EventPipeTracee/DuplicateNameMetrics.cs rename to src/tests/CommonTestRunner/Debuggees/EventPipeTracee/DuplicateNameMetrics.cs diff --git a/src/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj b/src/tests/CommonTestRunner/Debuggees/EventPipeTracee/EventPipeTracee.csproj similarity index 100% rename from src/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj rename to src/tests/CommonTestRunner/Debuggees/EventPipeTracee/EventPipeTracee.csproj diff --git a/src/tests/Debuggees/EventPipeTracee/Program.cs b/src/tests/CommonTestRunner/Debuggees/EventPipeTracee/Program.cs similarity index 100% rename from src/tests/Debuggees/EventPipeTracee/Program.cs rename to src/tests/CommonTestRunner/Debuggees/EventPipeTracee/Program.cs diff --git a/src/tests/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj b/src/tests/CommonTestRunner/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj similarity index 100% rename from src/tests/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj rename to src/tests/CommonTestRunner/Debuggees/ExitCodeTracee/ExitCodeTracee.csproj diff --git a/src/tests/Debuggees/ExitCodeTracee/Program.cs b/src/tests/CommonTestRunner/Debuggees/ExitCodeTracee/Program.cs similarity index 100% rename from src/tests/Debuggees/ExitCodeTracee/Program.cs rename to src/tests/CommonTestRunner/Debuggees/ExitCodeTracee/Program.cs diff --git a/src/tests/Debuggees/StackTracee/Program.cs b/src/tests/CommonTestRunner/Debuggees/StackTracee/Program.cs similarity index 100% rename from src/tests/Debuggees/StackTracee/Program.cs rename to src/tests/CommonTestRunner/Debuggees/StackTracee/Program.cs diff --git a/src/tests/Debuggees/StackTracee/StackTracee.csproj b/src/tests/CommonTestRunner/Debuggees/StackTracee/StackTracee.csproj similarity index 100% rename from src/tests/Debuggees/StackTracee/StackTracee.csproj rename to src/tests/CommonTestRunner/Debuggees/StackTracee/StackTracee.csproj diff --git a/src/tests/Debuggees/Tracee/Program.cs b/src/tests/CommonTestRunner/Debuggees/Tracee/Program.cs similarity index 100% rename from src/tests/Debuggees/Tracee/Program.cs rename to src/tests/CommonTestRunner/Debuggees/Tracee/Program.cs diff --git a/src/tests/Debuggees/Tracee/Tracee.csproj b/src/tests/CommonTestRunner/Debuggees/Tracee/Tracee.csproj similarity index 100% rename from src/tests/Debuggees/Tracee/Tracee.csproj rename to src/tests/CommonTestRunner/Debuggees/Tracee/Tracee.csproj diff --git a/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt index d15f246aa9..283f1082cf 100644 --- a/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -8,7 +8,7 @@ $(RootBinDir)/TestResults/$(TargetConfiguration)/dbgshim.unittests_$(Timestamp) ProjectK - $(RepoRootDir)/src/tests/Debuggees + $(RepoRootDir)/src/tests/DbgShim.UnitTests/Debuggees $(RepoRootDir)/eng/AuxMsbuildFiles cli SimpleDebuggee diff --git a/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt index 58b51e78a0..61fc2a88f5 100644 --- a/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -9,7 +9,7 @@ ProjectK $(RepoRootDir)\eng\AuxMsbuildFiles - $(RepoRootDir)\src\tests\Debuggees + $(RepoRootDir)\src\tests\DbgShim.UnitTests\Debuggees cli SimpleDebuggee diff --git a/src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props b/src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props new file mode 100644 index 0000000000..0a9a25f5ef --- /dev/null +++ b/src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props @@ -0,0 +1,16 @@ + + + + + false + full + true + false + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'debuggees', '$(MSBuildProjectName)', '$(Configuration)')) + + + + + + + diff --git a/src/tests/Debuggees/SimpleDebuggee/SimpleDebuggee.cs b/src/tests/DbgShim.UnitTests/Debuggees/SimpleDebuggee/SimpleDebuggee.cs similarity index 100% rename from src/tests/Debuggees/SimpleDebuggee/SimpleDebuggee.cs rename to src/tests/DbgShim.UnitTests/Debuggees/SimpleDebuggee/SimpleDebuggee.cs diff --git a/src/tests/Debuggees/SimpleDebuggee/SimpleDebuggee.csproj b/src/tests/DbgShim.UnitTests/Debuggees/SimpleDebuggee/SimpleDebuggee.csproj similarity index 100% rename from src/tests/Debuggees/SimpleDebuggee/SimpleDebuggee.csproj rename to src/tests/DbgShim.UnitTests/Debuggees/SimpleDebuggee/SimpleDebuggee.csproj diff --git a/src/tests/Debuggees/SimpleDebuggee/runtimeconfig.template.json b/src/tests/DbgShim.UnitTests/Debuggees/SimpleDebuggee/runtimeconfig.template.json similarity index 100% rename from src/tests/Debuggees/SimpleDebuggee/runtimeconfig.template.json rename to src/tests/DbgShim.UnitTests/Debuggees/SimpleDebuggee/runtimeconfig.template.json diff --git a/src/tests/Debuggees/WebApp3/Properties/launchSettings.json b/src/tests/Debuggees/WebApp3/Properties/launchSettings.json deleted file mode 100644 index c8d7225000..0000000000 --- a/src/tests/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/Grape/Grape.csproj b/src/tests/Grape/Grape.csproj index 7a617a31d9..4507fc0cd5 100644 --- a/src/tests/Grape/Grape.csproj +++ b/src/tests/Grape/Grape.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt index 2f591d4a23..0bf9b6591d 100644 --- a/src/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/src/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -28,7 +28,7 @@ true false - $(RepoRootDir)/src/tests/Debuggees + $(RepoRootDir)/src/tests/SOS.UnitTests/Debuggees $(RepoRootDir)/eng/AuxMsbuildFiles sdk.prebuilt $(RootBinDir) diff --git a/src/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt index c5f05c49e6..e4fa224fcc 100644 --- a/src/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/src/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -38,7 +38,7 @@ $(WinDir)\Microsoft.Net\Framework64\v4.0.30319\ $(WinDir)\Microsoft.Net\Framework\v4.0.30319\ - $(RepoRootDir)\src\tests\Debuggees + $(RepoRootDir)\src\tests\SOS.UnitTests\Debuggees $(RepoRootDir)\eng\AuxMsbuildFiles sdk.prebuilt $(RootBinDir) diff --git a/src/tests/SOS.UnitTests/Debuggees/Directory.Build.props b/src/tests/SOS.UnitTests/Debuggees/Directory.Build.props new file mode 100644 index 0000000000..0a9a25f5ef --- /dev/null +++ b/src/tests/SOS.UnitTests/Debuggees/Directory.Build.props @@ -0,0 +1,16 @@ + + + + + false + full + true + false + $([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'debuggees', '$(MSBuildProjectName)', '$(Configuration)')) + + + + + + + diff --git a/src/tests/Debuggees/DivZero/DivZero.cs b/src/tests/SOS.UnitTests/Debuggees/DivZero/DivZero.cs similarity index 100% rename from src/tests/Debuggees/DivZero/DivZero.cs rename to src/tests/SOS.UnitTests/Debuggees/DivZero/DivZero.cs diff --git a/src/tests/Debuggees/DivZero/DivZero.csproj b/src/tests/SOS.UnitTests/Debuggees/DivZero/DivZero.csproj similarity index 100% rename from src/tests/Debuggees/DivZero/DivZero.csproj rename to src/tests/SOS.UnitTests/Debuggees/DivZero/DivZero.csproj diff --git a/src/tests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj b/src/tests/SOS.UnitTests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj similarity index 100% rename from src/tests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj rename to src/tests/SOS.UnitTests/Debuggees/DotnetDumpCommands/DotnetDumpCommands.csproj diff --git a/src/tests/Debuggees/DotnetDumpCommands/Program.cs b/src/tests/SOS.UnitTests/Debuggees/DotnetDumpCommands/Program.cs similarity index 100% rename from src/tests/Debuggees/DotnetDumpCommands/Program.cs rename to src/tests/SOS.UnitTests/Debuggees/DotnetDumpCommands/Program.cs diff --git a/src/tests/Debuggees/DumpGCData/DumpGCData.csproj b/src/tests/SOS.UnitTests/Debuggees/DumpGCData/DumpGCData.csproj similarity index 100% rename from src/tests/Debuggees/DumpGCData/DumpGCData.csproj rename to src/tests/SOS.UnitTests/Debuggees/DumpGCData/DumpGCData.csproj diff --git a/src/tests/Debuggees/DumpGCData/Program.cs b/src/tests/SOS.UnitTests/Debuggees/DumpGCData/Program.cs similarity index 100% rename from src/tests/Debuggees/DumpGCData/Program.cs rename to src/tests/SOS.UnitTests/Debuggees/DumpGCData/Program.cs diff --git a/src/tests/Debuggees/DynamicMethod/DynamicMethod.csproj b/src/tests/SOS.UnitTests/Debuggees/DynamicMethod/DynamicMethod.csproj similarity index 100% rename from src/tests/Debuggees/DynamicMethod/DynamicMethod.csproj rename to src/tests/SOS.UnitTests/Debuggees/DynamicMethod/DynamicMethod.csproj diff --git a/src/tests/Debuggees/DynamicMethod/Program.cs b/src/tests/SOS.UnitTests/Debuggees/DynamicMethod/Program.cs similarity index 100% rename from src/tests/Debuggees/DynamicMethod/Program.cs rename to src/tests/SOS.UnitTests/Debuggees/DynamicMethod/Program.cs diff --git a/src/tests/Debuggees/FindRootsOlderGeneration/FindRootsOlderGeneration.csproj b/src/tests/SOS.UnitTests/Debuggees/FindRootsOlderGeneration/FindRootsOlderGeneration.csproj similarity index 100% rename from src/tests/Debuggees/FindRootsOlderGeneration/FindRootsOlderGeneration.csproj rename to src/tests/SOS.UnitTests/Debuggees/FindRootsOlderGeneration/FindRootsOlderGeneration.csproj diff --git a/src/tests/Debuggees/FindRootsOlderGeneration/Program.cs b/src/tests/SOS.UnitTests/Debuggees/FindRootsOlderGeneration/Program.cs similarity index 100% rename from src/tests/Debuggees/FindRootsOlderGeneration/Program.cs rename to src/tests/SOS.UnitTests/Debuggees/FindRootsOlderGeneration/Program.cs diff --git a/src/tests/Debuggees/GCPOH/GCPOH.cs b/src/tests/SOS.UnitTests/Debuggees/GCPOH/GCPOH.cs similarity index 100% rename from src/tests/Debuggees/GCPOH/GCPOH.cs rename to src/tests/SOS.UnitTests/Debuggees/GCPOH/GCPOH.cs diff --git a/src/tests/Debuggees/GCPOH/GCPOH.csproj b/src/tests/SOS.UnitTests/Debuggees/GCPOH/GCPOH.csproj similarity index 100% rename from src/tests/Debuggees/GCPOH/GCPOH.csproj rename to src/tests/SOS.UnitTests/Debuggees/GCPOH/GCPOH.csproj diff --git a/src/tests/Debuggees/GCWhere/GCWhere.cs b/src/tests/SOS.UnitTests/Debuggees/GCWhere/GCWhere.cs similarity index 100% rename from src/tests/Debuggees/GCWhere/GCWhere.cs rename to src/tests/SOS.UnitTests/Debuggees/GCWhere/GCWhere.cs diff --git a/src/tests/Debuggees/GCWhere/GCWhere.csproj b/src/tests/SOS.UnitTests/Debuggees/GCWhere/GCWhere.csproj similarity index 100% rename from src/tests/Debuggees/GCWhere/GCWhere.csproj rename to src/tests/SOS.UnitTests/Debuggees/GCWhere/GCWhere.csproj diff --git a/src/tests/Debuggees/LineNums/LineNums.csproj b/src/tests/SOS.UnitTests/Debuggees/LineNums/LineNums.csproj similarity index 100% rename from src/tests/Debuggees/LineNums/LineNums.csproj rename to src/tests/SOS.UnitTests/Debuggees/LineNums/LineNums.csproj diff --git a/src/tests/Debuggees/LineNums/Program.cs b/src/tests/SOS.UnitTests/Debuggees/LineNums/Program.cs similarity index 100% rename from src/tests/Debuggees/LineNums/Program.cs rename to src/tests/SOS.UnitTests/Debuggees/LineNums/Program.cs diff --git a/src/tests/Debuggees/NestedExceptionTest/NestedExceptionTest.cs b/src/tests/SOS.UnitTests/Debuggees/NestedExceptionTest/NestedExceptionTest.cs similarity index 100% rename from src/tests/Debuggees/NestedExceptionTest/NestedExceptionTest.cs rename to src/tests/SOS.UnitTests/Debuggees/NestedExceptionTest/NestedExceptionTest.cs diff --git a/src/tests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj b/src/tests/SOS.UnitTests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj similarity index 100% rename from src/tests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj rename to src/tests/SOS.UnitTests/Debuggees/NestedExceptionTest/NestedExceptionTest.csproj diff --git a/src/tests/Debuggees/Overflow/Overflow.cs b/src/tests/SOS.UnitTests/Debuggees/Overflow/Overflow.cs similarity index 100% rename from src/tests/Debuggees/Overflow/Overflow.cs rename to src/tests/SOS.UnitTests/Debuggees/Overflow/Overflow.cs diff --git a/src/tests/Debuggees/Overflow/Overflow.csproj b/src/tests/SOS.UnitTests/Debuggees/Overflow/Overflow.csproj similarity index 100% rename from src/tests/Debuggees/Overflow/Overflow.csproj rename to src/tests/SOS.UnitTests/Debuggees/Overflow/Overflow.csproj diff --git a/src/tests/Debuggees/ReflectionTest/ReflectionTest.cs b/src/tests/SOS.UnitTests/Debuggees/ReflectionTest/ReflectionTest.cs similarity index 100% rename from src/tests/Debuggees/ReflectionTest/ReflectionTest.cs rename to src/tests/SOS.UnitTests/Debuggees/ReflectionTest/ReflectionTest.cs diff --git a/src/tests/Debuggees/ReflectionTest/ReflectionTest.csproj b/src/tests/SOS.UnitTests/Debuggees/ReflectionTest/ReflectionTest.csproj similarity index 100% rename from src/tests/Debuggees/ReflectionTest/ReflectionTest.csproj rename to src/tests/SOS.UnitTests/Debuggees/ReflectionTest/ReflectionTest.csproj diff --git a/src/tests/Debuggees/SimpleThrow/SimpleThrow.cs b/src/tests/SOS.UnitTests/Debuggees/SimpleThrow/SimpleThrow.cs similarity index 100% rename from src/tests/Debuggees/SimpleThrow/SimpleThrow.cs rename to src/tests/SOS.UnitTests/Debuggees/SimpleThrow/SimpleThrow.cs diff --git a/src/tests/Debuggees/SimpleThrow/SimpleThrow.csproj b/src/tests/SOS.UnitTests/Debuggees/SimpleThrow/SimpleThrow.csproj similarity index 100% rename from src/tests/Debuggees/SimpleThrow/SimpleThrow.csproj rename to src/tests/SOS.UnitTests/Debuggees/SimpleThrow/SimpleThrow.csproj diff --git a/src/tests/Debuggees/SimpleThrow/UserObject.cs b/src/tests/SOS.UnitTests/Debuggees/SimpleThrow/UserObject.cs similarity index 100% rename from src/tests/Debuggees/SimpleThrow/UserObject.cs rename to src/tests/SOS.UnitTests/Debuggees/SimpleThrow/UserObject.cs diff --git a/src/tests/Debuggees/SymbolTestApp/SymbolTestApp.slnx b/src/tests/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestApp.slnx similarity index 100% rename from src/tests/Debuggees/SymbolTestApp/SymbolTestApp.slnx rename to src/tests/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestApp.slnx diff --git a/src/tests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.cs b/src/tests/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.cs similarity index 100% rename from src/tests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.cs rename to src/tests/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.cs diff --git a/src/tests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj b/src/tests/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj similarity index 100% rename from src/tests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj rename to src/tests/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestApp/SymbolTestApp.csproj diff --git a/src/tests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj b/src/tests/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj similarity index 100% rename from src/tests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj rename to src/tests/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestDll/SymbolTestDll.csproj diff --git a/src/tests/Debuggees/SymbolTestApp/SymbolTestDll/TestClass.cs b/src/tests/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestDll/TestClass.cs similarity index 100% rename from src/tests/Debuggees/SymbolTestApp/SymbolTestDll/TestClass.cs rename to src/tests/SOS.UnitTests/Debuggees/SymbolTestApp/SymbolTestDll/TestClass.cs diff --git a/src/tests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj b/src/tests/SOS.UnitTests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj similarity index 100% rename from src/tests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj rename to src/tests/SOS.UnitTests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserLibrary.csproj diff --git a/src/tests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserTask.cs b/src/tests/SOS.UnitTests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserTask.cs similarity index 100% rename from src/tests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserTask.cs rename to src/tests/SOS.UnitTests/Debuggees/TaskNestedException/RandomUserLibrary/RandomUserTask.cs diff --git a/src/tests/Debuggees/TaskNestedException/TaskNestedException.slnx b/src/tests/SOS.UnitTests/Debuggees/TaskNestedException/TaskNestedException.slnx similarity index 100% rename from src/tests/Debuggees/TaskNestedException/TaskNestedException.slnx rename to src/tests/SOS.UnitTests/Debuggees/TaskNestedException/TaskNestedException.slnx diff --git a/src/tests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.cs b/src/tests/SOS.UnitTests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.cs similarity index 100% rename from src/tests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.cs rename to src/tests/SOS.UnitTests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.cs diff --git a/src/tests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj b/src/tests/SOS.UnitTests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj similarity index 100% rename from src/tests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj rename to src/tests/SOS.UnitTests/Debuggees/TaskNestedException/TaskNestedException/TaskNestedException.csproj diff --git a/src/tests/Debuggees/TestDebuggee/Test.cs b/src/tests/SOS.UnitTests/Debuggees/TestDebuggee/Test.cs similarity index 100% rename from src/tests/Debuggees/TestDebuggee/Test.cs rename to src/tests/SOS.UnitTests/Debuggees/TestDebuggee/Test.cs diff --git a/src/tests/Debuggees/TestDebuggee/TestDebuggee.csproj b/src/tests/SOS.UnitTests/Debuggees/TestDebuggee/TestDebuggee.csproj similarity index 100% rename from src/tests/Debuggees/TestDebuggee/TestDebuggee.csproj rename to src/tests/SOS.UnitTests/Debuggees/TestDebuggee/TestDebuggee.csproj diff --git a/src/tests/Debuggees/VarargPInvokeInteropMD/Program.cs b/src/tests/SOS.UnitTests/Debuggees/VarargPInvokeInteropMD/Program.cs similarity index 100% rename from src/tests/Debuggees/VarargPInvokeInteropMD/Program.cs rename to src/tests/SOS.UnitTests/Debuggees/VarargPInvokeInteropMD/Program.cs diff --git a/src/tests/Debuggees/VarargPInvokeInteropMD/VarargPInvokeInteropMD.csproj b/src/tests/SOS.UnitTests/Debuggees/VarargPInvokeInteropMD/VarargPInvokeInteropMD.csproj similarity index 100% rename from src/tests/Debuggees/VarargPInvokeInteropMD/VarargPInvokeInteropMD.csproj rename to src/tests/SOS.UnitTests/Debuggees/VarargPInvokeInteropMD/VarargPInvokeInteropMD.csproj diff --git a/src/tests/Debuggees/WebApp3/Program.cs b/src/tests/SOS.UnitTests/Debuggees/WebApp3/Program.cs similarity index 100% rename from src/tests/Debuggees/WebApp3/Program.cs rename to src/tests/SOS.UnitTests/Debuggees/WebApp3/Program.cs diff --git a/src/tests/Debuggees/WebApp3/Startup.cs b/src/tests/SOS.UnitTests/Debuggees/WebApp3/Startup.cs similarity index 100% rename from src/tests/Debuggees/WebApp3/Startup.cs rename to src/tests/SOS.UnitTests/Debuggees/WebApp3/Startup.cs diff --git a/src/tests/Debuggees/WebApp3/WebApp3.csproj b/src/tests/SOS.UnitTests/Debuggees/WebApp3/WebApp3.csproj similarity index 100% rename from src/tests/Debuggees/WebApp3/WebApp3.csproj rename to src/tests/SOS.UnitTests/Debuggees/WebApp3/WebApp3.csproj diff --git a/src/tests/Debuggees/WebApp3/appsettings.Development.json b/src/tests/SOS.UnitTests/Debuggees/WebApp3/appsettings.Development.json similarity index 100% rename from src/tests/Debuggees/WebApp3/appsettings.Development.json rename to src/tests/SOS.UnitTests/Debuggees/WebApp3/appsettings.Development.json diff --git a/src/tests/Debuggees/WebApp3/appsettings.json b/src/tests/SOS.UnitTests/Debuggees/WebApp3/appsettings.json similarity index 100% rename from src/tests/Debuggees/WebApp3/appsettings.json rename to src/tests/SOS.UnitTests/Debuggees/WebApp3/appsettings.json From 3854a716558a1987654a25751ee706b33138b83e Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri, 10 Oct 2025 15:31:07 -0400 Subject: [PATCH 44/52] fix csprojs --- src/tests/CommonTestRunner/CommonTestRunner.csproj | 6 ++++++ .../Debuggees/EventPipeTracee/EventPipeTracee.csproj | 2 +- src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj | 6 ++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/src/tests/CommonTestRunner/CommonTestRunner.csproj b/src/tests/CommonTestRunner/CommonTestRunner.csproj index 99acdb79b5..5ce6ada4c6 100644 --- a/src/tests/CommonTestRunner/CommonTestRunner.csproj +++ b/src/tests/CommonTestRunner/CommonTestRunner.csproj @@ -5,6 +5,12 @@ $(OutputPath)$(TargetFramework)\Debugger.Tests.Common.txt + + + + + + diff --git a/src/tests/CommonTestRunner/Debuggees/EventPipeTracee/EventPipeTracee.csproj b/src/tests/CommonTestRunner/Debuggees/EventPipeTracee/EventPipeTracee.csproj index ddec55b529..3a7e162fd1 100644 --- a/src/tests/CommonTestRunner/Debuggees/EventPipeTracee/EventPipeTracee.csproj +++ b/src/tests/CommonTestRunner/Debuggees/EventPipeTracee/EventPipeTracee.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj b/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj index 4860f62e70..6d26a932eb 100644 --- a/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj +++ b/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj @@ -10,6 +10,12 @@ true + + + + + + From aa67d8af5249375e6e72c9dd5e19870acd61e107 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri, 10 Oct 2025 15:32:55 -0400 Subject: [PATCH 45/52] rename --- .../SOS.UnitTests/{SOS.Tests.csproj => SOS.UnitTests.csproj} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/tests/SOS.UnitTests/{SOS.Tests.csproj => SOS.UnitTests.csproj} (100%) diff --git a/src/tests/SOS.UnitTests/SOS.Tests.csproj b/src/tests/SOS.UnitTests/SOS.UnitTests.csproj similarity index 100% rename from src/tests/SOS.UnitTests/SOS.Tests.csproj rename to src/tests/SOS.UnitTests/SOS.UnitTests.csproj From e142bb146545bb156ebb184183bfbee107bc89e9 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri, 10 Oct 2025 15:53:51 -0400 Subject: [PATCH 46/52] fix --- src/tests/dirs.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/dirs.proj b/src/tests/dirs.proj index 0732e5b4f8..bcaa2a305a 100644 --- a/src/tests/dirs.proj +++ b/src/tests/dirs.proj @@ -1,7 +1,7 @@ - + From 539d07dd336cee30f42c6be1ea9d041ee80ecce6 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri, 10 Oct 2025 16:00:30 -0400 Subject: [PATCH 47/52] fix --- .../WebApp3/Properties/launchSettings.json | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/tests/SOS.UnitTests/Debuggees/WebApp3/Properties/launchSettings.json diff --git a/src/tests/SOS.UnitTests/Debuggees/WebApp3/Properties/launchSettings.json b/src/tests/SOS.UnitTests/Debuggees/WebApp3/Properties/launchSettings.json new file mode 100644 index 0000000000..c8d7225000 --- /dev/null +++ b/src/tests/SOS.UnitTests/Debuggees/WebApp3/Properties/launchSettings.json @@ -0,0 +1,29 @@ +{ + "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" + } + } +} From f5a504ad8a23d15a6fef45a4efeba5d463240f33 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri, 10 Oct 2025 16:24:07 -0400 Subject: [PATCH 48/52] fix mode --- src/tests/benchmarks/RunBenchmarks.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 src/tests/benchmarks/RunBenchmarks.sh diff --git a/src/tests/benchmarks/RunBenchmarks.sh b/src/tests/benchmarks/RunBenchmarks.sh old mode 100644 new mode 100755 From da601fffcf43f164292edc437527f143bb7d5860 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri, 10 Oct 2025 16:28:45 -0400 Subject: [PATCH 49/52] reduce diff --- src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props | 1 + src/tests/SOS.UnitTests/Debuggees/Directory.Build.props | 1 + 2 files changed, 2 insertions(+) diff --git a/src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props b/src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props index 0a9a25f5ef..673e0e5a76 100644 --- a/src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props +++ b/src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props @@ -1,5 +1,6 @@ + false diff --git a/src/tests/SOS.UnitTests/Debuggees/Directory.Build.props b/src/tests/SOS.UnitTests/Debuggees/Directory.Build.props index 0a9a25f5ef..d9bff4a61f 100644 --- a/src/tests/SOS.UnitTests/Debuggees/Directory.Build.props +++ b/src/tests/SOS.UnitTests/Debuggees/Directory.Build.props @@ -1,5 +1,6 @@ + false From c442e7a421586249555f55340fefba7d0ecb6ae9 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri, 10 Oct 2025 16:35:40 -0400 Subject: [PATCH 50/52] reduce diff --- src/tests/Directory.Build.targets | 64 ------------------------------- 1 file changed, 64 deletions(-) diff --git a/src/tests/Directory.Build.targets b/src/tests/Directory.Build.targets index 09a564cb6f..230e2a65a1 100644 --- a/src/tests/Directory.Build.targets +++ b/src/tests/Directory.Build.targets @@ -2,15 +2,6 @@ - - - $([System.IO.Path]::Combine('$(IntermediateOutputPath)','$(TargetFrameworkMoniker).AssemblyAttributes$(DefaultLanguageSourceExtension)')) - - - - - - @@ -24,59 +15,4 @@ - - - - - - - - - - - - - - - $(InternalReleaseTesting) - $(PrivateBuildTesting) -]]> - - - - -%(RuntimeTestVersions.Runtime) - %(RuntimeTestVersions.AspNet) - %(RuntimeTestVersions.TargetFramework) -]]> - - - - - -]]> - - - - - - - - - - - - From 725c7df81cddb03f966c584dbc5b1ce90f4e14f7 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri, 10 Oct 2025 16:51:26 -0400 Subject: [PATCH 51/52] update --- .gitignore | 2 +- dirs.proj => build.proj | 0 .../building/windows-instructions.md | 11 ++ eng/Build.props | 2 +- eng/generate-slnx.ps1 | 112 ++++++++++++++++++ generate-slnx.ps1 | 112 ------------------ .../Debuggees/Directory.Build.props | 1 - .../Debuggees/Directory.Build.props | 1 - 8 files changed, 125 insertions(+), 116 deletions(-) rename dirs.proj => build.proj (100%) create mode 100644 eng/generate-slnx.ps1 diff --git a/.gitignore b/.gitignore index 2dff8a06ff..f4dfe3f130 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ .vs/ *.VC.db .venv/ -dirs.slnx +build.slnx # Build results [Aa]rtifacts/ diff --git a/dirs.proj b/build.proj similarity index 100% rename from dirs.proj rename to build.proj diff --git a/documentation/building/windows-instructions.md b/documentation/building/windows-instructions.md index 09587a36e3..888caaf75c 100644 --- a/documentation/building/windows-instructions.md +++ b/documentation/building/windows-instructions.md @@ -108,3 +108,14 @@ To test the resulting SOS: ```bat test.cmd ``` + +## Loading solution file + +For a better dev inner loop experience, generate the `build.slnx` file using + +```pwsh +# Ensure local .dotnet is bootstrapped first (run build.cmd once if new clone) +./eng/generate-slnx.ps1 +``` + +then load the file into either VS or VSCode. diff --git a/eng/Build.props b/eng/Build.props index 9e51b89ad5..5046cae3ab 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -1,6 +1,6 @@ - + diff --git a/eng/generate-slnx.ps1 b/eng/generate-slnx.ps1 new file mode 100644 index 0000000000..b3ba58c748 --- /dev/null +++ b/eng/generate-slnx.ps1 @@ -0,0 +1,112 @@ +#!/usr/bin/env pwsh + +<# +.SYNOPSIS + Generates and migrates Visual Studio solution files for the diagnostics repository. + +.DESCRIPTION + This script generates solution files using SlnGen tool and migrates the legacy + build.sln file to the new .slnx format, then cleans up the old file. + +.EXAMPLE + .\generate-slnx.ps1 +#> + +[CmdletBinding()] +param() + +Set-StrictMode -Version Latest +$ErrorActionPreference = "Stop" + +# Determine local dotnet path (must exist) +$scriptRoot = Split-Path -Parent $MyInvocation.MyCommand.Path +$localDotNet = Join-Path $scriptRoot "../.dotnet" +$dotnetExe = Join-Path $localDotNet "dotnet.exe" +if (-not (Test-Path $dotnetExe)) { + Write-Host "[ERROR] Local dotnet not found at $dotnetExe" -ForegroundColor Red + Write-Host "Ensure .dotnet is bootstrapped (e.g. run build/restore scripts) before running this generator." -ForegroundColor Yellow + exit 1 +} + +function Write-Step { + param([string]$Message) + Write-Host "==> $Message" -ForegroundColor Cyan +} + +function Write-Success { + param([string]$Message) + Write-Host "[SUCCESS] $Message" -ForegroundColor Green +} + +function Write-Warning { + param([string]$Message) + Write-Host "[WARNING] $Message" -ForegroundColor Yellow +} + +function Write-ErrorMessage { + param([string]$Message) + Write-Host "[ERROR] $Message" -ForegroundColor Red +} + +try { + Write-Host "Diagnostics Solution Generator" -ForegroundColor Magenta + Write-Host "==============================" -ForegroundColor Magenta + + # Step 1: Generate solution files with SlnGen + Write-Step "Generating solution files with SlnGen..." + try { + # Use local dotnet to execute SlnGen tool + & $dotnetExe tool exec Microsoft.VisualStudio.SlnGen.Tool --collapsefolders true --folders true --launch false + $slngenExit = $LASTEXITCODE + if ($slngenExit -ne 0) { + throw "SlnGen tool exited with non-zero exit code $slngenExit" + } + Write-Success "Solution files generated successfully" + } + catch { + Write-ErrorMessage "Failed to generate solution files with SlnGen" + Write-Host "Error details: $($_.Exception.Message)" -ForegroundColor Red + exit 1 + } + + # Step 2: Check if build.sln exists before migration + if (Test-Path "build.sln") { + Write-Step "Migrating build.sln to new format..." + try { + & $dotnetExe sln build.sln migrate + $migrateExit = $LASTEXITCODE + if ($migrateExit -ne 0) { throw "dotnet sln migrate exited with $migrateExit" } + Write-Success "Migration completed successfully" + } + catch { + Write-ErrorMessage "Failed to migrate build.sln" + Write-Host "Error details: $($_.Exception.Message)" -ForegroundColor Red + Write-Warning "Continuing with cleanup..." + } + + # Step 3: Clean up old solution file + Write-Step "Cleaning up old build.sln file..." + try { + Remove-Item "build.sln" -Force + Write-Success "Old solution file removed" + } + catch { + Write-Warning "Could not remove build.sln: $($_.Exception.Message)" + Write-Host "You may need to remove it manually" -ForegroundColor Yellow + } + } + else { + Write-Warning "build.sln not found, skipping migration step" + } + + Write-Host "" + Write-Success "Solution generation and migration completed successfully!" + Write-Host "You can now open the generated build.slnx files in Visual Studio." -ForegroundColor Gray +} +catch { + Write-ErrorMessage "Script execution failed with unexpected error" + Write-Host "Error details: $($_.Exception.Message)" -ForegroundColor Red + Write-Host "Stack trace:" -ForegroundColor Gray + Write-Host $_.ScriptStackTrace -ForegroundColor Gray + exit 1 +} diff --git a/generate-slnx.ps1 b/generate-slnx.ps1 index 74069096a9..e69de29bb2 100644 --- a/generate-slnx.ps1 +++ b/generate-slnx.ps1 @@ -1,112 +0,0 @@ -#!/usr/bin/env pwsh - -<# -.SYNOPSIS - Generates and migrates Visual Studio solution files for the diagnostics repository. - -.DESCRIPTION - This script generates solution files using SlnGen tool and migrates the legacy - dirs.sln file to the new .slnx format, then cleans up the old file. - -.EXAMPLE - .\generate-slnx.ps1 -#> - -[CmdletBinding()] -param() - -Set-StrictMode -Version Latest -$ErrorActionPreference = "Stop" - -# Determine local dotnet path (must exist) -$scriptRoot = Split-Path -Parent $MyInvocation.MyCommand.Path -$localDotNet = Join-Path $scriptRoot ".dotnet" -$dotnetExe = Join-Path $localDotNet "dotnet.exe" -if (-not (Test-Path $dotnetExe)) { - Write-Host "[ERROR] Local dotnet not found at $dotnetExe" -ForegroundColor Red - Write-Host "Ensure .dotnet is bootstrapped (e.g. run build/restore scripts) before running this generator." -ForegroundColor Yellow - exit 1 -} - -function Write-Step { - param([string]$Message) - Write-Host "==> $Message" -ForegroundColor Cyan -} - -function Write-Success { - param([string]$Message) - Write-Host "[SUCCESS] $Message" -ForegroundColor Green -} - -function Write-Warning { - param([string]$Message) - Write-Host "[WARNING] $Message" -ForegroundColor Yellow -} - -function Write-ErrorMessage { - param([string]$Message) - Write-Host "[ERROR] $Message" -ForegroundColor Red -} - -try { - Write-Host "Diagnostics Solution Generator" -ForegroundColor Magenta - Write-Host "==============================" -ForegroundColor Magenta - - # Step 1: Generate solution files with SlnGen - Write-Step "Generating solution files with SlnGen..." - try { - # Use local dotnet to execute SlnGen tool - & $dotnetExe tool exec Microsoft.VisualStudio.SlnGen.Tool --collapsefolders true --folders true --launch false - $slngenExit = $LASTEXITCODE - if ($slngenExit -ne 0) { - throw "SlnGen tool exited with non-zero exit code $slngenExit" - } - Write-Success "Solution files generated successfully" - } - catch { - Write-ErrorMessage "Failed to generate solution files with SlnGen" - Write-Host "Error details: $($_.Exception.Message)" -ForegroundColor Red - exit 1 - } - - # Step 2: Check if dirs.sln exists before migration - if (Test-Path "dirs.sln") { - Write-Step "Migrating dirs.sln to new format..." - try { - & $dotnetExe sln dirs.sln migrate - $migrateExit = $LASTEXITCODE - if ($migrateExit -ne 0) { throw "dotnet sln migrate exited with $migrateExit" } - Write-Success "Migration completed successfully" - } - catch { - Write-ErrorMessage "Failed to migrate dirs.sln" - Write-Host "Error details: $($_.Exception.Message)" -ForegroundColor Red - Write-Warning "Continuing with cleanup..." - } - - # Step 3: Clean up old solution file - Write-Step "Cleaning up old dirs.sln file..." - try { - Remove-Item "dirs.sln" -Force - Write-Success "Old solution file removed" - } - catch { - Write-Warning "Could not remove dirs.sln: $($_.Exception.Message)" - Write-Host "You may need to remove it manually" -ForegroundColor Yellow - } - } - else { - Write-Warning "dirs.sln not found, skipping migration step" - } - - Write-Host "" - Write-Success "Solution generation and migration completed successfully!" - Write-Host "You can now open the generated .slnx files in Visual Studio." -ForegroundColor Gray -} -catch { - Write-ErrorMessage "Script execution failed with unexpected error" - Write-Host "Error details: $($_.Exception.Message)" -ForegroundColor Red - Write-Host "Stack trace:" -ForegroundColor Gray - Write-Host $_.ScriptStackTrace -ForegroundColor Gray - exit 1 -} diff --git a/src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props b/src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props index 673e0e5a76..0a9a25f5ef 100644 --- a/src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props +++ b/src/tests/DbgShim.UnitTests/Debuggees/Directory.Build.props @@ -1,6 +1,5 @@ - false diff --git a/src/tests/SOS.UnitTests/Debuggees/Directory.Build.props b/src/tests/SOS.UnitTests/Debuggees/Directory.Build.props index d9bff4a61f..0a9a25f5ef 100644 --- a/src/tests/SOS.UnitTests/Debuggees/Directory.Build.props +++ b/src/tests/SOS.UnitTests/Debuggees/Directory.Build.props @@ -1,6 +1,5 @@ - false From ee3e8c5bfe0bd41789374b41902fbf6fa1dd6641 Mon Sep 17 00:00:00 2001 From: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri, 5 Dec 2025 13:16:45 -0500 Subject: [PATCH 52/52] Squashed commit of the following: commit 5de3340acb90f8f47f0a16f2391e9939b4ed5da6 Author: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri Dec 5 11:36:00 2025 -0500 move native SOS test helpers to test folder (#5652) * Moves `runcommand` and `DesktopClrHost` from under the SOS package to `src/tests/` commit d1421e4bd32edb03709d3780c6bd8d2551ed05b2 Author: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Fri Dec 5 11:35:14 2025 -0500 add MiniDumpLocalVarLookup test (#5579) * Adds SOS test for minidump local var lookup commit 848b19c830197ff075fa503b005a6c9224901624 Author: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu Dec 4 22:37:26 2025 -0500 Simplify test `csproj` files (#5653) * MSBuild property: `$(SrcDir) -> $(RepoRoot)/src/` * MSBuild property: `$(TestDir) -> $(ReporRoot/src/tests/` * Tests `.csproj` files to use these properties to simplify imports. This also allows us to move around the test/src directories without modifying each project individually. * `Microsoft.FileFormats.UnitTests.csproj` and `Microsoft.SymbolStore.UnitTests.csproj` both copy test binary assets from the source tree into the artifacts tree. This was handled individually for each item with some inconsistencies. I simplified this process using globbing. There are a couple more files that are copied now, but I believe this shouldn't have any appreciable impact. commit bc690978a4eb3e98c3b09ab198fe213d5eb884b7 Author: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu Dec 4 16:20:38 2025 -0800 [main] Update dependencies from dotnet/dotnet (#5650) This pull request updates the following dependencies [marker]: <> (Begin:9c7d85bb-274e-4ad6-970a-48ffc448929b) - **Subscription**: [9c7d85bb-274e-4ad6-970a-48ffc448929b](https://maestro.dot.net/subscriptions?search=9c7d85bb-274e-4ad6-970a-48ffc448929b) - **Build**: [20251203.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2852778) ([293194](https://maestro.dot.net/channel/5173/github:dotnet:dotnet/build/293194)) - **Date Produced**: December 3, 2025 7:24:47 PM UTC - **Commit**: [5ddd0ddc0ebadca21645a05c419ed5a034454605](https://github.com/dotnet/dotnet/commit/5ddd0ddc0ebadca21645a05c419ed5a034454605) - **Branch**: [release/10.0.1xx](https://github.com/dotnet/dotnet/tree/release/10.0.1xx) [DependencyUpdate]: <> (Begin) - **Dependency Updates**: - From [10.0.2-servicing.25601.110 to 10.0.2-servicing.25603.103][1] - runtime.linux-arm64.Microsoft.DotNet.Cdac.Transport - runtime.linux-x64.Microsoft.DotNet.Cdac.Transport - runtime.osx-arm64.Microsoft.DotNet.Cdac.Transport - runtime.osx-x64.Microsoft.DotNet.Cdac.Transport - runtime.win-arm64.Microsoft.DotNet.Cdac.Transport - Microsoft.AspNetCore.App.Ref.Internal - Microsoft.NETCore.Platforms - runtime.win-x64.Microsoft.DotNet.Cdac.Transport - From [10.0.2 to 10.0.2][1] - Microsoft.AspNetCore.App.Ref - Microsoft.NETCore.App.Ref - From [5.0.0-2.25601.110 to 5.0.0-2.25603.103][1] - Microsoft.CodeAnalysis - Microsoft.CodeAnalysis.Analyzers - Microsoft.CodeAnalysis.CSharp - From [10.0.102 to 10.0.102][1] - Microsoft.CodeAnalysis.NetAnalyzers - From [10.0.0-beta.25601.110 to 10.0.0-beta.25603.103][1] - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.CodeAnalysis - From [10.0.102-servicing.25601.110 to 10.0.102-servicing.25603.103][1] - Microsoft.NET.Sdk [1]: https://github.com/dotnet/dotnet/compare/7dedd35363...5ddd0ddc0e [DependencyUpdate]: <> (End) [marker]: <> (End:9c7d85bb-274e-4ad6-970a-48ffc448929b) Co-authored-by: dotnet-maestro[bot] commit 4ba3f427b5076c3e06794ddd3eabc73852216e6d Author: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu Dec 4 18:53:44 2025 -0500 Remove references to $(RepoRoot) in testing scripts (#5614) This brings us closer to sending the tests to helix commit a81816d3b17861fcaa506c8da27ea9333c4b3482 Author: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu Dec 4 13:29:25 2025 -0500 move lldbplugin.tests to test folder (#5651) commit 94caedf0b8883d247423368ba360f42253c80a3b Author: Max Charlamb <44248479+max-charlamb@users.noreply.github.com> Date: Thu Dec 4 13:07:42 2025 -0500 Remove `FreeLibrary` invocations in managed SOS host (#5586) * Fixes intermittent failures when using the cDAC * Prepares SOS to consume NativeAOT packages --- Directory.Build.props | 2 + NuGet.config | 2 +- eng/Version.Details.props | 28 ++--- eng/Version.Details.xml | 62 +++++------ global.json | 2 +- src/SOS/SOS.Hosting/RuntimeWrapper.cs | 5 +- .../MiniDumpLocalVarLookup.csproj | 7 ++ .../MiniDumpLocalVarLookup/Program.cs | 26 +++++ src/tests/CMakeLists.txt | 1 + .../CommonTestRunner/CommonTestRunner.csproj | 2 +- .../DbgShim.UnitTests.csproj | 4 +- src/tests/Grape/Grape.csproj | 4 +- ...Diagnostics.DebugServices.UnitTests.csproj | 8 +- ...tics.Monitoring.EventPipe.UnitTests.csproj | 6 +- ...ft.Diagnostics.Monitoring.UnitTests.csproj | 6 +- ...iagnostics.NETCore.Client.UnitTests.csproj | 6 +- .../Microsoft.FileFormats.UnitTests.csproj | 56 +--------- .../Microsoft.SymbolStore.UnitTests.csproj | 102 ++---------------- .../Unix/Debugger.Tests.Config.txt | 2 +- .../Windows/Debugger.Tests.Config.txt | 2 +- src/tests/SOS.UnitTests/SOS.UnitTests.csproj | 11 ++ src/tests/SOS.UnitTests/SOS.cs | 50 ++++++++- src/tests/SOS.UnitTests/SOSRunner.cs | 10 ++ .../Scripts/MiniDumpLocalVarLookup.script | 15 +++ src/tests/TestExtension/TestExtension.csproj | 2 +- src/tests/TestHelpers/TestHelpers.csproj | 2 +- .../DotnetCounters.UnitTests.csproj | 6 +- .../dotnet-stack/DotnetStack.UnitTests.csproj | 4 +- .../dotnet-trace/DotnetTrace.UnitTests.csproj | 4 +- .../eventpipe/EventPipe.UnitTests.csproj | 2 +- 30 files changed, 209 insertions(+), 230 deletions(-) create mode 100644 src/SOS/SOS.UnitTests/Debuggees/MiniDumpLocalVarLookup/MiniDumpLocalVarLookup.csproj create mode 100644 src/SOS/SOS.UnitTests/Debuggees/MiniDumpLocalVarLookup/Program.cs create mode 100644 src/tests/SOS.UnitTests/Scripts/MiniDumpLocalVarLookup.script diff --git a/Directory.Build.props b/Directory.Build.props index 954a52ee0a..41c85d2542 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -36,6 +36,8 @@ --> + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src')) + $([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'tests')) $([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'dotnet-test')) diff --git a/NuGet.config b/NuGet.config index 324bea91ab..2dc10a79b4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 600df683a0..dffd39389a 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -14,22 +14,22 @@ This file should be imported by eng/Versions.props 1.0.105-preview.225 10.0.2 - 10.0.2-servicing.25601.110 - 5.0.0-2.25601.110 - 5.0.0-2.25601.110 - 5.0.0-2.25601.110 + 10.0.2-servicing.25603.103 + 5.0.0-2.25603.103 + 5.0.0-2.25603.103 + 5.0.0-2.25603.103 10.0.102 - 10.0.0-beta.25601.110 - 10.0.0-beta.25601.110 - 10.0.102-servicing.25601.110 + 10.0.0-beta.25603.103 + 10.0.0-beta.25603.103 + 10.0.102-servicing.25603.103 10.0.2 - 10.0.2-servicing.25601.110 - 10.0.2-servicing.25601.110 - 10.0.2-servicing.25601.110 - 10.0.2-servicing.25601.110 - 10.0.2-servicing.25601.110 - 10.0.2-servicing.25601.110 - 10.0.2-servicing.25601.110 + 10.0.2-servicing.25603.103 + 10.0.2-servicing.25603.103 + 10.0.2-servicing.25603.103 + 10.0.2-servicing.25603.103 + 10.0.2-servicing.25603.103 + 10.0.2-servicing.25603.103 + 10.0.2-servicing.25603.103 7.0.0-beta.22316.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1021d2fe52..4d073c2f0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,31 +19,31 @@ - + https://github.com/dotnet/dotnet - 7dedd35363daf74f94a980da38f2cf4dc86cc23a + 5ddd0ddc0ebadca21645a05c419ed5a034454605 - + https://github.com/dotnet/dotnet - 7dedd35363daf74f94a980da38f2cf4dc86cc23a + 5ddd0ddc0ebadca21645a05c419ed5a034454605 https://github.com/dotnet/arcade ccfe6da198c5f05534863bbb1bff66e830e0c6ab - + https://github.com/dotnet/dotnet - 7dedd35363daf74f94a980da38f2cf4dc86cc23a + 5ddd0ddc0ebadca21645a05c419ed5a034454605 - + https://github.com/dotnet/dotnet - 7dedd35363daf74f94a980da38f2cf4dc86cc23a + 5ddd0ddc0ebadca21645a05c419ed5a034454605 https://github.com/dotnet/dotnet - 7dedd35363daf74f94a980da38f2cf4dc86cc23a + 5ddd0ddc0ebadca21645a05c419ed5a034454605 https://github.com/dotnet/dotnet - 7dedd35363daf74f94a980da38f2cf4dc86cc23a + 5ddd0ddc0ebadca21645a05c419ed5a034454605 - + https://github.com/dotnet/dotnet - 7dedd35363daf74f94a980da38f2cf4dc86cc23a + 5ddd0ddc0ebadca21645a05c419ed5a034454605 - + https://github.com/dotnet/dotnet - 7dedd35363daf74f94a980da38f2cf4dc86cc23a + 5ddd0ddc0ebadca21645a05c419ed5a034454605 - + https://github.com/dotnet/dotnet - 7dedd35363daf74f94a980da38f2cf4dc86cc23a + 5ddd0ddc0ebadca21645a05c419ed5a034454605 - + https://github.com/dotnet/dotnet - 7dedd35363daf74f94a980da38f2cf4dc86cc23a + 5ddd0ddc0ebadca21645a05c419ed5a034454605 - + https://github.com/dotnet/dotnet - 7dedd35363daf74f94a980da38f2cf4dc86cc23a + 5ddd0ddc0ebadca21645a05c419ed5a034454605 - + https://github.com/dotnet/dotnet - 7dedd35363daf74f94a980da38f2cf4dc86cc23a + 5ddd0ddc0ebadca21645a05c419ed5a034454605 - + https://github.com/dotnet/dotnet - 7dedd35363daf74f94a980da38f2cf4dc86cc23a + 5ddd0ddc0ebadca21645a05c419ed5a034454605 - + https://github.com/dotnet/dotnet - 7dedd35363daf74f94a980da38f2cf4dc86cc23a + 5ddd0ddc0ebadca21645a05c419ed5a034454605 - + https://github.com/dotnet/dotnet - 7dedd35363daf74f94a980da38f2cf4dc86cc23a + 5ddd0ddc0ebadca21645a05c419ed5a034454605 - + https://github.com/dotnet/dotnet - 7dedd35363daf74f94a980da38f2cf4dc86cc23a + 5ddd0ddc0ebadca21645a05c419ed5a034454605 https://github.com/dotnet/dotnet - 7dedd35363daf74f94a980da38f2cf4dc86cc23a + 5ddd0ddc0ebadca21645a05c419ed5a034454605 diff --git a/global.json b/global.json index 4827c55875..f6eb7542fc 100644 --- a/global.json +++ b/global.json @@ -18,6 +18,6 @@ "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25601.110" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25603.103" } } diff --git a/src/SOS/SOS.Hosting/RuntimeWrapper.cs b/src/SOS/SOS.Hosting/RuntimeWrapper.cs index bfca28db91..ac37d23e01 100644 --- a/src/SOS/SOS.Hosting/RuntimeWrapper.cs +++ b/src/SOS/SOS.Hosting/RuntimeWrapper.cs @@ -158,12 +158,13 @@ protected override void Destroy() } if (_dacHandle != IntPtr.Zero) { - DataTarget.PlatformFunctions.FreeLibrary(_dacHandle); + // Previously, the DAC was freed here, but as we transition to the cDAC which uses NativeAOT, + // it is no longer possible to free the DAC library when it is using the shimmed cDAC. _dacHandle = IntPtr.Zero; } if (_cdacHandle != IntPtr.Zero) { - DataTarget.PlatformFunctions.FreeLibrary(_cdacHandle); + // cDAC can not be freed because it is a NativeAOT dll. _cdacHandle = IntPtr.Zero; } if (_dbiHandle != IntPtr.Zero) diff --git a/src/SOS/SOS.UnitTests/Debuggees/MiniDumpLocalVarLookup/MiniDumpLocalVarLookup.csproj b/src/SOS/SOS.UnitTests/Debuggees/MiniDumpLocalVarLookup/MiniDumpLocalVarLookup.csproj new file mode 100644 index 0000000000..644ea7fa32 --- /dev/null +++ b/src/SOS/SOS.UnitTests/Debuggees/MiniDumpLocalVarLookup/MiniDumpLocalVarLookup.csproj @@ -0,0 +1,7 @@ + + + Exe + $(BuildProjectFramework) + $(SupportedSubProcessTargetFrameworks) + + diff --git a/src/SOS/SOS.UnitTests/Debuggees/MiniDumpLocalVarLookup/Program.cs b/src/SOS/SOS.UnitTests/Debuggees/MiniDumpLocalVarLookup/Program.cs new file mode 100644 index 0000000000..cbea65ad93 --- /dev/null +++ b/src/SOS/SOS.UnitTests/Debuggees/MiniDumpLocalVarLookup/Program.cs @@ -0,0 +1,26 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using System; +using System.Diagnostics; + +namespace MiniDumpLocalVarLookup; + +internal class Program +{ + static public void Main() + { + int intValue = 42; + string stringValue = "Hello, World!"; + + PrintValues(intValue, stringValue); + } + + static void PrintValues(int intValue, string stringValue) + { + int length = stringValue.Length; + Debugger.Break(); + Console.WriteLine($"intValue: {intValue}"); + Console.WriteLine($"stringValue: {stringValue} (length = {length})"); + } +} diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 3800b3ca02..bf31588276 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -1,6 +1,7 @@ include(${CLR_SHARED_DIR}/shared.cmake) if(CLR_CMAKE_HOST_WIN32) + # test helpers used by SOS tests add_subdirectory(runcommand) if(NOT CLR_CMAKE_TARGET_ARCH_ARM) add_subdirectory(DesktopClrHost) diff --git a/src/tests/CommonTestRunner/CommonTestRunner.csproj b/src/tests/CommonTestRunner/CommonTestRunner.csproj index b15656ae47..3fe4a8a56d 100644 --- a/src/tests/CommonTestRunner/CommonTestRunner.csproj +++ b/src/tests/CommonTestRunner/CommonTestRunner.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj b/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj index 4e5a330edc..9bb29be6ea 100644 --- a/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj +++ b/src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj @@ -17,8 +17,8 @@ - - + + diff --git a/src/tests/Grape/Grape.csproj b/src/tests/Grape/Grape.csproj index 4507fc0cd5..76be2271ac 100644 --- a/src/tests/Grape/Grape.csproj +++ b/src/tests/Grape/Grape.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj index 2d462fbe2d..e7fd0726b9 100644 --- a/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj +++ b/src/tests/Microsoft.Diagnostics.DebugServices.UnitTests/Microsoft.Diagnostics.DebugServices.UnitTests.csproj @@ -16,10 +16,10 @@ - - - - + + + + diff --git a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj index 9968f7be5a..7d44500941 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj +++ b/src/tests/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/src/tests/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.UnitTests.csproj b/src/tests/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.UnitTests.csproj index cb4fccd10c..e7bb6394da 100644 --- a/src/tests/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.UnitTests.csproj +++ b/src/tests/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.UnitTests.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/src/tests/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj b/src/tests/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj index 6bc2cd68c9..30562d9f87 100644 --- a/src/tests/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj +++ b/src/tests/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.UnitTests.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/src/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj b/src/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj index 33032a7996..7e7c1fab17 100644 --- a/src/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj +++ b/src/tests/Microsoft.FileFormats.UnitTests/Microsoft.FileFormats.UnitTests.csproj @@ -9,61 +9,13 @@ - - + + - - - - - - PreserveNewest - - - Always - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - + + TestBinaries\%(RecursiveDir)%(Filename)%(Extension) PreserveNewest diff --git a/src/tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj b/src/tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj index 32816c8a84..c55575ccf7 100644 --- a/src/tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj +++ b/src/tests/Microsoft.SymbolStore.UnitTests/Microsoft.SymbolStore.UnitTests.csproj @@ -9,8 +9,8 @@ - - + + @@ -18,102 +18,12 @@ - - - - - - - - - - PreserveNewest - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - + + TestBinaries\%(RecursiveDir)%(Filename)%(Extension) PreserveNewest - + + TestBinaries\%(RecursiveDir)%(Filename)%(Extension) PreserveNewest diff --git a/src/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt b/src/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt index 1f6af11b2e..d3649f1d09 100644 --- a/src/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt +++ b/src/tests/SOS.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt @@ -13,7 +13,7 @@ ProjectK - $(RepoRootDir)/src/SOS/SOS.UnitTests/Scripts + $(ArtifactsDir)/bin/SOS.UnitTests/Scripts $(ArtifactsDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration) $(ArtifactsDir)/TestResults/$(TargetConfiguration)/sos.unittests_$(Timestamp) $(ArtifactsDir)/tmp/$(TargetConfiguration)\dumps diff --git a/src/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt b/src/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt index 4e1677ff87..ab01a5ce7d 100644 --- a/src/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt +++ b/src/tests/SOS.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt @@ -12,7 +12,7 @@ $(ArtifactsDir)\dotnet-test - $(RepoRootDir)\src\SOS\SOS.UnitTests\Scripts + $(ArtifactsDir)\bin\SOS.UnitTests\Scripts $(ArtifactsDir)\bin\Windows_NT.$(TargetArchitecture).$(TargetConfiguration) $(ArtifactsDir)\TestResults\$(TargetConfiguration)\sos.unittests_$(Timestamp) $(ArtifactsDir)\tmp\$(TargetConfiguration)\dumps diff --git a/src/tests/SOS.UnitTests/SOS.UnitTests.csproj b/src/tests/SOS.UnitTests/SOS.UnitTests.csproj index 5a2c5273b8..482ccf20c1 100644 --- a/src/tests/SOS.UnitTests/SOS.UnitTests.csproj +++ b/src/tests/SOS.UnitTests/SOS.UnitTests.csproj @@ -61,4 +61,15 @@ + + + + + + + + + diff --git a/src/tests/SOS.UnitTests/SOS.cs b/src/tests/SOS.UnitTests/SOS.cs index a4fa145545..7099fc8d2b 100644 --- a/src/tests/SOS.UnitTests/SOS.cs +++ b/src/tests/SOS.UnitTests/SOS.cs @@ -139,7 +139,9 @@ internal static async Task RunTest( string testName = null, bool testLive = true, bool testDump = true, - bool testTriage = false) + bool testTriage = false, + bool testMini = false, + SOSRunner.DumpGenerator dumpGenerator = SOSRunner.DumpGenerator.CreateDump) { await RunTest(scriptName, new SOSRunner.TestInformation @@ -149,7 +151,8 @@ await RunTest(scriptName, TestLive = testLive, TestDump = testDump, DebuggeeName = debuggeeName, - DumpType = SOSRunner.DumpType.Heap + DumpType = SOSRunner.DumpType.Heap, + DumpGenerator = dumpGenerator, }, output); @@ -165,7 +168,23 @@ await RunTest(scriptName, TestLive = false, TestDump = testDump, DebuggeeName = debuggeeName, - DumpType = SOSRunner.DumpType.Triage + DumpType = SOSRunner.DumpType.Triage, + DumpGenerator = dumpGenerator, + }, + output); + } + if (testMini && !config.PublishSingleFile) + { + await RunTest(scriptName, + new SOSRunner.TestInformation + { + TestConfiguration = config, + TestName = testName, + TestLive = false, + TestDump = testDump, + DebuggeeName = debuggeeName, + DumpType = SOSRunner.DumpType.Mini, + DumpGenerator = dumpGenerator, }, output); } @@ -234,6 +253,31 @@ public SOS(ITestOutputHelper output) public static IEnumerable Configurations => SOSTestHelpers.GetConfigurations("TestName", value: null); + [SkippableTheory, MemberData(nameof(SOSTestHelpers.GetNetCoreConfigurations), MemberType = typeof(SOSTestHelpers))] + public async Task MiniDumpLocalVarLookup(TestConfiguration config) + { + if (OS.Kind != OSKind.Windows) + { + throw new SkipTestException("Test only supports CDB and therefore only runs on Windows"); + } + + if (config.PublishSingleFile) + { + throw new SkipTestException("Single file does not support mini dumps"); + } + + // The default dumpGenerator, CreateDump, only supports taking dumps at exceptions. + // DotnetDump could support taking a dump at a breakpoint, but this SOS test framework doesn't currently support this operation. + // Therefore we use the NativeDebugger to take a dump at the DebugBreak() call in the debuggee. + await SOSTestHelpers.RunTest( + config, + debuggeeName: "MiniDumpLocalVarLookup", + scriptName: "MiniDumpLocalVarLookup.script", + Output, + testName: "SOS.MiniDumpLocalVarLookup", + testMini: true, + dumpGenerator: SOSRunner.DumpGenerator.NativeDebugger); + } [SkippableTheory, MemberData(nameof(SOSTestHelpers.GetNetCoreConfigurations), MemberType = typeof(SOSTestHelpers))] public async Task VarargPInvokeInteropMD(TestConfiguration config) diff --git a/src/tests/SOS.UnitTests/SOSRunner.cs b/src/tests/SOS.UnitTests/SOSRunner.cs index 382a66bfe9..80fed0eb5e 100644 --- a/src/tests/SOS.UnitTests/SOSRunner.cs +++ b/src/tests/SOS.UnitTests/SOSRunner.cs @@ -34,6 +34,7 @@ public enum DumpGenerator public enum DumpType { Triage, + Mini, Heap, Full } @@ -235,6 +236,9 @@ public static async Task CreateDump(TestInformation information) await runner.ContinueExecution(); switch (information.DumpType) { + case DumpType.Mini: + command = ".dump /o /m %DUMP_NAME%"; + break; case DumpType.Heap: command = ".dump /o /mw %DUMP_NAME%"; break; @@ -349,6 +353,9 @@ public static async Task CreateDump(TestInformation information) } switch (dumpType) { + case DumpType.Mini: + processRunner.WithRuntimeConfiguration("DbgMiniDumpType", "1"); + break; case DumpType.Heap: processRunner.WithRuntimeConfiguration("DbgMiniDumpType", "2"); break; @@ -1498,6 +1505,9 @@ private HashSet GetEnabledDefines() { switch (_dumpType.Value) { + case DumpType.Mini: + defines.Add("MINI_DUMP"); + break; case DumpType.Triage: defines.Add("TRIAGE_DUMP"); break; diff --git a/src/tests/SOS.UnitTests/Scripts/MiniDumpLocalVarLookup.script b/src/tests/SOS.UnitTests/Scripts/MiniDumpLocalVarLookup.script new file mode 100644 index 0000000000..8ce9245019 --- /dev/null +++ b/src/tests/SOS.UnitTests/Scripts/MiniDumpLocalVarLookup.script @@ -0,0 +1,15 @@ +# +# Verifies that local stack value variables are able to be parsed by the debugger in mini/triage dumps +# Utilizes the ICorDebug stackwalk with -i +# + +CONTINUE + +LOADSOS + +# stackwalk with locals +SOSCOMMAND:clrstack -l + +# stackwalk through ICorDebug with locals +SOSCOMMAND:clrstack -i -l +VERIFY:int\s+length\s+=\s+13 diff --git a/src/tests/TestExtension/TestExtension.csproj b/src/tests/TestExtension/TestExtension.csproj index 2bfb58c4ec..a78394a2c1 100644 --- a/src/tests/TestExtension/TestExtension.csproj +++ b/src/tests/TestExtension/TestExtension.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/tests/TestHelpers/TestHelpers.csproj b/src/tests/TestHelpers/TestHelpers.csproj index 78c0d0a8b0..7da9351438 100644 --- a/src/tests/TestHelpers/TestHelpers.csproj +++ b/src/tests/TestHelpers/TestHelpers.csproj @@ -5,6 +5,6 @@ - + diff --git a/src/tests/dotnet-counters/DotnetCounters.UnitTests.csproj b/src/tests/dotnet-counters/DotnetCounters.UnitTests.csproj index 4391f2fd89..aa872e9b45 100644 --- a/src/tests/dotnet-counters/DotnetCounters.UnitTests.csproj +++ b/src/tests/dotnet-counters/DotnetCounters.UnitTests.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/src/tests/dotnet-stack/DotnetStack.UnitTests.csproj b/src/tests/dotnet-stack/DotnetStack.UnitTests.csproj index 0425059030..ec1182198c 100644 --- a/src/tests/dotnet-stack/DotnetStack.UnitTests.csproj +++ b/src/tests/dotnet-stack/DotnetStack.UnitTests.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj b/src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj index 3460d85b12..9d70543023 100644 --- a/src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj +++ b/src/tests/dotnet-trace/DotnetTrace.UnitTests.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/tests/eventpipe/EventPipe.UnitTests.csproj b/src/tests/eventpipe/EventPipe.UnitTests.csproj index 7e384178a0..0234a80bbe 100644 --- a/src/tests/eventpipe/EventPipe.UnitTests.csproj +++ b/src/tests/eventpipe/EventPipe.UnitTests.csproj @@ -8,7 +8,7 @@ - +