Skip to content

Swap to .NET 10.0 as 6.0 is EOL. #496

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tzarc wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Swap to .NET 10.0 as 6.0 is EOL. #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4677c9d
Swap to .NET 8.0 as 6.0 is EOL.
tzarc Oct 10, 2025
13d5a80
Newer Windows runners don't include InnoSetup.
tzarc Oct 10, 2025
7c754f6
Directly install InnoSetup.
tzarc Oct 10, 2025
9d9b5e4
.NET 10
tzarc Nov 28, 2025
607602c
As per MSBuild output.
tzarc Nov 28, 2025
63c56e4
Will it compile?
tzarc Nov 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 4 additions & 2 deletions windows/QMK Toolbox/BindableToolStripMenuItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class BindableToolStripMenuItem : ToolStripMenuItem, IBindableComponent
private ControlBindingsCollection _dataBindings;

[Browsable(false)]
public BindingContext BindingContext
public new BindingContext BindingContext
{
get
{
Expand All @@ -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
{
Expand Down
6 changes: 6 additions & 0 deletions windows/QMK Toolbox/KeyTester/KeyControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions windows/QMK Toolbox/QMK Toolbox.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
<TargetFramework>net10.0-windows</TargetFramework>
<EnableWindowsTargeting>true</EnableWindowsTargeting>
<OutputType>WinExe</OutputType>
<AssemblyName>qmk_toolbox</AssemblyName>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
Expand Down Expand Up @@ -93,7 +94,6 @@
<PackageReference Include="hidlibrary">
<Version>3.3.40</Version>
</PackageReference>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.Net.Compilers.Toolset">
<Version>4.7.0</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down