Replace other instances of Env.CurrentDir with Assembly.GetExecutingA… (#1380)

Author: Evangelink

test/E2ETests/Automation.CLI/CLITestBase.common.cs

@@ -15,14 +15,15 @@ public partial class CLITestBase : TestContainer
     private const string TestAssetsFolder = "TestAssets";
     private const string PackagesFolder = "packages";
     private const string EngineeringFolder = "eng";
+    private const string ArtifactsFolder = "artifacts";
 
     // This value is automatically updated by "build.ps1" script.
     private const string TestPlatformCLIPackageName = "Microsoft.TestPlatform";
     private const string VstestConsoleRelativePath = @"tools\net462\Common7\IDE\Extensions\TestPlatform\vstest.console.exe";
 
     protected XmlDocument ReadVersionProps()
     {
-        var versionPropsFilePath = Path.Combine(Environment.CurrentDirectory, EngineeringFolder, "Versions.props");
+        var versionPropsFilePath = Path.Combine(GetRepositoryRootFolder(), EngineeringFolder, "Versions.props");
         using var fileStream = File.OpenRead(versionPropsFilePath);
         using var xmlTextReader = new XmlTextReader(fileStream) { Namespaces = false };
         var versionPropsXml = new XmlDocument();
@@ -39,18 +40,18 @@ protected string GetTestPlatformVersion()
         return testSdkVersion.InnerText;
     }
 
-    protected string GetArtifactsFolder()
+    protected string GetRepositoryRootFolder()
     {
         var assemblyLocation = System.Reflection.Assembly.GetExecutingAssembly().Location;
 
-        return Path.Combine(assemblyLocation, @"..\..\..\..");
+        return Path.Combine(assemblyLocation, @"..\..\..\..\..");
     }
 
     /// <summary>
     /// Gets the path of test assets folder.
     /// </summary>
     /// <returns>Path to testassets folder.</returns>
-    protected string GetAssetFolderPath() => Path.Combine(GetArtifactsFolder(), TestAssetsFolder);
+    protected string GetAssetFolderPath() => Path.Combine(GetRepositoryRootFolder(), ArtifactsFolder, TestAssetsFolder);
 
     /// <summary>
     /// Gets the full path to a test asset.
@@ -75,7 +76,7 @@ protected string GetAssetFullPath(string assetName)
 
     protected string GetTestAdapterPath()
     {
-        var testAdapterPath = Path.Combine(GetArtifactsFolder(), TestAssetsFolder);
+        var testAdapterPath = Path.Combine(GetRepositoryRootFolder(), ArtifactsFolder, TestAssetsFolder);
         return testAdapterPath;
     }
 

test/E2ETests/Automation.CLI/CLITestBase.e2e.cs

@@ -68,7 +68,7 @@ public void InvokeVsTestForExecution(string[] sources, string runSettings = "",
     /// <returns>Full path to <c>vstest.console.exe</c>.</returns>
     public string GetConsoleRunnerPath()
     {
-        var vstestConsolePath = Path.Combine(Environment.CurrentDirectory, PackagesFolder, TestPlatformCLIPackageName, GetTestPlatformVersion(), VstestConsoleRelativePath);
+        var vstestConsolePath = Path.Combine(GetRepositoryRootFolder(), PackagesFolder, TestPlatformCLIPackageName, GetTestPlatformVersion(), VstestConsoleRelativePath);
 
         File.Exists(vstestConsolePath).Should().BeTrue("GetConsoleRunnerPath: Path not found: {0}", vstestConsolePath);