Rename .UnitTests to .Tests

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

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_*.
 

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"
 

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"
 

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

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

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"

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"

src/Microsoft.Diagnostics.Monitoring.EventPipe/Microsoft.Diagnostics.Monitoring.EventPipe.csproj

@@ -41,10 +41,10 @@
     <InternalsVisibleTo Include="dotnet-monitor" />
     <InternalsVisibleTo Include="dotnet-counters" />
     <InternalsVisibleTo Include="dotnet-trace" />
-    <InternalsVisibleTo Include="DotnetCounters.UnitTests" />
-    <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests" />
+    <InternalsVisibleTo Include="DotnetCounters.Tests" />
+    <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.EventPipe.Tests" />
     <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.WebApi" />
-    <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.Tool.UnitTests" />
-    <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.UnitTests" />
+    <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.Tool.Tests" />
+    <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.Tests" />
   </ItemGroup>
 </Project>

src/Microsoft.Diagnostics.Monitoring/Microsoft.Diagnostics.Monitoring.csproj

@@ -27,11 +27,11 @@
   <ItemGroup>
     <InternalsVisibleTo Include="dotnet-monitor" />
     <InternalsVisibleTo Include="dotnet-counters" />
-    <InternalsVisibleTo Include="DotnetCounters.UnitTests" />
+    <InternalsVisibleTo Include="DotnetCounters.Tests" />
     <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.EventPipe" />
-    <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.EventPipe.UnitTests" />
-    <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.Tool.UnitTests" />
-    <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.UnitTests" />
+    <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.EventPipe.Tests" />
+    <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.Tool.Tests" />
+    <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.Tests" />
     <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.WebApi" />
   </ItemGroup>
 </Project>

src/Microsoft.Diagnostics.NETCore.Client/Microsoft.Diagnostics.NETCore.Client.csproj

@@ -46,7 +46,7 @@
     <InternalsVisibleTo Include="Microsoft.Diagnostics.WebSocketServer" />
     <!-- Temporary until Diagnostic Apis are finalized-->
     <InternalsVisibleTo Include="Microsoft.Diagnostics.Monitoring.WebApi" />
-    <InternalsVisibleTo Include="Microsoft.Diagnostics.NETCore.Client.UnitTests" />
+    <InternalsVisibleTo Include="Microsoft.Diagnostics.NETCore.Client.Tests" />
   </ItemGroup>
 
   <ItemGroup>

src/Tools/dotnet-counters/dotnet-counters.csproj

@@ -35,7 +35,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="DotnetCounters.UnitTests" />
+    <InternalsVisibleTo Include="DotnetCounters.Tests" />
   </ItemGroup>
 
 </Project>

src/Tools/dotnet-stack/dotnet-stack.csproj

@@ -29,7 +29,7 @@
  </ItemGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="DotnetStack.UnitTests" />
+    <InternalsVisibleTo Include="DotnetStack.Tests" />
   </ItemGroup>
 
 </Project>

src/Tools/dotnet-trace/dotnet-trace.csproj

@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <InternalsVisibleTo Include="DotnetTrace.UnitTests" />
+    <InternalsVisibleTo Include="DotnetTrace.Tests" />
   </ItemGroup>
 
 </Project>

src/tests/CommonTestRunner/ConfigFiles/Unix/Debugger.Tests.Config.txt

@@ -5,7 +5,7 @@
 
   <RootBinDir>$(RepoRootDir)/artifacts</RootBinDir>
   <InstallDir>$(RootBinDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration)</InstallDir>
-  <LogDir>$(RootBinDir)/TestResults/$(TargetConfiguration)/common.unittests_$(Timestamp)</LogDir>
+  <LogDir>$(RootBinDir)/TestResults/$(TargetConfiguration)/common.Tests_$(Timestamp)</LogDir>
 
   <TestProduct>ProjectK</TestProduct>
   <DebuggeeSourceRoot>$(RepoRootDir)/src/tests</DebuggeeSourceRoot>

src/tests/CommonTestRunner/ConfigFiles/Windows/Debugger.Tests.Config.txt

@@ -6,7 +6,7 @@
 
   <RootBinDir>$(RepoRootDir)\artifacts</RootBinDir>
   <InstallDir>$(RootBinDir)\bin\Windows_NT.$(TargetArchitecture).$(TargetConfiguration)</InstallDir>
-  <LogDir>$(RootBinDir)\TestResults\$(TargetConfiguration)\common.unittests_$(Timestamp)</LogDir>
+  <LogDir>$(RootBinDir)\TestResults\$(TargetConfiguration)\common.Tests_$(Timestamp)</LogDir>
 
   <TestProduct>ProjectK</TestProduct>
   <DebuggeeSourceRoot>$(RepoRootDir)\src\tests</DebuggeeSourceRoot>

src/tests/DbgShim.UnitTests/ConfigFiles/Unix/Debugger.Tests.Config.txt → src/tests/DbgShim.Tests/ConfigFiles/Unix/Debugger.Tests.Config.txt

@@ -5,7 +5,7 @@
 
   <RootBinDir>$(RepoRootDir)/artifacts</RootBinDir>
   <InstallDir>$(RootBinDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration)</InstallDir>
-  <LogDir>$(RootBinDir)/TestResults/$(TargetConfiguration)/dbgshim.unittests_$(Timestamp)</LogDir>
+  <LogDir>$(RootBinDir)/TestResults/$(TargetConfiguration)/dbgshim.Tests_$(Timestamp)</LogDir>
 
   <TestProduct>ProjectK</TestProduct>
   <DebuggeeSourceRoot>$(RepoRootDir)/src/tests/Debuggees</DebuggeeSourceRoot>

src/tests/DbgShim.UnitTests/DbgShimTests.cs → 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<string, Task<int>> 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);

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
 {

src/tests/Debuggees/EventPipeTracee/EventPipeTracee.csproj

@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)../../DotnetCounters.UnitTests/TestConstants.cs" Link="TestConstants.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)../../DotnetCounters.Tests/TestConstants.cs" Link="TestConstants.cs" />
   </ItemGroup>
 
   <ItemGroup>

src/tests/Directory.Build.props

@@ -26,7 +26,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <IsTestProject Condition="$(MSBuildProjectName.EndsWith('.UnitTests')) or $(MSBuildProjectName.EndsWith('.Tests'))">true</IsTestProject>
+    <IsTestProject Condition="$(MSBuildProjectName.EndsWith('.Tests'))">true</IsTestProject>
     <IsTestSupportProject Condition="'$(IsTestProject)' != 'true' and '$(IsTrimmingTestProject)' != 'true'">true</IsTestSupportProject>
   </PropertyGroup>
 </Project>

src/tests/DotnetCounters.UnitTests/CSVExporterTests.cs → src/tests/DotnetCounters.Tests/CSVExporterTests.cs

@@ -10,7 +10,7 @@
 using Microsoft.Diagnostics.Monitoring.EventPipe;
 using Xunit;
 
-namespace DotnetCounters.UnitTests
+namespace DotnetCounters.Tests
 {
     /// <summary>
     /// These test the some of the known providers that we provide as a default configuration for customers to use.

src/tests/DotnetCounters.UnitTests/ConsoleExporterTests.cs → 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
     {

src/tests/DotnetCounters.UnitTests/CounterMonitorPayloadTests.cs → 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
 {
     /// <summary>
     /// Tests the behavior of CounterMonitor's Collect command.

src/tests/DotnetCounters.UnitTests/CounterMonitorTests.cs → src/tests/DotnetCounters.Tests/CounterMonitorTests.cs

@@ -9,7 +9,7 @@
 using Microsoft.Diagnostics.Tools.Counters;
 using Xunit;
 
-namespace DotnetCounters.UnitTests
+namespace DotnetCounters.Tests
 {
     /// <summary>
     /// These test the various internal logic in CounterMonitor

src/tests/DotnetCounters.UnitTests/JSONExporterTests.cs → 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
 {
     /// <summary>
     /// These test the some of the known providers that we provide as a default configuration for customers to use.