From 6eca0806afc183f4b49a5fc5cd4ad6a924068f36 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Thu, 9 Feb 2017 14:30:27 -0800
Subject: [PATCH] Remove workarounds

---
 build/ci-test.common.props | 7 -------
 graph.proj                 | 7 -------
 makefile.shade             | 6 +++---
 3 files changed, 3 insertions(+), 17 deletions(-)
 delete mode 100644 build/ci-test.common.props
 delete mode 100644 graph.proj

diff --git a/build/ci-test.common.props b/build/ci-test.common.props
deleted file mode 100644
index 26dae2d417..0000000000
--- a/build/ci-test.common.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- KoreBuild can discover this file is renamed to universe.props-->
-<Project ToolsVersion="15.0">
-  <PropertyGroup>
-    <!-- VS 2017 aware-packages can use this env variable to swap ProjectReference for PackageReference -->
-    <TestFromPackages>true</TestFromPackages>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/graph.proj b/graph.proj
deleted file mode 100644
index c436c08d23..0000000000
--- a/graph.proj
+++ /dev/null
@@ -1,7 +0,0 @@
-<!-- workaround https://github.com/Microsoft/msbuild/issues/1587 -->
-<Project>
-    <ItemGroup>
-        <RestoreGraphProjectInputItems Include="$(RepoDir)\**\*.csproj" />
-    </ItemGroup>
-    <Import Project="$(MSBuildToolsPath)\NuGet.targets" />
-</Project>
\ No newline at end of file
diff --git a/makefile.shade b/makefile.shade
index 1007a24787..84d80d6a6a 100644
--- a/makefile.shade
+++ b/makefile.shade
@@ -777,6 +777,7 @@ functions
         {
             IEnumerable<string> reposToBuild = new HashSet<string>(StringComparer.OrdinalIgnoreCase)
             {
+                "Microsoft.Data.Sqlite",
                 "PlatformAbstractions",
                 "Common",
                 "JsonPatch",
@@ -791,7 +792,6 @@ functions
                 "DataProtection",
                 "HttpAbstractions",
                 "Testing",
-                "Microsoft.Data.Sqlite",
                 "Caching",
                 "Razor",
                 "Hosting",
@@ -1041,6 +1041,7 @@ functions
 
             private static void ResolveMsBuildProjects(RepositoryInfo info, string repo)
             {
+                Console.WriteLine("Resolving projects from " + repo);
                 var solutions = Directory.EnumerateFiles(repo, "*.sln")
                     .Select(MsBuildSolutionInfo.LoadFromFile)
                     .Where(sln => sln.IsVs2017);
@@ -1060,8 +1061,7 @@ functions
                 {
                     UseShellExecute = false,
                     FileName = "dotnet",
-                    // 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 + "\""
+                    Arguments = "msbuild \"" + solution.FilePath + "\" /v:q /nologo /t:GenerateRestoreGraphFile \"/p:RestoreGraphOutputPath=" + dgJson + "\""
                 };
                 var p = Process.Start(psi);
                 p.WaitForExit();