Skip to content
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.

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

[ABORT] Use ILMerge instead of ILRepack #421

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Changes from all commits
Commits
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
34 changes: 8 additions & 26 deletions osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<EmbeddedResource Include="Resources\**" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ILRepack.MSBuild.Task" Version="2.0.13" />
<PackageReference Include="ILMerge" Version="3.0.41" />
<PackageReference Include="LanguageDetection.karaoke-dev" Version="1.3.3-alpha" />
<PackageReference Include="Octokit" Version="0.50.0" />
<PackageReference Include="osu.Framework.KaraokeFont" Version="1.7.0" />
Expand All @@ -35,30 +35,12 @@
<PropertyGroup Condition=" '$(Configuration)'=='Release' ">
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
</PropertyGroup>

<Target Name="ILRepack" AfterTargets="Build" Condition=" '$(Configuration)'=='Release' ">
<PropertyGroup>
<WorkingDirectory>$(MSBuildThisFileDirectory)bin\$(Configuration)\$(TargetFramework)</WorkingDirectory>
</PropertyGroup>

<ItemGroup>
<InputAssemblies Include="LanguageDetection.dll" />
<InputAssemblies Include="Octokit.dll" />
<InputAssemblies Include="osu.Framework.KaraokeFont.dll" />
<InputAssemblies Include="osu.Framework.Microphone.dll" />
<InputAssemblies Include="NWaves.dll" />
<InputAssemblies Include="LyricMaker.dll" />
<InputAssemblies Include="NicoKaraParser.dll" />
<InputAssemblies Include="WanaKanaSharp.dll" />
<InputAssemblies Include="Zipangu.dll" />
</ItemGroup>

<ItemGroup>
<InternalizeExcludeAssemblies Include="osu.Game.dll" />
<InternalizeExcludeAssemblies Include="osu.Framework.dll" />
</ItemGroup>

<ILRepack OutputType="$(OutputType)" MainAssembly="$(AssemblyName).dll" OutputAssembly="$(AssemblyName).Packed.dll" InputAssemblies="@(InputAssemblies)" InternalizeExcludeAssemblies="@(InternalizeExcludeAssemblies)" WorkingDirectory="$(WorkingDirectory)" />


<Target Name="ILMerge" AfterTargets="Build" Condition=" '$(Configuration)'=='Release' ">
<!-- the ILMergePath property points to the location of ILMerge.exe console application -->
<Exec
WorkingDirectory="$(MSBuildThisFileDirectory)bin\$(Configuration)\$(TargetFramework)"
Command="$(ILMergeConsolePath) /log /out:osu.Game.Rulesets.Karaoke.Packed.dll osu.Game.Rulesets.Karaoke.dll LanguageDetection.dll Octokit.dll osu.Framework.KaraokeFont.dll osu.Framework.Microphone.dll NWaves.dll LyricMaker.dll NicoKaraParser.dll WanaKanaSharp.dll Zipangu.dll"
></Exec>
</Target>
</Project>