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

Workaround issue in solution targets in MSBuild RC3

This commit is contained in:
Nate McMaster 2017-01-19 16:51:13 -08:00
parent 8d94d9179d
commit 7f7413b3eb
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
graph.proj Normal file
View File

@ -0,0 +1,7 @@
<!-- workaround https://github.com/Microsoft/msbuild/issues/1587 -->
<Project>
<ItemGroup>
<RestoreGraphProjectInputItems Include="$(RepoDir)\**\*.csproj" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\NuGet.targets" />
</Project>

14
makefile.shade
View File

@ -918,9 +918,15 @@ functions
{ {
public static MsBuildSolutionInfo LoadFromFile(string file) public static MsBuildSolutionInfo LoadFromFile(string file)
{ {
var info = new MsBuildSolutionInfo() if (!Path.IsPathRooted(file))
{ {
FilePath = file file = Path.Combine(System.IO.Directory.GetCurrentDirectory(), file);
}
var info = new MsBuildSolutionInfo
{
FilePath = file,
Directory = Path.GetDirectoryName(file)
}; };
var lines = File.ReadAllLines(file); var lines = File.ReadAllLines(file);
@ -942,6 +948,7 @@ functions
} }
public string FilePath { get; private set; } public string FilePath { get; private set; }
public string Directory { get; private set; }
public Version VisualStudioVersion { get; set; } public Version VisualStudioVersion { get; set; }
@ -1054,7 +1061,8 @@ functions
{ {
UseShellExecute = false, UseShellExecute = false,
FileName = "dotnet", FileName = "dotnet",
Arguments = "msbuild \"" + solution.FilePath + "\" /nologo /t:GenerateRestoreGraphFile \"/p:RestoreGraphOutputPath=" + dgJson + "\"" // TODO revert to invoking on .sln file when https://github.com/Microsoft/msbuild/issues/1587 is resolve
Arguments = "msbuild \"" + Path.Combine(Directory.GetCurrentDirectory(), "graph.proj") + "\" /v:q /p:WarningLevel=0 /p:RepoDir=\"" + solution.Directory + "\" /nologo /t:GenerateRestoreGraphFile \"/p:RestoreGraphOutputPath=" + dgJson + "\""
}; };
var p = Process.Start(psi); var p = Process.Start(psi);
p.WaitForExit(); p.WaitForExit();