Skip to content

Fix LT-22527: Repair the ILRepack build functionality #910

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
jasonleenaylor wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix LT-22527: Repair the ILRepack build functionality #910

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
1 change: 0 additions & 1 deletion .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
31 changes: 0 additions & 31 deletions Bin/ilrepack-assemblies
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 2 additions & 0 deletions Src/FwParatextLexiconPlugin/FwParatextLexiconPlugin.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -53,4 +54,5 @@
<EmbeddedResource Include="question.ico" />
<EmbeddedResource Include="Resources\question.ico" />
</ItemGroup>
<Import Project="ILRepack.targets" />
</Project>
17 changes: 8 additions & 9 deletions Src/FwParatextLexiconPlugin/ILRepack.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Loading