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

Simplify ordering since Testing no longer has cyclic dependencies

This commit is contained in:
Pranav K 2016-03-14 19:01:06 -07:00
parent 699566394d
commit c261de6ee1
1 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
makefile.shade
View File

@ -98,6 +98,11 @@ var buildTarget = "compile"
buildTarget = Environment.GetEnvironmentVariable("KOREBUILD_BUILD_TARGETS") ?? "--quiet compile nuget-install"; buildTarget = Environment.GetEnvironmentVariable("KOREBUILD_BUILD_TARGETS") ?? "--quiet compile nuget-install";
var blockLogger = Log as IBlockLogger; var blockLogger = Log as IBlockLogger;
if (blockLogger != null)
{
blockLogger.StartBlock("Cloning repos");
}
Parallel.ForEach(repositories, repo => Parallel.ForEach(repositories, repo =>
{ {
if (Directory.Exists(repo)) if (Directory.Exists(repo))
@ -110,6 +115,11 @@ var buildTarget = "compile"
} }
}); });
if (blockLogger != null)
{
blockLogger.EndBlock("Cloning repos");
}
var batchedRepos = GetBuildGraph(); var batchedRepos = GetBuildGraph();
Log.Info("Building repositories in batches: "); Log.Info("Building repositories in batches: ");
foreach (var repos in batchedRepos) foreach (var repos in batchedRepos)
@ -931,21 +941,6 @@ functions
var dependency = repositoryLookup.Find(r => r.RepositoryNames.Contains(item)); var dependency = repositoryLookup.Find(r => r.RepositoryNames.Contains(item));
if (dependency != null) 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); info.Dependencies.Add(dependency);
} }
} }
@ -1020,22 +1015,6 @@ functions
{ {
get 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) if (Dependencies.Count > 0)
{ {
return 1 + Dependencies.Max(d => d.Order); return 1 + Dependencies.Max(d => d.Order);