Skip to content

Commit 391a83f

Browse files
authored
Allow build targets to be invoked in specific batches.
Enables building the aspnetcore repo with a single eng\build.cmd invocation (when using desktop msbuild). Unblocks dotnet/sdk#44828 & dotnet/aspnetcore#58987
1 parent 7d955f9 commit 391a83f

File tree

1 file changed

+10
-9
lines changed

1 file changed

+10
-9
lines changed

src/Microsoft.DotNet.Arcade.Sdk/tools/Build.proj

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444

4545
<ItemDefinitionGroup>
4646
<ProjectToBuild>
47+
<BuildStep>1</BuildStep>
4748
<RestoreInParallel>true</RestoreInParallel>
4849
<BuildInParallel>true</BuildInParallel>
4950
<DotNetBuildPass>1</DotNetBuildPass>
@@ -277,15 +278,7 @@
277278
BuildInParallel="%(_ProjectToRestore.RestoreInParallel)"
278279
Condition="'$(Restore)' == 'true'"/>
279280

280-
<!--
281-
Build solution.
282-
-->
283-
<MSBuild Projects="@(ProjectToBuild)"
284-
Properties="@(_SolutionBuildProps);__BuildPhase=SolutionBuild;_NETCORE_ENGINEERING_TELEMETRY=Build"
285-
RemoveProperties="$(_RemoveProps)"
286-
Targets="@(_SolutionBuildTargets)"
287-
BuildInParallel="%(ProjectToBuild.BuildInParallel)"
288-
Condition="'@(_SolutionBuildTargets)' != ''" />
281+
<CallTarget Targets="ExecuteBuildTargets" Condition="'@(_SolutionBuildTargets)' != ''" />
289282

290283
<MSBuild Projects="AfterSolutionBuild.proj"
291284
Properties="@(_CommonProps);_NETCORE_ENGINEERING_TELEMETRY=Build"
@@ -340,4 +333,12 @@
340333
Condition="'$(Publish)' == 'true' and '$(_ShouldRunPublish)' == 'true'"/>
341334
</Target>
342335

336+
<Target Name="ExecuteBuildTargets" Inputs="%(ProjectToBuild.BuildStep)" Outputs="unused">
337+
<MSBuild Projects="@(ProjectToBuild)"
338+
Properties="@(_SolutionBuildProps);__BuildPhase=SolutionBuild;_NETCORE_ENGINEERING_TELEMETRY=Build"
339+
RemoveProperties="$(_RemoveProps)"
340+
Targets="@(_SolutionBuildTargets)"
341+
BuildInParallel="%(ProjectToBuild.BuildInParallel)" />
342+
</Target>
343+
343344
</Project>

0 commit comments

Comments
 (0)