huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge in 'release/2.1' changes

This commit is contained in:
dotnet-bot 2019-01-02 22:31:05 +00:00
parent 47d2a6722c a10aff3a03
commit 90b2d60332
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Razor/Razor.Design/test/IntegrationTests/IntegrationTests/ProjectDirectory.cs
View File

@ -75,7 +75,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
CopyGlobalJson(solutionRoot, destinationPath); CopyGlobalJson(solutionRoot, destinationPath);
return new ProjectDirectory( return new ProjectDirectory(
destinationPath, destinationPath,
directoryPath, directoryPath,
newProjectFilePath); newProjectFilePath);
} }
@ -128,7 +128,8 @@ $@"<Project>
void CopyGlobalJson(string solutionRoot, string projectRoot) 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)) 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."); 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.");