Revert changes intended for running tests standalone

Author: steveisok

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

@@ -1,10 +1,10 @@
 <Configuration>
   <Import ConfigFile="Debugger.Tests.Common.txt" />
-  <DotNetRoot Condition="'$(TestDotNetRoot)' != ''">$(TestDotNetRoot)</DotNetRoot>
-  <Import ConfigFile="$(TestVersionConfigDir)/Debugger.Tests.Versions.txt" />
+  <DotNetRoot>$(RepoRootDir)/.dotnet-test</DotNetRoot>
+  <Import ConfigFile="$(DotNetRoot)/Debugger.Tests.Versions.txt" />
 
   <RootBinDir>$(RepoRootDir)/artifacts</RootBinDir>
-  <InstallDir>$(TestNativeDir)</InstallDir>
+  <InstallDir>$(RootBinDir)/bin/$(OS).$(TargetArchitecture).$(TargetConfiguration)</InstallDir>
   <LogDir>$(RootBinDir)/TestResults/$(TargetConfiguration)/dbgshim.unittests_$(Timestamp)</LogDir>
 
   <TestProduct>ProjectK</TestProduct>

src/tests/DbgShim.UnitTests/ConfigFiles/Windows/Debugger.Tests.Config.txt

@@ -1,15 +1,13 @@
 <Configuration>
   <Import ConfigFile="Debugger.Tests.Common.txt" />
-  <DotNetRoot Condition="'$(TestDotNetRoot)' != ''">$(TestDotNetRoot)</DotNetRoot>
-  <Import ConfigFile="$(TestVersionConfigDir)\Debugger.Tests.Versions.txt" />
-
+  <DotNetRoot Condition="'$(TargetArchitecture)' != 'x86'">$(RepoRootDir)\.dotnet-test</DotNetRoot>
+  <DotNetRoot Condition="'$(TargetArchitecture)' == 'x86'">$(RepoRootDir)\.dotnet-test\x86</DotNetRoot>
+  <Import ConfigFile="$(DotNetRoot)\Debugger.Tests.Versions.txt" />
   <RootBinDir>$(RepoRootDir)\artifacts</RootBinDir>
-  <InstallDir>$(TestNativeDir)</InstallDir>
-  <LogDir>$(RootBinDir)\TestResults\$(TargetConfiguration)\dbgshim.unittests_$(Timestamp)</LogDir>
+  <InstallDir>$(RootBinDir)\bin\Windows_NT.$(TargetArchitecture).$(TargetConfiguration)</InstallDir>
 
   <TestProduct>ProjectK</TestProduct>
   <DebuggeeSourceRoot>$(RepoRootDir)\src\tests\Debuggees</DebuggeeSourceRoot>
-  <DebuggeeMsbuildAuxRoot>$(RepoRootDir)\eng\AuxMsbuildFiles</DebuggeeMsbuildAuxRoot>
   <DebuggeeBuildProcess>cli</DebuggeeBuildProcess>
   <DebuggeeName>SimpleDebuggee</DebuggeeName>
 

src/tests/DbgShim.UnitTests/DbgShim.UnitTests.csproj

@@ -35,14 +35,11 @@
 <![CDATA[
 <Configuration>
   <TargetConfiguration>$(Configuration)</TargetConfiguration>
-  <TestDotNetRoot>$(TestDotNetRootDir)</TestDotNetRoot>
-  <RepoRootDir>$(TestRepoRoot)</RepoRootDir>
-  <TestNativeDir>$(TestNativeDir)</TestNativeDir>
-  <TestVersionConfigDir>$(TestVersionConfigDir)</TestVersionConfigDir>
-  <Package_TestAssets_Windows_x64_6_0>$(TestPackageArtifactsRootDir)\testassets.windows.x64.6.0\$(TestAssetsVersion)\content</Package_TestAssets_Windows_x64_6_0>
-  <Package_TestAssets_Windows_x86_6_0>$(TestPackageArtifactsRootDir)\testassets.windows.x86.6.0\$(TestAssetsVersion)\content</Package_TestAssets_Windows_x86_6_0>
-  <Package_TestAssets_Linux_x64_6_0>$(TestPackageArtifactsRootDir)\testassets.linux.x64.6.0\$(TestAssetsVersion)\content</Package_TestAssets_Linux_x64_6_0>
-  <Package_TestAssets_Linux_arm64_6_0>$(TestPackageArtifactsRootDir)\testassets.linux.arm64.6.0\$(TestAssetsVersion)\content</Package_TestAssets_Linux_arm64_6_0>
+  <RepoRootDir>$(RepoRoot)</RepoRootDir>
+  <Package_TestAssets_Windows_x64_6_0>$(NuGetPackageRoot)testassets.windows.x64.6.0\$(TestAssetsVersion)\content</Package_TestAssets_Windows_x64_6_0>
+  <Package_TestAssets_Windows_x86_6_0>$(NuGetPackageRoot)testassets.windows.x86.6.0\$(TestAssetsVersion)\content</Package_TestAssets_Windows_x86_6_0>
+  <Package_TestAssets_Linux_x64_6_0>$(NuGetPackageRoot)testassets.linux.x64.6.0\$(TestAssetsVersion)\content</Package_TestAssets_Linux_x64_6_0>
+  <Package_TestAssets_Linux_arm64_6_0>$(NuGetPackageRoot)testassets.linux.arm64.6.0\$(TestAssetsVersion)\content</Package_TestAssets_Linux_arm64_6_0>
 </Configuration>
 ]]>
        </ConfigFileEntry>
@@ -58,12 +55,9 @@
 <![CDATA[
 <Configuration>
   <TargetConfiguration>$(Configuration)</TargetConfiguration>
-  <TestDotNetRoot>$(TestDotNetRootDir)</TestDotNetRoot>
-  <RepoRootDir>$(TestRepoRoot)</RepoRootDir>
-  <TestNativeDir>$(TestNativeDir)</TestNativeDir>
-  <TestVersionConfigDir>$(TestVersionConfigDir)</TestVersionConfigDir>
-  <Package_TestAssets_Linux_x64_6_0>$(TestPackageArtifactsRootDir)\testassets.linux.x64.6.0\$(TestAssetsVersion)\content</Package_TestAssets_Linux_x64_6_0>
-  <Package_TestAssets_Linux_arm64_6_0>$(TestPackageArtifactsRootDir)\testassets.linux.arm64.6.0\$(TestAssetsVersion)\content</Package_TestAssets_Linux_arm64_6_0>
+  <RepoRootDir>$(RepoRoot)</RepoRootDir>
+  <Package_TestAssets_Linux_x64_6_0>$(NuGetPackageRoot)testassets.linux.x64.6.0/$(TestAssetsVersion)/content</Package_TestAssets_Linux_x64_6_0>
+  <Package_TestAssets_Linux_arm64_6_0>$(NuGetPackageRoot)testassets.linux.arm64.6.0/$(TestAssetsVersion)/content</Package_TestAssets_Linux_arm64_6_0>
 </Configuration>
 ]]>
        </ConfigFileEntry>

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);
             }
         }