|
390 | 390 | <_DependentProjectCurrentBuildPass Include="@(_DependentProject->WithMetadataValue('DotNetBuildPass', '$(DotNetBuildPass)'))" />
|
391 | 391 |
|
392 | 392 | <_DependentProjectToSkip Include="@(_DependentProject)" Exclude="@(_DependentProjectCurrentBuildPass)" />
|
| 393 | + <_DependentProjectToSkip Include="@(_DependentProject)" AdditionalProperties="GetDependentVerticalAssetsOnly=true" /> |
393 | 394 |
|
394 | 395 | <_DependentProject Remove="@(_DependentProject)" />
|
395 | 396 | <_DependentProject Include="@(_DependentProjectCurrentBuildPass)" />
|
|
553 | 554 | </Touch>
|
554 | 555 | </Target>
|
555 | 556 |
|
| 557 | + <Target Name="GetProducedPackagesFromDependentVerticals" |
| 558 | + Condition="'$(IsUtilityProject)' != 'true'" |
| 559 | + Returns="@(ProducedPackageFromDependentVertical)"> |
| 560 | + <!-- Add manifests from dependent verticals. --> |
| 561 | + <ItemGroup> |
| 562 | + <RepoAssetManifestFromDependentVertical Include="$(ArtifactsAssetManifestsDir)*.xml" Exclude="$(MergedAssetManifestOutputPath)" /> |
| 563 | + </ItemGroup> |
| 564 | + |
| 565 | + <GetKnownArtifactsFromAssetManifests AssetManifests="@(RepoAssetManifestFromDependentVertical)" RepoOrigin="$(RepositoryName)"> |
| 566 | + <Output TaskParameter="KnownPackages" ItemName="ProducedPackageFromDependentVertical" /> |
| 567 | + <Output TaskParameter="KnownBlobs" ItemName="ProducedAssetFromDependentVertical" /> |
| 568 | + </GetKnownArtifactsFromAssetManifests> |
| 569 | + |
| 570 | + <ItemGroup> |
| 571 | + <ProducedPackageFromDependentVertical ReferenceOnly="$([MSBuild]::ValueOrDefault('$(ReferenceOnlyRepoArtifacts)', 'false'))" /> |
| 572 | + </ItemGroup> |
| 573 | + </Target> |
| 574 | + |
556 | 575 | <Target Name="GetProducedPackages"
|
| 576 | + DependsOnTargets="GetProducedPackagesFromDependentVerticals" |
557 | 577 | Condition="'$(IsUtilityProject)' != 'true'"
|
558 | 578 | Returns="@(ProducedPackage);@(ProducedPackageFromDependentVertical)">
|
559 | 579 | <ItemGroup>
|
|
588 | 608 | <BinPlaceFile Include="@(ProducedAsset->'$(ArtifactsAssetsDir)%(Identity)')" Condition="'%(Visibility)' != 'Vertical'"/>
|
589 | 609 | </ItemGroup>
|
590 | 610 |
|
591 |
| - <!-- Add manifests from dependent verticals. --> |
592 |
| - <ItemGroup> |
593 |
| - <RepoAssetManifestFromDependentVertical Include="$(ArtifactsAssetManifestsDir)*.xml" Exclude="$(MergedAssetManifestOutputPath)" /> |
594 |
| - </ItemGroup> |
595 |
| - |
596 |
| - <GetKnownArtifactsFromAssetManifests AssetManifests="@(RepoAssetManifestFromDependentVertical)" RepoOrigin="$(RepositoryName)"> |
597 |
| - <Output TaskParameter="KnownPackages" ItemName="ProducedPackageFromDependentVertical" /> |
598 |
| - <Output TaskParameter="KnownBlobs" ItemName="ProducedAssetFromDependentVertical" /> |
599 |
| - </GetKnownArtifactsFromAssetManifests> |
600 |
| - |
601 | 611 | <ItemGroup>
|
602 | 612 | <ProducedPackage ReferenceOnly="$([MSBuild]::ValueOrDefault('$(ReferenceOnlyRepoArtifacts)', 'false'))" />
|
603 |
| - <ProducedPackageFromDependentVertical ReferenceOnly="$([MSBuild]::ValueOrDefault('$(ReferenceOnlyRepoArtifacts)', 'false'))" /> |
604 | 613 | </ItemGroup>
|
605 | 614 | </Target>
|
606 | 615 |
|
|
712 | 721 | </Touch>
|
713 | 722 | </Target>
|
714 | 723 |
|
715 |
| - <Target Name="DiscoverToolPackageVersions" DependsOnTargets="GetProducedPackages"> |
| 724 | + <PropertyGroup> |
| 725 | + <_DiscoverToolPackageVersionsDependsOn>GetProducedPackages</_DiscoverToolPackageVersionsDependsOn> |
| 726 | + <_DiscoverToolPackageVersionsDependsOn Condition="'$(GetDependentVerticalAssetsOnly)' == 'true'">GetProducedPackagesFromDependentVerticals</_DiscoverToolPackageVersionsDependsOn> |
| 727 | + </PropertyGroup> |
| 728 | + |
| 729 | + <Target Name="DiscoverToolPackageVersions" DependsOnTargets="$(_DiscoverToolPackageVersionsDependsOn)"> |
716 | 730 | <JoinItems Left="@(ProducedPackage);@(ProducedPackageFromDependentVertical)"
|
717 | 731 | Right="@(BuiltSdkPackage)"
|
718 | 732 | LeftMetadata="*">
|
|
0 commit comments