Build workflow: switch to dotnet and publish as self contained (#429)

qmk · Oct 15, 2023 · 8171da0 · 8171da0
1 parent 0b84160
commit 8171da0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,17 +15,16 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - uses: microsoft/setup-msbuild@v1.3
-
-    - uses: nuget/setup-nuget@v1
+    - uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '6.x'
 
     - uses: actions/checkout@v4
 
     - name: Build
       working-directory: ./windows
       run: |
-        nuget restore
-        msbuild "QMK Toolbox.sln" /verbosity:minimal /p:Configuration=Release
+        dotnet publish -c Release -r win-x64 --self-contained true
 
     - name: Create installer
       working-directory: ./windows
@@ -35,7 +34,7 @@ jobs:
     - uses: actions/upload-artifact@v3
       with:
         name: qmk_toolbox.exe
-        path: windows/QMK Toolbox/bin/Release/qmk_toolbox.exe
+        path: windows/QMK Toolbox/bin/Release/win-x64/publish/qmk_toolbox.exe
 
     - uses: actions/upload-artifact@v3
       with:

diff --git a/windows/QMK Toolbox/HidConsole/HidConsoleDevice.cs b/windows/QMK Toolbox/HidConsole/HidConsoleDevice.cs
@@ -1,6 +1,7 @@
 using HidLibrary;
 using System.Linq;
 using System.Text;
+using System.Threading.Tasks;
 
 namespace QMK_Toolbox.HidConsole
 {
@@ -33,8 +34,7 @@ public HidConsoleDevice(IHidDevice device)
             ProductId = (ushort)HidDevice.Attributes.ProductId;
             RevisionBcd = (ushort)HidDevice.Attributes.Version;
 
-            HidDevice.MonitorDeviceEvents = true;
-            HidDevice.ReadReport(HidDeviceReportEvent);
+            RegisterReportTask();
 
             HidDevice.CloseDevice();
         }
@@ -44,6 +44,16 @@ public override string ToString()
             return $"{ManufacturerString} {ProductString} ({VendorId:X4}:{ProductId:X4}:{RevisionBcd:X4})";
         }
 
+        private void RegisterReportTask()
+        {
+            Task.Run(async () => await ReadReportAsync()).ContinueWith(t => HidDeviceReportEvent(t.Result));
+        }
+
+        private async Task<HidReport> ReadReportAsync()
+        {
+            return await Task.Run(() => HidDevice.ReadReport());
+        }
+
         private string currentLine = "";
 
         private void HidDeviceReportEvent(HidReport report)
@@ -71,7 +81,7 @@ private void HidDeviceReportEvent(HidReport report)
                 }
 
                 // Reregister this callback
-                HidDevice.ReadReport(HidDeviceReportEvent);
+                RegisterReportTask();
             }
         }
 

diff --git a/windows/QMK Toolbox/QMK Toolbox.csproj b/windows/QMK Toolbox/QMK Toolbox.csproj
@@ -7,6 +7,7 @@
     <UseWindowsForms>true</UseWindowsForms>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
+    <PublishSingleFile>true</PublishSingleFile>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Resources\output.ico</ApplicationIcon>

diff --git a/windows/install_compiler.iss b/windows/install_compiler.iss
@@ -38,7 +38,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"
 
 [Files]
-Source: "QMK Toolbox\bin\Release\qmk_toolbox.exe"; DestDir: "{app}"; Flags: ignoreversion
+Source: "QMK Toolbox\bin\Release\win-x64\publish\qmk_toolbox.exe"; DestDir: "{app}"; Flags: ignoreversion
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]