Skip to content

Fix the patching for Newtonsoft.Json #894

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
jasonleenaylor merged 1 commit into from
May 19, 2026
Merged

Fix the patching for Newtonsoft.Json #894

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
8 changes: 4 additions & 4 deletions FLExInstaller/CustomComponents.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@
<Include>
<?ifdef MASTERBUILDDIR?>
<WixVariable Id="RootObjectsDir" Value="$(var.MASTERBUILDDIR)\.."/>
<WixVariable Id="BuildDir" Value="$(var.MASTERBUILDDIR)"/>
<?else?>
<WixVariable Id="RootObjectsDir" Value="$(var.UPDATEBUILDDIR)\.."/>
<WixVariable Id="BuildDir" Value="$(var.UPDATEBUILDDIR)"/>
<?endif?>

<DirectoryRef Id="$(var.CFDir)">
Expand Down Expand Up @@ -299,7 +301,6 @@
<?include $(var.HarvestWxiDir)\yoHarvest.wxi?>
<?include $(var.HarvestWxiDir)\zhHarvest.wxi?>
<?include $(var.HarvestWxiDir)\zlmHarvest.wxi?>
<?ifdef MASTERBUILDDIR?>
<!--
WiX 3 / PatchableInstaller: Newtonsoft.Json.dll is excluded from Heat (FLExInstaller/PatchableInstallerHeatExclude.xml
copied to BaseInstallerBuild/heat-exclude.xml; CopyFilesToInstall) and KeyPathFix.xsl. NewtonsoftJsonApp: private
Expand All @@ -309,17 +310,16 @@
<Component Id="NewtonsoftJsonApp" Guid="{B8A47C61-2E90-4D1A-9F4E-7C3B5A682D01}">
<File Id="NewtonsoftJsonFileApp"
Name="Newtonsoft.Json.dll"
Source="$(var.MASTERBUILDDIR)\Newtonsoft.Json.dll"
Source="!(wix.BuildDir)\Newtonsoft.Json.dll"
KeyPath="yes" />
</Component>
<Component Id="NewtonsoftJsonGac" Guid="*">
<File Id="NewtonsoftJsonFileGac"
Name="Newtonsoft.Json.dll"
Source="$(var.MASTERBUILDDIR)\Newtonsoft.Json.dll"
Source="!(wix.BuildDir)\Newtonsoft.Json.dll"
KeyPath="yes"
Assembly=".net" />
</Component>
</DirectoryRef>
<?endif?>
<?include Fonts.wxi?>
</Include>
3 changes: 0 additions & 3 deletions FLExInstaller/CustomFeatures.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,8 @@
<MergeRef Id="PerlEC"/>
<MergeRef Id="PythonEC"/>
<MergeRef Id="TECkit_DLLs"/>
<!-- Heat-excluded Newtonsoft.Json: components in CustomComponents.wxi are inside <?ifdef MASTERBUILDDIR?>; match that here so patch builds (UPDATEBUILDDIR only) do not emit dangling ComponentRefs (LGHT0094). -->
<?ifdef MASTERBUILDDIR?>
<ComponentRef Id="NewtonsoftJsonApp" />
<ComponentRef Id="NewtonsoftJsonGac" />
<?endif?>

<Feature Id='DesktopShortcut' Title='Desktop Shortcut' Description='Creates a shortcut on the desktop.' Level='1' ConfigurableDirectory='APPFOLDER' AllowAdvertise="no" InstallDefault="source" Absent='allow' TypicalDefault="install" >
<ComponentRef Id='ApplicationShortcutDesktop'/>
Expand Down
Loading