From 4677c9d0a39ab7602da3ba1ad06202283669a864 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Fri, 10 Oct 2025 13:40:38 +1100 Subject: [PATCH 1/6] Swap to .NET 8.0 as 6.0 is EOL. --- windows/QMK Toolbox/QMK Toolbox.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/QMK Toolbox/QMK Toolbox.csproj b/windows/QMK Toolbox/QMK Toolbox.csproj index 879c18f938..f1dd30184b 100644 --- a/windows/QMK Toolbox/QMK Toolbox.csproj +++ b/windows/QMK Toolbox/QMK Toolbox.csproj @@ -1,6 +1,6 @@  - net6.0-windows10.0.19041.0 + net8.0-windows WinExe qmk_toolbox true From 13d5a80a1fc6119d93c9a5a7713c10b1cfb9cd2c Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Fri, 10 Oct 2025 13:47:55 +1100 Subject: [PATCH 2/6] Newer Windows runners don't include InnoSetup. --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 98d38dbea0..55583be68b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,12 +12,12 @@ on: jobs: build_win: name: Build (Windows) - runs-on: windows-latest + runs-on: windows-2022 steps: - uses: actions/setup-dotnet@v4 with: - dotnet-version: '6.x' + dotnet-version: '8.x' - uses: actions/checkout@v4 From 7c754f614313e1762111a771fe0d0b6384f8cb8f Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Fri, 10 Oct 2025 13:49:16 +1100 Subject: [PATCH 3/6] Directly install InnoSetup. --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 55583be68b..c973f67a05 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,13 +12,17 @@ on: jobs: build_win: name: Build (Windows) - runs-on: windows-2022 + runs-on: windows-latest steps: - uses: actions/setup-dotnet@v4 with: dotnet-version: '8.x' + - name: Install InnoSetup + shell: cmd + run: choco upgrade innosetup -y --no-progress + - uses: actions/checkout@v4 - name: Build From 9d9b5e4f282e9456176c66ac6e2e83353a9f4ecf Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 29 Nov 2025 00:12:31 +1100 Subject: [PATCH 4/6] .NET 10 --- .github/workflows/build.yml | 2 +- windows/QMK Toolbox/QMK Toolbox.csproj | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c973f67a05..38862bef2f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: steps: - uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.x' + dotnet-version: '10.x' - name: Install InnoSetup shell: cmd diff --git a/windows/QMK Toolbox/QMK Toolbox.csproj b/windows/QMK Toolbox/QMK Toolbox.csproj index f1dd30184b..94e2d7d286 100644 --- a/windows/QMK Toolbox/QMK Toolbox.csproj +++ b/windows/QMK Toolbox/QMK Toolbox.csproj @@ -1,6 +1,7 @@  - net8.0-windows + net10.0-windows + true WinExe qmk_toolbox true From 607602c833773ab846c0744b39aa0f444ee2055f Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 29 Nov 2025 00:14:57 +1100 Subject: [PATCH 5/6] As per MSBuild output. --- windows/QMK Toolbox/QMK Toolbox.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/windows/QMK Toolbox/QMK Toolbox.csproj b/windows/QMK Toolbox/QMK Toolbox.csproj index 94e2d7d286..24f938b388 100644 --- a/windows/QMK Toolbox/QMK Toolbox.csproj +++ b/windows/QMK Toolbox/QMK Toolbox.csproj @@ -94,7 +94,6 @@ 3.3.40 - 4.7.0 runtime; build; native; contentfiles; analyzers; buildtransitive From 63c56e40f060dbb760ad5c1edf07952e89eb4738 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 29 Nov 2025 07:01:08 +1100 Subject: [PATCH 6/6] Will it compile? --- windows/QMK Toolbox/BindableToolStripMenuItem.cs | 6 ++++-- windows/QMK Toolbox/KeyTester/KeyControl.cs | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/windows/QMK Toolbox/BindableToolStripMenuItem.cs b/windows/QMK Toolbox/BindableToolStripMenuItem.cs index 292d24f6a8..7c6e3a697b 100644 --- a/windows/QMK Toolbox/BindableToolStripMenuItem.cs +++ b/windows/QMK Toolbox/BindableToolStripMenuItem.cs @@ -9,7 +9,7 @@ public class BindableToolStripMenuItem : ToolStripMenuItem, IBindableComponent private ControlBindingsCollection _dataBindings; [Browsable(false)] - public BindingContext BindingContext + public new BindingContext BindingContext { get { @@ -22,10 +22,12 @@ public BindingContext BindingContext } } + public bool ShouldSerializeBindingContext() => false; + [Category("Data")] [ParenthesizePropertyName(true)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Content)] - public ControlBindingsCollection DataBindings + public new ControlBindingsCollection DataBindings { get { diff --git a/windows/QMK Toolbox/KeyTester/KeyControl.cs b/windows/QMK Toolbox/KeyTester/KeyControl.cs index a51d400240..8b61b83c79 100644 --- a/windows/QMK Toolbox/KeyTester/KeyControl.cs +++ b/windows/QMK Toolbox/KeyTester/KeyControl.cs @@ -21,6 +21,8 @@ public bool Pressed { } } + public bool ShouldSerializePressed() => false; + [Description("Whether the key has been tested."), Category("Appearance")] public bool Tested { get => tested; @@ -31,12 +33,16 @@ public bool Tested { } } + public bool ShouldSerializeTested() => false; + [Description("The legend to be displayed on the key."), Category("Appearance"), Editor(typeof(MultilineStringEditor), typeof(UITypeEditor))] public string Legend { get => lblLegend.Text; set => lblLegend.Text = value; } + public bool ShouldSerializeLegend() => false; + private void SetKeyColor() { lblLegend.BackColor = Pressed ? Color.LightYellow : (Tested ? Color.LightGreen : SystemColors.ControlLight);