Skip to content

Commit b6170dd

Browse files
committed
Projects referencing C++/CLI need ijwhost in DesignerRuntimeImplementationProjectOutputGroup
1 parent 4358696 commit b6170dd

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.DesignerSupport.targets

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ Copyright (c) .NET Foundation. All rights reserved.
2222
$(DesignerRuntimeImplementationProjectOutputGroupDependsOn);
2323
_GenerateDesignerDepsFile;
2424
_GenerateDesignerRuntimeConfigFile;
25+
GetCopyToOutputDirectoryItems;
2526
_GatherDesignerShadowCopyFiles;
2627
</DesignerRuntimeImplementationProjectOutputGroupDependsOn>
2728

@@ -142,11 +143,9 @@ Copyright (c) .NET Foundation. All rights reserved.
142143

143144
<!-- Include ijwhost.dll for projects that use it -->
144145
<DesignerRuntimeImplementationProjectOutputGroupOutput
145-
Include="$(IjwHostSourcePath)"
146-
TargetPath="$(_DotNetIjwHostLibraryName)"
147-
Condition="'$(IjwHostSourcePath)' != '' and '$(UseIJWHost)' == 'true'"
146+
Include="@(AllItemsFullPathWithTargetPath->WithMetadataValue('Filename', '$(_DotNetIjwHostLibraryNameWithoutExtension)')->WithMetadataValue('Extension', '$(_IjwHostLibraryExtension)'))"
148147
/>
149-
</ItemGroup>
148+
</ItemGroup>
150149
</Target>
151150

152151
</Project>

0 commit comments

Comments
 (0)