tying to use another ILMerge tool and still not working.

karaoke-dev · Feb 21, 2022 · e26cfa3 · e26cfa3
1 parent 08e1487
commit e26cfa3
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 29 deletions.
diff --git a/osu.Game.Rulesets.Karaoke/ILRepack.targets b/osu.Game.Rulesets.Karaoke/ILRepack.targets
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Target Name="ILRepacker" AfterTargets="Build" Condition="'$(Configuration)' == 'Release'">
+        <ItemGroup>
+            <InputAssemblies Include="$(OutputPath)\LanguageDetection.dll" />
+            <InputAssemblies Include="$(OutputPath)\Octokit.dll" />
+            <InputAssemblies Include="$(OutputPath)\osu.Framework.KaraokeFont.dll" />
+            <InputAssemblies Include="$(OutputPath)\osu.Framework.Microphone.dll" />
+            <InputAssemblies Include="$(OutputPath)\NWaves.dll" />
+            <InputAssemblies Include="$(OutputPath)\LyricMaker.dll" />
+            <InputAssemblies Include="$(OutputPath)\NicoKaraParser.dll" />
+            <InputAssemblies Include="$(OutputPath)\SixLabors.Fonts.dll" />
+            <InputAssemblies Include="$(OutputPath)\SixLabors.ImageSharp.Drawing.dll" />
+            <InputAssemblies Include="$(OutputPath)\WanaKanaSharp.dll" />
+            <InputAssemblies Include="$(OutputPath)\Zipangu.dll" />
+        </ItemGroup>
+
+        <ItemGroup>
+            <InternalizeExcludeAssemblies Include="osu.Game.dll" />
+            <InternalizeExcludeAssemblies Include="osu.Framework.dll" />
+        </ItemGroup>
+
+        <ILRepack
+                Parallel="true"
+                Internalize="false"
+                InternalizeExclude="@(InternalizeExcludeAssemblies)"
+                InputAssemblies="@(InputAssemblies)"
+                TargetKind="Dll"
+                OutputFile="$(OutputPath)\$(AssemblyName).Packed.dll"
+        />
+    </Target>
+</Project>
diff --git a/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj b/osu.Game.Rulesets.Karaoke/osu.Game.Rulesets.Karaoke.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup Label="Project">
     <TargetFramework>netstandard2.1</TargetFramework>
     <AssemblyTitle>osu.Game.Rulesets.Karaoke</AssemblyTitle>
@@ -36,32 +36,5 @@
   <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="SixLabors.Fonts.dll" />
-      <InputAssemblies Include="SixLabors.ImageSharp.Drawing.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>
+
 </Project>