Update VirtualDesktop library to support newer Windows 10 versions

FreeVD/App/Window.cs

@@ -5,7 +5,6 @@
 using System.Linq;
 using System.Text;
 using WindowsDesktop;
-using WindowsDesktop.Interop;
 
 namespace FreeVD
 {
@@ -15,7 +14,7 @@ public static IEnumerable<Window> GetOpenWindows()
         {
             IntPtr shellWindow = User32.GetShellWindow();
             var windows = new List<Window>();
-            User32.EnumWindows((handle,lParam) =>
+            User32.EnumWindows((handle, lParam) =>
             {
                 if (handle != shellWindow &&
                     User32.IsWindowVisible(handle) &&
@@ -59,12 +58,13 @@ public int DesktopNumber
                 try
                 {
                     if (GetProcess().Id != Process.GetCurrentProcess().Id &&
-                        ComObjects.GetVirtualDesktopManager().GetWindowDesktopId(Handle) != Guid.Empty)
+                        (VirtualDesktop.FromHwnd(Handle) != null || IsPinnedWindow))
+                    //ComObjects.GetVirtualDesktopManager().GetWindowDesktopId(Handle) != Guid.Empty)
                     {
                         return (IsPinnedWindow ? VirtualDesktop.Current : VirtualDesktop.FromHwnd(Handle)).GetNumber();
                     }
                 }
-                catch (Exception ex) when (ex.HResult == Consts.TYPE_E_ELEMENTNOTFOUND) {}
+                catch (Exception ex) when (ex.HResult == Consts.TYPE_E_ELEMENTNOTFOUND) { }
                 catch (Exception ex)
                 {
                     Log.LogEvent("Window", $"Handle: {Handle}\nCaption: {GetWindowText()}", ex);

FreeVD/FreeVD.csproj

@@ -86,7 +86,7 @@
     <Reference Include="UIAutomationClient" />
     <Reference Include="UIAutomationTypes" />
     <Reference Include="Windows">
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Windows Kits\8.1\References\CommonConfiguration\Neutral\Windows.winmd</HintPath>
+      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Windows Kits\8.1\References\CommonConfiguration\Neutral\Annotated\Windows.winmd</HintPath>
     </Reference>
     <Reference Include="WindowsBase" />
   </ItemGroup>