mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Revert "HACK: Make the TestAssetsManager create shorter paths for test assets."

Browse source 
This reverts commit 196937c2f80129b2b224764cdb3fadca24204408.
This commit is contained in:
Sridhar Periyasamy 2016-05-18 13:28:47 -07:00 committed by Livar Cunha
parent 0d555afc59
commit 3abae8b5ef
1 changed files with 2 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/Microsoft.DotNet.TestFramework/TestAssetsManager.cs
View file

@ -107,48 +107,12 @@ namespace Microsoft.DotNet.TestFramework
private string GetTestDestinationDirectoryPath(string testProjectName, string callingMethod, string identifier)
{
// HACK: Make the TestAssetsManager create shorter paths for test assets.
// This is a workaround for https://github.com/dotnet/coreclr/issues/5046
// Remove this hack once the above issue is fixed.
/*#if NET451
#if NET451
string baseDirectory = AppDomain.CurrentDomain.BaseDirectory;
#else
string baseDirectory = AppContext.BaseDirectory;
#endif*/
string path = Path.Combine(GetRepoRoot(), "bin", callingMethod + identifier, testProjectName);
Console.WriteLine($"[TestAssetsManager] The working directory for {testProjectName} is '{path}'");
return path;
}
private static string GetRepoRoot()
{
if (!string.IsNullOrEmpty(s_repoRoot))
{
return s_repoRoot;
}
#if NET451
string directory = AppDomain.CurrentDomain.BaseDirectory;
#else
string directory = AppContext.BaseDirectory;
#endif
while (!Directory.Exists(Path.Combine(directory, ".git")) && directory != null)
{
directory = Directory.GetParent(directory).FullName;
}
if (directory == null)
{
throw new Exception("Cannot find the git repository root");
}
s_repoRoot = directory;
return s_repoRoot;
return Path.Combine(baseDirectory, callingMethod + identifier, testProjectName);
}
private static string s_repoRoot;
}
}