Skip to content

Commit 5dabe5f

Browse files
committed
When getting produced packages from dependencies that we aren't building, make sure to only look at dependent verticals. Otherwise we may run the "GetProducedPackages" target before we run the "Build" target.
1 parent baa6d97 commit 5dabe5f

File tree

1 file changed

+26
-12
lines changed

1 file changed

+26
-12
lines changed

src/SourceBuild/content/repo-projects/Directory.Build.targets

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,7 @@
390390
<_DependentProjectCurrentBuildPass Include="@(_DependentProject->WithMetadataValue('DotNetBuildPass', '$(DotNetBuildPass)'))" />
391391

392392
<_DependentProjectToSkip Include="@(_DependentProject)" Exclude="@(_DependentProjectCurrentBuildPass)" />
393+
<_DependentProjectToSkip Include="@(_DependentProject)" AdditionalProperties="GetDependentVerticalAssetsOnly=true" />
393394

394395
<_DependentProject Remove="@(_DependentProject)" />
395396
<_DependentProject Include="@(_DependentProjectCurrentBuildPass)" />
@@ -553,7 +554,26 @@
553554
</Touch>
554555
</Target>
555556

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+
556575
<Target Name="GetProducedPackages"
576+
DependsOnTargets="GetProducedPackagesFromDependentVerticals"
557577
Condition="'$(IsUtilityProject)' != 'true'"
558578
Returns="@(ProducedPackage);@(ProducedPackageFromDependentVertical)">
559579
<ItemGroup>
@@ -588,19 +608,8 @@
588608
<BinPlaceFile Include="@(ProducedAsset->'$(ArtifactsAssetsDir)%(Identity)')" Condition="'%(Visibility)' != 'Vertical'"/>
589609
</ItemGroup>
590610

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-
601611
<ItemGroup>
602612
<ProducedPackage ReferenceOnly="$([MSBuild]::ValueOrDefault('$(ReferenceOnlyRepoArtifacts)', 'false'))" />
603-
<ProducedPackageFromDependentVertical ReferenceOnly="$([MSBuild]::ValueOrDefault('$(ReferenceOnlyRepoArtifacts)', 'false'))" />
604613
</ItemGroup>
605614
</Target>
606615

@@ -712,7 +721,12 @@
712721
</Touch>
713722
</Target>
714723

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)">
716730
<JoinItems Left="@(ProducedPackage);@(ProducedPackageFromDependentVertical)"
717731
Right="@(BuiltSdkPackage)"
718732
LeftMetadata="*">

0 commit comments

Comments
 (0)