Skip to content

Commit a1cfcc5

Browse files
[release/9.0.1xx] Check shipping packages for poison (#47224)
Co-authored-by: Nikola Milosavljevic <[email protected]>
1 parent 5ff7dda commit a1cfcc5

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

src/SourceBuild/content/eng/finish-source-only.proj

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,22 @@
114114
Outputs="$(BaseIntermediateOutputPath)ReportPoisonUsage.complete" >
115115
<ItemGroup>
116116
<!-- Exclude the Private.SourceBuilt.Artifacts archive from poison usage scan. -->
117-
<PoisonFileToCheck Include="$(ArtifactsAssetsDir)*$(ArchiveExtension)" />
118-
<PoisonFileToCheck Remove="$(ArtifactsAssetsDir)$(SourceBuiltArtifactsTarballName)*" />
117+
<AssetToCheck Include="$(ArtifactsAssetsDir)*$(ArchiveExtension)" />
118+
<AssetToCheck Remove="$(ArtifactsAssetsDir)$(SourceBuiltArtifactsTarballName)*" />
119119
<!-- Include shipping nuget packages. -->
120-
<PoisonFileToCheck Include="$(ArtifactsShippingPackagesDir)*.nupkg" />
120+
<ShippingPackageToCheck Include="$(ArtifactsShippingPackagesDir)**/*.nupkg" />
121121
<!-- Add and mark SBRP packages to validate that they have the correct poison attribute. -->
122-
<PoisonFileToCheck Include="$(ReferencePackagesDir)**\*.nupkg" IsSourceBuildReferencePackage="true" />
122+
<SbrpPackageToCheck Include="$(ReferencePackagesDir)**\*.nupkg" IsSourceBuildReferencePackage="true" />
123+
</ItemGroup>
124+
125+
<Error Condition="'@(AssetToCheck)' == ''" Text="No assets will be poison checked - this is unexpected!" />
126+
<Error Condition="'@(ShippingPackageToCheck)' == ''" Text="No shipping packages will be poison checked - this is unexpected!" />
127+
<Error Condition="'@(SbrpPackageToCheck)' == ''" Text="No SBRP packages will be poison checked - this is unexpected!" />
128+
129+
<ItemGroup>
130+
<PoisonFileToCheck Include="@(AssetToCheck)" />
131+
<PoisonFileToCheck Include="@(ShippingPackageToCheck)" />
132+
<PoisonFileToCheck Include="@(SbrpPackageToCheck)" />
123133
</ItemGroup>
124134

125135
<Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Checking @(PoisonFileToCheck) for poisoned files." />

0 commit comments

Comments
 (0)