92767c646e
Replace the whole-file conflict resolver with a real 3-way merge editor built on the line-level hunk pipeline. - ConflictModels: MergeFile/MergeFileSegment/MergeConflictBlock with Compose() that reassembles stable text + chosen resolutions - ConflictResolverViewModel (same seam contract): loads conflict documents, flattens conflicts for one-at-a-time navigation, per-block Accept Ours/Base/Theirs/Both + editable result, binary files block continue - ConflictResolverView: 3-column Base|Ours|Theirs + editable result via AvaloniaEdit with TextMate syntax highlighting by file extension; editors synced in code-behind - add Avalonia.AvaloniaEdit + AvaloniaEdit.TextMate + TextMateSharp.Grammars; AvaloniaEdit theme StyleInclude in App.axaml - rewrite ConflictResolverViewModel tests (load/gating/compose/nav/binary/abort)
41 lines
1.7 KiB
XML
41 lines
1.7 KiB
XML
<Project Sdk="Microsoft.NET.Sdk">
|
|
|
|
<ItemGroup>
|
|
<ProjectReference Include="..\ClaudeDo.Data\ClaudeDo.Data.csproj" />
|
|
<ProjectReference Include="..\ClaudeDo.Localization\ClaudeDo.Localization.csproj" />
|
|
<ProjectReference Include="..\ClaudeDo.Releases\ClaudeDo.Releases.csproj" />
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<PackageReference Include="Avalonia" Version="12.0.4" />
|
|
<PackageReference Include="Avalonia.AvaloniaEdit" Version="12.0.0" />
|
|
<PackageReference Include="AvaloniaEdit.TextMate" Version="12.0.0" />
|
|
<PackageReference Include="TextMateSharp.Grammars" Version="2.0.3" />
|
|
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.1" />
|
|
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="8.0.11" />
|
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
|
|
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
|
|
<PackageReference Include="Duende.IdentityModel.OidcClient" Version="7.1.0" />
|
|
</ItemGroup>
|
|
|
|
<ItemGroup>
|
|
<InternalsVisibleTo Include="ClaudeDo.Ui.Tests" />
|
|
<InternalsVisibleTo Include="ClaudeDo.Worker.Tests" />
|
|
</ItemGroup>
|
|
|
|
<PropertyGroup>
|
|
<TargetFramework>net8.0</TargetFramework>
|
|
<ImplicitUsings>enable</ImplicitUsings>
|
|
<Nullable>enable</Nullable>
|
|
<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
|
|
</PropertyGroup>
|
|
|
|
<ItemGroup>
|
|
<AvaloniaResource Include="Assets/Fonts/*.ttf" />
|
|
<AvaloniaResource Include="Assets/Fonts/OFL-InterTight.txt" />
|
|
<AvaloniaResource Include="Assets/Fonts/OFL-JetBrainsMono.txt" />
|
|
<AvaloniaResource Include="..\ClaudeDo.App\Assets\ClaudeTask.ico" Link="Assets\ClaudeTask.ico" />
|
|
</ItemGroup>
|
|
|
|
</Project>
|