ILRepack moved from project file into build template

magic-chunks · Dec 19, 2017 · 3670b4d · 3670b4d
1 parent f047d67
commit 3670b4d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/build/build.cake b/build/build.cake
@@ -1,5 +1,6 @@
 #addin "Cake.Powershell"
 #addin "Newtonsoft.Json"
+#tool "nuget:?package=ILRepack"
 
 // Helpers
 
@@ -145,8 +146,14 @@ Task("Build")
             PlatformTarget = PlatformTarget.MSIL,
         }.WithTarget("Build"));
 
+        ILRepack(
+            paths.workingDirSolutionDir + "/MagicChunks/bin/" + configuration + "/netstandard1.3/MagicChunks.dll",
+            paths.workingDirSolutionDir + "/MagicChunks/bin/" + configuration + "/netstandard1.3/MagicChunks.dll",
+            GetFiles(paths.workingDirSolutionDir + "/MagicChunks/bin/" + configuration + "/netstandard1.3/*.dll"),
+            new ILRepackSettings { Internalize = true });
+
         CopyFiles(paths.workingDirSolutionDir + "/MagicChunks" + "/bin/" + configuration + "/netstandard1.3/MagicChunks*.dll", paths.workingDirDotNet);
-        CopyFiles(paths.workingDirSolutionDir + "/MagicChunks.Cake" + "/bin/" + configuration + "/netstandard1.6/MagicChunks*.dll", paths.workingDirDotNet);
+        CopyFiles(paths.workingDirSolutionDir + "/MagicChunks.Cake" + "/bin/" + configuration + "/netstandard1.6/MagicChunks.Cake.dll", paths.workingDirDotNet);
         CopyFiles(paths.workingDirSolutionDir + "/MagicChunks/MSBuild/*.targets", paths.workingDirDotNet);
         CopyFiles(paths.workingDirSolutionDir + "/MagicChunks/Powershell/*.ps*", paths.workingDirDotNet);
     });

diff --git a/src/MagicChunks/MagicChunks.csproj b/src/MagicChunks/MagicChunks.csproj
@@ -23,6 +23,4 @@
     <PackageReference Include="YamlDotNet" Version="4.2.2" />
   </ItemGroup>
 
-  <!-- <Import Project="$(SolutionDir)\..\tools\ILRepack\ILRepack.CSharp.targets" /> -->
-
 </Project>
diff --git a/tools/ILRepack/ILRepack.CSharp.targets b/tools/ILRepack/ILRepack.CSharp.targets
diff --git a/tools/ILRepack/ILRepack.exe b/tools/ILRepack/ILRepack.exe