diff --git a/build.proj b/build.proj
index d630ae8db..1538261a9 100644
--- a/build.proj
+++ b/build.proj
@@ -73,8 +73,15 @@
           WorkingDirectory="$(DotnetCliBuildDirectory)"/>
   </Target>
 
+  <Target Name="WriteDynamicPropsToStaticPropsFiles"
+          DependsOnTargets="BuildDotnetCliBuildFramework;
+                            WriteBuildInfoProps;
+                            WriteHostInfoProps"/>
+
   <Target DependsOnTargets="$(CLITargets)" Name="BuildTheWholeCli"></Target>
 
+  <Import Project="build/Microsoft.DotNet.Cli.BuildInfo.targets" />
+  <Import Project="build/Microsoft.DotNet.Cli.HostInfo.targets" />
   <Import Project="build/Microsoft.DotNet.Cli.Prepare.targets" />
   <Import Project="build/Microsoft.DotNet.Cli.Compile.targets" />
   <Import Project="build/Microsoft.DotNet.Cli.Package.targets" />
diff --git a/build/Microsoft.DotNet.Cli.BuildInfo.targets b/build/Microsoft.DotNet.Cli.BuildInfo.targets
index 0588c1427..017d46a28 100644
--- a/build/Microsoft.DotNet.Cli.BuildInfo.targets
+++ b/build/Microsoft.DotNet.Cli.BuildInfo.targets
@@ -3,7 +3,8 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.tasks))\dir.tasks" />
 
   <Target Name="WriteBuildInfoProps"
-          Condition=" !Exists('$(BuildInfoProps)') ">
+          Condition=" !Exists('$(BuildInfoProps)') "
+          DependsOnTargets="BuildDotnetCliBuildFramework">
     <GetCommitHash RepoRoot="$(RepoRoot)">
       <Output TaskParameter="CommitHash" PropertyName="CommitHash" />
     </GetCommitHash>
diff --git a/build/Microsoft.DotNet.Cli.HostInfo.targets b/build/Microsoft.DotNet.Cli.HostInfo.targets
index 48130c926..231589d46 100644
--- a/build/Microsoft.DotNet.Cli.HostInfo.targets
+++ b/build/Microsoft.DotNet.Cli.HostInfo.targets
@@ -3,7 +3,8 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.tasks))\dir.tasks" />
 
   <Target Name="WriteHostInfoProps"
-          Condition=" !Exists('$(HostInfoProps)') ">
+          Condition=" !Exists('$(HostInfoProps)') "
+          DependsOnTargets="BuildDotnetCliBuildFramework">
     <GetCurrentRuntimeInformation>
       <Output TaskParameter="Rid" PropertyName="Rid" />
       <Output TaskParameter="Architecture" PropertyName="Architecture" />
diff --git a/run-build.ps1 b/run-build.ps1
index f451330f0..5363dc222 100644
--- a/run-build.ps1
+++ b/run-build.ps1
@@ -114,8 +114,7 @@ if ($NoBuild)
 }
 else
 {
-    dotnet msbuild build\Microsoft.DotNet.Cli.BuildInfo.targets /t:WriteBuildInfoProps
-	dotnet msbuild build\Microsoft.DotNet.Cli.HostInfo.targets /t:WriteHostInfoProps
+    dotnet msbuild build.proj /t:WriteDynamicPropsToStaticPropsFiles
     dotnet msbuild build.proj /m /v:diag /p:Architecture=$Architecture $ExtraParameters
     if($LASTEXITCODE -ne 0) { throw "Failed to build" } 
 }
diff --git a/run-build.sh b/run-build.sh
index de9e0aa11..bf71fce5c 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -179,8 +179,7 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 echo "${args[@]}"
 
 if [ $BUILD -eq 1 ]; then
-    dotnet msbuild build/Microsoft.DotNet.Cli.BuildInfo.targets /t:WriteBuildInfoProps
-	dotnet msbuild build/Microsoft.DotNet.Cli.HostInfo.targets /t:WriteHostInfoProps
+    dotnet msbuild build.proj /t:WriteDynamicPropsToStaticPropsFiles
     dotnet msbuild build.proj /m /v:diag /p:Architecture=$ARCHITECTURE "${args[@]}"
 else
     echo "Not building due to --nobuild"