From 1700569a30421cf79519f43d9c8f2f68fa416146 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 19 Nov 2019 12:12:43 +0100
Subject: [PATCH] Fix race in installer tasks build

---
 eng/Build.props                                          | 5 ++---
 tools-local/tasks/installer.tasks/installer.tasks.csproj | 9 +++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/eng/Build.props b/eng/Build.props
index 3215bb6feb4a4f..3f3624723e948f 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -79,8 +79,7 @@
     </ItemGroup>
 
     <MSBuild Projects="@(RepoTaskProjects)"
-             Properties="RepoRoot=$(RepoRoot)"
-             Targets="Restore;Build;CreateHostMachineInfoFile"/>
+             Targets="Restore;Build"/>
 
     <WriteLinesToFile File="$(RepoTasksOutputFile)"
                       Lines="$(RepoTasksOutputFile)"
@@ -94,7 +93,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <RepoTasksSrc Include="$(RepoTasksDir)**\*.cs" />
+      <RepoTasksSrc Include="$(RepoTasksDir)**\*.cs*" />
     </ItemGroup>
   </Target>
 
diff --git a/tools-local/tasks/installer.tasks/installer.tasks.csproj b/tools-local/tasks/installer.tasks/installer.tasks.csproj
index f2814d37e8be7b..5416b0796a416b 100644
--- a/tools-local/tasks/installer.tasks/installer.tasks.csproj
+++ b/tools-local/tasks/installer.tasks/installer.tasks.csproj
@@ -4,6 +4,9 @@
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net46</TargetFrameworks>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <!-- Duplicating the assembly path here as CoreClr current overrides the Configuration property. -->
+    <InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(IntermediateOutputPath)netstandard2.0\installer.tasks.dll</InstallerTasksAssemblyPath>
+    <InstallerTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$(IntermediateOutputPath)net46\installer.tasks.dll</InstallerTasksAssemblyPath>
   </PropertyGroup>
 
   <ItemGroup>
@@ -37,8 +40,10 @@
     <Reference Include="System.IO.Compression" />
   </ItemGroup>
 
-  <UsingTask TaskName="GetTargetMachineInfo" AssemblyFile="$(InstallerTasksAssemblyPath)" />
-  <Target Name="CreateHostMachineInfoFile">
+  <UsingTask TaskName="GetTargetMachineInfo"
+             AssemblyFile="$(InstallerTasksAssemblyPath)" />
+  <Target Name="CreateHostMachineInfoFile"
+          AfterTargets="DispatchToInnerBuilds">
     <GetTargetMachineInfo>
       <Output PropertyName="HostMachineRid" TaskParameter="RuntimeIdentifier" />
     </GetTargetMachineInfo>