Skip to content

fix(packaging): inject patched WPF into self-contained publish output #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oysteinkrog wants to merge 1 commit into
base: if/main
Choose a base branch
from
Open

fix(packaging): inject patched WPF into self-contained publish output #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 37 additions & 0 deletions packaging/InitialForce.WPF/buildTransitive/InitialForce.WPF.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,41 @@
Condition="'$(RuntimeIdentifier)' == 'win-x64'" />
</Target>

<!-- Target 3: Self-contained publish path. InjectIfWpfAssemblies (Target 2) adds our DLLs to
ResolvedFileToPublish from a Build-time target, but a self-contained publish recomputes
that list later in ComputeResolvedFilesToPublishList and re-adds the runtime-pack stock
WPF DLLs, so the published app ships stock WPF (the installer harvests the publish output).
Run AFTER the publish list is computed and BEFORE it is copied: strip the stock WPF entries
and add our patched copies. -->
<Target Name="ReplaceWpfInPublish"
AfterTargets="ComputeResolvedFilesToPublishList"
BeforeTargets="_CopyResolvedFilesToPublishPreserveNewest;CopyFilesToPublishDirectory"
Condition="'$(RuntimeIdentifier)' == 'win-x64'">
<ItemGroup>
<ResolvedFileToPublish Remove="@(ResolvedFileToPublish)"
Condition="'%(Filename)%(Extension)' == 'PresentationCore.dll'
or '%(Filename)%(Extension)' == 'PresentationFramework.dll'
or '%(Filename)%(Extension)' == 'WindowsBase.dll'
or '%(Filename)%(Extension)' == 'System.Xaml.dll'" />
<ResolvedFileToPublish Include="$(_IFWpfRuntimeDir)PresentationCore.dll">
<RelativePath>PresentationCore.dll</RelativePath>
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</ResolvedFileToPublish>
<ResolvedFileToPublish Include="$(_IFWpfRuntimeDir)PresentationFramework.dll">
<RelativePath>PresentationFramework.dll</RelativePath>
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</ResolvedFileToPublish>
<ResolvedFileToPublish Include="$(_IFWpfRuntimeDir)WindowsBase.dll">
<RelativePath>WindowsBase.dll</RelativePath>
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</ResolvedFileToPublish>
<ResolvedFileToPublish Include="$(_IFWpfRuntimeDir)System.Xaml.dll">
<RelativePath>System.Xaml.dll</RelativePath>
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
</ResolvedFileToPublish>
</ItemGroup>
<Message Importance="high"
Text="ReplaceWpfInPublish: replaced stock WPF with InitialForce.WPF patched DLLs in the publish set" />
</Target>

</Project>
Loading