diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 98d38dbea0..38862bef2f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,11 @@ jobs: steps: - uses: actions/setup-dotnet@v4 with: - dotnet-version: '6.x' + dotnet-version: '10.x' + + - name: Install InnoSetup + shell: cmd + run: choco upgrade innosetup -y --no-progress - uses: actions/checkout@v4 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); diff --git a/windows/QMK Toolbox/QMK Toolbox.csproj b/windows/QMK Toolbox/QMK Toolbox.csproj index 879c18f938..24f938b388 100644 --- a/windows/QMK Toolbox/QMK Toolbox.csproj +++ b/windows/QMK Toolbox/QMK Toolbox.csproj @@ -1,6 +1,7 @@  - net6.0-windows10.0.19041.0 + net10.0-windows + true WinExe qmk_toolbox true @@ -93,7 +94,6 @@ 3.3.40 - 4.7.0 runtime; build; native; contentfiles; analyzers; buildtransitive