From ddd690200e3500a89486448814fd2f6a7d7e4ddc Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 11 Aug 2017 10:37:41 -0700
Subject: [PATCH] React to changes in the gatekeeper build

---
 build/RepositoryBuild.targets         | 1 +
 build/repobuild/BeforeKoreBuild.props | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets
index 72a0fcb2c1..660030d6c8 100644
--- a/build/RepositoryBuild.targets
+++ b/build/RepositoryBuild.targets
@@ -30,6 +30,7 @@
       <!-- If there are duplicate properties, the properties which are defined later in the order would override the earlier ones -->
       <RepositoryBuildArguments>$(RepositoryBuildArguments) '/p:Universe_Version=$(Version)'</RepositoryBuildArguments>
       <RepositoryBuildArguments>$(RepositoryBuildArguments) '/p:Universe_LineupBuildDir=$(LineupBuildDir)'</RepositoryBuildArguments>
+      <RepositoryBuildArguments>$(RepositoryBuildArguments) '/p:Universe_DependencyLineupDir=$(_DependencyLineupDir)'</RepositoryBuildArguments>
       <RepositoryBuildArguments>$(RepositoryBuildArguments) '/p:Universe_IntermediateDir=$(IntermediateDir)'</RepositoryBuildArguments>
       <RepositoryBuildArguments>$(RepositoryBuildArguments) '/p:CustomBeforeKoreBuildProps=$(MSBuildThisFileDirectory)repobuild\BeforeKoreBuild.props'</RepositoryBuildArguments>
       <RepositoryBuildArguments>$(RepositoryBuildArguments) '/p:CustomAfterKoreBuildTargets=$(MSBuildThisFileDirectory)repobuild\AfterKoreBuild.targets'</RepositoryBuildArguments>
diff --git a/build/repobuild/BeforeKoreBuild.props b/build/repobuild/BeforeKoreBuild.props
index 2a2c50dd2b..d9f67657f2 100644
--- a/build/repobuild/BeforeKoreBuild.props
+++ b/build/repobuild/BeforeKoreBuild.props
@@ -4,6 +4,7 @@
     <!-- Restore locally-built lineups into a temp directory, not the global cache. -->
     <PolicyRestorePackagesPath>$([MSBuild]::NormalizeDirectory($(Universe_IntermediateDir)))packages\</PolicyRestorePackagesPath>
     <!-- Restore from the locally-built artifacts directory -->
-    <PolicyRestoreAdditionalSources>$(PolicyRestoreAdditionalSources);$([MSBuild]::NormalizeDirectory($(Universe_LineupBuildDir)))</PolicyRestoreAdditionalSources>
+    <PolicyRestoreAdditionalSources Condition=" '$(Universe_LineupBuildDir)' != '' ">$(PolicyRestoreAdditionalSources);$([MSBuild]::NormalizeDirectory($(Universe_LineupBuildDir)))</PolicyRestoreAdditionalSources>
+    <PolicyRestoreAdditionalSources Condition=" '$(Universe_DependencyLineupDir)' != '' ">$(PolicyRestoreAdditionalSources);$([MSBuild]::NormalizeDirectory($(Universe_DependencyLineupDir)))</PolicyRestoreAdditionalSources>
   </PropertyGroup>
 </Project>