|
306 | 306 | <UsingTask TaskName="Microsoft.DotNet.UnifiedBuild.Tasks.WritePackageVersionsProps" AssemblyFile="$(MicrosoftDotNetUnifiedBuildTasksAssembly)" TaskFactory="TaskHostFactory" />
|
307 | 307 | <UsingTask TaskName="Microsoft.DotNet.UnifiedBuild.Tasks.GetKnownArtifactsFromAssetManifests" AssemblyFile="$(MicrosoftDotNetUnifiedBuildTasksAssembly)" TaskFactory="TaskHostFactory" />
|
308 | 308 | <Target Name="CreateBuildInputProps"
|
309 |
| - DependsOnTargets="GetProducedPackagesFromTransitiveReferences" |
| 309 | + DependsOnTargets="GetProducedPackagesFromTransitiveReferences;GetProducedPackagesFromTransitiveReferencesFromPreviousBuildPasses" |
310 | 310 | Inputs="$(MSBuildProjectFullPath)"
|
311 | 311 | Outputs="$(BaseIntermediateOutputPath)CreateBuildInputProps.complete">
|
312 | 312 |
|
|
413 | 413 | Condition="'@(_DependentProjectToSkip)' != ''" />
|
414 | 414 | </Target>
|
415 | 415 |
|
416 |
| - <Target Name="DiscoverBuiltSdkOverrides" DependsOnTargets="GetProducedPackagesFromTransitiveReferences"> |
| 416 | + <Target Name="DiscoverBuiltSdkOverrides" DependsOnTargets="GetProducedPackagesFromTransitiveReferences;GetProducedPackagesFromTransitiveReferencesFromPreviousBuildPasses"> |
417 | 417 | <!--
|
418 | 418 | Discover the Arcade SDKs built from the live Arcade source and set them as overrides here.
|
419 | 419 | This will automatically no-op for Arcade and SBRP, as these packages will not have been produced yet.
|
|
613 | 613 | </ItemGroup>
|
614 | 614 | </Target>
|
615 | 615 |
|
| 616 | + <Target Name="GetProducedPackagesFromTransitiveReferencesFromPreviousBuildPasses" DependsOnTargets="GetTransitiveRepositoryReferences" Returns="@(_DependencyProducedPackage)"> |
| 617 | + <ItemGroup> |
| 618 | + <_TransitivelyThisBuildPassReferencedRepo Include="@(TransitiveRepositoryReference->WithMetadataValue('DotNetBuildPass','$(DotNetBuildPass)'))" /> |
| 619 | + <_TransitivelyPreviousBuildPassReferencedRepo Include="@(TransitiveRepositoryReference)" |
| 620 | + Exclude="@(_TransitivelyThisBuildPassReferencedRepo)" /> |
| 621 | + </ItemGroup> |
| 622 | + <MSBuild Projects="@(_TransitivelyPreviousBuildPassReferencedRepo->'%(Identity).proj')" |
| 623 | + Targets="GetProducedPackagesFromDependentVerticals" |
| 624 | + BuildInParallel="true"> |
| 625 | + <Output TaskParameter="TargetOutputs" ItemName="_DependencyProducedPackage" /> |
| 626 | + </MSBuild> |
| 627 | + </Target> |
| 628 | + |
616 | 629 | <Target Name="GetProducedPackagesFromTransitiveReferences" DependsOnTargets="GetTransitiveRepositoryReferences" Returns="@(_DependencyProducedPackage)">
|
617 |
| - <MSBuild Projects="@(TransitiveRepositoryReference->'%(Identity).proj')" |
| 630 | + <MSBuild Projects="@(TransitiveRepositoryReference->WithMetadataValue('DotNetBuildPass','$(DotNetBuildPass)')->'%(Identity).proj')" |
618 | 631 | Targets="GetProducedPackages"
|
619 | 632 | BuildInParallel="true">
|
620 | 633 | <Output TaskParameter="TargetOutputs" ItemName="_DependencyProducedPackage" />
|
|
0 commit comments