From a6a01db7a6c3e7312239662067d97a167319f0ed Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Fri, 29 Sep 2017 17:03:35 -0700
Subject: [PATCH] Include DotNetPackageVersionPropsPath in the design-time
 build

---
 build/Repositories.props | 2 +-
 build/repo.targets       | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build/Repositories.props b/build/Repositories.props
index adba85b527..0c9265e5d8 100644
--- a/build/Repositories.props
+++ b/build/Repositories.props
@@ -17,7 +17,7 @@
     <Repository Include="JavaScriptServices" Branch="rel/2.0.1" Commit="" CloneUrl="git@github.com:aspnet/%(Identity)" />
     <Repository Include="KestrelHttpServer" Branch="rel/2.0.1" Commit="" CloneUrl="git@github.com:aspnet/%(Identity)" />
     <Repository Include="Localization" Branch="rel/2.0.1" Commit="" CloneUrl="git@github.com:aspnet/%(Identity)" />
-    <Repository Include="MetaPackages" Branch="rel/2.0.2" Commit="" CloneUrl="git@github.com:aspnet/%(Identity)" />
+    <Repository Include="MetaPackages" Branch="rel/2.0.1" Commit="" CloneUrl="git@github.com:aspnet/%(Identity)" />
     <Repository Include="Mvc" Branch="rel/2.0.1" Commit="" CloneUrl="git@github.com:aspnet/%(Identity)" />
     <Repository Include="MvcPrecompilation" Branch="rel/2.0.1" Commit="" CloneUrl="git@github.com:aspnet/%(Identity)" />
     <Repository Include="Proxy" Branch="rel/2.0.1" Commit="" CloneUrl="git@github.com:aspnet/%(Identity)" />
diff --git a/build/repo.targets b/build/repo.targets
index 0a20957aaf..989af75856 100644
--- a/build/repo.targets
+++ b/build/repo.targets
@@ -3,6 +3,7 @@
 
   <PropertyGroup>
     <_CloneRepositoryRoot>$(RepositoryRoot).r\</_CloneRepositoryRoot>
+    <ClearRepositoryCloneRoot Condition="'$(SkipClone)' == 'true'">false</ClearRepositoryCloneRoot>
     <_DependencyBuildDirectory>$(RepositoryRoot).deps\build\</_DependencyBuildDirectory>
     <_DependencyPackagesDirectory>$(_DependencyBuildDirectory)</_DependencyPackagesDirectory>
 
@@ -80,7 +81,7 @@
     </ItemGroup>
   </Target>
 
-  <Target Name="CloneRepositories" DependsOnTargets="_PrepareRepositories">
+  <Target Name="CloneRepositories" DependsOnTargets="_PrepareRepositories" Condition="'$(SkipClone)' != 'true'">
     <ItemGroup>
       <_CloneRepositories Include="@(Repository)" />
       <_CloneRepositories Remove="%(Repository.Identity)" Condition="$([System.Environment]::GetEnvironmentVariable('BUILD_VCS_NUMBER_$(TcVcsIdPrefix)%(Repository.Identity)')) != ''" />
@@ -182,14 +183,14 @@
     <Error Text="No solutions were found in '$(_CloneRepositoryRoot)'" Condition="@(Solution->Count()) == 0" />
   </Target>
 
-  <Target Name="ComputeGraph" DependsOnTargets="ResolveRepoInfo">
+  <Target Name="ComputeGraph" DependsOnTargets="ResolveRepoInfo;GeneratePackageVersionPropsFile">
     <RepoTasks.AnalyzeBuildGraph
       Solutions="@(Solution)"
       Artifacts="@(ArtifactInfo)"
       Dependencies="@(ExternalDependency)"
       ShippedArtifacts="@(ShippedArtifactInfo)"
       StartGraphAt="$(BuildGraphOf)"
-      Properties="Configuration=$(Configuration);BuildNumber=$(BuildNumber)">
+      Properties="Configuration=$(Configuration);BuildNumber=$(BuildNumber);DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath)">
       <Output TaskParameter="RepositoryBuildOrder" ItemName="RepositoryBuildOrder" />
     </RepoTasks.AnalyzeBuildGraph>
   </Target>