[3.0] Build native binaries for #2567

Directory.Packages.props

@@ -21,7 +21,7 @@
     <!-- Analyzers -->
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.12.0-beta1.25218.8" />
     <!-- SilkTouch -->
-    <PackageVersion Include="ClangSharp.PInvokeGenerator" Version="20.1.2.4" />
+    <PackageVersion Include="ClangSharp.PInvokeGenerator" Version="21.1.8.3" />
     <PackageVersion Include="CSharpier.Core" Version="0.30.2" />
     <PackageVersion Include="Humanizer.Core" Version="2.14.1" />
     <PackageVersion Include="Microsoft.Build.Locator" Version="1.11.1" />

sources/SDL/Native/build-linux-arm.sh

@@ -6,13 +6,14 @@ fi
 if [[ ! -z ${GITHUB_ACTIONS+x} ]]; then
     ../../../eng/native/buildsystem/download-zig.py
     export PATH="$PATH:$(readlink -f "../../../eng/native/buildsystem/zig")"
+    # Dependency list is from https://github.com/libsdl-org/SDL/blob/main/docs/README-linux.md#build-dependencies
     sudo apt-get update
     sudo apt-get install build-essential git make \
         pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \
-        libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
-        libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev \
+        libaudio-dev libfribidi-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
+        libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxtst-dev \
         libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
-        libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev \
+        libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev libthai-dev \
         libpipewire-0.3-dev libwayland-dev libdecor-0-dev liburing-dev
 fi
 rm -rf build

sources/SDL/Native/build-linux-arm64.sh

@@ -6,13 +6,14 @@ fi
 if [[ ! -z ${GITHUB_ACTIONS+x} ]]; then
     ../../../eng/native/buildsystem/download-zig.py
     export PATH="$PATH:$(readlink -f "../../../eng/native/buildsystem/zig")"
+    # Dependency list is from https://github.com/libsdl-org/SDL/blob/main/docs/README-linux.md#build-dependencies
     sudo apt-get update
     sudo apt-get install build-essential git make \
         pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \
-        libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
-        libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev \
+        libaudio-dev libfribidi-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
+        libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxtst-dev \
         libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
-        libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev \
+        libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev libthai-dev \
         libpipewire-0.3-dev libwayland-dev libdecor-0-dev liburing-dev
 fi
 rm -rf build

sources/SDL/Native/build-linux-x64.sh

@@ -6,13 +6,14 @@ fi
 if [[ ! -z ${GITHUB_ACTIONS+x} ]]; then
     ../../../eng/native/buildsystem/download-zig.py
     export PATH="$PATH:$(readlink -f "../../../eng/native/buildsystem/zig")"
+    # Dependency list is from https://github.com/libsdl-org/SDL/blob/main/docs/README-linux.md#build-dependencies
     sudo apt-get update
     sudo apt-get install build-essential git make \
         pkg-config cmake ninja-build gnome-desktop-testing libasound2-dev libpulse-dev \
-        libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
-        libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev \
+        libaudio-dev libfribidi-dev libjack-dev libsndio-dev libx11-dev libxext-dev \
+        libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxtst-dev \
         libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev \
-        libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev \
+        libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev libthai-dev \
         libpipewire-0.3-dev libwayland-dev libdecor-0-dev liburing-dev
 fi
 rm -rf build

sources/SilkTouch/SilkTouch/Mods/AddApiProfiles.cs

@@ -265,9 +265,7 @@ rewriter.Profile is null
                 logger.LogDebug("No profile identified for {}", path);
             }
 
-            ctx.SourceProject = doc.WithSyntaxRoot(
-                rewriter.Visit(root).NormalizeWhitespace()
-            ).Project;
+            ctx.SourceProject = doc.WithSyntaxRoot(rewriter.Visit(root)).Project;
             rewriter.Profile = null;
         }
     }

sources/SilkTouch/SilkTouch/Mods/AddOpaqueStructs.cs

@@ -72,11 +72,10 @@ public Task ExecuteAsync(IModContext ctx, CancellationToken ct = default)
         {
             var qualified = name.LastIndexOf('.');
             var ns =
-                qualified != -1
-                    ? ModUtils.NamespaceIntoIdentifierName(name.AsSpan()[..qualified])
-                    : _defaultNamespaces.TryGetValue(ctx.JobKey, out var def)
-                        ? ModUtils.NamespaceIntoIdentifierName(def)
-                        : null;
+                qualified != -1 ? ModUtils.NamespaceIntoIdentifierName(name.AsSpan()[..qualified])
+                : _defaultNamespaces.TryGetValue(ctx.JobKey, out var def)
+                    ? ModUtils.NamespaceIntoIdentifierName(def)
+                : null;
             if (ns is null)
             {
                 logger.LogWarning(
@@ -107,8 +106,7 @@ public Task ExecuteAsync(IModContext ctx, CancellationToken ct = default)
                                     )
                                 )
                         )
-                    )
-                    .NormalizeWhitespace(),
+                    ),
                 filePath: proj.FullPath(fname)
             ).Project;
         }

sources/SilkTouch/SilkTouch/Mods/AddVTables.cs

@@ -1454,8 +1454,7 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default)
 
             rw.Reset();
             proj = doc.WithSyntaxRoot(
-                rw.Visit(node)?.NormalizeWhitespace()
-                    ?? throw new InvalidOperationException("Visit returned null")
+                rw.Visit(node) ?? throw new InvalidOperationException("Visit returned null")
             ).Project;
             if (rw.InterfacePartials.Count == 0)
             {
@@ -1515,11 +1514,7 @@ rw.ClassName is not null
         )
         {
             proj = proj
-                ?.AddDocument(
-                    Path.GetFileName(fname),
-                    root.NormalizeWhitespace(),
-                    filePath: proj.FullPath(fname)
-                )
+                ?.AddDocument(Path.GetFileName(fname), root, filePath: proj.FullPath(fname))
                 .Project;
         }
 

sources/SilkTouch/SilkTouch/Mods/BakeSourceSets.cs

@@ -391,7 +391,7 @@ .. ctx
         {
             proj = proj.AddDocument(
                 Path.GetFileName(bakedPath),
-                bakedRoot.NormalizeWhitespace(),
+                bakedRoot,
                 // we can forgive the below nulls because RelativePath checks them, and returns null if they're null.
                 filePath: proj.FullPath(bakedPath)
             ).Project;

sources/SilkTouch/SilkTouch/Mods/ChangeNamespace.cs

@@ -59,7 +59,8 @@ public Task<List<ResponseFile>> BeforeScrapeAsync(string key, List<ResponseFile>
 
             rsps[i] = rsp with
             {
-                GeneratorConfiguration = rsp.GeneratorConfiguration.ToWrapper() with {
+                GeneratorConfiguration = rsp.GeneratorConfiguration.ToWrapper() with
+                {
                     DefaultNamespace = def,
                     WithNamespaces = with,
                 },
@@ -91,7 +92,7 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default)
             var doc =
                 proj!.GetDocument(docId) ?? throw new InvalidOperationException("Document missing");
             proj = doc.WithSyntaxRoot(
-                rewriter.Visit(await doc.GetSyntaxRootAsync(ct))?.NormalizeWhitespace()
+                rewriter.Visit(await doc.GetSyntaxRootAsync(ct))
                     ?? throw new InvalidOperationException("Visit returned null.")
             ).Project;
         }
@@ -116,17 +117,16 @@ public Rewriter(
             _usingsToAdd.Clear();
             return base.VisitCompilationUnit(node) switch
             {
-                CompilationUnitSyntax syntax
-                    => syntax.AddUsings(
-                        _usingsToAdd
-                            .Select(x => UsingDirective(ModUtils.NamespaceIntoIdentifierName(x)))
-                            .Where(x =>
-                                syntax.Usings.All(y => x.Name?.ToString() != y.Name?.ToString())
-                            )
-                            .ToArray()
-                    ),
+                CompilationUnitSyntax syntax => syntax.AddUsings(
+                    _usingsToAdd
+                        .Select(x => UsingDirective(ModUtils.NamespaceIntoIdentifierName(x)))
+                        .Where(x =>
+                            syntax.Usings.All(y => x.Name?.ToString() != y.Name?.ToString())
+                        )
+                        .ToArray()
+                ),
                 { } ret => ret,
-                null => null
+                null => null,
             };
         }
 
@@ -140,10 +140,11 @@ CompilationUnitSyntax syntax
             }
             return base.VisitNamespaceDeclaration(node) switch
             {
-                NamespaceDeclarationSyntax syntax
-                    => syntax.WithName(ModUtils.NamespaceIntoIdentifierName(newNs)),
+                NamespaceDeclarationSyntax syntax => syntax.WithName(
+                    ModUtils.NamespaceIntoIdentifierName(newNs)
+                ),
                 { } ret => ret,
-                null => null
+                null => null,
             };
         }
 
@@ -159,10 +160,11 @@ FileScopedNamespaceDeclarationSyntax node
             }
             return base.VisitFileScopedNamespaceDeclaration(node) switch
             {
-                FileScopedNamespaceDeclarationSyntax syntax
-                    => syntax.WithName(ModUtils.NamespaceIntoIdentifierName(newNs)),
+                FileScopedNamespaceDeclarationSyntax syntax => syntax.WithName(
+                    ModUtils.NamespaceIntoIdentifierName(newNs)
+                ),
                 { } ret => ret,
-                null => null
+                null => null,
             };
         }
     }

sources/SilkTouch/SilkTouch/Mods/Common/MSBuildModContext.cs

@@ -308,13 +308,8 @@ private static async Task<string> ToNormalisedStringAsync(
         CancellationToken ct = default
     )
     {
-        var result = await CodeFormatter.FormatAsync(
-            root.NormalizeWhitespace().SyntaxTree,
-            _opts,
-            ct
-        );
-        return !result.CompilationErrors.Any()
-            ? result.Code
-            : root.NormalizeWhitespace(eol: "\n").ToFullString();
+        var normalizedRoot = root.NormalizeWhitespace(eol: "\n");
+        var result = await CodeFormatter.FormatAsync(normalizedRoot.SyntaxTree, _opts, ct);
+        return !result.CompilationErrors.Any() ? result.Code : normalizedRoot.ToFullString();
     }
 }

sources/SilkTouch/SilkTouch/Mods/ExtractHandles.cs

@@ -51,7 +51,7 @@ public override async Task ExecuteAsync(IModContext ctx, CancellationToken ct =
             project = project
                 .AddDocument(
                     Path.GetFileName(relativePath),
-                    node.NormalizeWhitespace(),
+                    node,
                     filePath: project.FullPath(relativePath)
                 )
                 .Project;

sources/SilkTouch/SilkTouch/Mods/ExtractNestedTyping.cs

@@ -86,7 +86,7 @@ public override async Task ExecuteAsync(IModContext ctx, CancellationToken ct =
             // This is also where extracted enums are processed.
             rewriter.File = fname;
             project = doc.WithSyntaxRoot(
-                rewriter.Visit(node)?.NormalizeWhitespace()
+                rewriter.Visit(node)
                     ?? throw new InvalidOperationException("Rewriter returned null")
             ).Project;
 
@@ -110,8 +110,7 @@ rewriter.Namespace is not null
                                             )
                                     )
                                     : SingletonList<MemberDeclarationSyntax>(newStruct)
-                            )
-                            .NormalizeWhitespace(),
+                            ),
                         filePath: project.FullPath(
                             $"{fname.AsSpan()[..fname.LastIndexOf('/')]}/{newStruct.Identifier}.gen.cs"
                         )
@@ -174,8 +173,7 @@ rewriter.Namespace is not null
                                         .WithMembers(SingletonList(typeDecl))
                                 )
                                 : SingletonList(typeDecl)
-                        )
-                        .NormalizeWhitespace(),
+                        ),
                     filePath: project.FullPath($"{dir}/{identifier}.gen.cs")
                 )
                 .Project;

sources/SilkTouch/SilkTouch/Mods/InterceptNativeFunctions.cs

@@ -48,7 +48,7 @@ public async Task ExecuteAsync(IModContext ctx, CancellationToken ct = default)
             var doc =
                 proj!.GetDocument(docId) ?? throw new InvalidOperationException("Document missing");
             proj = doc.WithSyntaxRoot(
-                rewriter.Visit(await doc.GetSyntaxRootAsync(ct))?.NormalizeWhitespace()
+                rewriter.Visit(await doc.GetSyntaxRootAsync(ct))
                     ?? throw new InvalidOperationException("Visit returned null.")
             ).Project;
         }

sources/SilkTouch/SilkTouch/Mods/LocationTransformation/IdentifierRenamingTransformer.cs

@@ -14,29 +14,40 @@ public class IdentifierRenamingTransformer : LocationTransformer
 {
     private ISymbol symbol = null!;
 
-    private readonly IReadOnlyDictionary<string, List<(ISymbol Symbol, string NewName)>> newNameLookup;
+    private readonly IReadOnlyDictionary<
+        string,
+        List<(ISymbol Symbol, string NewName)>
+    > newNameLookup;
 
     /// <summary>
     /// Creates a new IdentifierRenamingTransformer.
     /// </summary>
     /// <param name="newNames">The new names for each symbol</param>
-    public IdentifierRenamingTransformer(IEnumerable<(ISymbol Symbol, string NewName)> newNames) : this(CreateNameLookup(newNames)) {}
+    public IdentifierRenamingTransformer(IEnumerable<(ISymbol Symbol, string NewName)> newNames)
+        : this(CreateNameLookup(newNames)) { }
 
     /// <summary>
     /// Creates a new IdentifierRenamingTransformer.
     /// </summary>
     /// <param name="newNameLookup">The new names for each symbol grouped by symbol name.</param>
-    public IdentifierRenamingTransformer(IReadOnlyDictionary<string, List<(ISymbol Symbol, string NewName)>> newNameLookup)
+    public IdentifierRenamingTransformer(
+        IReadOnlyDictionary<string, List<(ISymbol Symbol, string NewName)>> newNameLookup
+    )
     {
         this.newNameLookup = newNameLookup;
     }
 
     /// <summary>
     /// Creates a name lookup dictionary designed for <see cref="IdentifierRenamingTransformer"/>.
     /// </summary>
-    public static IReadOnlyDictionary<string, List<(ISymbol Symbol, string NewName)>> CreateNameLookup(IEnumerable<(ISymbol Symbol, string NewName)> names)
+    public static IReadOnlyDictionary<
+        string,
+        List<(ISymbol Symbol, string NewName)>
+    > CreateNameLookup(IEnumerable<(ISymbol Symbol, string NewName)> names)
     {
-        return names.GroupBy(t => t.Symbol.Name).ToDictionary(group => group.Key, group => group.ToList());
+        return names
+            .GroupBy(t => t.Symbol.Name)
+            .ToDictionary(group => group.Key, group => group.ToList());
     }
 
     /// <inheritdoc />
@@ -68,7 +79,7 @@ private SyntaxToken GetRenamed(ISymbol symbol, SyntaxToken currentNameIdentifier
         return currentNameIdentifier;
     }
 
-     // ----- Types -----
+    // ----- Types -----
 
     /// <inheritdoc />
     public override SyntaxNode VisitClassDeclaration(ClassDeclarationSyntax node)