From a10aff3a036dabb690ccfa5dad88972fd451ac71 Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Wed, 2 Jan 2019 14:30:01 -0800 Subject: [PATCH] Specify correct global.json path for Razor.Design tests (#6311) --- .../IntegrationTests/IntegrationTests/ProjectDirectory.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/ProjectDirectory.cs b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/ProjectDirectory.cs index 84b7e2a0c5..d5a5dffb3e 100644 --- a/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/ProjectDirectory.cs +++ b/src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/ProjectDirectory.cs @@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests CopyGlobalJson(solutionRoot, destinationPath); return new ProjectDirectory( - destinationPath, + destinationPath, directoryPath, newProjectFilePath); } @@ -128,7 +128,8 @@ $@" void CopyGlobalJson(string solutionRoot, string projectRoot) { - var srcGlobalJson = Path.Combine(solutionRoot, "global.json"); + var repoRoot = Path.Combine(solutionRoot, "..", ".."); + var srcGlobalJson = Path.Combine(repoRoot, "global.json"); if (!File.Exists(srcGlobalJson)) { throw new InvalidOperationException("global.json at the root of the repository could not be found. Run './build /t:Noop' at the repository root and re-run these tests.");