Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
zhili1208 committed Apr 21, 2016
1 parent e3cd11a commit 585b7f3
Showing 1 changed file with 11 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,18 @@ public NuGetProject CreateNuGetProject(EnvDTEProject envDTEProject, INuGetProjec

// Treat projects with project.json as build integrated projects
// Search for projectName.project.json first, then project.json
var projectJsonPath = ProjectJsonPathUtilities.GetProjectConfigPath(
msbuildProjectFile.DirectoryName,
// For website project, since projectNameFromMSBuildPath is empty, only search project.json
string projectJsonPath = null;
if (string.IsNullOrEmpty(projectNameFromMSBuildPath))
{
projectJsonPath = Path.Combine(msbuildProjectFile.DirectoryName,
ProjectJsonPathUtilities.ProjectConfigFileName);
}
else
{
projectJsonPath = ProjectJsonPathUtilities.GetProjectConfigPath(msbuildProjectFile.DirectoryName,
projectNameFromMSBuildPath);
}

if (File.Exists(projectJsonPath))
{
Expand Down

0 comments on commit 585b7f3

Please sign in to comment.