From c2675558a028ff576bad7a7c2d97adbc948a2f77 Mon Sep 17 00:00:00 2001
From: hzqst <113660872@qq.com>
Date: Fri, 9 Oct 2026 15:40:25 +0800
Subject: [PATCH] build: retarget to .NET 10 and publish GUI/CLI as Native AOT

Align the toolset with the organization's other .NET tools (MetahookInstaller):

- Pin the .NET 10 SDK via global.json; migrate the solution to .slnx.
- Retarget all projects to net10.0 / net10.0-windows10.0.17763.0.
- Enable Native AOT (PublishAot + full trimming) for the GUI and CLI, folding
  the AOT settings into the csproj so every publish gets them.
- Upgrade Avalonia 11.3.8 -> 12.1.3 and ReactiveUI.Avalonia 11.3.0 -> 12.1.6
  (add System.Reactive 7.0.0, which is no longer transitive).
- Adapt to Avalonia 12: TextBox.Watermark -> PlaceholderText, and drop
  x:CompileBindings="False" on the map ContextMenu so its bindings compile
  (reflection bindings break under AOT).
- Replace the two anonymous-type JsonSerializer calls with source-generated
  request types (LlmRequestJsonContext); the anonymous-type overloads are not
  AOT-compatible. JSON output is unchanged.
- Drop the redundant System.Text.Encoding.CodePages reference (in-box on
  .NET 10) and the unused Avalonia.Diagnostics package (removed in Avalonia 12).
- Update the build workflow and README for .NET 10 / Native AOT.

Co-Authored-By: Claude Code <noreply@anthropic.com>
---
 .github/actions/build-windows-x64/action.yml  | 49 +++++++++--
 .gitignore                                    |  2 +
 BSPLocalizationTools.sln                      | 84 -------------------
 BSPLocalizationTools.slnx                     | 15 ++++
 README.md                                     | 25 ++++++
 global.json                                   |  6 ++
 .../BSPLocalizationTools.csproj               | 22 +++--
 src/BSPLocalizationTools/Program.cs           |  2 +-
 .../Views/MainWindow.axaml                    | 16 ++--
 .../BSPLocalizationToolsCLI.csproj            |  4 +-
 .../BSPLocalizationToolsCore.csproj           |  3 +-
 .../LlmRequestJson.cs                         | 52 ++++++++++++
 .../OpenAICompatibleLLMClient.cs              | 60 ++++++-------
 .../TranslationPromptBuilder.cs               | 23 ++---
 .../BSPLocalizationTools.Tests.csproj         |  2 +-
 15 files changed, 210 insertions(+), 155 deletions(-)
 delete mode 100644 BSPLocalizationTools.sln
 create mode 100644 BSPLocalizationTools.slnx
 create mode 100644 global.json
 create mode 100644 src/BSPLocalizationToolsCore/LlmRequestJson.cs

diff --git a/.github/actions/build-windows-x64/action.yml b/.github/actions/build-windows-x64/action.yml
index d7e8599..e4035a2 100644
--- a/.github/actions/build-windows-x64/action.yml
+++ b/.github/actions/build-windows-x64/action.yml
@@ -12,23 +12,58 @@ runs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '10.0.x'
 
     - name: Restore
       shell: cmd
-      run: dotnet restore BSPLocalizationTools.sln
+      run: dotnet restore BSPLocalizationTools.slnx
 
     - name: Test
       shell: cmd
-      run: dotnet test BSPLocalizationTools.sln -c Release --no-restore
+      run: dotnet test BSPLocalizationTools.slnx -c Release --no-restore
 
-    - name: Publish GUI (single file)
+    - name: Publish GUI (Native AOT)
       shell: cmd
-      run: dotnet publish src\BSPLocalizationTools\BSPLocalizationTools.csproj -c Release -r win-x64 --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -p:EnableCompressionInSingleFile=true -o BSPLocalizationTools-Output\GUI
+      run: dotnet publish src\BSPLocalizationTools\BSPLocalizationTools.csproj -c Release -r win-x64 -o BSPLocalizationTools-Output\GUI
 
-    - name: Publish CLI (single file)
+    - name: Publish CLI (Native AOT)
       shell: cmd
-      run: dotnet publish src\BSPLocalizationToolsCLI\BSPLocalizationToolsCLI.csproj -c Release -r win-x64 --self-contained true -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -p:EnableCompressionInSingleFile=true -o BSPLocalizationTools-Output\CLI
+      run: dotnet publish src\BSPLocalizationToolsCLI\BSPLocalizationToolsCLI.csproj -c Release -r win-x64 -o BSPLocalizationTools-Output\CLI
+
+    - name: Verify publish output
+      shell: pwsh
+      run: |
+        # Native AOT discards PDBs; the release payload never ships them.
+        Get-ChildItem -LiteralPath 'BSPLocalizationTools-Output' -Filter *.pdb -Recurse | Remove-Item -Force
+
+        $cliDirectory = 'BSPLocalizationTools-Output\CLI'
+        $cliFiles = @(Get-ChildItem -LiteralPath $cliDirectory -Recurse -File)
+        if ($cliFiles.Count -ne 1 -or $cliFiles[0].Name -ne 'BSPLocalizationToolsCLI.exe') {
+          throw 'CLI publish must contain exactly one self-contained executable.'
+        }
+
+        # Native AOT cannot fold Avalonia's native backends into the executable, and
+        # satellite resource assemblies are still emitted for localized strings. The
+        # set is exact: anything else means an unintended payload crept in.
+        $exeName = 'BSPLocalizationTools.exe'
+        $nativeDlls = @('av_libglesv2.dll', 'libSkiaSharp.dll', 'libHarfBuzzSharp.dll')
+        $guiDirectory = 'BSPLocalizationTools-Output\GUI'
+        $guiFiles = @(Get-ChildItem -LiteralPath $guiDirectory -Recurse -File)
+        $unexpected = @($guiFiles | Where-Object {
+          $_.Name -ne $exeName -and $nativeDlls -notcontains $_.Name -and
+          $_.Name -ne 'BSPLocalizationTools.resources.dll'
+        })
+        if ($unexpected.Count -gt 0) {
+          throw "GUI publish contains unexpected files: $($unexpected.Name -join ', ')"
+        }
+        if (!(Test-Path -LiteralPath (Join-Path $guiDirectory $exeName) -PathType Leaf)) {
+          throw "GUI publish is missing its executable: $exeName"
+        }
+        foreach ($nativeDll in $nativeDlls) {
+          if (!(Test-Path -LiteralPath (Join-Path $guiDirectory $nativeDll) -PathType Leaf)) {
+            throw "GUI publish is missing its native backend library: $nativeDll"
+          }
+        }
 
     - name: Copy README to output
       shell: cmd
diff --git a/.gitignore b/.gitignore
index b5c4649..31a4bf4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@
 .vs/
 .env
 **/.env
+/BSPLocalizationTools-Output/
+/build/
 
 # Generated at build time by Microsoft.CodeAnalysis.ResxSourceGenerator
 **/Resources.Designer.cs
diff --git a/BSPLocalizationTools.sln b/BSPLocalizationTools.sln
deleted file mode 100644
index 82751cc..0000000
--- a/BSPLocalizationTools.sln
+++ /dev/null
@@ -1,84 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31903.59
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{827E0CD3-B72D-47B6-A68D-7590B98EB39B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BSPLocalizationTools", "src\BSPLocalizationTools\BSPLocalizationTools.csproj", "{E465BB12-D220-4171-BEA2-73E63C0A00E1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BSPLocalizationTools.Tests", "tests\BSPLocalizationTools.Tests\BSPLocalizationTools.Tests.csproj", "{FE47E594-ABEB-49BE-87F4-080B6359C840}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BSPLocalizationToolsCore", "src\BSPLocalizationToolsCore\BSPLocalizationToolsCore.csproj", "{3B0AE2B3-8A62-4548-84B9-518E624D8688}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BSPLocalizationToolsCLI", "src\BSPLocalizationToolsCLI\BSPLocalizationToolsCLI.csproj", "{30F77649-3BAC-4265-81A7-499A334434F2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E465BB12-D220-4171-BEA2-73E63C0A00E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E465BB12-D220-4171-BEA2-73E63C0A00E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E465BB12-D220-4171-BEA2-73E63C0A00E1}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E465BB12-D220-4171-BEA2-73E63C0A00E1}.Debug|x64.Build.0 = Debug|Any CPU
-		{E465BB12-D220-4171-BEA2-73E63C0A00E1}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E465BB12-D220-4171-BEA2-73E63C0A00E1}.Debug|x86.Build.0 = Debug|Any CPU
-		{E465BB12-D220-4171-BEA2-73E63C0A00E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E465BB12-D220-4171-BEA2-73E63C0A00E1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E465BB12-D220-4171-BEA2-73E63C0A00E1}.Release|x64.ActiveCfg = Release|Any CPU
-		{E465BB12-D220-4171-BEA2-73E63C0A00E1}.Release|x64.Build.0 = Release|Any CPU
-		{E465BB12-D220-4171-BEA2-73E63C0A00E1}.Release|x86.ActiveCfg = Release|Any CPU
-		{E465BB12-D220-4171-BEA2-73E63C0A00E1}.Release|x86.Build.0 = Release|Any CPU
-		{FE47E594-ABEB-49BE-87F4-080B6359C840}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE47E594-ABEB-49BE-87F4-080B6359C840}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE47E594-ABEB-49BE-87F4-080B6359C840}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FE47E594-ABEB-49BE-87F4-080B6359C840}.Debug|x64.Build.0 = Debug|Any CPU
-		{FE47E594-ABEB-49BE-87F4-080B6359C840}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FE47E594-ABEB-49BE-87F4-080B6359C840}.Debug|x86.Build.0 = Debug|Any CPU
-		{FE47E594-ABEB-49BE-87F4-080B6359C840}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FE47E594-ABEB-49BE-87F4-080B6359C840}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FE47E594-ABEB-49BE-87F4-080B6359C840}.Release|x64.ActiveCfg = Release|Any CPU
-		{FE47E594-ABEB-49BE-87F4-080B6359C840}.Release|x64.Build.0 = Release|Any CPU
-		{FE47E594-ABEB-49BE-87F4-080B6359C840}.Release|x86.ActiveCfg = Release|Any CPU
-		{FE47E594-ABEB-49BE-87F4-080B6359C840}.Release|x86.Build.0 = Release|Any CPU
-		{3B0AE2B3-8A62-4548-84B9-518E624D8688}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3B0AE2B3-8A62-4548-84B9-518E624D8688}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3B0AE2B3-8A62-4548-84B9-518E624D8688}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3B0AE2B3-8A62-4548-84B9-518E624D8688}.Debug|x64.Build.0 = Debug|Any CPU
-		{3B0AE2B3-8A62-4548-84B9-518E624D8688}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{3B0AE2B3-8A62-4548-84B9-518E624D8688}.Debug|x86.Build.0 = Debug|Any CPU
-		{3B0AE2B3-8A62-4548-84B9-518E624D8688}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3B0AE2B3-8A62-4548-84B9-518E624D8688}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3B0AE2B3-8A62-4548-84B9-518E624D8688}.Release|x64.ActiveCfg = Release|Any CPU
-		{3B0AE2B3-8A62-4548-84B9-518E624D8688}.Release|x64.Build.0 = Release|Any CPU
-		{3B0AE2B3-8A62-4548-84B9-518E624D8688}.Release|x86.ActiveCfg = Release|Any CPU
-		{3B0AE2B3-8A62-4548-84B9-518E624D8688}.Release|x86.Build.0 = Release|Any CPU
-		{30F77649-3BAC-4265-81A7-499A334434F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{30F77649-3BAC-4265-81A7-499A334434F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{30F77649-3BAC-4265-81A7-499A334434F2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{30F77649-3BAC-4265-81A7-499A334434F2}.Debug|x64.Build.0 = Debug|Any CPU
-		{30F77649-3BAC-4265-81A7-499A334434F2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{30F77649-3BAC-4265-81A7-499A334434F2}.Debug|x86.Build.0 = Debug|Any CPU
-		{30F77649-3BAC-4265-81A7-499A334434F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{30F77649-3BAC-4265-81A7-499A334434F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{30F77649-3BAC-4265-81A7-499A334434F2}.Release|x64.ActiveCfg = Release|Any CPU
-		{30F77649-3BAC-4265-81A7-499A334434F2}.Release|x64.Build.0 = Release|Any CPU
-		{30F77649-3BAC-4265-81A7-499A334434F2}.Release|x86.ActiveCfg = Release|Any CPU
-		{30F77649-3BAC-4265-81A7-499A334434F2}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{E465BB12-D220-4171-BEA2-73E63C0A00E1} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
-		{FE47E594-ABEB-49BE-87F4-080B6359C840} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
-		{3B0AE2B3-8A62-4548-84B9-518E624D8688} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
-		{30F77649-3BAC-4265-81A7-499A334434F2} = {827E0CD3-B72D-47B6-A68D-7590B98EB39B}
-	EndGlobalSection
-EndGlobal
diff --git a/BSPLocalizationTools.slnx b/BSPLocalizationTools.slnx
new file mode 100644
index 0000000..c8bc86e
--- /dev/null
+++ b/BSPLocalizationTools.slnx
@@ -0,0 +1,15 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Any CPU" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/src/">
+    <Project Path="src/BSPLocalizationTools/BSPLocalizationTools.csproj" />
+    <Project Path="src/BSPLocalizationToolsCLI/BSPLocalizationToolsCLI.csproj" />
+    <Project Path="src/BSPLocalizationToolsCore/BSPLocalizationToolsCore.csproj" />
+  </Folder>
+  <Folder Name="/tests/">
+    <Project Path="tests/BSPLocalizationTools.Tests/BSPLocalizationTools.Tests.csproj" />
+  </Folder>
+</Solution>
diff --git a/README.md b/README.md
index d1cf1ca..2a8473c 100644
--- a/README.md
+++ b/README.md
@@ -63,3 +63,28 @@ The **Settings** tab loads and saves LLM and prompt path settings to `.env`.
 ## Encodings
 
 CSV output is always written as UTF-8 with BOM.
+
+## Build
+
+Use Windows x64 with the **.NET 10 SDK**. Publishing the GUI and CLI as Native
+AOT additionally requires the Visual Studio 2022 **Desktop development with C++**
+workload (MSVC linker) and a Windows SDK.
+
+From the repository root:
+
+```powershell
+dotnet restore BSPLocalizationTools.slnx
+dotnet test BSPLocalizationTools.slnx -c Release
+dotnet run --project src\BSPLocalizationTools                          # Avalonia GUI
+dotnet run --project src\BSPLocalizationToolsCLI -- "-bsp=path\to\map.bsp"   # CLI
+```
+
+Both executables are published as self-contained Native AOT programs, so the
+target machine does not need the .NET runtime. Native AOT cannot fold Avalonia's
+native backends into the executable, so the GUI ships as the executable plus its
+native libraries:
+
+```powershell
+dotnet publish src\BSPLocalizationTools\BSPLocalizationTools.csproj -c Release -r win-x64 -o out\GUI
+dotnet publish src\BSPLocalizationToolsCLI\BSPLocalizationToolsCLI.csproj -c Release -r win-x64 -o out\CLI
+```
diff --git a/global.json b/global.json
new file mode 100644
index 0000000..512142d
--- /dev/null
+++ b/global.json
@@ -0,0 +1,6 @@
+{
+  "sdk": {
+    "version": "10.0.100",
+    "rollForward": "latestFeature"
+  }
+}
diff --git a/src/BSPLocalizationTools/BSPLocalizationTools.csproj b/src/BSPLocalizationTools/BSPLocalizationTools.csproj
index 228887d..d3a9dcb 100644
--- a/src/BSPLocalizationTools/BSPLocalizationTools.csproj
+++ b/src/BSPLocalizationTools/BSPLocalizationTools.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.17763.0</TargetFramework>
     <RootNamespace>BSPLocalizationTools.GUI</RootNamespace>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -10,15 +10,23 @@
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     <SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
     <PlatformTarget>x64</PlatformTarget>
+    <PublishTrimmed>true</PublishTrimmed>
+    <PublishAot>true</PublishAot>
+    <!--Native AOT size settings; kept here so they apply to every publish, profile or not.-->
+    <TrimMode>full</TrimMode>
+    <StripSymbols>true</StripSymbols>
+    <StackTraceSupport>false</StackTraceSupport>
+    <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="11.3.8" />
-    <PackageReference Include="Avalonia.Desktop" Version="11.3.8" />
-    <PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.8" />
-    <PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.8" />
-    <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.3.8" />
-    <PackageReference Include="ReactiveUI.Avalonia" Version="11.3.0" />
+    <PackageReference Include="Avalonia" Version="12.1.3" />
+    <PackageReference Include="Avalonia.Desktop" Version="12.1.3" />
+    <PackageReference Include="Avalonia.Fonts.Inter" Version="12.1.3" />
+    <PackageReference Include="Avalonia.Themes.Fluent" Version="12.1.3" />
+    <PackageReference Include="ReactiveUI.Avalonia" Version="12.1.6" />
+    <!--No longer transitive via ReactiveUI.Avalonia 12; used for System.Reactive.Linq.-->
+    <PackageReference Include="System.Reactive" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/BSPLocalizationTools/Program.cs b/src/BSPLocalizationTools/Program.cs
index cb96c2a..6267dec 100644
--- a/src/BSPLocalizationTools/Program.cs
+++ b/src/BSPLocalizationTools/Program.cs
@@ -17,6 +17,6 @@ public static AppBuilder BuildAvaloniaApp()
             .UsePlatformDetect()
             .WithInterFont()
             .LogToTrace()
-            .UseReactiveUI();
+            .UseReactiveUI(_ => { });
     }
 }
diff --git a/src/BSPLocalizationTools/Views/MainWindow.axaml b/src/BSPLocalizationTools/Views/MainWindow.axaml
index b51c5f8..0ce081b 100644
--- a/src/BSPLocalizationTools/Views/MainWindow.axaml
+++ b/src/BSPLocalizationTools/Views/MainWindow.axaml
@@ -15,7 +15,7 @@
       <TabItem Header="{Binding Strings.TranslateTab}">
         <Grid RowDefinitions="Auto,*,Auto,160" RowSpacing="12">
           <Grid ColumnDefinitions="*,Auto,Auto,Auto" ColumnSpacing="8">
-            <TextBox Text="{Binding OutLang}" Watermark="{Binding Strings.TargetLanguage}" />
+            <TextBox Text="{Binding OutLang}" PlaceholderText="{Binding Strings.TargetLanguage}" />
             <Button Grid.Column="1" Content="{Binding Strings.AddBsp}" Click="AddBspButton_Click" />
             <Button Grid.Column="2" Content="{Binding Strings.ClearCompletedTasks}" Command="{Binding ClearCompletedItemsCommand}" />
             <Button Grid.Column="3" Content="{Binding Strings.Clear}" Command="{Binding ClearAllItemsCommand}" />
@@ -35,7 +35,7 @@
               <DataTemplate x:DataType="vm:TranslationItemViewModel">
                 <Grid ColumnDefinitions="4*,200,2*,2*" ColumnSpacing="8" MinHeight="30" Background="Transparent" HorizontalAlignment="Stretch">
                   <Grid.ContextMenu>
-                    <ContextMenu x:CompileBindings="False">
+                    <ContextMenu>
                       <MenuItem
                           Header="{Binding #Root.DataContext.Strings.RemoveTask}"
                           Command="{Binding #Root.DataContext.RemoveItemCommand}"
@@ -87,7 +87,7 @@
 
             <TextBlock Grid.Row="2" Text="{Binding Strings.PromptFile}" FontWeight="SemiBold" />
             <Grid Grid.Row="3" ColumnDefinitions="*,120" ColumnSpacing="8">
-              <TextBox Text="{Binding PromptFilePath}" Watermark="{Binding Strings.PromptFileWatermark}" />
+              <TextBox Text="{Binding PromptFilePath}" PlaceholderText="{Binding Strings.PromptFileWatermark}" />
               <Button Grid.Column="1" Content="{Binding Strings.Browse}" Click="BrowsePromptButton_Click" />
             </Grid>
 
@@ -106,23 +106,23 @@
                   TextWrapping="Wrap"
                   MinHeight="140"
                   VerticalContentAlignment="Top"
-                  Watermark="{Binding Strings.PromptEditorWatermark}" />
+                  PlaceholderText="{Binding Strings.PromptEditorWatermark}" />
             </Grid>
 
             <TextBlock Grid.Row="6" Text="{Binding Strings.Llm}" FontWeight="SemiBold" />
             <Grid Grid.Row="7" ColumnDefinitions="160,*" RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto" RowSpacing="8" ColumnSpacing="8">
               <TextBlock Text="{Binding Strings.Model}" VerticalAlignment="Center" />
-              <TextBox Grid.Column="1" Text="{Binding LlmModel}" Watermark="gpt-5.5" />
+              <TextBox Grid.Column="1" Text="{Binding LlmModel}" PlaceholderText="gpt-5.5" />
               <TextBlock Grid.Row="1" Text="{Binding Strings.ApiKey}" VerticalAlignment="Center" />
               <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding LlmApiKey}" PasswordChar="*" />
               <TextBlock Grid.Row="2" Text="{Binding Strings.BaseUrl}" VerticalAlignment="Center" />
-              <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding LlmBaseUrl}" Watermark="https://api.openai.com/v1" />
+              <TextBox Grid.Row="2" Grid.Column="1" Text="{Binding LlmBaseUrl}" PlaceholderText="https://api.openai.com/v1" />
               <TextBlock Grid.Row="3" Text="{Binding Strings.Temperature}" VerticalAlignment="Center" />
-              <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding LlmTemperature}" Watermark="optional" />
+              <TextBox Grid.Row="3" Grid.Column="1" Text="{Binding LlmTemperature}" PlaceholderText="optional" />
               <TextBlock Grid.Row="4" Text="{Binding Strings.ReasoningEffort}" VerticalAlignment="Center" />
               <ComboBox Grid.Row="4" Grid.Column="1" ItemsSource="{Binding EffortOptions}" SelectedItem="{Binding LlmEffort}" />
               <TextBlock Grid.Row="5" Text="{Binding Strings.FakeAs}" VerticalAlignment="Center" />
-              <TextBox Grid.Row="5" Grid.Column="1" Text="{Binding LlmFakeAs}" Watermark="codex" />
+              <TextBox Grid.Row="5" Grid.Column="1" Text="{Binding LlmFakeAs}" PlaceholderText="codex" />
             </Grid>
 
             <TextBlock Grid.Row="8" Text="{Binding Strings.Defaults}" FontWeight="SemiBold" />
diff --git a/src/BSPLocalizationToolsCLI/BSPLocalizationToolsCLI.csproj b/src/BSPLocalizationToolsCLI/BSPLocalizationToolsCLI.csproj
index daf9ae8..7a058a2 100644
--- a/src/BSPLocalizationToolsCLI/BSPLocalizationToolsCLI.csproj
+++ b/src/BSPLocalizationToolsCLI/BSPLocalizationToolsCLI.csproj
@@ -1,10 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
+    <PublishAot>true</PublishAot>
+    <StripSymbols>true</StripSymbols>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/BSPLocalizationToolsCore/BSPLocalizationToolsCore.csproj b/src/BSPLocalizationToolsCore/BSPLocalizationToolsCore.csproj
index 6521a7a..ac80071 100644
--- a/src/BSPLocalizationToolsCore/BSPLocalizationToolsCore.csproj
+++ b/src/BSPLocalizationToolsCore/BSPLocalizationToolsCore.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
@@ -10,6 +10,5 @@
     <PackageReference Include="CsvHelper" Version="33.1.0" />
     <PackageReference Include="DotNetEnv" Version="3.2.0" />
     <PackageReference Include="Sledge.Formats.Bsp" Version="1.0.17" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
   </ItemGroup>
 </Project>
diff --git a/src/BSPLocalizationToolsCore/LlmRequestJson.cs b/src/BSPLocalizationToolsCore/LlmRequestJson.cs
new file mode 100644
index 0000000..e28b4c6
--- /dev/null
+++ b/src/BSPLocalizationToolsCore/LlmRequestJson.cs
@@ -0,0 +1,52 @@
+using System.Text.Json.Serialization;
+
+namespace BSPLocalizationTools;
+
+// Concrete request shapes for the OpenAI-compatible endpoints. They replace the
+// former anonymous types so Native AOT and trimming keep the serialization
+// metadata (the anonymous-type JsonSerializer overloads are not AOT-compatible).
+// Default serializer options are used, so escaping matches the previous output.
+internal sealed record ChatCompletionRequest(
+    [property: JsonPropertyName("model")] string Model,
+    [property: JsonPropertyName("messages")] ChatRequestMessage[] Messages,
+    [property: JsonPropertyName("reasoning_effort")] string ReasoningEffort,
+    [property: JsonPropertyName("temperature")] [property: JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] double? Temperature);
+
+internal sealed record ChatRequestMessage(
+    [property: JsonPropertyName("role")] string Role,
+    [property: JsonPropertyName("content")] string Content);
+
+internal sealed record ResponsesRequest(
+    [property: JsonPropertyName("model")] string Model,
+    [property: JsonPropertyName("input")] ResponsesInputMessage[] Input,
+    [property: JsonPropertyName("reasoning")] ResponsesReasoning Reasoning,
+    [property: JsonPropertyName("stream")] bool Stream,
+    [property: JsonPropertyName("temperature")] [property: JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)] double? Temperature);
+
+internal sealed record ResponsesInputMessage(
+    [property: JsonPropertyName("role")] string Role,
+    [property: JsonPropertyName("content")] string Content);
+
+internal sealed record ResponsesReasoning(
+    [property: JsonPropertyName("effort")] string Effort);
+
+internal sealed record PromptPayload(
+    [property: JsonPropertyName("target_language")] string TargetLanguage,
+    [property: JsonPropertyName("output_contract")] PromptOutputContract OutputContract,
+    [property: JsonPropertyName("inputs")] PromptInput[] Inputs);
+
+internal sealed record PromptOutputContract(
+    [property: JsonPropertyName("format")] string Format,
+    [property: JsonPropertyName("schema")] string Schema,
+    [property: JsonPropertyName("rules")] string[] Rules);
+
+internal sealed record PromptInput(
+    [property: JsonPropertyName("id")] int Id,
+    [property: JsonPropertyName("text")] string Text);
+
+[JsonSerializable(typeof(ChatCompletionRequest))]
+[JsonSerializable(typeof(ResponsesRequest))]
+[JsonSerializable(typeof(PromptPayload))]
+internal sealed partial class LlmRequestJsonContext : JsonSerializerContext
+{
+}
diff --git a/src/BSPLocalizationToolsCore/OpenAICompatibleLLMClient.cs b/src/BSPLocalizationToolsCore/OpenAICompatibleLLMClient.cs
index dd52b78..89baf9e 100644
--- a/src/BSPLocalizationToolsCore/OpenAICompatibleLLMClient.cs
+++ b/src/BSPLocalizationToolsCore/OpenAICompatibleLLMClient.cs
@@ -1,6 +1,7 @@
 using System.Net.Http.Headers;
 using System.Text;
 using System.Text.Json;
+using System.Text.Json.Serialization.Metadata;
 
 namespace BSPLocalizationTools;
 
@@ -43,18 +44,17 @@ private async Task<string> CompleteViaChatAsync(
         LLMOptions options,
         CancellationToken cancellationToken)
     {
-        var body = new Dictionary<string, object?>
-        {
-            ["model"] = options.Model,
-            ["messages"] = messages.Select(m => new { role = m.Role, content = m.Content }).ToArray(),
-            ["reasoning_effort"] = options.Effort,
-        };
-        if (options.Temperature is not null)
-        {
-            body["temperature"] = options.Temperature;
-        }
-
-        using var request = CreateJsonRequest(GetBaseUrl(options) + "/chat/completions", options, body);
+        var body = new ChatCompletionRequest(
+            options.Model!,
+            messages.Select(m => new ChatRequestMessage(m.Role, m.Content)).ToArray(),
+            options.Effort,
+            options.Temperature);
+
+        using var request = CreateJsonRequest(
+            GetBaseUrl(options) + "/chat/completions",
+            options,
+            body,
+            LlmRequestJsonContext.Default.ChatCompletionRequest);
         using var response = await httpClient.SendAsync(request, cancellationToken);
         response.EnsureSuccessStatusCode();
         var json = await response.Content.ReadAsStringAsync(cancellationToken);
@@ -74,22 +74,18 @@ private async Task<string> CompleteViaResponsesAsync(
         LLMOptions options,
         CancellationToken cancellationToken)
     {
-        var body = new Dictionary<string, object?>
-        {
-            ["model"] = options.Model,
-            ["input"] = new[]
-            {
-                new { role = "user", content = string.Join("\n\n", messages.Select(m => m.Content)) },
-            },
-            ["reasoning"] = new { effort = options.Effort },
-            ["stream"] = true,
-        };
-        if (options.Temperature is not null)
-        {
-            body["temperature"] = options.Temperature;
-        }
-
-        using var request = CreateJsonRequest(GetBaseUrl(options) + "/responses", options, body);
+        var body = new ResponsesRequest(
+            options.Model!,
+            [new ResponsesInputMessage("user", string.Join("\n\n", messages.Select(m => m.Content)))],
+            new ResponsesReasoning(options.Effort),
+            true,
+            options.Temperature);
+
+        using var request = CreateJsonRequest(
+            GetBaseUrl(options) + "/responses",
+            options,
+            body,
+            LlmRequestJsonContext.Default.ResponsesRequest);
         request.Headers.Accept.Clear();
         request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("text/event-stream"));
         using var response = await httpClient.SendAsync(request, HttpCompletionOption.ResponseHeadersRead, cancellationToken);
@@ -101,12 +97,16 @@ private async Task<string> CompleteViaResponsesAsync(
             : result;
     }
 
-    private static HttpRequestMessage CreateJsonRequest(string uri, LLMOptions options, object body)
+    private static HttpRequestMessage CreateJsonRequest<TBody>(
+        string uri,
+        LLMOptions options,
+        TBody body,
+        JsonTypeInfo<TBody> jsonTypeInfo)
     {
         var request = new HttpRequestMessage(HttpMethod.Post, uri);
         request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", options.ApiKey);
         request.Headers.UserAgent.ParseAdd("BSPLocalizationTools/1.0");
-        request.Content = new StringContent(JsonSerializer.Serialize(body), Encoding.UTF8, "application/json");
+        request.Content = new StringContent(JsonSerializer.Serialize(body, jsonTypeInfo), Encoding.UTF8, "application/json");
         return request;
     }
 
diff --git a/src/BSPLocalizationToolsCore/TranslationPromptBuilder.cs b/src/BSPLocalizationToolsCore/TranslationPromptBuilder.cs
index df8a1db..6be28af 100644
--- a/src/BSPLocalizationToolsCore/TranslationPromptBuilder.cs
+++ b/src/BSPLocalizationToolsCore/TranslationPromptBuilder.cs
@@ -19,27 +19,22 @@ public static IReadOnlyList<LLMMessage> Build(
         var instructions = string.IsNullOrWhiteSpace(customPrompt)
             ? BuiltInPrompt
             : customPrompt.Trim();
-        var payload = new
-        {
-            target_language = targetLanguage,
-            output_contract = new
-            {
-                format = "json",
-                schema = """{"translations":[{"id":0,"translation":"..."}]}""",
-                rules = new[]
-                {
+        var payload = new PromptPayload(
+            targetLanguage,
+            new PromptOutputContract(
+                "json",
+                """{"translations":[{"id":0,"translation":"..."}]}""",
+                [
                     "Return only valid JSON.",
                     "Include every input id exactly once.",
                     "Keep literal \\n as backslash-n text.",
-                },
-            },
-            inputs = sourceMessages.Select((text, id) => new { id, text }).ToArray(),
-        };
+                ]),
+            sourceMessages.Select((text, id) => new PromptInput(id, text)).ToArray());
 
         return
         [
             new LLMMessage("system", instructions),
-            new LLMMessage("user", JsonSerializer.Serialize(payload)),
+            new LLMMessage("user", JsonSerializer.Serialize(payload, LlmRequestJsonContext.Default.PromptPayload)),
         ];
     }
 }
diff --git a/tests/BSPLocalizationTools.Tests/BSPLocalizationTools.Tests.csproj b/tests/BSPLocalizationTools.Tests/BSPLocalizationTools.Tests.csproj
index 92d06f6..05bf15e 100644
--- a/tests/BSPLocalizationTools.Tests/BSPLocalizationTools.Tests.csproj
+++ b/tests/BSPLocalizationTools.Tests/BSPLocalizationTools.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0-windows10.0.17763.0</TargetFramework>
+    <TargetFramework>net10.0-windows10.0.17763.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>