From c261de6ee1b1d37833e30b7cd4eb529a6e558bfb Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 14 Mar 2016 19:01:06 -0700
Subject: [PATCH] Simplify ordering since Testing no longer has cyclic
 dependencies

---
 makefile.shade | 41 ++++++++++-------------------------------
 1 file changed, 10 insertions(+), 31 deletions(-)

diff --git a/makefile.shade b/makefile.shade
index 3e668e351c..b04bf9d72a 100644
--- a/makefile.shade
+++ b/makefile.shade
@@ -98,6 +98,11 @@ var buildTarget = "compile"
         buildTarget = Environment.GetEnvironmentVariable("KOREBUILD_BUILD_TARGETS") ?? "--quiet compile nuget-install";
         var blockLogger = Log as IBlockLogger;
 
+        if (blockLogger != null)
+        {
+            blockLogger.StartBlock("Cloning repos");
+        }
+
         Parallel.ForEach(repositories, repo =>
         {
             if (Directory.Exists(repo))
@@ -110,6 +115,11 @@ var buildTarget = "compile"
             }
         });
 
+        if (blockLogger != null)
+        {
+            blockLogger.EndBlock("Cloning repos");
+        }
+
         var batchedRepos = GetBuildGraph();
         Log.Info("Building repositories in batches: ");
         foreach (var repos in batchedRepos)
@@ -931,21 +941,6 @@ functions
                     var dependency = repositoryLookup.Find(r => r.RepositoryNames.Contains(item));
                     if (dependency != null)
                     {
-                        // Testing has odd cyclic dependencies
-                        if (string.Equals(info.Name, "Testing", StringComparison.OrdinalIgnoreCase) &&
-                            string.Equals(dependency.Name, "aspnet.xunit", StringComparison.OrdinalIgnoreCase))
-                        {
-                            continue;
-                        }
-
-                        if (string.Equals(dependency.Name, "Testing", StringComparison.OrdinalIgnoreCase) &&
-                            (string.Equals(info.Name, "Common", StringComparison.OrdinalIgnoreCase) ||
-                            string.Equals(info.Name, "PlatformAbstractions", StringComparison.OrdinalIgnoreCase) ||
-                            string.Equals(info.Name, "Logging", StringComparison.OrdinalIgnoreCase)))
-                        {
-                            continue;
-                        }
-
                         info.Dependencies.Add(dependency);
                     }
                 }
@@ -1020,22 +1015,6 @@ functions
             {
                 get
                 {
-                    if (string.Equals("PlatformAbstractions", Name, StringComparison.OrdinalIgnoreCase))
-                    {
-                        return 0;
-                    }
-
-                    if (string.Equals("Common", Name, StringComparison.OrdinalIgnoreCase))
-                    {
-                        return 1;
-                    }
-
-                    if (string.Equals("Testing", Name, StringComparison.OrdinalIgnoreCase))
-                    {
-                        // Testing has a cyclic dependency with Common, PlatformAbstractions and Logging.
-                        return 2;
-                    }
-
                     if (Dependencies.Count > 0)
                     {
                         return 1 + Dependencies.Max(d => d.Order);