#5: System wide Light mode does not allow changing the context menu c…

…olor
Aldaviva · Mar 3, 2023 · 6b163f1 · 6b163f1
1 parent fc1991e
commit 6b163f1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/dotnetpackage.yml b/.github/workflows/dotnetpackage.yml
@@ -3,7 +3,6 @@ name: .NET
 on:
   push:
     branches: [ master ]
-
   workflow_dispatch:
 
 jobs:
@@ -14,7 +13,7 @@ jobs:
     runs-on: windows-latest
 
     steps:
-    - name: Set up MSBuild
+    - name: Add MSBuild to PATH
       uses: microsoft/setup-msbuild@v1.3.1
 
     - name: Clone repository
@@ -30,7 +29,7 @@ jobs:
       run: dotnet pack ${{ env.ProjectName }} --no-build --configuration Release --verbosity normal
 
     - name: Build Windows Forms demo
-      run: msbuild darknet-demo-winforms -p:Configuration=Release -t:build -restore
+      run: msbuild darknet-demo-winforms -p:Configuration=Release -t:build -restore -m
 
     - name: Build WPF demo
       run: dotnet publish darknet-demo-wpf --no-restore --configuration Release -p:PublishSingleFile=true --runtime win-x64 --self-contained false --verbosity normal
@@ -47,3 +46,4 @@ jobs:
       with:
         name: ${{ env.ProjectName }}
         path: upload
+        if-no-files-found: error
diff --git a/DarkNet/DarkNet.cs b/DarkNet/DarkNet.cs
@@ -71,7 +71,12 @@ public class DarkNet: IDarkNet {
 
         try {
             // Windows 10 1903 and later
-            Win32.SetPreferredAppMode(theme == Theme.Light ? AppMode.Default : AppMode.AllowDark);
+            Win32.SetPreferredAppMode(theme switch {
+                Theme.Light => AppMode.Default,
+                Theme.Auto  => AppMode.AllowDark,
+                Theme.Dark  => AppMode.ForceDark,
+                _           => AppMode.Default
+            });
         } catch (Exception e1) when (e1 is not OutOfMemoryException) {
             try {
                 // Windows 10 1809 only

diff --git a/DarkNet/DarkNet.csproj b/DarkNet/DarkNet.csproj
@@ -3,7 +3,7 @@
 
     <PropertyGroup>
         <TargetFrameworks>netcoreapp3.1;net452</TargetFrameworks>
-        <Version>2.1.0</Version>
+        <Version>2.1.1</Version>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
         <UseWindowsForms>true</UseWindowsForms>

diff --git a/darknet-demo-winforms/Form1.Designer.cs b/darknet-demo-winforms/Form1.Designer.cs