diff --git a/.gitattributes b/.gitattributes
index 8cf8104b2a..55bdc47fa2 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -27,7 +27,6 @@ FwHelpAbout.cs -whitespace
 LICENSE -whitespace
 RealSplashScreen.cs -whitespace
 run-app -whitespace
-Bin/ilrepack-assemblies -whitespace
 *.json -whitespace
 *.js -whitespace
 Src/LexText/ParserCore/ParserCoreTests/**/*.txt -whitespace
diff --git a/Bin/ilrepack-assemblies b/Bin/ilrepack-assemblies
deleted file mode 100755
index bc0d30ea84..0000000000
--- a/Bin/ilrepack-assemblies
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-# Repack an assembly.
-# Created 2018-08-13
-#
-# Usage: ./ilrepack-assemblies /path/to/PrimaryAssembly.dll [/path/to/OtherAssemblies.dll ...]
-#
-# Original PrimaryAssembly.dll is left as PrimaryAssembly.dll~.
-#
-# Environment variables:
-#   ILREPACK - path to ILRepack.exe to use.
-
-set -e -o pipefail -u
-
-PRIMARY_ASSEMBLY="$1"
-ILREPACK="${ILREPACK-"$(dirname "$0")/../packages/ILRepack.2.0.15/tools/ILRepack.exe"}"
-TMP_ASSEMBLY=$(mktemp -d)/"$(basename "$PRIMARY_ASSEMBLY")"
-# Set ASSEMBLIES to the remaining arguments.
-shift
-ASSEMBLIES="${@}"
-
-LIBSARGS=/lib:"$(dirname "$PRIMARY_ASSEMBLY")"
-mono "$ILREPACK" /out:"$TMP_ASSEMBLY" "$LIBSARGS" "$PRIMARY_ASSEMBLY" $ASSEMBLIES
-mv "$PRIMARY_ASSEMBLY" "$PRIMARY_ASSEMBLY~"
-mv "$TMP_ASSEMBLY" "$PRIMARY_ASSEMBLY"
-
-for assembly in $ASSEMBLIES; do
-  if [[ -f $assembly.config ]]; then
-	echo >&2 "ilrepack-assemblies($$): WARNING: Not including settings from $assembly.config for $PRIMARY_ASSEMBLY."
-  fi
-done
diff --git a/Directory.Packages.props b/Directory.Packages.props
index fd6974bad6..4c64f845ad 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -103,6 +103,7 @@
 		=============================================================
 	-->
 	<ItemGroup Label="SIL Tools">
+		<PackageVersion Include="ILRepack" Version="2.0.18" />
 		<PackageVersion Include="SIL.Chorus.App" Version="$(SilChorusVersion)" />
 		<PackageVersion Include="SIL.Chorus.LibChorus" Version="$(SilChorusVersion)" />
 		<PackageVersion Include="SIL.DesktopAnalytics" Version="4.0.0" />
diff --git a/Src/FwParatextLexiconPlugin/FwParatextLexiconPlugin.csproj b/Src/FwParatextLexiconPlugin/FwParatextLexiconPlugin.csproj
index 4627293a85..07e0ca9cad 100644
--- a/Src/FwParatextLexiconPlugin/FwParatextLexiconPlugin.csproj
+++ b/Src/FwParatextLexiconPlugin/FwParatextLexiconPlugin.csproj
@@ -28,6 +28,7 @@
     <PackageReference Include="SIL.LCModel.Utils" />
     <PackageReference Include="SIL.Machine" />
     <PackageReference Include="SIL.WritingSystems" />
+    <PackageReference Include="ILRepack" GeneratePathProperty="true" ExcludeAssets="all" />
     <PackageReference Include="System.ValueTuple" />
   </ItemGroup>
   <ItemGroup>
@@ -53,4 +54,5 @@
     <EmbeddedResource Include="question.ico" />
     <EmbeddedResource Include="Resources\question.ico" />
   </ItemGroup>
+  <Import Project="ILRepack.targets" />
 </Project>
\ No newline at end of file
diff --git a/Src/FwParatextLexiconPlugin/ILRepack.targets b/Src/FwParatextLexiconPlugin/ILRepack.targets
index bdc0217354..c6bb8d8443 100644
--- a/Src/FwParatextLexiconPlugin/ILRepack.targets
+++ b/Src/FwParatextLexiconPlugin/ILRepack.targets
@@ -6,9 +6,7 @@ This software is licensed under the LGPL, version 2.1 or later
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="Current">
 	<PropertyGroup>
-		<FwrtPath>../..</FwrtPath>
-		<ILRepackBin Condition="('$(OS)' == 'Windows_NT')">&quot;$(FwrtPath)\packages\ILRepack.2.0.16\tools\ILRepack.exe&quot;</ILRepackBin>
-		<ILRepackBin Condition="('$(OS)' != 'Windows_NT')">mono &quot;$(FwrtPath)\packages\ILRepack.2.0.16\tools\ILRepack.exe&quot;</ILRepackBin>
+		<ILRepackBin>&quot;$(PkgILRepack)\tools\ILRepack.exe&quot;</ILRepackBin>
 		<PrimaryAssembly>$(OutputPath)/FwParatextLexiconPlugin.dll</PrimaryAssembly>
 	</PropertyGroup>
 	<ItemGroup>
@@ -27,16 +25,17 @@ This software is licensed under the LGPL, version 2.1 or later
 	<ItemGroup>
 		<LibDirs Include="$(OutputPath)"/>
 	</ItemGroup>
-	<Target Name="AfterBuild" DependsOnTargets="ILRepack">
-		<!-- Insert tasks to run after build here -->
-	</Target>
-	<Target Name="ILRepack" DependsOnTargets="">
+	<Target Name="ILRepack" AfterTargets="Build">
 		<!-- ILRepack some dependencies into primary assembly, first renaming
 			primary assembly so the original filename can be used as the
 			output of ILRepack. -->
 		<Copy SourceFiles="$(PrimaryAssembly)" DestinationFiles="$(PrimaryAssembly)~" />
+		<!-- Remove auto-generated binding-redirect configs for merged assemblies
+			 to prevent ILRepack config-merge failures (DataSet schema conflicts). -->
+		<Delete Files="@(RepackAssemblies -> '%(Identity).config')" />
 		<Exec Command="$(ILRepackBin) /internalize /repackDrop:NoLinuxRepack /out:$(PrimaryAssembly) @(LibDirs -> '/lib:%(Identity)', ' ') $(PrimaryAssembly)~ @(RepackAssemblies -> '%(Identity)', ' ')" />
-		<!-- Any dependency .config files may contain dllmaps that we will need in the repacked assembly. -->
-		<Copy SourceFiles="$(OutputPath)/SIL.LCModel.Core.dll.config" DestinationFiles="$(PrimaryAssembly).config"/>
+		<!-- SIL.LCModel.Core.dll.config contains dllmaps needed for the repacked assembly.
+			 It was deleted above, so restore it from the NuGet package and copy as the plugin config. -->
+		<Copy SourceFiles="$(PkgSIL_LCModel_Core)/contentFiles/any/any/SIL.LCModel.Core.dll.config" DestinationFiles="$(PrimaryAssembly).config"/>
 	</Target>
 </Project>