Skip to content

Fix LT-20658: Add Geckofx redirect to PdfPrinter config #825

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

Merged
papeh merged 1 commit into from
Apr 9, 2026
Merged

Fix LT-20658: Add Geckofx redirect to PdfPrinter config #825

Show file tree
Hide file tree
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
32 changes: 31 additions & 1 deletion Build/PackageRestore.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,36 @@
OverwriteReadOnlyFiles="true"
Condition="Exists('$(DownloadsDir)/GeckofxHtmlToPdf.exe.config')"
/>
<!-- FieldWorksPdfMaker is a pre-built external binary so AutoGenerateBindingRedirects
does not run for it. Patch its config with Geckofx redirects keyed to GeckoNugetVersion
so version drift between the binary and our NuGet pin cannot cause load failures. -->
<XmlPeek
Condition="Exists('$(dir-outputBase)/FieldWorksPdfMaker.exe.config')"
XmlInputPath="$(dir-outputBase)/FieldWorksPdfMaker.exe.config"
Namespaces="&lt;Namespace Prefix='b' Uri='urn:schemas-microsoft-com:asm.v1'/&gt;"
Query="//b:assemblyIdentity[@name='Geckofx-Core']/../b:bindingRedirect/@newVersion">
<Output TaskParameter="Result" PropertyName="_GeckoRedirectVersion" />
</XmlPeek>
<Error
Condition="'$(_GeckoRedirectVersion)' != '' AND '$(_GeckoRedirectVersion)' != '$(GeckoNugetVersion).0'"
Text="FieldWorksPdfMaker.exe.config has Geckofx-Core redirect to $(_GeckoRedirectVersion), expected $(GeckoNugetVersion).0"
/>
<ReadLinesFromFile
Condition="'$(_GeckoRedirectVersion)' == '' AND Exists('$(dir-outputBase)/FieldWorksPdfMaker.exe.config')"
File="$(dir-outputBase)/FieldWorksPdfMaker.exe.config">
<Output TaskParameter="Lines" ItemName="_PdfMakerConfigLines" />
</ReadLinesFromFile>
<PropertyGroup Condition="'$(_GeckoRedirectVersion)' == '' AND '@(_PdfMakerConfigLines)' != ''">
<_PdfMakerConfigContent>@(_PdfMakerConfigLines, '%0A')</_PdfMakerConfigContent>
<_GeckoRedirectBlock>&lt;runtime&gt;&lt;assemblyBinding xmlns=&quot;urn:schemas-microsoft-com:asm.v1&quot;&gt;&lt;dependentAssembly&gt;&lt;assemblyIdentity name=&quot;Geckofx-Core&quot; publicKeyToken=&quot;3209ac31600d1857&quot;/&gt;&lt;bindingRedirect oldVersion=&quot;0.0.0.0-$(GeckoNugetVersion).0&quot; newVersion=&quot;$(GeckoNugetVersion).0&quot;/&gt;&lt;/dependentAssembly&gt;&lt;dependentAssembly&gt;&lt;assemblyIdentity name=&quot;Geckofx-Winforms&quot; publicKeyToken=&quot;3209ac31600d1857&quot;/&gt;&lt;bindingRedirect oldVersion=&quot;0.0.0.0-$(GeckoNugetVersion).0&quot; newVersion=&quot;$(GeckoNugetVersion).0&quot;/&gt;&lt;/dependentAssembly&gt;&lt;/assemblyBinding&gt;&lt;/runtime&gt;</_GeckoRedirectBlock>
<_PdfMakerConfigContent>$(_PdfMakerConfigContent.Replace('&lt;/configuration&gt;', '$(_GeckoRedirectBlock)&lt;/configuration&gt;'))</_PdfMakerConfigContent>
</PropertyGroup>
<WriteLinesToFile
Condition="'$(_GeckoRedirectVersion)' == '' AND '@(_PdfMakerConfigLines)' != ''"
File="$(dir-outputBase)/FieldWorksPdfMaker.exe.config"
Lines="$(_PdfMakerConfigContent)"
Overwrite="true"
/>
<!-- Copy pre-populated binaries from pc-parse -->
<Copy
SourceFiles="$(DownloadsDir)/pcpatr64.exe"
Expand Down Expand Up @@ -526,7 +556,7 @@
<!-- Native Geckofx browser engine package (managed wrapper + native XULRunner files) -->
<PropertyGroup>
<Architecture>64</Architecture>
<GeckoDir Condition="'$(OS)'=='Windows_NT'">$(PackagesDir)/Geckofx60.$(Architecture).60.0.56</GeckoDir>
<GeckoDir Condition="'$(OS)'=='Windows_NT'">$(PackagesDir)/Geckofx60.$(Architecture).$(GeckoNugetVersion)</GeckoDir>
</PropertyGroup>
<ItemGroup>
<GeckoFiles Include="$(GeckoDir)/lib/net45/*.*" Condition="'$(OS)'=='Windows_NT'" />
Expand Down
1 change: 1 addition & 0 deletions Build/SilVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@
<SilMachineVersion>3.7.13</SilMachineVersion>
<SilIPCFrameworkVersion>1.1.1-beta0001</SilIPCFrameworkVersion>
<IcuNugetVersion>70.1.152</IcuNugetVersion>
<GeckoNugetVersion>60.0.56</GeckoNugetVersion>
</PropertyGroup>
</Project>
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
<PackageVersion Include="DialogAdapters" Version="0.1.11" />
<PackageVersion Include="DocumentFormat.OpenXml" Version="2.20.0" />
<PackageVersion Include="encoding-converters-core" Version="0.9.7" />
<PackageVersion Include="Geckofx60.64" Version="60.0.56" />
<PackageVersion Include="Geckofx60.64" Version="$(GeckoNugetVersion)" />
<PackageVersion Include="Geckofx60.64.Windows" Version="0.19.0" />
<PackageVersion Include="ibusdotnet" Version="2.0.3" />
<PackageVersion Include="icu.net" Version="3.0.1" />
Expand Down
Loading