Skip to content

Commit e9b1246

Browse files
committed
Improve build reliability
- ensure `ResolveCustomReferences` target executes before packages are used - `ResolveAssemblyReferences` and `ResolveAssemblyReferencesDesignTime` targets run too late - e.g. failed builds of Microsoft.AspNetCore.WebUtilities or Microsoft.AspNetCore.Hosting when building from root (ports a small part of #20760 to master)
1 parent c836a3a commit e9b1246

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

eng/targets/ResolveReferences.targets

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,9 @@
132132
This target resolves remaining Referene items to Packages, if possible. If not, they are left as Reference items fo the SDK to resolve.
133133
This executes on NuGet restore and during DesignTimeBuild. It should not run in the outer, cross-targeting build.
134134
-->
135-
<Target Name="ResolveCustomReferences" BeforeTargets="CollectPackageReferences;ResolveAssemblyReferencesDesignTime;ResolveAssemblyReferences" Condition=" '$(TargetFramework)' != '' AND '$(EnableCustomReferenceResolution)' == 'true' ">
135+
<Target Name="ResolveCustomReferences"
136+
BeforeTargets="CheckForImplicitPackageReferenceOverrides;CollectPackageReferences;ResolvePackageAssets"
137+
Condition=" '$(TargetFramework)' != '' AND '$(EnableCustomReferenceResolution)' == 'true' ">
136138
<ItemGroup>
137139
<!-- Ensure only content asset are consumed from .Sources packages -->
138140
<Reference>

0 commit comments

Comments
 (0)