Use ILRepack tool instead of submodule

AvaloniaUI · Jul 27, 2024 · 3f6eb6a · 3f6eb6a
1 parent b2f9a66
commit 3f6eb6a
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 33 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "src/Markup/Avalonia.Markup.Xaml/XamlIl/xamlil.github"]
 	path = src/Markup/Avalonia.Markup.Xaml.Loader/xamlil.github
 	url = https://github.com/kekekeks/XamlX.git
-[submodule "nukebuild/il-repack"]
-	path = nukebuild/il-repack
-	url = https://github.com/Gillibald/il-repack
diff --git a/nukebuild/Build.cs b/nukebuild/Build.cs
@@ -40,7 +40,8 @@ partial class Build : NukeBuild
     [PackageExecutable("Microsoft.DotNet.GenAPI.Tool", "Microsoft.DotNet.GenAPI.Tool.dll", Framework = "net8.0")]
     Tool ApiGenTool;
 
-
+    [PackageExecutable("dotnet-ilrepack", "ILRepackTool.dll", Framework = "net8.0")]
+    Tool IlRepackTool;
 
     protected override void OnBuildInitialized()
     {
@@ -307,7 +308,8 @@ void DoMemoryTest()
         .Executes(() =>
         {
             BuildTasksPatcher.PatchBuildTasksInPackage(Parameters.NugetIntermediateRoot / "Avalonia.Build.Tasks." +
-                                                       Parameters.Version + ".nupkg");
+                                                       Parameters.Version + ".nupkg",
+                                                       IlRepackTool);
             var config = Numerge.MergeConfiguration.LoadFile(RootDirectory / "nukebuild" / "numerge.config");
             EnsureCleanDirectory(Parameters.NugetRoot);
             if(!Numerge.NugetPackageMerger.Merge(Parameters.NugetIntermediateRoot, Parameters.NugetRoot, config,

diff --git a/nukebuild/BuildTasksPatcher.cs b/nukebuild/BuildTasksPatcher.cs
@@ -2,9 +2,9 @@
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
-using ILRepacking;
 using Mono.Cecil;
 using Mono.Cecil.Cil;
+using Nuke.Common.Tooling;
 
 public class BuildTasksPatcher
 {
@@ -56,7 +56,7 @@ private static string GetSourceLinkInfo(string path)
         return null;
     }
 
-    public static void PatchBuildTasksInPackage(string packagePath)
+    public static void PatchBuildTasksInPackage(string packagePath, Tool ilRepackTool)
     {
         using (var archive = new ZipArchive(File.Open(packagePath, FileMode.Open, FileAccess.ReadWrite),
             ZipArchiveMode.Update))
@@ -70,30 +70,23 @@ public static void PatchBuildTasksInPackage(string packagePath)
                     Directory.CreateDirectory(tempDir);
                     var temp = Path.Combine(tempDir, entry.Name);
                     var output = temp + ".output";
-                    File.Copy(typeof(Microsoft.Build.Framework.ITask).Assembly.GetModules()[0].FullyQualifiedName,
+                    File.Copy(GetAssemblyPath(typeof(Microsoft.Build.Framework.ITask)),
                         Path.Combine(tempDir, "Microsoft.Build.Framework.dll"));
                     var patched = new MemoryStream();
                     try
                     {
                         entry.ExtractToFile(temp, true);
                         // Get Original SourceLinkInfo Content
                         var sourceLinkInfoContent = GetSourceLinkInfo(temp);
-                        var repack = new ILRepacking.ILRepack(new RepackOptions()
-                        {
-                            Internalize = true,
-                            InputAssemblies = new[]
-                            {
-                                temp,
-                                typeof(Mono.Cecil.AssemblyDefinition).Assembly.GetModules()[0].FullyQualifiedName,
-                                typeof(Mono.Cecil.Rocks.MethodBodyRocks).Assembly.GetModules()[0].FullyQualifiedName,
-                                typeof(Mono.Cecil.Pdb.PdbReaderProvider).Assembly.GetModules()[0].FullyQualifiedName,
-                                typeof(Mono.Cecil.Mdb.MdbReaderProvider).Assembly.GetModules()[0].FullyQualifiedName,
-                            },
-                            SearchDirectories = Array.Empty<string>(),
-                            DebugInfo = true, // Allowed read debug info
-                            OutputFile = output
-                        });
-                        repack.Repack();
+
+                        var cecilAsm = GetAssemblyPath(typeof(Mono.Cecil.AssemblyDefinition));
+                        var cecilRocksAsm = GetAssemblyPath(typeof(Mono.Cecil.Rocks.MethodBodyRocks));
+                        var cecilPdbAsm = GetAssemblyPath(typeof(Mono.Cecil.Pdb.PdbReaderProvider));
+                        var cecilMdbAsm = GetAssemblyPath(typeof(Mono.Cecil.Mdb.MdbReaderProvider));
+
+                        ilRepackTool.Invoke(
+                            $"/internalize /out:\"{output}\" \"{temp}\" \"{cecilAsm}\" \"{cecilRocksAsm}\" \"{cecilPdbAsm}\" \"{cecilMdbAsm}\"",
+                            tempDir);
 
                         // 'hurr-durr assembly with the same name is already loaded' prevention
                         using (var asm = AssemblyDefinition.ReadAssembly(output,
@@ -161,4 +154,7 @@ public static void PatchBuildTasksInPackage(string packagePath)
             }
         }
     }
+
+    private static string GetAssemblyPath(Type typeInAssembly)
+        => typeInAssembly.Assembly.GetModules()[0].FullyQualifiedName;
 }
diff --git a/nukebuild/_build.csproj b/nukebuild/_build.csproj
@@ -20,7 +20,6 @@
     <PackageReference Include="MicroCom.CodeGenerator" Version="0.11.0" />
     <!-- Keep in sync with Avalonia.Build.Tasks -->
     <PackageReference Include="Mono.Cecil" Version="0.11.5" />
-    <PackageReference Include="Microsoft.Debugging.Tools.PdbStr" Version="20230731.1609.0" GeneratePathProperty="true" PrivateAssets="All"/>
     <PackageReference Include="Microsoft.Build.Framework" Version="17.3.2" PrivateAssets="All" />
     <PackageReference Include="xunit.runner.console" Version="2.4.2">
       <PrivateAssets>all</PrivateAssets>
@@ -29,6 +28,7 @@
 
     <PackageDownload Include="Microsoft.DotNet.ApiCompat.Tool" Version="[8.0.200]" />
     <PackageDownload Include="Microsoft.DotNet.GenAPI.Tool" Version="[8.0.300-preview.24115.44]" />
+    <PackageDownload Include="dotnet-ilrepack" Version="[1.0.0]" />
   </ItemGroup>
 
   <ItemGroup>
@@ -38,9 +38,7 @@
     <!-- Common build related files -->
     <Compile Remove="Numerge/**/*.*" />
     <Compile Include="Numerge/Numerge/**/*.cs" Exclude="Numerge/Numerge/obj/**/*.cs" />
-    <EmbeddedResource Include="$(PkgMicrosoft_Debugging_Tools_PdbStr)/content/x86/pdbstr.exe" />
     <EmbeddedResource Include="../build/avalonia.snk" />
-    <Compile Remove="il-repack\ILRepack\Application.cs" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/nukebuild/il-repack b/nukebuild/il-repack
diff --git a/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj b/src/Avalonia.Build.Tasks/Avalonia.Build.Tasks.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-      <TargetFrameworks>netstandard2.0</TargetFrameworks>
+      <TargetFramework>netstandard2.0</TargetFramework>
+      <Nullable>enable</Nullable>
       <GenerateDocumentationFile>false</GenerateDocumentationFile>
       <BuildOutputTargetFolder>tools</BuildOutputTargetFolder>
       <DefineConstants>$(DefineConstants);BUILDTASK;XAMLX_CECIL_INTERNAL;XAMLX_INTERNAL</DefineConstants>
@@ -114,13 +115,14 @@
       <Compile Include="../Avalonia.Base/RelativePoint.cs">
         <Link>Markup/%(RecursiveDir)%(FileName)%(Extension)</Link>
       </Compile>
-      <Compile Include="../Avalonia.Base/Compatibility/NullableAttributes.cs" Link="NullableAttributes.cs" />
-      <Compile Include="../Avalonia.Base/Compatibility/TrimmingAttributes.cs" Link="TrimmingAttributes.cs" Visible="False" />
+      <Compile Include="../Avalonia.Base/Compatibility/NullableAttributes.cs" Link="Compatibility/NullableAttributes.cs" />
+      <Compile Include="../Avalonia.Base/Compatibility/TrimmingAttributes.cs" Link="Compatibility/TrimmingAttributes.cs" />
       <Compile Include="../Avalonia.Base/Utilities/SpanHelpers.cs" Link="Utilities/SpanHelpers.cs" />
       <Compile Include="../Shared/StringCompatibilityExtensions.cs" Link="Compatibility/StringCompatibilityExtensions.cs" />
       <Compile Include="../Shared/IsExternalInit.cs" Link="Compatibility/IsExternalInit.cs" />
-      <Compile Remove="../Markup/Avalonia.Markup.Xaml.Loader\xamlil.github\**\obj\**\*.cs" />
-      <Compile Remove="../Markup/Avalonia.Markup.Xaml.Loader\xamlil.github\src\XamlX\IL\SreTypeSystem.cs" />
+      <Compile Remove="../Markup/Avalonia.Markup.Xaml.Loader/xamlil.github/**/obj/**/*.cs" />
+      <Compile Remove="../Markup/Avalonia.Markup.Xaml.Loader/xamlil.github/src/XamlX/Compatibility/*.cs" />
+      <Compile Remove="../Markup/Avalonia.Markup.Xaml.Loader/xamlil.github/src/XamlX/IL/SreTypeSystem.cs" />
       <PackageReference Include="Mono.Cecil" Version="0.11.5" />
       <PackageReference Include="Microsoft.Build.Framework" Version="15.1.548" PrivateAssets="All" />
       <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />