Compare commits

...
5 Commits
Author SHA1 Message Date
poli0981 134115bfd5 Merge pull request #383 from poli0981/alpha4/pr2-sync-main
sync: main at 0.1.0-alpha.4's notes into alpha - v0.1.0-beta.37 on .NET 11.0.0; every switch file takes main's side and the branch now differs from main in RELEASE_LINE alone (D98) (alpha.4 PR-2)
2026-11-11 07:43:33 +07:00
poli0981andClaude Fable 5.2 da2cb93fa9 sync: main at 0.1.0-alpha.4's notes into alpha - v0.1.0-beta.37 on .NET 11.0.0; every switch file takes main's side and the branch now differs from main in RELEASE_LINE alone (D98) (alpha.4 PR-2)
main moved to .NET 11 with 0.1.0-beta.37 (D94), so what the alpha
branch held as its switch - global.json, the TFM, the three
runtime-serviced packages, legal/licenses/nuget, the Transitive row of
THIRD_PARTY_NOTICES - main now holds at released versions. All 27
conflicts were in those files and each takes main's side: the branch's
release-candidate lines go. RELEASE_LINE stays `alpha`, and
`git diff --name-only origin/main` on this tree prints that one name.

The alpha line rests after 0.1.0-alpha.4 (docs/12_BUILD.md, The alpha
line): no further sync follows a beta until a newer .NET is tried.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
2026-11-11 07:30:48 +07:00
poli0981andClaude Opus 5.5 eb1c375b87 sync: main at 0.1.0-alpha.3's notes into alpha - v0.1.0-beta.34 and the notes, by a merge commit (D87) (alpha.3 PR-2) (#364)
alpha takes main at 0.1.0-alpha.3's notes (27f537a, #363) - v0.1.0-beta.34 and the notes, no other change - by a merge commit (13_CI_CD §The alpha line). One file the switch holds moved on main, legal/THIRD_PARTY_NOTICES.md (#358's Streamline row), on a line the switch does not touch, so the merge took both without a conflict; main's package set is unchanged and the switch is alpha.1's (SDK 11.0.100-rc.3.26522.148, the three packages at 11.0.0-rc.3.26522.148, the same NuGet licence texts). Its gate passed on the 11 SDK (run 42198454631, net11.0), as the local trial of the same tree had.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-06 17:11:35 +07:00
poli0981andClaude Opus 5.5 4a0d5b482d sync: main at 0.1.0-alpha.2's notes into alpha - v0.1.0-beta.33 and the notes, by a merge commit (D82) (alpha.2 PR-3) (#355)
alpha takes main at 0.1.0-alpha.2's notes (4054492, #354) - v0.1.0-beta.33 and the notes, no other change - by a merge commit (13_CI_CD §The alpha line). No file the switch holds moved on main and its package set is unchanged, so nothing conflicted and the switch is alpha.1's (SDK 11.0.100-rc.3.26522.148, the three packages at 11.0.0-rc.3.26522.148, the same NuGet licence texts). Its gate passed on the 11 SDK (run 41597957507, net11.0).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-03 14:57:26 +07:00
poli0981andClaude Opus 5.5 a13206f220 build: the alpha line's switch - .NET 11 RC3 SDK and runtime, C# 15, the three runtime-serviced packages at 11.0.0-rc.3, the NuGet licence texts of that package set (D73, D76) (alpha.1 PR-1) (#349)
What the alpha branch differs from main by, and nothing else (docs/12_BUILD.md §The alpha line):
- RELEASE_LINE: alpha - release.yml tags this line vX.Y.Z-alpha.N only and packs it on Velopack's
  alpha channel; the App and the Agent act on it (the Alpha notice, its tick box, the Agent's
  wait, the badge and banner, the locked channel, the ledger copy).
- global.json: SDK 11.0.100-rc.3.26522.148, allowPrerelease (setup-dotnet installs exactly it).
- Directory.Build.props: TFM net11.0-windows10.0.22621.0; SupportedOSPlatformVersion stays 19045.
- Directory.Packages.props: Microsoft.Extensions.Hosting, Microsoft.Data.Sqlite and
  System.Diagnostics.EventLog 11.0.0-rc.3.26522.148 (Data.Sqlite 11 declares SQLitePCLRaw 3.0.5,
  SQLite 3.53.4).
- legal/licenses/nuget/: regenerated by tools/license-gather.ps1 - 69 packages (the nine
  Microsoft.Extensions abstractions are in the .NET 11 runtime; SQLitePCLRaw 3.0.5 and
  SourceGear's SQLite package); THIRD_PARTY_NOTICES says so.

./build.ps1 check on SDK 11.0.100-rc.3: ALL GATES PASSED - App 730, Application 553,
Infrastructure 536 of 538 (the two that need an administrator token), Domain 422, CaptureHost
137, Agent 32; coverage and licence OK. No source change: what .NET 11's SDK asked of the source
is on main (#345, spike-notes §24).

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-31 23:38:04 +07:00
+1 -1
View File
@@ -1 +1 @@
main
alpha