From cad2b01dae12eb695f9f29b4f527485e2be8da39 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 2 Apr 2018 15:31:45 -0700 Subject: [PATCH] Hard-code the repo-to-repo build order on macOS and Linux (#1028) Workaround for #1014 --- build/buildorder.props | 54 ++++++++++++++++++++++++++++++++ build/repo.targets | 9 +++++- build/tasks/AnalyzeBuildGraph.cs | 7 ----- 3 files changed, 62 insertions(+), 8 deletions(-) create mode 100644 build/buildorder.props diff --git a/build/buildorder.props b/build/buildorder.props new file mode 100644 index 0000000000..45aab39853 --- /dev/null +++ b/build/buildorder.props @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/repo.targets b/build/repo.targets index 046fbbd7b1..cb419361ca 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -7,6 +7,9 @@ + + + $(IntermediateDir)dependencies.g.props $(IntermediateDir)sources.g.props @@ -154,7 +157,8 @@ - + + + + diff --git a/build/tasks/AnalyzeBuildGraph.cs b/build/tasks/AnalyzeBuildGraph.cs index f62afa76ce..076706eef0 100644 --- a/build/tasks/AnalyzeBuildGraph.cs +++ b/build/tasks/AnalyzeBuildGraph.cs @@ -247,13 +247,6 @@ namespace RepoTasks repositoriesWithOrder.Add((repositoryTaskItem, order)); } - Log.LogMessage(MessageImportance.High, "Repository build order:"); - foreach (var buildGroup in repositoriesWithOrder.GroupBy(r => r.order).OrderBy(g => g.Key)) - { - var buildGroupRepos = buildGroup.Select(b => b.repository.ItemSpec); - Log.LogMessage(MessageImportance.High, $"{buildGroup.Key.ToString().PadLeft(2, ' ')}: {string.Join(", ", buildGroupRepos)}"); - } - return repositoriesWithOrder .OrderBy(r => r.order) .Select(r => r.repository)