Trying to fix the build breaks first

build/Microsoft.DotNet.Cli.BuildInfo.targets

@@ -32,7 +32,7 @@
       </BuildInfoPropsContent>
     </PropertyGroup>
 
-    <MakeDir Directories="$(RepoRoot)/obj"/>
+    <MakeDir Directories="$(GeneratedPropsDir)" />
 
     <WriteLinesToFile File="$(BuildInfoProps)"
                       Lines="$(BuildInfoPropsContent)" />

build/Microsoft.DotNet.Cli.HostInfo.targets

@@ -23,7 +23,7 @@
       </HostInfoPropsContent>
     </PropertyGroup>
 
-    <MakeDir Directories="$(RepoRoot)/obj"/>
+    <MakeDir Directories="$(GeneratedPropsDir)" />
 
     <WriteLinesToFile File="$(HostInfoProps)"
                       Lines="$(HostInfoPropsContent)" />

dir.props

@@ -9,8 +9,10 @@
   <PropertyGroup>
     <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
 
-    <BuildInfoProps>$(RepoRoot)/obj/BuildInfo.props</BuildInfoProps>
-    <HostInfoProps>$(RepoRoot)/obj/HostInfo.props</HostInfoProps>
+    <GeneratedPropsDir>$(RepoRoot)/obj</GeneratedPropsDir>
+
+    <BuildInfoProps>$(GeneratedPropsDir)/BuildInfo.props</BuildInfoProps>
+    <HostInfoProps>$(GeneratedPropsDir)/HostInfo.props</HostInfoProps>
 
     <NuGetPackagesDir>$(NUGET_PACKAGES)</NuGetPackagesDir>
     <NuGetPackagesDir Condition=" '$(NuGetPackagesDir)' == '' ">$(RepoRoot)/.nuget/packages</NuGetPackagesDir>

run-build.ps1

@@ -114,7 +114,7 @@ if ($NoBuild)
 }
 else
 {
-    dotnet msbuild build.proj /t:WriteDynamicPropsToStaticPropsFiles
+    dotnet msbuild build.proj /p:Architecture=$Architecture /t:WriteDynamicPropsToStaticPropsFiles
     dotnet msbuild build.proj /m /v:diag /p:Architecture=$Architecture $ExtraParameters
     if($LASTEXITCODE -ne 0) { throw "Failed to build" } 
 }

run-build.sh

@@ -179,7 +179,7 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 echo "${args[@]}"
 
 if [ $BUILD -eq 1 ]; then
-    dotnet msbuild build.proj /t:WriteDynamicPropsToStaticPropsFiles
+    dotnet msbuild build.proj /p:Architecture=$ARCHITECTURE /t:WriteDynamicPropsToStaticPropsFiles
     dotnet msbuild build.proj /m /v:diag /p:Architecture=$ARCHITECTURE "${args[@]}"
 else
     echo "Not building due to --nobuild"