Workaround issue in solution targets in MSBuild RC3

aspnet · Jan 20, 2017 · 7f7413b · 7f7413b
1 parent 8d94d91
commit 7f7413b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/graph.proj b/graph.proj
@@ -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>
diff --git a/makefile.shade b/makefile.shade
@@ -918,9 +918,15 @@ functions
         {
             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);
@@ -942,6 +948,7 @@ functions
             }
 
             public string FilePath { get; private set; }
+            public string Directory { get; private set; }
 
             public Version VisualStudioVersion { get; set; }
 
@@ -1054,7 +1061,8 @@ functions
                 {
                     UseShellExecute = false,
                     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);
                 p.WaitForExit();