Ensure inner builds batch

Fixes #154 Author: @nguerrera
novotnyllc · Feb 18, 2019 · b7e32a5 · b7e32a5
1 parent 8cfb9cd
commit b7e32a5
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/Source/MSBuild.Sdk.Extras/Build/RIDs.targets b/Source/MSBuild.Sdk.Extras/Build/RIDs.targets
@@ -17,22 +17,28 @@
       <_SdkRuntimeId Include="$(TargetFramework)" Condition="'$(ExtrasBuildEachRuntimeIdentifier)' == 'false'"  />
     </ItemGroup>
   </Target>
-  
-  
+
+
 
   <Target Name="_ComputeTargetFrameworkItems" Returns="@(InnerOutput)">
     <ItemGroup>
       <_TargetFramework Include="$(TargetFrameworks)" />
     </ItemGroup>
-
-    <MSBuild Projects="$(MSBuildProjectFile)"
+
+    <ItemGroup>
+      <_InnerBuildProjects Include="$(MSBuildProjectFile)">
+        <AdditionalProperties>TargetFramework=%(_TargetFramework.Identity)</AdditionalProperties>
+      </_InnerBuildProjects>
+    </ItemGroup>
+
+    <MSBuild Projects="@(_InnerBuildProjects)"
              BuildInParallel="$(BuildInParallel)"
-             Properties="TargetFramework=%(_TargetFramework.Identity)"
              Targets="_SdkGetRidsPerTargetFramework">
       <Output ItemName="_SdkTargetsWithRids" TaskParameter="TargetOutputs"  />
     </MSBuild>
-    
+
     <ItemGroup>
+      <_InnerBuildProjects Remove="@(_InnerBuildProjects)" />
       <_InnerBuildProjects Include="$(MSBuildProjectFile)">
         <AdditionalProperties Condition="'%(_SdkTargetsWithRids.Rid)' != ''" >TargetFramework=%(_SdkTargetsWithRids.Identity);RuntimeIdentifier=%(_SdkTargetsWithRids.Rid)</AdditionalProperties>
         <AdditionalProperties Condition="'%(_SdkTargetsWithRids.Rid)' == ''" >TargetFramework=%(_SdkTargetsWithRids.Identity)</AdditionalProperties>