Rebase dev branch onto current master, preserving random timer feature#118
Merged
Rebase dev branch onto current master, preserving random timer feature#118
Conversation
…m timer feature Co-authored-by: cerebrate <371623+cerebrate@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Clean up the old dev branch
Rebase dev branch onto current master, preserving random timer feature
Feb 26, 2026
Member
|
lgtm! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The
devbranch had diverged significantly frommaster(which moved to .NET 9 + CsWin32), causing unresolvable merge conflicts in PR #117.Changes
Framework & API migration (master baseline)
net6.0-windows→net9.0-windows7.0PInvoke.User32/PInvoke.Kernel32withMicrosoft.Windows.CsWin32source generatorHelpers.cs,Program.cs,MainForm.cs,MainForm.Designer.csto useWindows.Win32.PInvokeAPI and modern C# (file-scoped namespaces, collection expressions)NativeMethods.txtandApp.configrequired by masterRandom timer feature (dev-unique, preserved)
--random/-rCLI option wired throughProgram.cs→MainFormconstructorcbRandomcheckbox +lbRandomdisplay integrated into master's settings panel layoutRandomTimeruser setting persisted viaSettings.DefaultRandom.Sharedand clamps to[1, JigglePeriod]secondsOther alignment with master
JigglePerioddefault: 1 → 60s;tbPeriod.Maximum: 60 → 10800ToolStripMenuItemfields)FolderProfile.pubxmlupdated tonet9.0-windows7.0-r/--random✨ Let Copilot coding agent set things up for you — coding agent works faster and does higher quality work when set up for your repo.