Merge branch 'main' into the desktop updater, and give way on two numbers

Public Access

Main landed a realtime push feature while this branch was building the updater,
and the two collided in three places. Every one of them resolves the same way:
main got there first, so this branch moves.

**Two ADRs were both numbered 0012.** Main's is realtime push; this one is now
[ADR 0013](docs/adr/0013-desktop-distribution-and-updates.md). Git did not call
this a conflict — the filenames differ — so it would have merged quietly and left
the directory with two 0012s and every cross-reference ambiguous. Renumbered here
along with the nine places that point at it.

**Two manual-check phases were both numbered 15**, and that one git did catch.
Main's "Changes that arrive without a timer" keeps 15; installing and updating
the desktop client becomes Phase 16, with its checks and every reference to them
renumbered. The file's own rule is that a number is for life, which is exactly
why the one that had not been pushed is the one that gives way.

**The merge rewrote several files with CRLF**, and `.editorconfig` asks for LF on
everything except `*.ps1`. That is not cosmetic here: IDE0055 is an error and
`EnforceCodeStyleInBuild` is on, so it failed the build on three lines of
App.axaml.cs whose only change in this branch was an ADR number in a comment.
Forty-six files normalised back to LF; the release script keeps CRLF, which is
what `.gitattributes` and `.editorconfig` both already say for a PowerShell file.

Nothing else conflicted. The updater does not touch the sync loop or the event
stream, and the one file both sides edited heavily — MainWindowViewModel — merged
without a hunk in common.

Verified after merging: the solution restores locked and builds clean, and 304
shell, 100 layout, 54 session, 28 client-api and 25 contracts tests pass. The
first two counts are higher than before the merge because main's own tests came
with it and pass alongside these.

This commit is contained in:

jaap-jan

2026-08-04 17:52:57 +02:00

parent 6728a0a597 5a8731ca8c

commit 3ead865f01

52 changed files with 6205 additions and 341 deletions

									
										src/DodoSSH.Client.App/Platform/VelopackUpdateChannel.cs
									
		+1
		-1
	
												View File
												
				@@ -65,7 +65,7 @@ internal static class UpdateChannels

				/// <c>DodoSSH.Client.Shell</c> is shared with the Android head, which must never acquire an updater.

				/// </para>

				/// <para>

				/// See <c>docs/adr/0012-desktop-distribution-and-updates.md</c>.

				/// See <c>docs/adr/0013-desktop-distribution-and-updates.md</c>.

				/// </para>

				/// </remarks>

				internal sealed class VelopackUpdateChannel : IUpdateChannel