Add flag to override OS build number

Closes #474
srwi · Jan 7, 2024 · a747a57 · a747a57
1 parent 4d7f9fb
commit a747a57
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 16 deletions.
diff --git a/EverythingToolbar.Deskband/CSDeskBand.cs b/EverythingToolbar.Deskband/CSDeskBand.cs
@@ -16,6 +16,7 @@
 using CSDeskBand.ContextMenu;
 using CSDeskBand.Interop;
 using EverythingToolbar.Helpers;
+using EverythingToolbar.Properties;
 using Microsoft.Win32;
 using NLog;
 using MSG = CSDeskBand.Interop.MSG;
@@ -1018,6 +1019,8 @@ public CSDeskBandWpf()
         {
             ToolbarLogger.Initialize();
             Logger.Info($"EverythingToolbar {Assembly.GetExecutingAssembly().GetName().Version} started. OS: {Environment.OSVersion}");
+            if (Settings.Default.OSBuildNumberOverride != 0)
+                Logger.Info($"OS build number override: {Settings.Default.OSBuildNumberOverride}");
             AppDomain.CurrentDomain.FirstChanceException += (sender, e) =>
             {
              	Logger.Debug(e.Exception, "Unhandled first chance exception");

diff --git a/EverythingToolbar.Deskband/WindowPlacement.cs b/EverythingToolbar.Deskband/WindowPlacement.cs
@@ -99,7 +99,7 @@ private double GetScalingFactor()
 
         private int GetMargin()
         {
-            if (Environment.OSVersion.Version >= Utils.WindowsVersion.Windows11)
+            if (Utils.GetWindowsVersion() >= Utils.WindowsVersion.Windows11)
                 return (int)(12 / GetScalingFactor());
 
             return 0;

diff --git a/EverythingToolbar.Launcher/Launcher.cs b/EverythingToolbar.Launcher/Launcher.cs
@@ -34,6 +34,8 @@ public LauncherWindow(NotifyIcon icon)
             {
                 ToolbarLogger.Initialize();
                 Logger.Info($"EverythingToolbar Launcher {Assembly.GetExecutingAssembly().GetName().Version} started. OS: {Environment.OSVersion}");
+                if (Settings.Default.OSBuildNumberOverride != 0)
+                    Logger.Info($"OS build number override: {Settings.Default.OSBuildNumberOverride}");
 
                 _searchWindowRecentlyClosedTimer = new Timer(500);
                 _searchWindowRecentlyClosedTimer.AutoReset = false;

diff --git a/EverythingToolbar.Launcher/Utils.cs b/EverythingToolbar.Launcher/Utils.cs
@@ -26,12 +26,10 @@ public static string GetTaskbarShortcutPath()
 
         public static bool IsTaskbarCenterAligned()
         {
-            ToolbarLogger.GetLogger<Utils>().Debug($"Windows version: {Environment.OSVersion.Version}");
-
             if (Settings.Default.isForceCenterAlignment)
                 return true;
 
-            if (Environment.OSVersion.Version < WindowsVersion.Windows11)
+            if (Helpers.Utils.GetWindowsVersion() < Helpers.Utils.WindowsVersion.Windows11)
                 return false;
 
             using (RegistryKey key = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced"))

diff --git a/EverythingToolbar.Launcher/WindowPlacement.cs b/EverythingToolbar.Launcher/WindowPlacement.cs
@@ -185,7 +185,7 @@ private double GetScalingFactor()
 
         private int GetMargin()
         {
-            if (Environment.OSVersion.Version >= Helpers.Utils.WindowsVersion.Windows11)
+            if (Helpers.Utils.GetWindowsVersion() >= Helpers.Utils.WindowsVersion.Windows11)
                 return 12;
             else
                 return 0;

diff --git a/EverythingToolbar/Behaviors/DpiScaling.cs b/EverythingToolbar/Behaviors/DpiScaling.cs
@@ -72,7 +72,7 @@ protected override void OnDetaching()
 
         private static double GetParentWindowDpi(Visual visual)
         {
-            if (Environment.OSVersion.Version < Utils.WindowsVersion.Windows10Anniversary)
+            if (Utils.GetWindowsVersion() < Utils.WindowsVersion.Windows10Anniversary)
             {
                 return 96.0;
             }

diff --git a/EverythingToolbar/Behaviors/MicaWindow.cs b/EverythingToolbar/Behaviors/MicaWindow.cs
@@ -33,7 +33,7 @@ protected override void OnAttached()
         {
             base.OnAttached();
 
-            if (Environment.OSVersion.Version < Utils.WindowsVersion.Windows11)
+            if (Utils.GetWindowsVersion() < Utils.WindowsVersion.Windows11)
                 return;
 
             if (AssociatedObject.IsLoaded)

diff --git a/EverythingToolbar/Behaviors/ThemeAwareness.cs b/EverythingToolbar/Behaviors/ThemeAwareness.cs
@@ -101,7 +101,7 @@ private void ApplyTheme(bool isLightTheme)
             var assemblyLocation = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
 
             var themeLocation = assemblyLocation;
-            if (Environment.OSVersion.Version >= Utils.WindowsVersion.Windows11)
+            if (Utils.GetWindowsVersion() >= Utils.WindowsVersion.Windows11)
                 themeLocation = Path.Combine(themeLocation, "Themes", "Win11");
             else
                 themeLocation = Path.Combine(themeLocation, "Themes", "Win10");

diff --git a/EverythingToolbar/Helpers/FilterLoader.cs b/EverythingToolbar/Helpers/FilterLoader.cs
@@ -18,7 +18,7 @@ internal class FilterLoader : INotifyPropertyChanged
         {
             new Filter {
                 Name = Resources.DefaultFilterAll,
-                Icon = Environment.OSVersion.Version >= Utils.WindowsVersion.Windows10 ? "\xE71D  " : "",
+                Icon = Utils.GetWindowsVersion() >= Utils.WindowsVersion.Windows10 ? "\xE71D  " : "",
                 IsMatchCase = false,
                 IsMatchWholeWord = false,
                 IsMatchPath = false,
@@ -28,7 +28,7 @@ internal class FilterLoader : INotifyPropertyChanged
             },
             new Filter {
                 Name = Resources.DefaultFilterFile,
-                Icon = Environment.OSVersion.Version >= Utils.WindowsVersion.Windows10 ? "\xE7C3  " : "",
+                Icon = Utils.GetWindowsVersion() >= Utils.WindowsVersion.Windows10 ? "\xE7C3  " : "",
                 IsMatchCase = false,
                 IsMatchWholeWord = false,
                 IsMatchPath = false,
@@ -38,7 +38,7 @@ internal class FilterLoader : INotifyPropertyChanged
             },
             new Filter {
                 Name = Resources.DefaultFilterFolder,
-                Icon = Environment.OSVersion.Version >= Utils.WindowsVersion.Windows10 ? "\xE8B7  " : "",
+                Icon = Utils.GetWindowsVersion() >= Utils.WindowsVersion.Windows10 ? "\xE8B7  " : "",
                 IsMatchCase = false,
                 IsMatchWholeWord = false,
                 IsMatchPath = false,

diff --git a/EverythingToolbar/Helpers/Utils.cs b/EverythingToolbar/Helpers/Utils.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using EverythingToolbar.Properties;
 
 namespace EverythingToolbar.Helpers
 {
@@ -11,6 +12,14 @@ public static string GetConfigDirectory()
                 "EverythingToolbar");
         }
 
+        public static Version GetWindowsVersion()
+        {
+            if (Settings.Default.OSBuildNumberOverride != 0)
+                return new Version(10, 0, Settings.Default.OSBuildNumberOverride);
+
+            return Environment.OSVersion.Version;
+        }
+
         public static class WindowsVersion
         {
             public static readonly Version Windows10 = new Version(10, 0, 10240);

diff --git a/EverythingToolbar/Properties/Settings.Designer.cs b/EverythingToolbar/Properties/Settings.Designer.cs
diff --git a/EverythingToolbar/Properties/Settings.settings b/EverythingToolbar/Properties/Settings.settings
@@ -98,5 +98,8 @@
     <Setting Name="isDoubleClickToOpen" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="OSBuildNumberOverride" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/EverythingToolbar/SearchWindow.xaml.cs b/EverythingToolbar/SearchWindow.xaml.cs
@@ -26,7 +26,7 @@ private SearchWindow()
                 Settings.Default.isUpgradeRequired = false;
             }
 
-            if (Environment.OSVersion.Version < Utils.WindowsVersion.Windows11)
+            if (Utils.GetWindowsVersion() < Utils.WindowsVersion.Windows11)
             {
                 AllowsTransparency = true;
                 Loaded += (s, e) =>
@@ -150,7 +150,7 @@ public void AnimateShow(double left, double top, double width, double height, Ed
             };
             animation.Completed += (s, e) =>
             {
-                if (Environment.OSVersion.Version >= Utils.WindowsVersion.Windows11)
+                if (Utils.GetWindowsVersion() >= Utils.WindowsVersion.Windows11)
                     AnimateShowWin11(left, top, width, height, taskbarEdge);
                 else
                     AnimateShowWin10(left, top, width, height, taskbarEdge);
@@ -424,7 +424,7 @@ private void AnimateHideWin11(Edge taskbarEdge)
 
         public void AnimateHide(Edge taskbarEdge)
         {
-            if (Environment.OSVersion.Version >= Utils.WindowsVersion.Windows11)
+            if (Utils.GetWindowsVersion() >= Utils.WindowsVersion.Windows11)
                 AnimateHideWin11(taskbarEdge);
             else
                 AnimateHideWin10(taskbarEdge);

diff --git a/EverythingToolbar/app.config b/EverythingToolbar/app.config
@@ -103,6 +103,9 @@
             <setting name="isDoubleClickToOpen" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="OSBuildNumberOverride" serializeAs="String">
+                <value>0</value>
+            </setting>
         </EverythingToolbar.Properties.Settings>
     </userSettings>
     <System.Windows.Forms.ApplicationConfigurationSection>