Skip to content

Commit b875f2a

Browse files
committed
Execute ResolveCustomReferencesToProjects in outer builds too
1 parent be9537b commit b875f2a

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
@@ -17,6 +17,8 @@
1717
* ProjectReferenceProvider = a list which maps of assembly names to the project file that produces it
1818
-->
1919
<Project>
20+
<!-- The .NET SDK uses this task but only in inner builds. Needed in outer builds for ResolveCustomReferencesToProjects. -->
21+
<UsingTask TaskName="Microsoft.NET.Build.Tasks.JoinItems" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" />
2022

2123
<PropertyGroup>
2224
<EnableCustomReferenceResolution Condition="'$(EnableCustomReferenceResolution)' == '' AND ('$(DotNetBuildFromSource)' != 'true' OR '$(ExcludeFromSourceBuild)' != 'true')">true</EnableCustomReferenceResolution>
@@ -98,7 +100,7 @@
98100
(therefore fragile) target names.
99101
-->
100102
<Target Name="ResolveCustomReferencesToProjects"
101-
Condition=" '$(TargetFramework)' != '' AND '$(EnableCustomReferenceResolution)' == 'true' AND '$(UseProjectReferences)' == 'true' "
103+
Condition=" '$(EnableCustomReferenceResolution)' == 'true' AND '$(UseProjectReferences)' == 'true' "
102104
BeforeTargets="AssignProjectConfiguration;ResolveCustomReferences;_LoadRestoreGraphEntryPoints;_GenerateProjectRestoreGraphPerFramework;_GenerateRestoreProjectPathItemsPerFramework">
103105
<JoinItems Left="@(Reference)" Right="@(ProjectReferenceProvider)" LeftMetadata="*" RightMetadata="ProjectPath;RefProjectPath">
104106
<Output TaskParameter="JoinResult" ItemName="_ProjectReferenceByAssemblyName" />

0 commit comments

Comments
 (0)