diff --git a/build/repo.targets b/build/repo.targets
index 61fb75cef5..ad0354952e 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -106,7 +106,7 @@
   </Target>
 
   <Target Name="BuildRepositories"
-     DependsOnTargets="_PrepareRepositories;_CreateRepositoriesListWithCommits;_UpdateNuGetConfig;Graph;_BuildRepositories" />
+     DependsOnTargets="_PrepareRepositories;_CreateRepositoriesListWithCommits;_UpdateNuGetConfig;ComputeGraph;_BuildRepositories" />
 
   <Target Name="ResolveRepoInfo" DependsOnTargets="_PrepareRepositories">
     <MSBuild Projects="$(MSBuildProjectFullPath)"
@@ -149,7 +149,7 @@
     <Error Text="No solutions were found in '$(_CloneRepositoryRoot)'" Condition="@(Solution->Count()) == 0" />
   </Target>
 
-  <Target Name="Graph" DependsOnTargets="ResolveRepoInfo">
+  <Target Name="ComputeGraph" DependsOnTargets="ResolveRepoInfo">
     <RepoTasks.AnalyzeBuildGraph
       Solutions="@(Solution)"
       Artifacts="@(ArtifactInfo)"
diff --git a/build/tasks/AnalyzeBuildGraph.cs b/build/tasks/AnalyzeBuildGraph.cs
index b9c2982f5e..49d8eed87d 100644
--- a/build/tasks/AnalyzeBuildGraph.cs
+++ b/build/tasks/AnalyzeBuildGraph.cs
@@ -38,8 +38,6 @@ namespace RepoTasks
         [Required]
         public string Properties { get; set; }
 
-        public string StartGraphAt { get; set; }
-
         /// <summary>
         /// The order in which to build repositories
         /// </summary>
@@ -105,7 +103,11 @@ namespace RepoTasks
             foreach (var tfm in proj.Frameworks)
             foreach (var dependency in tfm.Dependencies)
             {
-                if (!buildPackageMap.TryGetValue(dependency.Key, out var package)) continue;
+                if (!buildPackageMap.TryGetValue(dependency.Key, out var package))
+                {
+                    // this dependency is not a PackageReference to something that we build in Universe
+                    continue;
+                }
 
                 var refVersion = VersionRange.Parse(dependency.Value.Version);
                 if (refVersion.IsFloating && refVersion.Float.Satisfies(package.PackageInfo.Version))
diff --git a/build/tasks/GenerateLineup.cs b/build/tasks/GenerateLineup.cs
index 92c2de9eb9..e2baf809de 100644
--- a/build/tasks/GenerateLineup.cs
+++ b/build/tasks/GenerateLineup.cs
@@ -61,7 +61,7 @@ namespace RepoTasks
                     version = version.Substring(0, version.Length - BuildNumber.Length) + "*";
                 }
 
-                var refType = "DotNetCliTool".Equals(pkg.Id, StringComparison.OrdinalIgnoreCase)
+                var refType = "DotNetCliTool".Equals(pkg.PackageType, StringComparison.OrdinalIgnoreCase)
                     ? "DotNetCliToolReference"
                     : "PackageReference";