More robust OS version resolution

Close #11.

Author: Slion

src/VirtualDesktop/Interop/ComInterfaceAssemblyBuilder.cs

@@ -25,9 +25,10 @@ internal class ComInterfaceAssemblyBuilder
     // Now using assembly version even though regenerating our DLL won't strictly be needed for every new version this is the safest option
     // Otherwise people will surely forget to increment a specific version here
     private static readonly Version? _requireVersion = Assembly.GetExecutingAssembly().GetName().Version;
-    private static readonly Regex _assemblyRegex = new(@"VirtualDesktop\.(?<build>\d{5}\.\d{4}?)(\.\w*|)\.dll");
-    private static readonly Regex _buildNumberRegex = new(@"\.Build(?<build>\d{5}\.\d{4})\.");
-    private static readonly double osBuild = OS.Build();
+    private static readonly Regex _assemblyRegex = new(@"VirtualDesktop\.10\.0\.(?<build>\d+\.\d+)(\.\w*|)\.dll");
+    private static readonly Regex _buildNumberRegex = new(@"\.Build(?<build>\d+\.\d+)\.");
+    private static readonly Version osBuild = OS.Build;
+    
     private static ComInterfaceAssembly? _assembly;
 
     private readonly VirtualDesktopCompilerConfiguration _configuration;
@@ -46,7 +47,7 @@ public ComInterfaceAssembly GetAssembly()
         {
             foreach (var file in this._configuration.CompiledAssemblySaveDirectory.GetFiles())
             {
-                if (double.TryParse(_assemblyRegex.Match(file.Name).Groups["build"].ToString(), out var build)
+                if (Version.TryParse(OS.VersionPrefix + _assemblyRegex.Match(file.Name).Groups["build"].ToString(), out var build)
                     && build == osBuild)
                 {
                     try
@@ -57,6 +58,8 @@ public ComInterfaceAssembly GetAssembly()
                             Debug.WriteLine($"Assembly found: {file.FullName}");
 #if !DEBUG
                             return Assembly.LoadFile(file.FullName);
+#else
+                            Debug.WriteLine($"Debug force assembly creation");
 #endif
                         }
                         else 
@@ -110,19 +113,19 @@ private Assembly CreateAssembly()
         //           └── 22000, VirtualDesktop.Interop.Build22000..interfaces.IVirtualDesktop.cs
         //   IVirtualDesktopPinnedApps
         //           └── 10240, VirtualDesktop.Interop.Build10240..interfaces.IVirtualDesktopPinnedApps.cs
-        var interfaceSourceFiles = new Dictionary<string, SortedList<double, string>>();
+        var interfaceSourceFiles = new Dictionary<string, SortedList<Version, string>>();
 
         // This is where we decide which interface variant goes into our generated DLL assembly
         foreach (var name in executingAssembly.GetManifestResourceNames())
         {
             var interfaceName = Path.GetFileNameWithoutExtension(name).Split('.').LastOrDefault();
             if (interfaceName != null
                 && interfaceNames.Contains(interfaceName)
-                && double.TryParse(_buildNumberRegex.Match(name.Replace('_','.')).Groups["build"].ToString(), out var build))
+                && Version.TryParse(OS.VersionPrefix + _buildNumberRegex.Match(name.Replace('_','.')).Groups["build"].ToString(), out var build))
             {
                 if (interfaceSourceFiles.TryGetValue(interfaceName, out var sourceFiles) == false)
                 {
-                    sourceFiles = new SortedList<double, string>();
+                    sourceFiles = new SortedList<Version, string>();
                     interfaceSourceFiles.Add(interfaceName, sourceFiles);
                 }
 

src/VirtualDesktop/Interop/IID.cs

@@ -12,13 +12,13 @@
 namespace WindowsDesktop.Interop;
 
 internal record OsBuildSettings(
-    double osBuild,
+    Version osBuild,
     SettingsProperty prop);
 
 internal static class IID
 {
-    private static readonly Regex _osBuildRegex = new(@"v_(?<build>\d{5}_\d{4}?)");
-    
+    private static readonly Regex _osBuildRegex = new(@"v_(?<build>\d+_\d+)");    
+
     // ReSharper disable once InconsistentNaming
     public static Dictionary<string, Guid> GetIIDs(string[] interfaceNames)
     {
@@ -28,7 +28,7 @@ public static Dictionary<string, Guid> GetIIDs(string[] interfaceNames)
         var orderedProps = Settings.Default.Properties.OfType<SettingsProperty>()
             .Select(prop =>
             {
-                if (double.TryParse(_osBuildRegex.Match(prop.Name).Groups["build"].ToString().Replace('_','.'), NumberStyles.Any, CultureInfo.InvariantCulture, out var build))
+                if (Version.TryParse(OS.VersionPrefix + _osBuildRegex.Match(prop.Name).Groups["build"].ToString().Replace('_','.'), out var build))
                 {
                     return new OsBuildSettings(build, prop);
                 }
@@ -41,15 +41,15 @@ public static Dictionary<string, Guid> GetIIDs(string[] interfaceNames)
 
         // Find first prop with build version <= current OS version
         var selectedSettings = orderedProps.FirstOrDefault(p =>
-            p.osBuild <= OS.Build()
+            p.osBuild <= OS.Build
         );
 
         if (selectedSettings == null)
         {
             var supportedBuilds = orderedProps.Select(v => v.osBuild).ToArray();
             throw new ConfigurationException(
                 "Invalid application configuration. Unable to determine interop interfaces for " +
-                $"current OS Build: {OS.Build()}. All configured OS Builds " +
+                $"current OS Build: {OS.Build}. All configured OS Builds " +
                 $"have build version greater than current OS: {supportedBuilds}");
         }
 

src/VirtualDesktop/Utils/OS.cs

@@ -13,12 +13,19 @@ internal class OS
         /// Return the OS Build number such as: 22621.2215
         /// </summary>
         /// <returns></returns>
-        public static double Build()
+        public static Version Build
         {
-            int _osBuild = Environment.OSVersion.Version.Build;
-            int _osRevision = int.Parse(Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion").GetValue("UBR").ToString());
-            double _osId = _osBuild + (_osRevision / 10000d);
-            return _osId;
+            get
+            {
+                Version v = Environment.OSVersion.Version;
+                Version actual = new(v.Major, v.Minor, v.Build, int.Parse(Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion").GetValue("UBR").ToString()));
+                return actual;
+            }
         }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public static readonly String VersionPrefix = "10.0.";
     }
 }

src/VirtualDesktop/VirtualDesktop.system.cs

@@ -35,21 +35,48 @@ public static bool IsSupported
 
     static VirtualDesktop()
     {
-        _provider = OS.Build() switch
-        {
-            >= 22621.2215 => new VirtualDesktopProvider22621(), // Windows 11 22H2
-            >= 22000 => new VirtualDesktopProvider22000(),      //Windows 11 21H2
-            >= 20348 => new VirtualDesktopProvider20348(),      // Windows Server 2022
-            >= 10240 => new VirtualDesktopProvider10240(),
-            _ => new VirtualDesktopProvider.NotSupported()
-        };
+        
+        _provider = CreateProvider();
 
         Debug.WriteLine($"*** {AssemblyInfo.Title} Library ***");
         Debug.WriteLine($"Version:  {AssemblyInfo.VersionString}");
-        Debug.WriteLine($"OS Build: {OS.Build()}");
+        Debug.WriteLine($"OS Build: {OS.Build}");
         Debug.WriteLine($"Provider: {_provider.GetType().Name}");
     }
 
+    /// <summary>
+    ///  Create provider for current OS version.
+    ///  Test order matters. Make sure you test the highest version first.
+    /// </summary>
+    /// <returns></returns>
+    private static VirtualDesktopProvider CreateProvider()
+    {
+        Version v = OS.Build;
+
+        if (v >= new Version(10, 0, 22621, 2215))
+        {
+            return new VirtualDesktopProvider22621();
+        }
+
+        if (v >= new Version(10, 0, 22000, 0))
+        {
+            return new VirtualDesktopProvider22000();
+        }
+
+        if (v >= new Version(10, 0, 20348, 0))
+        {
+            return new VirtualDesktopProvider20348();
+        }
+        
+        if (v >= new Version(10, 0, 10240, 0))
+        {
+            return new VirtualDesktopProvider10240();
+        }
+       
+        return new VirtualDesktopProvider.NotSupported();
+    }
+
+
     private VirtualDesktop(IVirtualDesktop source)
     {
         this._source = source;