From 85636cd0670af11c2d187fb45b910aa5d19f6e25 Mon Sep 17 00:00:00 2001
From: squidly <none@none>
Date: Sat, 4 Sep 2021 17:01:00 +1000
Subject: [PATCH] Switch to https://github.com/Grabacr07/VirtualDesktop/pull/57
 commit c0f93aea77129850dc3f4442bc37900ece3d7131

--HG--
branch : Win11
---
 VirtualDesktop-master/CREDIT.txt              |    5 -
 VirtualDesktop-master/appveyor.yml            |   19 -
 VirtualDesktop-master/azure-pipelines.yml     |   39 +
 VirtualDesktop-master/packaging/.gitignore    |    3 +
 VirtualDesktop-master/packaging/pack.bat      |    2 +
 .../VirtualDesktop.Showcase/App.config        |    6 -
 .../VirtualDesktop.Showcase/MainWindow.xaml   |   25 +
 .../MainWindow.xaml.cs                        |   79 +-
 .../Properties/AssemblyInfo.cs                |   11 +-
 .../Properties/Resources.Designer.cs          |   63 -
 .../Properties/Resources.resx                 |  117 --
 .../Properties/Settings.Designer.cs           |   26 -
 .../Properties/Settings.settings              |    7 -
 .../VirtualDesktop.Showcase.csproj            |  151 +-
 .../Properties/AssemblyInfo.cs                |   12 +-
 .../VirtualDesktop.WPF.csproj                 |  124 +-
 .../VirtualDesktop.WPF.nuspec                 |   19 -
 .../Properties/AssemblyInfo.cs                |   12 +-
 .../VirtualDesktop.WinForms.csproj            |  101 +-
 .../VirtualDesktop.WinForms.nuspec            |   19 -
 .../source/VirtualDesktop.sln                 |   65 +-
 .../source/VirtualDesktop.sln.DotSettings     |   15 +-
 .../JetBrains.Annotations.cs                  | 1065 --------------
 .../VirtualDesktop/Internal/RawWindow.cs      |    7 +-
 .../{ => 10240}/IVirtualDesktop.cs            |    3 +-
 .../(interfaces)/10240/IVirtualDesktop2.cs    |   45 +
 .../IVirtualDesktopManagerInternal.cs         |    7 +-
 .../10240/IVirtualDesktopManagerInternal2.cs  |   39 +
 .../10240/IVirtualDesktopManagerInternal3.cs  |   41 +
 .../IVirtualDesktopNotification.cs            |    4 +-
 .../10240/IVirtualDesktopNotification2.cs     |   63 +
 .../(interfaces)/20231/IVirtualDesktop.cs     |   47 +
 .../20231/IVirtualDesktopManagerInternal.cs   |   40 +
 .../20231/IVirtualDesktopNotification.cs      |   69 +
 .../(interfaces)/21313/IVirtualDesktop.cs     |   50 +
 .../21313/IVirtualDesktopManagerInternal.cs   |   46 +
 .../21313/IVirtualDesktopNotification.cs      |   83 ++
 .../(interfaces)/21359/IVirtualDesktop.cs     |   47 +
 .../21359/IVirtualDesktopManagerInternal.cs   |   48 +
 .../21359/IVirtualDesktopNotification.cs      |   83 ++
 .../Interop/(interfaces)/AssemblyInfo.cs      |    2 +-
 .../VirtualDesktopManagerInternal.cs          |   61 +-
 .../VirtualDesktopManagerInternal10240.cs     |   83 ++
 .../VirtualDesktopManagerInternal20231.cs     |   81 ++
 .../VirtualDesktopManagerInternal21313.cs     |   81 ++
 .../VirtualDesktopManagerInternal21359.cs     |   15 +
 .../(wrappers)/VirtualDesktopNotification.cs  |   35 +-
 .../Interop/ComInterfaceAssembly.cs           |    2 +-
 .../Interop/ComInterfaceAssemblyProvider.cs   |   73 +-
 .../Interop/ComInterfaceWrapperAttribute.cs   |   42 +-
 .../Interop/ComInterfaceWrapperBase.cs        |   43 +-
 .../VirtualDesktop/Interop/ComObjects.cs      |   24 +-
 .../VirtualDesktop/Properties/Annotations.cs  | 1235 +++++++++++++++++
 .../VirtualDesktop/Properties/AssemblyInfo.cs |   12 +-
 .../Properties/Settings.Designer.cs           |    2 +-
 .../source/VirtualDesktop/VirtualDesktop.cs   |  119 +-
 .../VirtualDesktop/VirtualDesktop.csproj      |  220 ++-
 .../VirtualDesktop.notification.cs            |   26 +
 .../VirtualDesktop/VirtualDesktop.nuspec      |   16 -
 .../VirtualDesktop/VirtualDesktop.static.cs   |    6 +-
 .../VirtualDesktop.static.notification.cs     |   43 +-
 .../VirtualDesktop/VirtualDesktopCache.cs     |   15 +-
 .../VirtualDesktopMovedEventArgs.cs           |   32 +
 .../VirtualDesktop/VirtualDesktopProvider.cs  |    2 +-
 .../VirtualDesktopRenamedEventArgs.cs         |   32 +
 ...VirtualDesktopWallpaperChangedEventArgs.cs |   32 +
 .../source/VirtualDesktop/app.config          |  110 +-
 .../source/VirtualDesktop/packages.config     |    4 -
 68 files changed, 3092 insertions(+), 2063 deletions(-)
 delete mode 100644 VirtualDesktop-master/CREDIT.txt
 delete mode 100644 VirtualDesktop-master/appveyor.yml
 create mode 100644 VirtualDesktop-master/azure-pipelines.yml
 create mode 100644 VirtualDesktop-master/packaging/.gitignore
 create mode 100644 VirtualDesktop-master/packaging/pack.bat
 delete mode 100644 VirtualDesktop-master/samples/VirtualDesktop.Showcase/App.config
 delete mode 100644 VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/Resources.Designer.cs
 delete mode 100644 VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/Resources.resx
 delete mode 100644 VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/Settings.Designer.cs
 delete mode 100644 VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/Settings.settings
 delete mode 100644 VirtualDesktop-master/source/VirtualDesktop.WPF/VirtualDesktop.WPF.nuspec
 delete mode 100644 VirtualDesktop-master/source/VirtualDesktop.WinForms/VirtualDesktop.WinForms.nuspec
 delete mode 100644 VirtualDesktop-master/source/VirtualDesktop/App_Packages/Source.JetBrains.Annotations_11.1.1/JetBrains.Annotations.cs
 rename VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/{ => 10240}/IVirtualDesktop.cs (87%)
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktop2.cs
 rename VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/{ => 10240}/IVirtualDesktopManagerInternal.cs (76%)
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktopManagerInternal2.cs
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktopManagerInternal3.cs
 rename VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/{ => 10240}/IVirtualDesktopNotification.cs (90%)
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktopNotification2.cs
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/20231/IVirtualDesktop.cs
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/20231/IVirtualDesktopManagerInternal.cs
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/20231/IVirtualDesktopNotification.cs
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21313/IVirtualDesktop.cs
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21313/IVirtualDesktopManagerInternal.cs
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21313/IVirtualDesktopNotification.cs
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21359/IVirtualDesktop.cs
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21359/IVirtualDesktopManagerInternal.cs
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21359/IVirtualDesktopNotification.cs
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal10240.cs
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal20231.cs
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal21313.cs
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal21359.cs
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/Properties/Annotations.cs
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.notification.cs
 delete mode 100644 VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.nuspec
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopMovedEventArgs.cs
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopRenamedEventArgs.cs
 create mode 100644 VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopWallpaperChangedEventArgs.cs
 delete mode 100644 VirtualDesktop-master/source/VirtualDesktop/packages.config

diff --git a/VirtualDesktop-master/CREDIT.txt b/VirtualDesktop-master/CREDIT.txt
deleted file mode 100644
index 1e42f46..0000000
--- a/VirtualDesktop-master/CREDIT.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Virtual Desktop Library
------------------------
-Modifed MIT Licensed code from
-https://github.com/Grabacr07/VirtualDesktop
-by Manato KAMEYA
\ No newline at end of file
diff --git a/VirtualDesktop-master/appveyor.yml b/VirtualDesktop-master/appveyor.yml
deleted file mode 100644
index f50ad7d..0000000
--- a/VirtualDesktop-master/appveyor.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: '{build}'
-branches:
-  only:
-  - master
-os: Visual Studio 2017
-configuration: Release
-platform: Any CPU
-init:
-- cmd: git config --global core.autocrlf true
-nuget:
-  disable_publish_on_pr: true
-build:
-  project: source\VirtualDesktop.sln
-  publish_nuget: true
-  verbosity: minimal
-deploy:
-- provider: NuGet
-  api_key:
-    secure: GrOjr849MkxFz3v7VSIvDNd0ZNZDaUTDeHqRF0InDLzMSuFoDmrqiMaKtIz0MxG8
\ No newline at end of file
diff --git a/VirtualDesktop-master/azure-pipelines.yml b/VirtualDesktop-master/azure-pipelines.yml
new file mode 100644
index 0000000..5a4468b
--- /dev/null
+++ b/VirtualDesktop-master/azure-pipelines.yml
@@ -0,0 +1,39 @@
+# .NET Desktop
+# Build and run tests for .NET Desktop or Windows classic desktop solutions.
+# Add steps that publish symbols, save build artifacts, and more:
+# https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net
+
+pool:
+  vmImage: 'windows-latest'
+
+variables:
+  solution: 'source/VirtualDesktop.sln'
+  buildPlatform: 'Any CPU'
+  buildConfiguration: 'Release'
+
+steps:
+- task: DotNetCoreCLI@2
+  displayName: 'dotnet build'
+  inputs:
+    command: 'build'
+    projects: '$(solution)'
+    arguments: '-c $(buildConfiguration)'
+
+- task: DotNetCoreCLI@2
+  displayName: 'dotnet pack'
+  inputs:
+    command: pack
+    packagesToPack: '$(solution)'
+    packDirectory: '$(Build.ArtifactStagingDirectory)'
+    nobuild: true
+    versioningScheme: 'off'
+    arguments: '-c $(buildConfiguration)'
+  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/release'))
+
+- task: PublishBuildArtifacts@1
+  displayName: 'publish artifact: drop'
+  inputs:
+    PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+    ArtifactName: 'drop'
+    publishLocation: 'Container'
+  condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/release'))
diff --git a/VirtualDesktop-master/packaging/.gitignore b/VirtualDesktop-master/packaging/.gitignore
new file mode 100644
index 0000000..96de5b9
--- /dev/null
+++ b/VirtualDesktop-master/packaging/.gitignore
@@ -0,0 +1,3 @@
+/*
+!/.gitignore
+!/*.bat
diff --git a/VirtualDesktop-master/packaging/pack.bat b/VirtualDesktop-master/packaging/pack.bat
new file mode 100644
index 0000000..c4f09ef
--- /dev/null
+++ b/VirtualDesktop-master/packaging/pack.bat
@@ -0,0 +1,2 @@
+dotnet build ..\source\VirtualDesktop.sln -c Release
+dotnet pack ..\source\VirtualDesktop.sln -c Release --no-build -o %CD%
diff --git a/VirtualDesktop-master/samples/VirtualDesktop.Showcase/App.config b/VirtualDesktop-master/samples/VirtualDesktop.Showcase/App.config
deleted file mode 100644
index defd879..0000000
--- a/VirtualDesktop-master/samples/VirtualDesktop.Showcase/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
-    </startup>
-</configuration>
diff --git a/VirtualDesktop-master/samples/VirtualDesktop.Showcase/MainWindow.xaml b/VirtualDesktop-master/samples/VirtualDesktop.Showcase/MainWindow.xaml
index fdda1f6..049e03f 100644
--- a/VirtualDesktop-master/samples/VirtualDesktop.Showcase/MainWindow.xaml
+++ b/VirtualDesktop-master/samples/VirtualDesktop.Showcase/MainWindow.xaml
@@ -22,6 +22,16 @@
 					<Setter Property="BorderThickness"
 							Value="0.99" />
 				</Style>
+				<Style TargetType="{x:Type TextBox}">
+					<Setter Property="Padding"
+							Value="18,4" />
+					<Setter Property="HorizontalContentAlignment"
+							Value="Left" />
+					<Setter Property="Margin"
+							Value="8" />
+					<Setter Property="BorderThickness"
+							Value="0.99" />
+				</Style>
 			</Panel.Resources>
 			<StackPanel Margin="8">
 				<RadioButton x:Name="ThisWindowMenu"
@@ -56,6 +66,21 @@
 					Click="PinApp" />
 			<Button Content="Remove"
 					Click="Remove" />
+			<Button Content="Get name"
+					Click="GetName" />
+			<TextBox x:Name="NameTextBlock"
+					 Margin="8,8,8,0"
+					 Text="Desktop name" />
+			<Button Grid.Column="1"
+					Content="Set name"
+					Click="SetName"
+					Margin="8,0,8,8" />
+			<Button Content="Get wallpaper path"
+					Click="GetWallpaperPath" />
+			<Button Content="Move to previous"
+					Click="MovePrevious" />
+			<Button Content="Move to next"
+					Click="MoveNext" />
 		</StackPanel>
 	</ScrollViewer>
 </Window>
diff --git a/VirtualDesktop-master/samples/VirtualDesktop.Showcase/MainWindow.xaml.cs b/VirtualDesktop-master/samples/VirtualDesktop.Showcase/MainWindow.xaml.cs
index 141a923..b10c7ae 100644
--- a/VirtualDesktop-master/samples/VirtualDesktop.Showcase/MainWindow.xaml.cs
+++ b/VirtualDesktop-master/samples/VirtualDesktop.Showcase/MainWindow.xaml.cs
@@ -22,7 +22,7 @@ private static async void InitializeComObjects()
 		{
 			try
 			{
-				await VirtualDesktopProvider.Default.Initialize();
+				await VirtualDesktopProvider.Default.Initialize(TaskScheduler.FromCurrentSynchronizationContext());
 			}
 			catch (Exception ex)
 			{
@@ -30,6 +30,8 @@ private static async void InitializeComObjects()
 			}
 
 			VirtualDesktop.CurrentChanged += (sender, args) => System.Diagnostics.Debug.WriteLine($"Desktop changed: {args.NewDesktop.Id}");
+			VirtualDesktop.Moved += (sender, args) => System.Diagnostics.Debug.WriteLine($"Desktop moved: {args.OldIndex} -> {args.NewIndex} ({args.Source.Id})");
+			VirtualDesktop.Renamed += (sender, args) => System.Diagnostics.Debug.WriteLine($"Desktop renamed: {args.OldName} -> {args.NewName} ({args.Source.Id})");
 		}
 
 		private void CreateNew(object sender, RoutedEventArgs e)
@@ -124,7 +126,7 @@ private async void PinApp(object sender, RoutedEventArgs e)
 			{
 				await Task.Delay(_delay);
 				var appId = ApplicationHelper.GetAppId(GetForegroundWindow());
-				(VirtualDesktop.IsPinnedApplication(appId) ? VirtualDesktop.UnpinApplication : (Action<string>)VirtualDesktop.PinApplication)(appId);
+				if (appId != null) (VirtualDesktop.IsPinnedApplication(appId) ? VirtualDesktop.UnpinApplication : (Action<string>)VirtualDesktop.PinApplication)(appId);
 			}
 		}
 
@@ -141,6 +143,79 @@ private async void Remove(object sender, RoutedEventArgs e)
 			}
 		}
 
+		private async void GetName(object sender, RoutedEventArgs e)
+		{
+			if (this.ThisWindowMenu.IsChecked ?? false)
+			{
+				var name = this.GetCurrentDesktop().Name;
+				MessageBox.Show(name, "Current desktop name");
+			}
+			else
+			{
+				await Task.Delay(_delay);
+				var name = this.GetCurrentDesktop().Name;
+				MessageBox.Show(name, "Current desktop name");
+			}
+		}
+
+		private async void SetName(object sender, RoutedEventArgs e)
+		{
+			if (this.ThisWindowMenu.IsChecked ?? false)
+			{
+				try
+				{
+					this.GetCurrentDesktop().Name = this.NameTextBlock.Text;
+				}
+				catch (PlatformNotSupportedException ex)
+				{
+					MessageBox.Show(ex.Message, "Error");
+				}
+			}
+			else
+			{
+				await Task.Delay(_delay);
+				try
+				{
+					this.GetCurrentDesktop().Name = this.NameTextBlock.Text;
+				}
+				catch (PlatformNotSupportedException ex)
+				{
+					MessageBox.Show(ex.Message, "Error");
+				}
+			}
+		}
+
+		private async void GetWallpaperPath(object sender, RoutedEventArgs e)
+		{
+			if (this.ThisWindowMenu.IsChecked ?? false)
+			{
+				var name = this.GetCurrentDesktop().WallpaperPath;
+				MessageBox.Show(name, "Current wallpaper path");
+			}
+			else
+			{
+				await Task.Delay(_delay);
+				var name = this.GetCurrentDesktop().WallpaperPath;
+				MessageBox.Show(name, "Current wallpaper path");
+			}
+		}
+
+		private void MovePrevious(object sender, RoutedEventArgs e)
+		{
+			var desktop = this.GetCurrentDesktop();
+			if (desktop == null) return;
+
+			desktop.Move(desktop.Index - 1);
+		}
+
+		private void MoveNext(object sender, RoutedEventArgs e)
+		{
+			var desktop = this.GetCurrentDesktop();
+			if (desktop == null) return;
+
+			desktop.Move(desktop.Index + 1);
+		}
+
 
 		[DllImport("user32.dll")]
 		private static extern IntPtr GetForegroundWindow();
diff --git a/VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/AssemblyInfo.cs b/VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/AssemblyInfo.cs
index caedc46..d85b59a 100644
--- a/VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/AssemblyInfo.cs
+++ b/VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/AssemblyInfo.cs
@@ -1,15 +1,6 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 using System.Windows;
 
-[assembly: AssemblyTitle("VirtualDesktop.Showcase")]
-[assembly: AssemblyCompany("grabacr.net")]
-[assembly: AssemblyProduct("VirtualDesktop")]
-[assembly: AssemblyDescription("C# wrapper for IVirtualDesktopManager on Windows 10.")]
-[assembly: AssemblyCopyright("Copyright © 2015 Manato KAMEYA")]
-
 [assembly: ComVisible(false)]
 [assembly: Guid("5B4544B8-3EF0-4E9F-8D60-DD605AD99725")]
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
-
-[assembly: AssemblyVersion("1.0.0.0")]
diff --git a/VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/Resources.Designer.cs b/VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/Resources.Designer.cs
deleted file mode 100644
index 6c56888..0000000
--- a/VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     このコードはツールによって生成されました。
-//     ランタイム バージョン:4.0.30319.42000
-//
-//     このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
-//     コードが再生成されるときに損失したりします。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace VirtualDesktopShowcase.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   ローカライズされた文字列などを検索するための、厳密に型指定されたリソース クラスです。
-    /// </summary>
-    // このクラスは StronglyTypedResourceBuilder クラスが ResGen
-    // または Visual Studio のようなツールを使用して自動生成されました。
-    // メンバーを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に
-    // ResGen を実行し直すか、または VS プロジェクトをビルドし直します。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   このクラスで使用されているキャッシュされた ResourceManager インスタンスを返します。
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("VirtualDesktopShowcase.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   厳密に型指定されたこのリソース クラスを使用して、すべての検索リソースに対し、
-        ///   現在のスレッドの CurrentUICulture プロパティをオーバーライドします。
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-    }
-}
diff --git a/VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/Resources.resx b/VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/Resources.resx
deleted file mode 100644
index ffecec8..0000000
--- a/VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/Resources.resx
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/Settings.Designer.cs b/VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/Settings.Designer.cs
deleted file mode 100644
index 7f2c8a6..0000000
--- a/VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/Settings.Designer.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     このコードはツールによって生成されました。
-//     ランタイム バージョン:4.0.30319.42000
-//
-//     このファイルへの変更は、以下の状況下で不正な動作の原因になったり、
-//     コードが再生成されるときに損失したりします。
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace VirtualDesktopShowcase.Properties {
-    
-    
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")]
-    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
-        
-        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
-        
-        public static Settings Default {
-            get {
-                return defaultInstance;
-            }
-        }
-    }
-}
diff --git a/VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/Settings.settings b/VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/Settings.settings
deleted file mode 100644
index 8f2fd95..0000000
--- a/VirtualDesktop-master/samples/VirtualDesktop.Showcase/Properties/Settings.settings
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>
\ No newline at end of file
diff --git a/VirtualDesktop-master/samples/VirtualDesktop.Showcase/VirtualDesktop.Showcase.csproj b/VirtualDesktop-master/samples/VirtualDesktop.Showcase/VirtualDesktop.Showcase.csproj
index 12c9161..4f1e41d 100644
--- a/VirtualDesktop-master/samples/VirtualDesktop.Showcase/VirtualDesktop.Showcase.csproj
+++ b/VirtualDesktop-master/samples/VirtualDesktop.Showcase/VirtualDesktop.Showcase.csproj
@@ -1,141 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7B6874C1-48E1-4C04-8132-888495CA8EF5}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <UseWPF>true</UseWPF>
+    <Authors>Manato KAMEYA</Authors>
+    <Company>grabacr.net</Company>
+    <Product>VirtualDesktop</Product>
+    <Description>C# wrapper for IVirtualDesktopManager on Windows 10.</Description>
+    <Copyright>Copyright © 2020 Manato KAMEYA</Copyright>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageProjectUrl>https://github.com/Grabacr07/VirtualDesktop</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/Grabacr07/VirtualDesktop</RepositoryUrl>
+    <PackageTags>Windows;Windows10;Desktop;VirtualDesktop;</PackageTags>
     <RootNamespace>VirtualDesktopShowcase</RootNamespace>
-    <AssemblyName>VirtualDesktop.Showcase</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
+    <ProjectReference Include="..\..\source\VirtualDesktop.WPF\VirtualDesktop.WPF.csproj" />
+    <ProjectReference Include="..\..\source\VirtualDesktop\VirtualDesktop.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <None Include="app.manifest" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    <None Include="..\..\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
     </None>
-    <AppDesigner Include="Properties\" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\source\VirtualDesktop.WPF\VirtualDesktop.WPF.csproj">
-      <Project>{9dd597c6-065a-4764-a96c-1b18c4eded78}</Project>
-      <Name>VirtualDesktop.WPF</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\source\VirtualDesktop\VirtualDesktop.csproj">
-      <Project>{ab848ecd-76aa-41c0-b63d-86a8591b25aa}</Project>
-      <Name>VirtualDesktop</Name>
-    </ProjectReference>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+
 </Project>
\ No newline at end of file
diff --git a/VirtualDesktop-master/source/VirtualDesktop.WPF/Properties/AssemblyInfo.cs b/VirtualDesktop-master/source/VirtualDesktop.WPF/Properties/AssemblyInfo.cs
index 8b828e8..c2f9184 100644
--- a/VirtualDesktop-master/source/VirtualDesktop.WPF/Properties/AssemblyInfo.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop.WPF/Properties/AssemblyInfo.cs
@@ -1,14 +1,4 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("VirtualDesktop.WPF")]
-[assembly: AssemblyCompany("grabacr.net")]
-[assembly: AssemblyProduct("VirtualDesktop")]
-[assembly: AssemblyDescription("C# wrapper for IVirtualDesktopManager on Windows 10.")]
-[assembly: AssemblyCopyright("Copyright © 2015 Manato KAMEYA")]
+using System.Runtime.InteropServices;
 
 [assembly: ComVisible(false)]
 [assembly: Guid("9dd597c6-065a-4764-a96c-1b18c4eded78")]
-
-[assembly: AssemblyVersion("2.0.0")]
-[assembly: AssemblyInformationalVersion("2.0.0-beta3")]
diff --git a/VirtualDesktop-master/source/VirtualDesktop.WPF/VirtualDesktop.WPF.csproj b/VirtualDesktop-master/source/VirtualDesktop.WPF/VirtualDesktop.WPF.csproj
index c964e89..fd00c35 100644
--- a/VirtualDesktop-master/source/VirtualDesktop.WPF/VirtualDesktop.WPF.csproj
+++ b/VirtualDesktop-master/source/VirtualDesktop.WPF/VirtualDesktop.WPF.csproj
@@ -1,105 +1,35 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{9DD597C6-065A-4764-A96C-1B18C4EDED78}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <UseWPF>true</UseWPF>
+    <Version>4.0.1</Version>
+    <Authors>Manato KAMEYA</Authors>
+    <Company>grabacr.net</Company>
+    <Description>C# wrapper for IVirtualDesktopManager on Windows 10.</Description>
+    <Copyright>Copyright © 2020 Manato KAMEYA</Copyright>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageProjectUrl>https://github.com/Grabacr07/VirtualDesktop</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/Grabacr07/VirtualDesktop</RepositoryUrl>
+    <Product>VirtualDesktop</Product>
     <RootNamespace>WindowsDesktop</RootNamespace>
-    <AssemblyName>VirtualDesktop.WPF</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <PackageTags>Windows;Windows10;Desktop;VirtualDesktop;</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DocumentationFile>bin\Release\$(TargetFramework)\VirtualDesktop.WPF.xml</DocumentationFile>
+    <NoWarn>1701,1702,1591</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>1591</NoWarn>
-    <DocumentationFile>bin\Release\VirtualDesktop.WPF.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <DebugType>full</DebugType>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <ErrorReport>prompt</ErrorReport>
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>true</DebugSymbols>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xaml" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="WindowsBase" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ApplicationExtensions.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="WindowExtensions.cs" />
-  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\VirtualDesktop\VirtualDesktop.csproj">
-      <Project>{ab848ecd-76aa-41c0-b63d-86a8591b25aa}</Project>
-      <Name>VirtualDesktop</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\VirtualDesktop\VirtualDesktop.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="VirtualDesktop.WPF.nuspec" />
+    <None Include="..\..\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+</Project>
diff --git a/VirtualDesktop-master/source/VirtualDesktop.WPF/VirtualDesktop.WPF.nuspec b/VirtualDesktop-master/source/VirtualDesktop.WPF/VirtualDesktop.WPF.nuspec
deleted file mode 100644
index 25237fe..0000000
--- a/VirtualDesktop-master/source/VirtualDesktop.WPF/VirtualDesktop.WPF.nuspec
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>$id$</id>
-    <title>$title$</title>
-    <version>$version$</version>
-    <authors>$author$</authors>
-    <owners>$author$</owners>
-    <licenseUrl>https://github.com/Grabacr07/VirtualDesktop/blob/master/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/Grabacr07/VirtualDesktop</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <language>en-US</language>
-    <tags>Windows Windows10 Desktop VirtualDesktop WPF</tags>
-    <dependencies>
-      <dependency id="VirtualDesktop" version="2.0.0-beta3" />
-    </dependencies>
-  </metadata>
-</package>
diff --git a/VirtualDesktop-master/source/VirtualDesktop.WinForms/Properties/AssemblyInfo.cs b/VirtualDesktop-master/source/VirtualDesktop.WinForms/Properties/AssemblyInfo.cs
index 3ba1759..78556a4 100644
--- a/VirtualDesktop-master/source/VirtualDesktop.WinForms/Properties/AssemblyInfo.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop.WinForms/Properties/AssemblyInfo.cs
@@ -1,14 +1,4 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("VirtualDesktop.WinForms")]
-[assembly: AssemblyCompany("grabacr.net")]
-[assembly: AssemblyProduct("VirtualDesktop")]
-[assembly: AssemblyDescription("C# wrapper for IVirtualDesktopManager on Windows 10.")]
-[assembly: AssemblyCopyright("Copyright © 2015 Manato KAMEYA")]
+using System.Runtime.InteropServices;
 
 [assembly: ComVisible(false)]
 [assembly: Guid("da586cec-2ffe-42c5-aeda-56d25984c7ad")]
-
-[assembly: AssemblyVersion("1.0.3")]
-[assembly: AssemblyInformationalVersion("1.0.3")]
diff --git a/VirtualDesktop-master/source/VirtualDesktop.WinForms/VirtualDesktop.WinForms.csproj b/VirtualDesktop-master/source/VirtualDesktop.WinForms/VirtualDesktop.WinForms.csproj
index e2c4ee3..b12f915 100644
--- a/VirtualDesktop-master/source/VirtualDesktop.WinForms/VirtualDesktop.WinForms.csproj
+++ b/VirtualDesktop-master/source/VirtualDesktop.WinForms/VirtualDesktop.WinForms.csproj
@@ -1,85 +1,36 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{DA586CEC-2FFE-42C5-AEDA-56D25984C7AD}</ProjectGuid>
     <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <UseWindowsForms>true</UseWindowsForms>
+    <Version>4.0.1</Version>
+    <Authors>Manato KAMEYA</Authors>
+    <Company>grabacr.net</Company>
+    <Description>C# wrapper for IVirtualDesktopManager on Windows 10.</Description>
+    <Copyright>Copyright © 2020 Manato KAMEYA</Copyright>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageProjectUrl>https://github.com/Grabacr07/VirtualDesktop</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/Grabacr07/VirtualDesktop</RepositoryUrl>
+    <Product>VirtualDesktop</Product>
     <RootNamespace>WindowsDesktop</RootNamespace>
-    <AssemblyName>VirtualDesktop.WinForms</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <PackageTags>Windows;Windows10;Desktop;VirtualDesktop;</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DocumentationFile>bin\Release\$(TargetFramework)\VirtualDesktop.WinForms.xml</DocumentationFile>
+    <NoWarn>1701,1702,1591</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <NoWarn>1591</NoWarn>
-    <DocumentationFile>bin\Release\VirtualDesktop.WinForms.xml</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="FormExtensions.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\VirtualDesktop\VirtualDesktop.csproj">
-      <Project>{ab848ecd-76aa-41c0-b63d-86a8591b25aa}</Project>
-      <Name>VirtualDesktop</Name>
-    </ProjectReference>
+    <None Include="..\..\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="VirtualDesktop.WinForms.nuspec" />
+    <ProjectReference Include="..\VirtualDesktop\VirtualDesktop.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+
 </Project>
\ No newline at end of file
diff --git a/VirtualDesktop-master/source/VirtualDesktop.WinForms/VirtualDesktop.WinForms.nuspec b/VirtualDesktop-master/source/VirtualDesktop.WinForms/VirtualDesktop.WinForms.nuspec
deleted file mode 100644
index e1da0e5..0000000
--- a/VirtualDesktop-master/source/VirtualDesktop.WinForms/VirtualDesktop.WinForms.nuspec
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>$id$</id>
-    <title>$title$</title>
-    <version>$version$</version>
-    <authors>$author$</authors>
-    <owners>$author$</owners>
-    <licenseUrl>https://github.com/Grabacr07/VirtualDesktop/blob/master/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/Grabacr07/VirtualDesktop</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <language>en-US</language>
-    <tags>Windows Windows10 Desktop VirtualDesktop WinForms</tags>
-    <dependencies>
-      <dependency id="VirtualDesktop" version="1.0.3" />
-    </dependencies>
-  </metadata>
-</package>
diff --git a/VirtualDesktop-master/source/VirtualDesktop.sln b/VirtualDesktop-master/source/VirtualDesktop.sln
index 8e89ffc..9046b58 100644
--- a/VirtualDesktop-master/source/VirtualDesktop.sln
+++ b/VirtualDesktop-master/source/VirtualDesktop.sln
@@ -1,64 +1,45 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27703.2000
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29709.97
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualDesktop", "VirtualDesktop\VirtualDesktop.csproj", "{AB848ECD-76AA-41C0-B63D-86A8591B25AA}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{17B4686F-1AFC-4D5E-BCD8-408DE4CEC3C3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualDesktop.WPF", "VirtualDesktop.WPF\VirtualDesktop.WPF.csproj", "{9DD597C6-065A-4764-A96C-1B18C4EDED78}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VirtualDesktop", "VirtualDesktop\VirtualDesktop.csproj", "{08312F86-7BB2-46BF-A4E4-5A35757D65EE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualDesktop.WinForms", "VirtualDesktop.WinForms\VirtualDesktop.WinForms.csproj", "{DA586CEC-2FFE-42C5-AEDA-56D25984C7AD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VirtualDesktop.WPF", "VirtualDesktop.WPF\VirtualDesktop.WPF.csproj", "{0C17C595-1669-4333-8153-A04676AA3EF3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{17B4686F-1AFC-4D5E-BCD8-408DE4CEC3C3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VirtualDesktop.Showcase", "..\samples\VirtualDesktop.Showcase\VirtualDesktop.Showcase.csproj", "{EEF46F33-3DDB-4D77-9054-4273332745B4}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualDesktop.Showcase", "..\samples\VirtualDesktop.Showcase\VirtualDesktop.Showcase.csproj", "{7B6874C1-48E1-4C04-8132-888495CA8EF5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VirtualDesktop.WinForms", "VirtualDesktop.WinForms\VirtualDesktop.WinForms.csproj", "{4B6FB0EB-943E-42C9-8CC9-990D84A2EEDB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{AB848ECD-76AA-41C0-B63D-86A8591B25AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AB848ECD-76AA-41C0-B63D-86A8591B25AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AB848ECD-76AA-41C0-B63D-86A8591B25AA}.Debug|x64.ActiveCfg = Debug|x64
-		{AB848ECD-76AA-41C0-B63D-86A8591B25AA}.Debug|x64.Build.0 = Debug|x64
-		{AB848ECD-76AA-41C0-B63D-86A8591B25AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AB848ECD-76AA-41C0-B63D-86A8591B25AA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AB848ECD-76AA-41C0-B63D-86A8591B25AA}.Release|x64.ActiveCfg = Release|x64
-		{AB848ECD-76AA-41C0-B63D-86A8591B25AA}.Release|x64.Build.0 = Release|x64
-		{9DD597C6-065A-4764-A96C-1B18C4EDED78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9DD597C6-065A-4764-A96C-1B18C4EDED78}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9DD597C6-065A-4764-A96C-1B18C4EDED78}.Debug|x64.ActiveCfg = Debug|x64
-		{9DD597C6-065A-4764-A96C-1B18C4EDED78}.Debug|x64.Build.0 = Debug|x64
-		{9DD597C6-065A-4764-A96C-1B18C4EDED78}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9DD597C6-065A-4764-A96C-1B18C4EDED78}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9DD597C6-065A-4764-A96C-1B18C4EDED78}.Release|x64.ActiveCfg = Release|x64
-		{9DD597C6-065A-4764-A96C-1B18C4EDED78}.Release|x64.Build.0 = Release|x64
-		{DA586CEC-2FFE-42C5-AEDA-56D25984C7AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{DA586CEC-2FFE-42C5-AEDA-56D25984C7AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{DA586CEC-2FFE-42C5-AEDA-56D25984C7AD}.Debug|x64.ActiveCfg = Debug|x64
-		{DA586CEC-2FFE-42C5-AEDA-56D25984C7AD}.Debug|x64.Build.0 = Debug|x64
-		{DA586CEC-2FFE-42C5-AEDA-56D25984C7AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{DA586CEC-2FFE-42C5-AEDA-56D25984C7AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{DA586CEC-2FFE-42C5-AEDA-56D25984C7AD}.Release|x64.ActiveCfg = Release|x64
-		{DA586CEC-2FFE-42C5-AEDA-56D25984C7AD}.Release|x64.Build.0 = Release|x64
-		{7B6874C1-48E1-4C04-8132-888495CA8EF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7B6874C1-48E1-4C04-8132-888495CA8EF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7B6874C1-48E1-4C04-8132-888495CA8EF5}.Debug|x64.ActiveCfg = Debug|x64
-		{7B6874C1-48E1-4C04-8132-888495CA8EF5}.Debug|x64.Build.0 = Debug|x64
-		{7B6874C1-48E1-4C04-8132-888495CA8EF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7B6874C1-48E1-4C04-8132-888495CA8EF5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7B6874C1-48E1-4C04-8132-888495CA8EF5}.Release|x64.ActiveCfg = Release|x64
-		{7B6874C1-48E1-4C04-8132-888495CA8EF5}.Release|x64.Build.0 = Release|x64
+		{08312F86-7BB2-46BF-A4E4-5A35757D65EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08312F86-7BB2-46BF-A4E4-5A35757D65EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08312F86-7BB2-46BF-A4E4-5A35757D65EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08312F86-7BB2-46BF-A4E4-5A35757D65EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0C17C595-1669-4333-8153-A04676AA3EF3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0C17C595-1669-4333-8153-A04676AA3EF3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0C17C595-1669-4333-8153-A04676AA3EF3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0C17C595-1669-4333-8153-A04676AA3EF3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EEF46F33-3DDB-4D77-9054-4273332745B4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EEF46F33-3DDB-4D77-9054-4273332745B4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EEF46F33-3DDB-4D77-9054-4273332745B4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4B6FB0EB-943E-42C9-8CC9-990D84A2EEDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4B6FB0EB-943E-42C9-8CC9-990D84A2EEDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4B6FB0EB-943E-42C9-8CC9-990D84A2EEDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4B6FB0EB-943E-42C9-8CC9-990D84A2EEDB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{7B6874C1-48E1-4C04-8132-888495CA8EF5} = {17B4686F-1AFC-4D5E-BCD8-408DE4CEC3C3}
+		{EEF46F33-3DDB-4D77-9054-4273332745B4} = {17B4686F-1AFC-4D5E-BCD8-408DE4CEC3C3}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0EDF8EBE-5CA7-414F-B7EA-04FC9D5D0FE7}
diff --git a/VirtualDesktop-master/source/VirtualDesktop.sln.DotSettings b/VirtualDesktop-master/source/VirtualDesktop.sln.DotSettings
index 8c2cf32..88837f5 100644
--- a/VirtualDesktop-master/source/VirtualDesktop.sln.DotSettings
+++ b/VirtualDesktop-master/source/VirtualDesktop.sln.DotSettings
@@ -37,8 +37,14 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/ProcessingInstructionAttributesFormat/@EntryValue">OnSingleLine</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/TagAttributesFormat/@EntryValue">OnSingleLine</s:String>
 	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/TagSpaceBeforeHeaderEnd1/@EntryValue">False</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/IndentSubtags/@EntryValue">ZeroIndent</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/IndentTagContent/@EntryValue">RemoveIndent</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/BlankLineAfterProcessingInstructions/@EntryValue">False</s:Boolean>
+	
+	
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/INDENT_SIZE/@EntryValue">2</s:Int64>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/LINE_FEED_AT_FILE_END/@EntryValue">True</s:Boolean>
+	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/TAB_WIDTH/@EntryValue">2</s:Int64>
+	
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/WRAP_LINES/@EntryValue">False</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CSharpUsing/KeepImports/=System/@EntryIndexedValue">System</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpUsing/KeepImports/=System_002ECollections_002EGeneric/@EntryIndexedValue">System.Collections.Generic</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpUsing/KeepImports/=System_002ELinq/@EntryIndexedValue">System.Linq</s:String>
@@ -82,8 +88,8 @@
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_WHILE/@EntryValue">Required</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_FOREACH/@EntryValue">Required</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/BRACES_FOR_IFELSE/@EntryValue">NotRequired</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/ProcessingInstructionAttributeIndenting/@EntryValue">OneStep</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlFormatter/TagAttributeIndenting/@EntryValue">OneStep</s:String>
+	
+	
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/ProcessingInstructionAttributeIndenting/@EntryValue">OneStep</s:String>
 	<s:String x:Key="/Default/CodeStyle/CodeFormatting/XmlDocFormatter/IndentTagContent/@EntryValue">ZeroIndent</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpFileLayoutPatterns/Pattern/@EntryValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&#xD;
@@ -297,6 +303,7 @@
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAlwaysTreatStructAsNotReorderableMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
diff --git a/VirtualDesktop-master/source/VirtualDesktop/App_Packages/Source.JetBrains.Annotations_11.1.1/JetBrains.Annotations.cs b/VirtualDesktop-master/source/VirtualDesktop/App_Packages/Source.JetBrains.Annotations_11.1.1/JetBrains.Annotations.cs
deleted file mode 100644
index a3c0558..0000000
--- a/VirtualDesktop-master/source/VirtualDesktop/App_Packages/Source.JetBrains.Annotations_11.1.1/JetBrains.Annotations.cs
+++ /dev/null
@@ -1,1065 +0,0 @@
-/* MIT License
-
-Copyright (c) 2016 JetBrains http://www.jetbrains.com
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE. */
-
-using System;
-
-#pragma warning disable 1591
-// ReSharper disable UnusedMember.Global
-// ReSharper disable MemberCanBePrivate.Global
-// ReSharper disable UnusedAutoPropertyAccessor.Global
-// ReSharper disable IntroduceOptionalParameters.Global
-// ReSharper disable MemberCanBeProtected.Global
-// ReSharper disable InconsistentNaming
-
-namespace JetBrains.Annotations
-{
-  /// <summary>
-  /// Indicates that the value of the marked element could be <c>null</c> sometimes,
-  /// so the check for <c>null</c> is necessary before its usage.
-  /// </summary>
-  /// <example><code>
-  /// [CanBeNull] object Test() => null;
-  /// 
-  /// void UseTest() {
-  ///   var p = Test();
-  ///   var s = p.ToString(); // Warning: Possible 'System.NullReferenceException'
-  /// }
-  /// </code></example>
-  [AttributeUsage(
-    AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property |
-    AttributeTargets.Delegate | AttributeTargets.Field | AttributeTargets.Event |
-    AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.GenericParameter)]
-internal sealed class CanBeNullAttribute : Attribute { }
-
-  /// <summary>
-  /// Indicates that the value of the marked element could never be <c>null</c>.
-  /// </summary>
-  /// <example><code>
-  /// [NotNull] object Foo() {
-  ///   return null; // Warning: Possible 'null' assignment
-  /// }
-  /// </code></example>
-  [AttributeUsage(
-    AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property |
-    AttributeTargets.Delegate | AttributeTargets.Field | AttributeTargets.Event |
-    AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.GenericParameter)]
-internal sealed class NotNullAttribute : Attribute { }
-
-  /// <summary>
-  /// Can be appplied to symbols of types derived from IEnumerable as well as to symbols of Task
-  /// and Lazy classes to indicate that the value of a collection item, of the Task.Result property
-  /// or of the Lazy.Value property can never be null.
-  /// </summary>
-  [AttributeUsage(
-    AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property |
-    AttributeTargets.Delegate | AttributeTargets.Field)]
-internal sealed class ItemNotNullAttribute : Attribute { }
-
-  /// <summary>
-  /// Can be appplied to symbols of types derived from IEnumerable as well as to symbols of Task
-  /// and Lazy classes to indicate that the value of a collection item, of the Task.Result property
-  /// or of the Lazy.Value property can be null.
-  /// </summary>
-  [AttributeUsage(
-    AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property |
-    AttributeTargets.Delegate | AttributeTargets.Field)]
-internal sealed class ItemCanBeNullAttribute : Attribute { }
-
-  /// <summary>
-  /// Indicates that the marked method builds string by format pattern and (optional) arguments.
-  /// Parameter, which contains format string, should be given in constructor. The format string
-  /// should be in <see cref="string.Format(IFormatProvider,string,object[])"/>-like form.
-  /// </summary>
-  /// <example><code>
-  /// [StringFormatMethod("message")]
-  /// void ShowError(string message, params object[] args) { /* do something */ }
-  /// 
-  /// void Foo() {
-  ///   ShowError("Failed: {0}"); // Warning: Non-existing argument in format string
-  /// }
-  /// </code></example>
-  [AttributeUsage(
-    AttributeTargets.Constructor | AttributeTargets.Method |
-    AttributeTargets.Property | AttributeTargets.Delegate)]
-internal sealed class StringFormatMethodAttribute : Attribute
-  {
-    /// <param name="formatParameterName">
-    /// Specifies which parameter of an annotated method should be treated as format-string
-    /// </param>
-    public StringFormatMethodAttribute([NotNull] string formatParameterName)
-    {
-      FormatParameterName = formatParameterName;
-    }
-
-    [NotNull] public string FormatParameterName { get; private set; }
-  }
-
-  /// <summary>
-  /// For a parameter that is expected to be one of the limited set of values.
-  /// Specify fields of which type should be used as values for this parameter.
-  /// </summary>
-  [AttributeUsage(
-    AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.Field,
-    AllowMultiple = true)]
-internal sealed class ValueProviderAttribute : Attribute
-  {
-    public ValueProviderAttribute([NotNull] string name)
-    {
-      Name = name;
-    }
-
-    [NotNull] public string Name { get; private set; }
-  }
-
-  /// <summary>
-  /// Indicates that the function argument should be string literal and match one
-  /// of the parameters of the caller function. For example, ReSharper annotates
-  /// the parameter of <see cref="System.ArgumentNullException"/>.
-  /// </summary>
-  /// <example><code>
-  /// void Foo(string param) {
-  ///   if (param == null)
-  ///     throw new ArgumentNullException("par"); // Warning: Cannot resolve symbol
-  /// }
-  /// </code></example>
-  [AttributeUsage(AttributeTargets.Parameter)]
-internal sealed class InvokerParameterNameAttribute : Attribute { }
-
-  /// <summary>
-  /// Indicates that the method is contained in a type that implements
-  /// <c>System.ComponentModel.INotifyPropertyChanged</c> interface and this method
-  /// is used to notify that some property value changed.
-  /// </summary>
-  /// <remarks>
-  /// The method should be non-static and conform to one of the supported signatures:
-  /// <list>
-  /// <item><c>NotifyChanged(string)</c></item>
-  /// <item><c>NotifyChanged(params string[])</c></item>
-  /// <item><c>NotifyChanged{T}(Expression{Func{T}})</c></item>
-  /// <item><c>NotifyChanged{T,U}(Expression{Func{T,U}})</c></item>
-  /// <item><c>SetProperty{T}(ref T, T, string)</c></item>
-  /// </list>
-  /// </remarks>
-  /// <example><code>
-  /// public class Foo : INotifyPropertyChanged {
-  ///   public event PropertyChangedEventHandler PropertyChanged;
-  /// 
-  ///   [NotifyPropertyChangedInvocator]
-  ///   protected virtual void NotifyChanged(string propertyName) { ... }
-  ///
-  ///   string _name;
-  /// 
-  ///   public string Name {
-  ///     get { return _name; }
-  ///     set { _name = value; NotifyChanged("LastName"); /* Warning */ }
-  ///   }
-  /// }
-  /// </code>
-  /// Examples of generated notifications:
-  /// <list>
-  /// <item><c>NotifyChanged("Property")</c></item>
-  /// <item><c>NotifyChanged(() =&gt; Property)</c></item>
-  /// <item><c>NotifyChanged((VM x) =&gt; x.Property)</c></item>
-  /// <item><c>SetProperty(ref myField, value, "Property")</c></item>
-  /// </list>
-  /// </example>
-  [AttributeUsage(AttributeTargets.Method)]
-internal sealed class NotifyPropertyChangedInvocatorAttribute : Attribute
-  {
-    public NotifyPropertyChangedInvocatorAttribute() { }
-    public NotifyPropertyChangedInvocatorAttribute([NotNull] string parameterName)
-    {
-      ParameterName = parameterName;
-    }
-
-    [CanBeNull] public string ParameterName { get; private set; }
-  }
-
-  /// <summary>
-  /// Describes dependency between method input and output.
-  /// </summary>
-  /// <syntax>
-  /// <p>Function Definition Table syntax:</p>
-  /// <list>
-  /// <item>FDT      ::= FDTRow [;FDTRow]*</item>
-  /// <item>FDTRow   ::= Input =&gt; Output | Output &lt;= Input</item>
-  /// <item>Input    ::= ParameterName: Value [, Input]*</item>
-  /// <item>Output   ::= [ParameterName: Value]* {halt|stop|void|nothing|Value}</item>
-  /// <item>Value    ::= true | false | null | notnull | canbenull</item>
-  /// </list>
-  /// If method has single input parameter, it's name could be omitted.<br/>
-  /// Using <c>halt</c> (or <c>void</c>/<c>nothing</c>, which is the same) for method output
-  /// means that the methos doesn't return normally (throws or terminates the process).<br/>
-  /// Value <c>canbenull</c> is only applicable for output parameters.<br/>
-  /// You can use multiple <c>[ContractAnnotation]</c> for each FDT row, or use single attribute
-  /// with rows separated by semicolon. There is no notion of order rows, all rows are checked
-  /// for applicability and applied per each program state tracked by R# analysis.<br/>
-  /// </syntax>
-  /// <examples><list>
-  /// <item><code>
-  /// [ContractAnnotation("=&gt; halt")]
-  /// public void TerminationMethod()
-  /// </code></item>
-  /// <item><code>
-  /// [ContractAnnotation("halt &lt;= condition: false")]
-  /// public void Assert(bool condition, string text) // regular assertion method
-  /// </code></item>
-  /// <item><code>
-  /// [ContractAnnotation("s:null =&gt; true")]
-  /// public bool IsNullOrEmpty(string s) // string.IsNullOrEmpty()
-  /// </code></item>
-  /// <item><code>
-  /// // A method that returns null if the parameter is null,
-  /// // and not null if the parameter is not null
-  /// [ContractAnnotation("null =&gt; null; notnull =&gt; notnull")]
-  /// public object Transform(object data) 
-  /// </code></item>
-  /// <item><code>
-  /// [ContractAnnotation("=&gt; true, result: notnull; =&gt; false, result: null")]
-  /// public bool TryParse(string s, out Person result)
-  /// </code></item>
-  /// </list></examples>
-  [AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
-internal sealed class ContractAnnotationAttribute : Attribute
-  {
-    public ContractAnnotationAttribute([NotNull] string contract)
-      : this(contract, false) { }
-
-    public ContractAnnotationAttribute([NotNull] string contract, bool forceFullStates)
-    {
-      Contract = contract;
-      ForceFullStates = forceFullStates;
-    }
-
-    [NotNull] public string Contract { get; private set; }
-
-    public bool ForceFullStates { get; private set; }
-  }
-
-  /// <summary>
-  /// Indicates that marked element should be localized or not.
-  /// </summary>
-  /// <example><code>
-  /// [LocalizationRequiredAttribute(true)]
-  /// class Foo {
-  ///   string str = "my string"; // Warning: Localizable string
-  /// }
-  /// </code></example>
-  [AttributeUsage(AttributeTargets.All)]
-internal sealed class LocalizationRequiredAttribute : Attribute
-  {
-    public LocalizationRequiredAttribute() : this(true) { }
-
-    public LocalizationRequiredAttribute(bool required)
-    {
-      Required = required;
-    }
-
-    public bool Required { get; private set; }
-  }
-
-  /// <summary>
-  /// Indicates that the value of the marked type (or its derivatives)
-  /// cannot be compared using '==' or '!=' operators and <c>Equals()</c>
-  /// should be used instead. However, using '==' or '!=' for comparison
-  /// with <c>null</c> is always permitted.
-  /// </summary>
-  /// <example><code>
-  /// [CannotApplyEqualityOperator]
-  /// class NoEquality { }
-  /// 
-  /// class UsesNoEquality {
-  ///   void Test() {
-  ///     var ca1 = new NoEquality();
-  ///     var ca2 = new NoEquality();
-  ///     if (ca1 != null) { // OK
-  ///       bool condition = ca1 == ca2; // Warning
-  ///     }
-  ///   }
-  /// }
-  /// </code></example>
-  [AttributeUsage(AttributeTargets.Interface | AttributeTargets.Class | AttributeTargets.Struct)]
-internal sealed class CannotApplyEqualityOperatorAttribute : Attribute { }
-
-  /// <summary>
-  /// When applied to a target attribute, specifies a requirement for any type marked
-  /// with the target attribute to implement or inherit specific type or types.
-  /// </summary>
-  /// <example><code>
-  /// [BaseTypeRequired(typeof(IComponent)] // Specify requirement
-  /// class ComponentAttribute : Attribute { }
-  /// 
-  /// [Component] // ComponentAttribute requires implementing IComponent interface
-  /// class MyComponent : IComponent { }
-  /// </code></example>
-  [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-  [BaseTypeRequired(typeof(Attribute))]
-internal sealed class BaseTypeRequiredAttribute : Attribute
-  {
-    public BaseTypeRequiredAttribute([NotNull] Type baseType)
-    {
-      BaseType = baseType;
-    }
-
-    [NotNull] public Type BaseType { get; private set; }
-  }
-
-  /// <summary>
-  /// Indicates that the marked symbol is used implicitly (e.g. via reflection, in external library),
-  /// so this symbol will not be marked as unused (as well as by other usage inspections).
-  /// </summary>
-  [AttributeUsage(AttributeTargets.All)]
-internal sealed class UsedImplicitlyAttribute : Attribute
-  {
-    public UsedImplicitlyAttribute()
-      : this(ImplicitUseKindFlags.Default, ImplicitUseTargetFlags.Default) { }
-
-    public UsedImplicitlyAttribute(ImplicitUseKindFlags useKindFlags)
-      : this(useKindFlags, ImplicitUseTargetFlags.Default) { }
-
-    public UsedImplicitlyAttribute(ImplicitUseTargetFlags targetFlags)
-      : this(ImplicitUseKindFlags.Default, targetFlags) { }
-
-    public UsedImplicitlyAttribute(ImplicitUseKindFlags useKindFlags, ImplicitUseTargetFlags targetFlags)
-    {
-      UseKindFlags = useKindFlags;
-      TargetFlags = targetFlags;
-    }
-
-    public ImplicitUseKindFlags UseKindFlags { get; private set; }
-
-    public ImplicitUseTargetFlags TargetFlags { get; private set; }
-  }
-
-  /// <summary>
-  /// Should be used on attributes and causes ReSharper to not mark symbols marked with such attributes
-  /// as unused (as well as by other usage inspections)
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Class | AttributeTargets.GenericParameter)]
-internal sealed class MeansImplicitUseAttribute : Attribute
-  {
-    public MeansImplicitUseAttribute()
-      : this(ImplicitUseKindFlags.Default, ImplicitUseTargetFlags.Default) { }
-
-    public MeansImplicitUseAttribute(ImplicitUseKindFlags useKindFlags)
-      : this(useKindFlags, ImplicitUseTargetFlags.Default) { }
-
-    public MeansImplicitUseAttribute(ImplicitUseTargetFlags targetFlags)
-      : this(ImplicitUseKindFlags.Default, targetFlags) { }
-
-    public MeansImplicitUseAttribute(ImplicitUseKindFlags useKindFlags, ImplicitUseTargetFlags targetFlags)
-    {
-      UseKindFlags = useKindFlags;
-      TargetFlags = targetFlags;
-    }
-
-    [UsedImplicitly] public ImplicitUseKindFlags UseKindFlags { get; private set; }
-
-    [UsedImplicitly] public ImplicitUseTargetFlags TargetFlags { get; private set; }
-  }
-
-  [Flags]
-internal enum ImplicitUseKindFlags
-  {
-    Default = Access | Assign | InstantiatedWithFixedConstructorSignature,
-    /// <summary>Only entity marked with attribute considered used.</summary>
-    Access = 1,
-    /// <summary>Indicates implicit assignment to a member.</summary>
-    Assign = 2,
-    /// <summary>
-    /// Indicates implicit instantiation of a type with fixed constructor signature.
-    /// That means any unused constructor parameters won't be reported as such.
-    /// </summary>
-    InstantiatedWithFixedConstructorSignature = 4,
-    /// <summary>Indicates implicit instantiation of a type.</summary>
-    InstantiatedNoFixedConstructorSignature = 8,
-  }
-
-  /// <summary>
-  /// Specify what is considered used implicitly when marked
-  /// with <see cref="MeansImplicitUseAttribute"/> or <see cref="UsedImplicitlyAttribute"/>.
-  /// </summary>
-  [Flags]
-internal enum ImplicitUseTargetFlags
-  {
-    Default = Itself,
-    Itself = 1,
-    /// <summary>Members of entity marked with attribute are considered used.</summary>
-    Members = 2,
-    /// <summary>Entity marked with attribute and all its members considered used.</summary>
-    WithMembers = Itself | Members
-  }
-
-  /// <summary>
-  /// This attribute is intended to mark publicly available API
-  /// which should not be removed and so is treated as used.
-  /// </summary>
-  [MeansImplicitUse(ImplicitUseTargetFlags.WithMembers)]
-internal sealed class PublicAPIAttribute : Attribute
-  {
-    public PublicAPIAttribute() { }
-
-    public PublicAPIAttribute([NotNull] string comment)
-    {
-      Comment = comment;
-    }
-
-    [CanBeNull] public string Comment { get; private set; }
-  }
-
-  /// <summary>
-  /// Tells code analysis engine if the parameter is completely handled when the invoked method is on stack.
-  /// If the parameter is a delegate, indicates that delegate is executed while the method is executed.
-  /// If the parameter is an enumerable, indicates that it is enumerated while the method is executed.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-internal sealed class InstantHandleAttribute : Attribute { }
-
-  /// <summary>
-  /// Indicates that a method does not make any observable state changes.
-  /// The same as <c>System.Diagnostics.Contracts.PureAttribute</c>.
-  /// </summary>
-  /// <example><code>
-  /// [Pure] int Multiply(int x, int y) => x * y;
-  /// 
-  /// void M() {
-  ///   Multiply(123, 42); // Waring: Return value of pure method is not used
-  /// }
-  /// </code></example>
-  [AttributeUsage(AttributeTargets.Method)]
-internal sealed class PureAttribute : Attribute { }
-
-  /// <summary>
-  /// Indicates that the return value of method invocation must be used.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Method)]
-internal sealed class MustUseReturnValueAttribute : Attribute
-  {
-    public MustUseReturnValueAttribute() { }
-
-    public MustUseReturnValueAttribute([NotNull] string justification)
-    {
-      Justification = justification;
-    }
-
-    [CanBeNull] public string Justification { get; private set; }
-  }
-
-  /// <summary>
-  /// Indicates the type member or parameter of some type, that should be used instead of all other ways
-  /// to get the value that type. This annotation is useful when you have some "context" value evaluated
-  /// and stored somewhere, meaning that all other ways to get this value must be consolidated with existing one.
-  /// </summary>
-  /// <example><code>
-  /// class Foo {
-  ///   [ProvidesContext] IBarService _barService = ...;
-  /// 
-  ///   void ProcessNode(INode node) {
-  ///     DoSomething(node, node.GetGlobalServices().Bar);
-  ///     //              ^ Warning: use value of '_barService' field
-  ///   }
-  /// }
-  /// </code></example>
-  [AttributeUsage(
-    AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Parameter | AttributeTargets.Method |
-    AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Struct | AttributeTargets.GenericParameter)]
-internal sealed class ProvidesContextAttribute : Attribute { }
-
-  /// <summary>
-  /// Indicates that a parameter is a path to a file or a folder within a web project.
-  /// Path can be relative or absolute, starting from web root (~).
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-internal sealed class PathReferenceAttribute : Attribute
-  {
-    public PathReferenceAttribute() { }
-
-    public PathReferenceAttribute([NotNull, PathReference] string basePath)
-    {
-      BasePath = basePath;
-    }
-
-    [CanBeNull] public string BasePath { get; private set; }
-  }
-
-  /// <summary>
-  /// An extension method marked with this attribute is processed by ReSharper code completion
-  /// as a 'Source Template'. When extension method is completed over some expression, it's source code
-  /// is automatically expanded like a template at call site.
-  /// </summary>
-  /// <remarks>
-  /// Template method body can contain valid source code and/or special comments starting with '$'.
-  /// Text inside these comments is added as source code when the template is applied. Template parameters
-  /// can be used either as additional method parameters or as identifiers wrapped in two '$' signs.
-  /// Use the <see cref="MacroAttribute"/> attribute to specify macros for parameters.
-  /// </remarks>
-  /// <example>
-  /// In this example, the 'forEach' method is a source template available over all values
-  /// of enumerable types, producing ordinary C# 'foreach' statement and placing caret inside block:
-  /// <code>
-  /// [SourceTemplate]
-  /// public static void forEach&lt;T&gt;(this IEnumerable&lt;T&gt; xs) {
-  ///   foreach (var x in xs) {
-  ///      //$ $END$
-  ///   }
-  /// }
-  /// </code>
-  /// </example>
-  [AttributeUsage(AttributeTargets.Method)]
-internal sealed class SourceTemplateAttribute : Attribute { }
-
-  /// <summary>
-  /// Allows specifying a macro for a parameter of a <see cref="SourceTemplateAttribute">source template</see>.
-  /// </summary>
-  /// <remarks>
-  /// You can apply the attribute on the whole method or on any of its additional parameters. The macro expression
-  /// is defined in the <see cref="MacroAttribute.Expression"/> property. When applied on a method, the target
-  /// template parameter is defined in the <see cref="MacroAttribute.Target"/> property. To apply the macro silently
-  /// for the parameter, set the <see cref="MacroAttribute.Editable"/> property value = -1.
-  /// </remarks>
-  /// <example>
-  /// Applying the attribute on a source template method:
-  /// <code>
-  /// [SourceTemplate, Macro(Target = "item", Expression = "suggestVariableName()")]
-  /// public static void forEach&lt;T&gt;(this IEnumerable&lt;T&gt; collection) {
-  ///   foreach (var item in collection) {
-  ///     //$ $END$
-  ///   }
-  /// }
-  /// </code>
-  /// Applying the attribute on a template method parameter:
-  /// <code>
-  /// [SourceTemplate]
-  /// public static void something(this Entity x, [Macro(Expression = "guid()", Editable = -1)] string newguid) {
-  ///   /*$ var $x$Id = "$newguid$" + x.ToString();
-  ///   x.DoSomething($x$Id); */
-  /// }
-  /// </code>
-  /// </example>
-  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method, AllowMultiple = true)]
-internal sealed class MacroAttribute : Attribute
-  {
-    /// <summary>
-    /// Allows specifying a macro that will be executed for a <see cref="SourceTemplateAttribute">source template</see>
-    /// parameter when the template is expanded.
-    /// </summary>
-    [CanBeNull] public string Expression { get; set; }
-
-    /// <summary>
-    /// Allows specifying which occurrence of the target parameter becomes editable when the template is deployed.
-    /// </summary>
-    /// <remarks>
-    /// If the target parameter is used several times in the template, only one occurrence becomes editable;
-    /// other occurrences are changed synchronously. To specify the zero-based index of the editable occurrence,
-    /// use values >= 0. To make the parameter non-editable when the template is expanded, use -1.
-    /// </remarks>>
-    public int Editable { get; set; }
-
-    /// <summary>
-    /// Identifies the target parameter of a <see cref="SourceTemplateAttribute">source template</see> if the
-    /// <see cref="MacroAttribute"/> is applied on a template method.
-    /// </summary>
-    [CanBeNull] public string Target { get; set; }
-  }
-
-  [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
-internal sealed class AspMvcAreaMasterLocationFormatAttribute : Attribute
-  {
-    public AspMvcAreaMasterLocationFormatAttribute([NotNull] string format)
-    {
-      Format = format;
-    }
-
-    [NotNull] public string Format { get; private set; }
-  }
-
-  [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
-internal sealed class AspMvcAreaPartialViewLocationFormatAttribute : Attribute
-  {
-    public AspMvcAreaPartialViewLocationFormatAttribute([NotNull] string format)
-    {
-      Format = format;
-    }
-
-    [NotNull] public string Format { get; private set; }
-  }
-
-  [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
-internal sealed class AspMvcAreaViewLocationFormatAttribute : Attribute
-  {
-    public AspMvcAreaViewLocationFormatAttribute([NotNull] string format)
-    {
-      Format = format;
-    }
-
-    [NotNull] public string Format { get; private set; }
-  }
-
-  [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
-internal sealed class AspMvcMasterLocationFormatAttribute : Attribute
-  {
-    public AspMvcMasterLocationFormatAttribute([NotNull] string format)
-    {
-      Format = format;
-    }
-
-    [NotNull] public string Format { get; private set; }
-  }
-
-  [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
-internal sealed class AspMvcPartialViewLocationFormatAttribute : Attribute
-  {
-    public AspMvcPartialViewLocationFormatAttribute([NotNull] string format)
-    {
-      Format = format;
-    }
-
-    [NotNull] public string Format { get; private set; }
-  }
-
-  [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
-internal sealed class AspMvcViewLocationFormatAttribute : Attribute
-  {
-    public AspMvcViewLocationFormatAttribute([NotNull] string format)
-    {
-      Format = format;
-    }
-
-    [NotNull] public string Format { get; private set; }
-  }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
-  /// is an MVC action. If applied to a method, the MVC action name is calculated
-  /// implicitly from the context. Use this attribute for custom wrappers similar to
-  /// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String)</c>.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
-internal sealed class AspMvcActionAttribute : Attribute
-  {
-    public AspMvcActionAttribute() { }
-
-    public AspMvcActionAttribute([NotNull] string anonymousProperty)
-    {
-      AnonymousProperty = anonymousProperty;
-    }
-
-    [CanBeNull] public string AnonymousProperty { get; private set; }
-  }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. Indicates that a parameter is an MVC area.
-  /// Use this attribute for custom wrappers similar to
-  /// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String)</c>.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-internal sealed class AspMvcAreaAttribute : Attribute
-  {
-    public AspMvcAreaAttribute() { }
-
-    public AspMvcAreaAttribute([NotNull] string anonymousProperty)
-    {
-      AnonymousProperty = anonymousProperty;
-    }
-
-    [CanBeNull] public string AnonymousProperty { get; private set; }
-  }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter is
-  /// an MVC controller. If applied to a method, the MVC controller name is calculated
-  /// implicitly from the context. Use this attribute for custom wrappers similar to
-  /// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String, String)</c>.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
-internal sealed class AspMvcControllerAttribute : Attribute
-  {
-    public AspMvcControllerAttribute() { }
-
-    public AspMvcControllerAttribute([NotNull] string anonymousProperty)
-    {
-      AnonymousProperty = anonymousProperty;
-    }
-
-    [CanBeNull] public string AnonymousProperty { get; private set; }
-  }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. Indicates that a parameter is an MVC Master. Use this attribute
-  /// for custom wrappers similar to <c>System.Web.Mvc.Controller.View(String, String)</c>.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-internal sealed class AspMvcMasterAttribute : Attribute { }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. Indicates that a parameter is an MVC model type. Use this attribute
-  /// for custom wrappers similar to <c>System.Web.Mvc.Controller.View(String, Object)</c>.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-internal sealed class AspMvcModelTypeAttribute : Attribute { }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter is an MVC
-  /// partial view. If applied to a method, the MVC partial view name is calculated implicitly
-  /// from the context. Use this attribute for custom wrappers similar to
-  /// <c>System.Web.Mvc.Html.RenderPartialExtensions.RenderPartial(HtmlHelper, String)</c>.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
-internal sealed class AspMvcPartialViewAttribute : Attribute { }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. Allows disabling inspections for MVC views within a class or a method.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
-internal sealed class AspMvcSuppressViewErrorAttribute : Attribute { }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. Indicates that a parameter is an MVC display template.
-  /// Use this attribute for custom wrappers similar to 
-  /// <c>System.Web.Mvc.Html.DisplayExtensions.DisplayForModel(HtmlHelper, String)</c>.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-internal sealed class AspMvcDisplayTemplateAttribute : Attribute { }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. Indicates that a parameter is an MVC editor template.
-  /// Use this attribute for custom wrappers similar to
-  /// <c>System.Web.Mvc.Html.EditorExtensions.EditorForModel(HtmlHelper, String)</c>.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-internal sealed class AspMvcEditorTemplateAttribute : Attribute { }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. Indicates that a parameter is an MVC template.
-  /// Use this attribute for custom wrappers similar to
-  /// <c>System.ComponentModel.DataAnnotations.UIHintAttribute(System.String)</c>.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-internal sealed class AspMvcTemplateAttribute : Attribute { }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
-  /// is an MVC view component. If applied to a method, the MVC view name is calculated implicitly
-  /// from the context. Use this attribute for custom wrappers similar to
-  /// <c>System.Web.Mvc.Controller.View(Object)</c>.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
-internal sealed class AspMvcViewAttribute : Attribute { }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
-  /// is an MVC view component name.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-internal sealed class AspMvcViewComponentAttribute : Attribute { }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
-  /// is an MVC view component view. If applied to a method, the MVC view component view name is default.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
-internal sealed class AspMvcViewComponentViewAttribute : Attribute { }
-
-  /// <summary>
-  /// ASP.NET MVC attribute. When applied to a parameter of an attribute,
-  /// indicates that this parameter is an MVC action name.
-  /// </summary>
-  /// <example><code>
-  /// [ActionName("Foo")]
-  /// public ActionResult Login(string returnUrl) {
-  ///   ViewBag.ReturnUrl = Url.Action("Foo"); // OK
-  ///   return RedirectToAction("Bar"); // Error: Cannot resolve action
-  /// }
-  /// </code></example>
-  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property)]
-internal sealed class AspMvcActionSelectorAttribute : Attribute { }
-
-  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.Field)]
-internal sealed class HtmlElementAttributesAttribute : Attribute
-  {
-    public HtmlElementAttributesAttribute() { }
-
-    public HtmlElementAttributesAttribute([NotNull] string name)
-    {
-      Name = name;
-    }
-
-    [CanBeNull] public string Name { get; private set; }
-  }
-
-  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Field | AttributeTargets.Property)]
-internal sealed class HtmlAttributeValueAttribute : Attribute
-  {
-    public HtmlAttributeValueAttribute([NotNull] string name)
-    {
-      Name = name;
-    }
-
-    [NotNull] public string Name { get; private set; }
-  }
-
-  /// <summary>
-  /// Razor attribute. Indicates that a parameter or a method is a Razor section.
-  /// Use this attribute for custom wrappers similar to 
-  /// <c>System.Web.WebPages.WebPageBase.RenderSection(String)</c>.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
-internal sealed class RazorSectionAttribute : Attribute { }
-
-  /// <summary>
-  /// Indicates how method, constructor invocation or property access
-  /// over collection type affects content of the collection.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Property)]
-internal sealed class CollectionAccessAttribute : Attribute
-  {
-    public CollectionAccessAttribute(CollectionAccessType collectionAccessType)
-    {
-      CollectionAccessType = collectionAccessType;
-    }
-
-    public CollectionAccessType CollectionAccessType { get; private set; }
-  }
-
-  [Flags]
-internal enum CollectionAccessType
-  {
-    /// <summary>Method does not use or modify content of the collection.</summary>
-    None = 0,
-    /// <summary>Method only reads content of the collection but does not modify it.</summary>
-    Read = 1,
-    /// <summary>Method can change content of the collection but does not add new elements.</summary>
-    ModifyExistingContent = 2,
-    /// <summary>Method can add new elements to the collection.</summary>
-    UpdatedContent = ModifyExistingContent | 4
-  }
-
-  /// <summary>
-  /// Indicates that the marked method is assertion method, i.e. it halts control flow if
-  /// one of the conditions is satisfied. To set the condition, mark one of the parameters with 
-  /// <see cref="AssertionConditionAttribute"/> attribute.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Method)]
-internal sealed class AssertionMethodAttribute : Attribute { }
-
-  /// <summary>
-  /// Indicates the condition parameter of the assertion method. The method itself should be
-  /// marked by <see cref="AssertionMethodAttribute"/> attribute. The mandatory argument of
-  /// the attribute is the assertion type.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-internal sealed class AssertionConditionAttribute : Attribute
-  {
-    public AssertionConditionAttribute(AssertionConditionType conditionType)
-    {
-      ConditionType = conditionType;
-    }
-
-    public AssertionConditionType ConditionType { get; private set; }
-  }
-
-  /// <summary>
-  /// Specifies assertion type. If the assertion method argument satisfies the condition,
-  /// then the execution continues. Otherwise, execution is assumed to be halted.
-  /// </summary>
-internal enum AssertionConditionType
-  {
-    /// <summary>Marked parameter should be evaluated to true.</summary>
-    IS_TRUE = 0,
-    /// <summary>Marked parameter should be evaluated to false.</summary>
-    IS_FALSE = 1,
-    /// <summary>Marked parameter should be evaluated to null value.</summary>
-    IS_NULL = 2,
-    /// <summary>Marked parameter should be evaluated to not null value.</summary>
-    IS_NOT_NULL = 3,
-  }
-
-  /// <summary>
-  /// Indicates that the marked method unconditionally terminates control flow execution.
-  /// For example, it could unconditionally throw exception.
-  /// </summary>
-  [Obsolete("Use [ContractAnnotation('=> halt')] instead")]
-  [AttributeUsage(AttributeTargets.Method)]
-internal sealed class TerminatesProgramAttribute : Attribute { }
-
-  /// <summary>
-  /// Indicates that method is pure LINQ method, with postponed enumeration (like Enumerable.Select,
-  /// .Where). This annotation allows inference of [InstantHandle] annotation for parameters
-  /// of delegate type by analyzing LINQ method chains.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Method)]
-internal sealed class LinqTunnelAttribute : Attribute { }
-
-  /// <summary>
-  /// Indicates that IEnumerable, passed as parameter, is not enumerated.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-internal sealed class NoEnumerationAttribute : Attribute { }
-
-  /// <summary>
-  /// Indicates that parameter is regular expression pattern.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Parameter)]
-internal sealed class RegexPatternAttribute : Attribute { }
-
-  /// <summary>
-  /// Prevents the Member Reordering feature from tossing members of the marked class.
-  /// </summary>
-  /// <remarks>
-  /// The attribute must be mentioned in your member reordering patterns
-  /// </remarks>
-  [AttributeUsage(
-    AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Struct | AttributeTargets.Enum)]
-internal sealed class NoReorderAttribute : Attribute { }
-
-  /// <summary>
-  /// XAML attribute. Indicates the type that has <c>ItemsSource</c> property and should be treated
-  /// as <c>ItemsControl</c>-derived type, to enable inner items <c>DataContext</c> type resolve.
-  /// </summary>
-  [AttributeUsage(AttributeTargets.Class)]
-internal sealed class XamlItemsControlAttribute : Attribute { }
-
-  /// <summary>
-  /// XAML attribute. Indicates the property of some <c>BindingBase</c>-derived type, that
-  /// is used to bind some item of <c>ItemsControl</c>-derived type. This annotation will
-  /// enable the <c>DataContext</c> type resolve for XAML bindings for such properties.
-  /// </summary>
-  /// <remarks>
-  /// Property should have the tree ancestor of the <c>ItemsControl</c> type or
-  /// marked with the <see cref="XamlItemsControlAttribute"/> attribute.
-  /// </remarks>
-  [AttributeUsage(AttributeTargets.Property)]
-internal sealed class XamlItemBindingOfItemsControlAttribute : Attribute { }
-
-  [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-internal sealed class AspChildControlTypeAttribute : Attribute
-  {
-    public AspChildControlTypeAttribute([NotNull] string tagName, [NotNull] Type controlType)
-    {
-      TagName = tagName;
-      ControlType = controlType;
-    }
-
-    [NotNull] public string TagName { get; private set; }
-
-    [NotNull] public Type ControlType { get; private set; }
-  }
-
-  [AttributeUsage(AttributeTargets.Property | AttributeTargets.Method)]
-internal sealed class AspDataFieldAttribute : Attribute { }
-
-  [AttributeUsage(AttributeTargets.Property | AttributeTargets.Method)]
-internal sealed class AspDataFieldsAttribute : Attribute { }
-
-  [AttributeUsage(AttributeTargets.Property)]
-internal sealed class AspMethodPropertyAttribute : Attribute { }
-
-  [AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
-internal sealed class AspRequiredAttributeAttribute : Attribute
-  {
-    public AspRequiredAttributeAttribute([NotNull] string attribute)
-    {
-      Attribute = attribute;
-    }
-
-    [NotNull] public string Attribute { get; private set; }
-  }
-
-  [AttributeUsage(AttributeTargets.Property)]
-internal sealed class AspTypePropertyAttribute : Attribute
-  {
-    public bool CreateConstructorReferences { get; private set; }
-
-    public AspTypePropertyAttribute(bool createConstructorReferences)
-    {
-      CreateConstructorReferences = createConstructorReferences;
-    }
-  }
-
-  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
-internal sealed class RazorImportNamespaceAttribute : Attribute
-  {
-    public RazorImportNamespaceAttribute([NotNull] string name)
-    {
-      Name = name;
-    }
-
-    [NotNull] public string Name { get; private set; }
-  }
-
-  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
-internal sealed class RazorInjectionAttribute : Attribute
-  {
-    public RazorInjectionAttribute([NotNull] string type, [NotNull] string fieldName)
-    {
-      Type = type;
-      FieldName = fieldName;
-    }
-
-    [NotNull] public string Type { get; private set; }
-
-    [NotNull] public string FieldName { get; private set; }
-  }
-
-  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
-internal sealed class RazorDirectiveAttribute : Attribute
-  {
-    public RazorDirectiveAttribute([NotNull] string directive)
-    {
-      Directive = directive;
-    }
-
-    [NotNull] public string Directive { get; private set; }
-  }
-
-  [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
-internal sealed class RazorPageBaseTypeAttribute : Attribute
-  {
-      public RazorPageBaseTypeAttribute([NotNull] string baseType)
-      {
-        BaseType = baseType;
-      }
-      public RazorPageBaseTypeAttribute([NotNull] string baseType, string pageName)
-      {
-          BaseType = baseType;
-          PageName = pageName;
-      }
-
-      [NotNull] public string BaseType { get; private set; }
-      [CanBeNull] public string PageName { get; private set; }
-  }
-    
-  [AttributeUsage(AttributeTargets.Method)]
-internal sealed class RazorHelperCommonAttribute : Attribute { }
-
-  [AttributeUsage(AttributeTargets.Property)]
-internal sealed class RazorLayoutAttribute : Attribute { }
-
-  [AttributeUsage(AttributeTargets.Method)]
-internal sealed class RazorWriteLiteralMethodAttribute : Attribute { }
-
-  [AttributeUsage(AttributeTargets.Method)]
-internal sealed class RazorWriteMethodAttribute : Attribute { }
-
-  [AttributeUsage(AttributeTargets.Parameter)]
-internal sealed class RazorWriteMethodParameterAttribute : Attribute { }
-}
\ No newline at end of file
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Internal/RawWindow.cs b/VirtualDesktop-master/source/VirtualDesktop/Internal/RawWindow.cs
index 21cd5bc..140c9bb 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/Internal/RawWindow.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/Internal/RawWindow.cs
@@ -1,7 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Windows.Interop;
+using System.Windows.Threading;
 using WindowsDesktop.Interop;
 
 namespace WindowsDesktop.Internal
@@ -28,7 +27,9 @@ protected void Show(HwndSourceParameters parameters)
 		public virtual void Close()
 		{
 			this.Source?.RemoveHook(this.WndProc);
-			this.Source?.Dispose();
+			// Source could have been created on a different thread, which means we 
+			// have to Dispose of it on the UI thread or it will crash.
+			this.Source?.Dispatcher?.BeginInvoke(DispatcherPriority.Send, (Action)(() => this.Source?.Dispose()));
 			this.Source = null;
 
 			NativeMethods.CloseWindow(this.Handle);
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktop.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktop.cs
similarity index 87%
rename from VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktop.cs
rename to VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktop.cs
index d6a80d7..364d821 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktop.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktop.cs
@@ -9,7 +9,8 @@ namespace WindowsDesktop.Interop
 	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
 	public interface IVirtualDesktop
 	{
-		bool IsViewVisible(object pView);
+		[return: MarshalAs(UnmanagedType.Bool)]
+		bool IsViewVisible(IApplicationView pView);
 
 		Guid GetID();
 	}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktop2.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktop2.cs
new file mode 100644
index 0000000..d4cde09
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktop2.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Collections.Concurrent;
+using System.Runtime.InteropServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComImport]
+	[Guid("00000000-0000-0000-0000-000000000000") /* replace at runtime */]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	public interface IVirtualDesktop2
+	{
+		[return: MarshalAs(UnmanagedType.Bool)]
+		bool IsViewVisible(IApplicationView pView);
+
+		Guid GetID();
+
+		[return: MarshalAs(UnmanagedType.HString)]
+		string GetName();
+	}
+
+	// see also:
+	//  https://github.com/MScholtes/VirtualDesktop/blob/f7c0018069f5500bce3b170a53fb71edee44ebec/VirtualDesktop.cs#L156-L173
+
+	public class VirtualDesktopCacheImpl2 : IVirtualDesktopCache
+	{
+		private readonly ConcurrentDictionary<Guid, VirtualDesktop> _wrappers = new ConcurrentDictionary<Guid, VirtualDesktop>();
+
+		public Func<Guid, object, VirtualDesktop> Factory { get; set; }
+
+		public VirtualDesktop GetOrCreate(object comObject)
+		{
+			if (comObject is IVirtualDesktop2)
+			{
+				return this._wrappers.GetOrAdd(((IVirtualDesktop)comObject).GetID(), id => this.Factory(id, comObject));
+			}
+
+			throw new ArgumentException();
+		}
+
+		public void Clear()
+		{
+			this._wrappers.Clear();
+		}
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktopManagerInternal.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktopManagerInternal.cs
similarity index 76%
rename from VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktopManagerInternal.cs
rename to VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktopManagerInternal.cs
index 39439e5..681036f 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktopManagerInternal.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktopManagerInternal.cs
@@ -10,8 +10,9 @@ internal interface IVirtualDesktopManagerInternal
 	{
 		int GetCount();
 
-		void MoveViewToDesktop(IApplicationView pView, IVirtualDesktop desktop);
+		void MoveViewToDesktop(IApplicationView pView, IVirtualDesktop pDesktop);
 
+		[return: MarshalAs(UnmanagedType.Bool)]
 		bool CanViewMoveDesktops(IApplicationView pView);
 
 		IVirtualDesktop GetCurrentDesktop();
@@ -20,12 +21,12 @@ internal interface IVirtualDesktopManagerInternal
 
 		IVirtualDesktop GetAdjacentDesktop(IVirtualDesktop pDesktopReference, AdjacentDesktop uDirection);
 
-		void SwitchDesktop(IVirtualDesktop desktop);
+		void SwitchDesktop(IVirtualDesktop pDesktop);
 
 		IVirtualDesktop CreateDesktopW();
 
 		void RemoveDesktop(IVirtualDesktop pRemove, IVirtualDesktop pFallbackDesktop);
 
-		IVirtualDesktop FindDesktop(ref Guid desktopId);
+		IVirtualDesktop FindDesktop([In, MarshalAs(UnmanagedType.LPStruct)] Guid desktopId);
 	}
 }
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktopManagerInternal2.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktopManagerInternal2.cs
new file mode 100644
index 0000000..8a59d94
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktopManagerInternal2.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComImport]
+	[Guid("00000000-0000-0000-0000-000000000000") /* replace at runtime */]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	internal interface IVirtualDesktopManagerInternal2
+	{
+		int GetCount();
+
+		void MoveViewToDesktop(IApplicationView pView, IVirtualDesktop pDesktop);
+
+		[return: MarshalAs(UnmanagedType.Bool)]
+		bool CanViewMoveDesktops(IApplicationView pView);
+
+		IVirtualDesktop GetCurrentDesktop();
+
+		IObjectArray GetDesktops();
+
+		IVirtualDesktop GetAdjacentDesktop(IVirtualDesktop pDesktopReference, AdjacentDesktop uDirection);
+
+		void SwitchDesktop(IVirtualDesktop pDesktop);
+
+		IVirtualDesktop CreateDesktopW();
+
+		void RemoveDesktop(IVirtualDesktop pRemove, IVirtualDesktop pFallbackDesktop);
+
+		IVirtualDesktop FindDesktop([In, MarshalAs(UnmanagedType.LPStruct)] Guid desktopId);
+
+		void Unknown1(IVirtualDesktop pDesktop, out IObjectArray pUnknown1, out IObjectArray pUnknown2);
+
+		void SetName(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chName);
+	}
+
+	// see also:
+	//  https://github.com/MScholtes/VirtualDesktop/blob/f7c0018069f5500bce3b170a53fb71edee44ebec/VirtualDesktop.cs#L193-L211
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktopManagerInternal3.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktopManagerInternal3.cs
new file mode 100644
index 0000000..5c116c4
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktopManagerInternal3.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComImport]
+	[Guid("00000000-0000-0000-0000-000000000000") /* replace at runtime */]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	internal interface IVirtualDesktopManagerInternal3
+	{
+		int GetCount();
+
+		void MoveViewToDesktop(IApplicationView pView, IVirtualDesktop pDesktop);
+
+		[return: MarshalAs(UnmanagedType.Bool)]
+		bool CanViewMoveDesktops(IApplicationView pView);
+
+		IVirtualDesktop GetCurrentDesktop();
+
+		IObjectArray GetDesktops();
+
+		IVirtualDesktop GetAdjacentDesktop(IVirtualDesktop pDesktopReference, AdjacentDesktop uDirection);
+
+		void SwitchDesktop(IVirtualDesktop pDesktop);
+
+		IVirtualDesktop CreateDesktopW();
+
+		void RemoveDesktop(IVirtualDesktop pRemove, IVirtualDesktop pFallbackDesktop);
+
+		IVirtualDesktop FindDesktop([In, MarshalAs(UnmanagedType.LPStruct)] Guid desktopId);
+
+		void Unknown1(IVirtualDesktop pDesktop, out IObjectArray pUnknown1, out IObjectArray pUnknown2);
+
+		void SetName(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chName);
+
+		void Unknown2(IApplicationView pUnknown0, IApplicationView pUnknown1);
+	}
+
+	// see also:
+	//  https://github.com/MScholtes/VirtualDesktop/blob/f7c0018069f5500bce3b170a53fb71edee44ebec/VirtualDesktop.cs#L193-L211
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktopNotification.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktopNotification.cs
similarity index 90%
rename from VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktopNotification.cs
rename to VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktopNotification.cs
index 0eb19ba..bf52904 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/IVirtualDesktopNotification.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktopNotification.cs
@@ -16,7 +16,7 @@ public interface IVirtualDesktopNotification
 
 		void VirtualDesktopDestroyed(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback);
 
-		void ViewVirtualDesktopChanged(IntPtr pView);
+		void ViewVirtualDesktopChanged(IApplicationView pView);
 
 		void CurrentVirtualDesktopChanged(IVirtualDesktop pDesktopOld, IVirtualDesktop pDesktopNew);
 	}
@@ -43,7 +43,7 @@ public void VirtualDesktopDestroyed(IVirtualDesktop pDesktopDestroyed, IVirtualD
 			this.VirtualDesktopDestroyedCore(pDesktopDestroyed, pDesktopFallback);
 		}
 
-		public void ViewVirtualDesktopChanged(IntPtr pView)
+		public void ViewVirtualDesktopChanged(IApplicationView pView)
 		{
 			this.ViewVirtualDesktopChangedCore(pView);
 		}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktopNotification2.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktopNotification2.cs
new file mode 100644
index 0000000..ad04ea4
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/10240/IVirtualDesktopNotification2.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComImport]
+	[Guid("00000000-0000-0000-0000-000000000000") /* replace at runtime */]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	public interface IVirtualDesktopNotification2
+	{
+		void VirtualDesktopCreated(IVirtualDesktop pDesktop);
+
+		void VirtualDesktopDestroyBegin(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback);
+
+		void VirtualDesktopDestroyFailed(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback);
+
+		void VirtualDesktopDestroyed(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback);
+
+		void ViewVirtualDesktopChanged(IApplicationView pView);
+
+		void CurrentVirtualDesktopChanged(IVirtualDesktop pDesktopOld, IVirtualDesktop pDesktopNew);
+		
+		void VirtualDesktopRenamed(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chName);
+	}
+
+	public class VirtualDesktopNotificationListener2 : VirtualDesktopNotification, IVirtualDesktopNotification, IVirtualDesktopNotification2
+	{
+		public void VirtualDesktopCreated(IVirtualDesktop pDesktop)
+		{
+			this.VirtualDesktopCreatedCore(pDesktop);
+		}
+
+		public void VirtualDesktopDestroyBegin(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback)
+		{
+			this.VirtualDesktopDestroyBeginCore(pDesktopDestroyed, pDesktopFallback);
+		}
+
+		public void VirtualDesktopDestroyFailed(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback)
+		{
+			this.VirtualDesktopDestroyFailedCore(pDesktopDestroyed, pDesktopFallback);
+		}
+
+		public void VirtualDesktopDestroyed(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback)
+		{
+			this.VirtualDesktopDestroyedCore(pDesktopDestroyed, pDesktopFallback);
+		}
+
+		public void ViewVirtualDesktopChanged(IApplicationView pView)
+		{
+			this.ViewVirtualDesktopChangedCore(pView);
+		}
+
+		public void CurrentVirtualDesktopChanged(IVirtualDesktop pDesktopOld, IVirtualDesktop pDesktopNew)
+		{
+			this.CurrentVirtualDesktopChangedCore(pDesktopOld, pDesktopNew);
+		}
+
+		public void VirtualDesktopRenamed(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chName)
+		{
+			this.VirtualDesktopRenamedCore(pDesktop, chName);
+		}
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/20231/IVirtualDesktop.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/20231/IVirtualDesktop.cs
new file mode 100644
index 0000000..a2495fb
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/20231/IVirtualDesktop.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Concurrent;
+using System.Runtime.InteropServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComImport]
+	[Guid("00000000-0000-0000-0000-000000000000") /* replace at runtime */]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	public interface IVirtualDesktop
+	{
+		[return: MarshalAs(UnmanagedType.Bool)]
+		bool IsViewVisible(IApplicationView pView);
+
+		Guid GetID();
+
+		IntPtr Unknown1();
+
+		[return: MarshalAs(UnmanagedType.HString)]
+		string GetName();
+	}
+
+	// see also:
+	//  https://github.com/MScholtes/VirtualDesktop/blob/f7c0018069f5500bce3b170a53fb71edee44ebec/VirtualDesktop.cs#L156-L173
+
+	public class VirtualDesktopCacheImpl : IVirtualDesktopCache
+	{
+		private readonly ConcurrentDictionary<Guid, VirtualDesktop> _wrappers = new ConcurrentDictionary<Guid, VirtualDesktop>();
+
+		public Func<Guid, object, VirtualDesktop> Factory { get; set; }
+
+		public VirtualDesktop GetOrCreate(object comObject)
+		{
+			if (comObject is IVirtualDesktop)
+			{
+				return this._wrappers.GetOrAdd(((IVirtualDesktop)comObject).GetID(), id => this.Factory(id, comObject));
+			}
+
+			throw new ArgumentException();
+		}
+
+		public void Clear()
+		{
+			this._wrappers.Clear();
+		}
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/20231/IVirtualDesktopManagerInternal.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/20231/IVirtualDesktopManagerInternal.cs
new file mode 100644
index 0000000..aa1ef4f
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/20231/IVirtualDesktopManagerInternal.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComImport]
+	[Guid("00000000-0000-0000-0000-000000000000") /* replace at runtime */]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	internal interface IVirtualDesktopManagerInternal
+	{
+		int GetCount(IntPtr hWndOrMon);
+
+		void MoveViewToDesktop(IApplicationView pView, IVirtualDesktop pDesktop);
+
+		[return: MarshalAs(UnmanagedType.Bool)]
+		bool CanViewMoveDesktops(IApplicationView pView);
+
+		IVirtualDesktop GetCurrentDesktop(IntPtr hWndOrMon);
+
+		IObjectArray GetDesktops(IntPtr hWndOrMon);
+
+		IVirtualDesktop GetAdjacentDesktop(IVirtualDesktop pDesktopReference, AdjacentDesktop uDirection);
+
+		void SwitchDesktop(IntPtr hWndOrMon, IVirtualDesktop pDesktop);
+
+		IVirtualDesktop CreateDesktopW(IntPtr hWndOrMon);
+
+		void RemoveDesktop(IVirtualDesktop pRemove, IVirtualDesktop pFallbackDesktop);
+
+		IVirtualDesktop FindDesktop([In, MarshalAs(UnmanagedType.LPStruct)] Guid desktopId);
+
+		void Unknown1(IVirtualDesktop pDesktop, out IObjectArray pUnknown1, out IObjectArray pUnknown2);
+
+		void SetName(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chName);
+
+		void Unknown2(IApplicationView pUnknown0, IApplicationView pUnknown1);
+
+		int Unknown3();
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/20231/IVirtualDesktopNotification.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/20231/IVirtualDesktopNotification.cs
new file mode 100644
index 0000000..cb73819
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/20231/IVirtualDesktopNotification.cs
@@ -0,0 +1,69 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComImport]
+	[Guid("00000000-0000-0000-0000-000000000000") /* replace at runtime */]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	public interface IVirtualDesktopNotification
+	{
+		void VirtualDesktopCreated(IVirtualDesktop pDesktop);
+
+		void VirtualDesktopDestroyBegin(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback);
+
+		void VirtualDesktopDestroyFailed(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback);
+
+		void VirtualDesktopDestroyed(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback);
+
+		void Unknown1(int nNumber);
+
+		void VirtualDesktopRenamed(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chName);
+
+		void ViewVirtualDesktopChanged(IApplicationView pView);
+
+		void CurrentVirtualDesktopChanged(IVirtualDesktop pDesktopOld, IVirtualDesktop pDesktopNew);
+	}
+
+	public class VirtualDesktopNotificationListener : VirtualDesktopNotification, IVirtualDesktopNotification
+	{
+		public void VirtualDesktopCreated(IVirtualDesktop pDesktop)
+		{
+			this.VirtualDesktopCreatedCore(pDesktop);
+		}
+
+		public void VirtualDesktopDestroyBegin(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback)
+		{
+			this.VirtualDesktopDestroyBeginCore(pDesktopDestroyed, pDesktopFallback);
+		}
+
+		public void VirtualDesktopDestroyFailed(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback)
+		{
+			this.VirtualDesktopDestroyFailedCore(pDesktopDestroyed, pDesktopFallback);
+		}
+
+		public void VirtualDesktopDestroyed(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback)
+		{
+			this.VirtualDesktopDestroyedCore(pDesktopDestroyed, pDesktopFallback);
+		}
+
+		public void Unknown1(int nNumber)
+		{
+		}
+
+		public void VirtualDesktopRenamed(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chName)
+		{
+			this.VirtualDesktopRenamedCore(pDesktop, chName);
+		}
+
+		public void ViewVirtualDesktopChanged(IApplicationView pView)
+		{
+			this.ViewVirtualDesktopChangedCore(pView);
+		}
+
+		public void CurrentVirtualDesktopChanged(IVirtualDesktop pDesktopOld, IVirtualDesktop pDesktopNew)
+		{
+			this.CurrentVirtualDesktopChangedCore(pDesktopOld, pDesktopNew);
+		}
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21313/IVirtualDesktop.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21313/IVirtualDesktop.cs
new file mode 100644
index 0000000..c675d6c
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21313/IVirtualDesktop.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Concurrent;
+using System.Runtime.InteropServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComImport]
+	[Guid("00000000-0000-0000-0000-000000000000") /* replace at runtime */]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	public interface IVirtualDesktop
+	{
+		[return: MarshalAs(UnmanagedType.Bool)]
+		bool IsViewVisible(IApplicationView pView);
+
+		Guid GetID();
+
+		IntPtr Unknown1();
+
+		[return: MarshalAs(UnmanagedType.HString)]
+		string GetName();
+
+		[return: MarshalAs(UnmanagedType.HString)]
+		string GetWallpaperPath();
+	}
+
+	// see also:
+	//  https://github.com/MScholtes/VirtualDesktop/blob/f7c0018069f5500bce3b170a53fb71edee44ebec/VirtualDesktop.cs#L156-L173
+
+	public class VirtualDesktopCacheImpl : IVirtualDesktopCache
+	{
+		private readonly ConcurrentDictionary<Guid, VirtualDesktop> _wrappers = new ConcurrentDictionary<Guid, VirtualDesktop>();
+
+		public Func<Guid, object, VirtualDesktop> Factory { get; set; }
+
+		public VirtualDesktop GetOrCreate(object comObject)
+		{
+			if (comObject is IVirtualDesktop)
+			{
+				return this._wrappers.GetOrAdd(((IVirtualDesktop)comObject).GetID(), id => this.Factory(id, comObject));
+			}
+
+			throw new ArgumentException();
+		}
+
+		public void Clear()
+		{
+			this._wrappers.Clear();
+		}
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21313/IVirtualDesktopManagerInternal.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21313/IVirtualDesktopManagerInternal.cs
new file mode 100644
index 0000000..e5c7479
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21313/IVirtualDesktopManagerInternal.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComImport]
+	[Guid("00000000-0000-0000-0000-000000000000") /* replace at runtime */]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	internal interface IVirtualDesktopManagerInternal
+	{
+		int GetCount(IntPtr hWndOrMon);
+
+		void MoveViewToDesktop(IApplicationView pView, IVirtualDesktop pDesktop);
+
+		[return: MarshalAs(UnmanagedType.Bool)]
+		bool CanViewMoveDesktops(IApplicationView pView);
+
+		IVirtualDesktop GetCurrentDesktop(IntPtr hWndOrMon);
+
+		IObjectArray GetDesktops(IntPtr hWndOrMon);
+
+		IVirtualDesktop GetAdjacentDesktop(IVirtualDesktop pDesktopReference, AdjacentDesktop uDirection);
+
+		void SwitchDesktop(IntPtr hWndOrMon, IVirtualDesktop pDesktop);
+
+		IVirtualDesktop CreateDesktopW(IntPtr hWndOrMon);
+
+		IVirtualDesktop MoveDesktop(IVirtualDesktop pDesktopReference, IntPtr hWndOrMon, int nIndex);
+
+		void RemoveDesktop(IVirtualDesktop pRemove, IVirtualDesktop pFallbackDesktop);
+
+		IVirtualDesktop FindDesktop([In, MarshalAs(UnmanagedType.LPStruct)] Guid desktopId);
+
+		void Unknown1(IVirtualDesktop pDesktop, out IObjectArray pUnknown1, out IObjectArray pUnknown2);
+
+		void SetName(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chName);
+
+		void SetWallpaperPath(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chPath);
+
+		void Unknown2([MarshalAs(UnmanagedType.HString)] string chText);
+
+		void Unknown3(IApplicationView pUnknown0, IApplicationView pUnknown1);
+
+		int Unknown4();
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21313/IVirtualDesktopNotification.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21313/IVirtualDesktopNotification.cs
new file mode 100644
index 0000000..5274383
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21313/IVirtualDesktopNotification.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComImport]
+	[Guid("00000000-0000-0000-0000-000000000000") /* replace at runtime */]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	public interface IVirtualDesktopNotification
+	{
+		void VirtualDesktopCreated(IVirtualDesktop pDesktop);
+
+		void VirtualDesktopDestroyBegin(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback);
+
+		void VirtualDesktopDestroyFailed(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback);
+
+		void VirtualDesktopDestroyed(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback);
+
+		void Unknown1(int nNumber);
+
+		void VirtualDesktopMoved(IVirtualDesktop pDesktop, int nFromIndex, int nToIndex);
+
+		void VirtualDesktopRenamed(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chName);
+
+		void ViewVirtualDesktopChanged(IApplicationView pView);
+
+		void CurrentVirtualDesktopChanged(IVirtualDesktop pDesktopOld, IVirtualDesktop pDesktopNew);
+
+		void VirtualDesktopWallpaperChanged(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chPath);
+	}
+
+	public class VirtualDesktopNotificationListener : VirtualDesktopNotification, IVirtualDesktopNotification
+	{
+		public void VirtualDesktopCreated(IVirtualDesktop pDesktop)
+		{
+			this.VirtualDesktopCreatedCore(pDesktop);
+		}
+
+		public void VirtualDesktopDestroyBegin(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback)
+		{
+			this.VirtualDesktopDestroyBeginCore(pDesktopDestroyed, pDesktopFallback);
+		}
+
+		public void VirtualDesktopDestroyFailed(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback)
+		{
+			this.VirtualDesktopDestroyFailedCore(pDesktopDestroyed, pDesktopFallback);
+		}
+
+		public void VirtualDesktopDestroyed(IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback)
+		{
+			this.VirtualDesktopDestroyedCore(pDesktopDestroyed, pDesktopFallback);
+		}
+
+		public void Unknown1(int nNumber)
+		{
+		}
+
+		public void VirtualDesktopMoved(IVirtualDesktop pDesktop, int nFromIndex, int nToIndex)
+		{
+			this.VirtualDesktopMovedCore(pDesktop, nFromIndex, nToIndex);
+		}
+
+		public void VirtualDesktopRenamed(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chName)
+		{
+			this.VirtualDesktopRenamedCore(pDesktop, chName);
+		}
+
+		public void ViewVirtualDesktopChanged(IApplicationView pView)
+		{
+			this.ViewVirtualDesktopChangedCore(pView);
+		}
+
+		public void CurrentVirtualDesktopChanged(IVirtualDesktop pDesktopOld, IVirtualDesktop pDesktopNew)
+		{
+			this.CurrentVirtualDesktopChangedCore(pDesktopOld, pDesktopNew);
+		}
+
+		public void VirtualDesktopWallpaperChanged(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chName)
+		{
+			this.VirtualDesktopWallpaperChangedCore(pDesktop, chName);
+		}
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21359/IVirtualDesktop.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21359/IVirtualDesktop.cs
new file mode 100644
index 0000000..6144da8
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21359/IVirtualDesktop.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Concurrent;
+using System.Runtime.InteropServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComImport]
+	[Guid("00000000-0000-0000-0000-000000000000") /* replace at runtime */]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	public interface IVirtualDesktop
+	{
+		[return: MarshalAs(UnmanagedType.Bool)]
+		bool IsViewVisible(IApplicationView pView);
+
+		Guid GetID();
+
+		IntPtr Unknown1();
+
+		[return: MarshalAs(UnmanagedType.HString)]
+		string GetName();
+
+		[return: MarshalAs(UnmanagedType.HString)]
+		string GetWallpaperPath();
+	}
+
+	public class VirtualDesktopCacheImpl : IVirtualDesktopCache
+	{
+		private readonly ConcurrentDictionary<Guid, VirtualDesktop> _wrappers = new ConcurrentDictionary<Guid, VirtualDesktop>();
+
+		public Func<Guid, object, VirtualDesktop> Factory { get; set; }
+
+		public VirtualDesktop GetOrCreate(object comObject)
+		{
+			if (comObject is IVirtualDesktop)
+			{
+				return this._wrappers.GetOrAdd(((IVirtualDesktop)comObject).GetID(), id => this.Factory(id, comObject));
+			}
+
+			throw new ArgumentException();
+		}
+
+		public void Clear()
+		{
+			this._wrappers.Clear();
+		}
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21359/IVirtualDesktopManagerInternal.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21359/IVirtualDesktopManagerInternal.cs
new file mode 100644
index 0000000..8ce3890
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21359/IVirtualDesktopManagerInternal.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComImport]
+	[Guid("00000000-0000-0000-0000-000000000000") /* replace at runtime */]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	internal interface IVirtualDesktopManagerInternal
+	{
+		int GetCount(IntPtr hWndOrMon);
+
+		void MoveViewToDesktop(IApplicationView pView, IVirtualDesktop pDesktop);
+
+		[return: MarshalAs(UnmanagedType.Bool)]
+		bool CanViewMoveDesktops(IApplicationView pView);
+
+		IVirtualDesktop GetCurrentDesktop(IntPtr hWndOrMon);
+
+		IObjectArray GetDesktops(IntPtr hWndOrMon);
+
+		IVirtualDesktop GetAdjacentDesktop(IVirtualDesktop pDesktopReference, AdjacentDesktop uDirection);
+
+		void SwitchDesktop(IntPtr hWndOrMon, IVirtualDesktop pDesktop);
+
+		IVirtualDesktop CreateDesktopW(IntPtr hWndOrMon);
+
+		IVirtualDesktop MoveDesktop(IVirtualDesktop pDesktopReference, IntPtr hWndOrMon, int nIndex);
+
+		void RemoveDesktop(IVirtualDesktop pRemove, IVirtualDesktop pFallbackDesktop);
+
+		IVirtualDesktop FindDesktop([In, MarshalAs(UnmanagedType.LPStruct)] Guid desktopId);
+
+		void Unknown1(IVirtualDesktop pDesktop, out IObjectArray pUnknown1, out IObjectArray pUnknown2);
+
+		void SetName(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chName);
+
+		void SetWallpaperPath(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chPath);
+
+		void Unknown2([MarshalAs(UnmanagedType.HString)] string chText);
+
+		void Unknown3(IApplicationView pUnknown0, IApplicationView pUnknown1);
+
+		int Unknown4();
+
+		void Unknown5(int nNum);
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21359/IVirtualDesktopNotification.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21359/IVirtualDesktopNotification.cs
new file mode 100644
index 0000000..65d2190
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/21359/IVirtualDesktopNotification.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Runtime.InteropServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComImport]
+	[Guid("00000000-0000-0000-0000-000000000000") /* replace at runtime */]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	public interface IVirtualDesktopNotification
+	{
+		void VirtualDesktopCreated(IObjectArray p0, IVirtualDesktop pDesktop);
+
+		void VirtualDesktopDestroyBegin(IObjectArray p0, IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback);
+
+		void VirtualDesktopDestroyFailed(IObjectArray p0, IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback);
+
+		void VirtualDesktopDestroyed(IObjectArray p0, IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback);
+
+		void Unknown1(int nNumber);
+
+		void VirtualDesktopMoved(IObjectArray p0, IVirtualDesktop pDesktop, int nFromIndex, int nToIndex);
+
+		void VirtualDesktopRenamed(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chName);
+
+		void ViewVirtualDesktopChanged(IApplicationView pView);
+
+		void CurrentVirtualDesktopChanged(IObjectArray p0, IVirtualDesktop pDesktopOld, IVirtualDesktop pDesktopNew);
+
+		void VirtualDesktopWallpaperChanged(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chPath);
+	}
+
+	public class VirtualDesktopNotificationListener : VirtualDesktopNotification, IVirtualDesktopNotification
+	{
+		public void VirtualDesktopCreated(IObjectArray p0, IVirtualDesktop pDesktop)
+		{
+			this.VirtualDesktopCreatedCore(pDesktop);
+		}
+
+		public void VirtualDesktopDestroyBegin(IObjectArray p0, IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback)
+		{
+			this.VirtualDesktopDestroyBeginCore(pDesktopDestroyed, pDesktopFallback);
+		}
+
+		public void VirtualDesktopDestroyFailed(IObjectArray p0, IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback)
+		{
+			this.VirtualDesktopDestroyFailedCore(pDesktopDestroyed, pDesktopFallback);
+		}
+
+		public void VirtualDesktopDestroyed(IObjectArray p0, IVirtualDesktop pDesktopDestroyed, IVirtualDesktop pDesktopFallback)
+		{
+			this.VirtualDesktopDestroyedCore(pDesktopDestroyed, pDesktopFallback);
+		}
+
+		public void Unknown1(int nNumber)
+		{
+		}
+
+		public void VirtualDesktopMoved(IObjectArray p0, IVirtualDesktop pDesktop, int nFromIndex, int nToIndex)
+		{
+			this.VirtualDesktopMovedCore(pDesktop, nFromIndex, nToIndex);
+		}
+
+		public void VirtualDesktopRenamed(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chName)
+		{
+			this.VirtualDesktopRenamedCore(pDesktop, chName);
+		}
+
+		public void ViewVirtualDesktopChanged(IApplicationView pView)
+		{
+			this.ViewVirtualDesktopChangedCore(pView);
+		}
+
+		public void CurrentVirtualDesktopChanged(IObjectArray p0, IVirtualDesktop pDesktopOld, IVirtualDesktop pDesktopNew)
+		{
+			this.CurrentVirtualDesktopChangedCore(pDesktopOld, pDesktopNew);
+		}
+
+		public void VirtualDesktopWallpaperChanged(IVirtualDesktop pDesktop, [MarshalAs(UnmanagedType.HString)] string chName)
+		{
+			this.VirtualDesktopWallpaperChangedCore(pDesktop, chName);
+		}
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/AssemblyInfo.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/AssemblyInfo.cs
index 5c16f5d..990037b 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/AssemblyInfo.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(interfaces)/AssemblyInfo.cs
@@ -7,4 +7,4 @@
 [assembly: AssemblyDescription("COM interface definitions for virtual desktop on Windows 10 build {VERSION}.")]
 [assembly: AssemblyCopyright("Copyright © 2018 Manato KAMEYA")]
 
-[assembly: AssemblyVersion("1.0.0")]
+[assembly: AssemblyVersion("1.0.0.{BUILD}")]
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal.cs
index 67fad4e..79a3d0e 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal.cs
@@ -1,66 +1,35 @@
 using System;
 using System.Collections.Generic;
-using System.Runtime.CompilerServices;
 
 namespace WindowsDesktop.Interop
 {
-	[ComInterfaceWrapper]
-	internal class VirtualDesktopManagerInternal : ComInterfaceWrapperBase
+	internal abstract class VirtualDesktopManagerInternal : ComInterfaceWrapperBase
 	{
-		public VirtualDesktopManagerInternal(ComInterfaceAssembly assembly)
-			: base(assembly, service: CLSID.VirtualDesktopAPIUnknown)
+		public VirtualDesktopManagerInternal(ComInterfaceAssembly assembly, uint latestVersion = 1)
+			: base(assembly, "IVirtualDesktopManagerInternal", latestVersion, service: CLSID.VirtualDesktopAPIUnknown)
 		{
 		}
 
-		public void MoveViewToDesktop(ApplicationView pView, VirtualDesktop desktop)
-		{
-			this.Invoke(Args(pView.ComObject, desktop.ComObject));
-		}
+		public abstract void MoveViewToDesktop(ApplicationView pView, VirtualDesktop desktop);
 
-		public VirtualDesktop GetCurrentDesktop()
-		{
-			return this.GetDesktop();
-		}
+		public abstract VirtualDesktop GetCurrentDesktop();
 
-		public IEnumerable<VirtualDesktop> GetDesktops()
-		{
-			var array = this.Invoke<IObjectArray>();
-			var count = array.GetCount();
-			var vdType = this.ComInterfaceAssembly.GetType("IVirtualDesktop");
+		public abstract IEnumerable<VirtualDesktop> GetDesktops();
 
-			for (var i = 0u; i < count; i++)
-			{
-				array.GetAt(i, vdType.GUID, out var ppvObject);
-				yield return VirtualDesktopCache.GetOrCreate(ppvObject);
-			}
-		}
+		public abstract VirtualDesktop GetAdjacentDesktop(VirtualDesktop pDesktopReference, AdjacentDesktop uDirection);
 
-		public VirtualDesktop GetAdjacentDesktop(VirtualDesktop pDesktopReference, AdjacentDesktop uDirection)
-		{
-			return this.GetDesktop(Args(pDesktopReference.ComObject, uDirection));
-		}
+		public abstract void SwitchDesktop(VirtualDesktop desktop);
 
-		public void SwitchDesktop(VirtualDesktop desktop)
-		{
-			this.Invoke(Args(desktop.ComObject));
-		}
+		public abstract VirtualDesktop CreateDesktopW();
 
-		public VirtualDesktop CreateDesktopW()
-		{
-			return this.GetDesktop();
-		}
+		public abstract void MoveDesktop(VirtualDesktop desktop, int index);
 
-		public void RemoveDesktop(VirtualDesktop pRemove, VirtualDesktop pFallbackDesktop)
-		{
-			this.Invoke(Args(pRemove.ComObject, pFallbackDesktop.ComObject));
-		}
+		public abstract void RemoveDesktop(VirtualDesktop pRemove, VirtualDesktop pFallbackDesktop);
 
-		public VirtualDesktop FindDesktop(ref Guid desktopId)
-		{
-			return this.GetDesktop(Args(desktopId));
-		}
+		public abstract VirtualDesktop FindDesktop(Guid desktopId);
+
+		public abstract void SetName(VirtualDesktop desktop, string name);
 
-		private VirtualDesktop GetDesktop(object[] parameters = null, [CallerMemberName] string methodName = "")
-			=> VirtualDesktopCache.GetOrCreate(this.Invoke<object>(parameters, methodName));
+		public abstract void SetWallpaperPath(VirtualDesktop desktop, string path);
 	}
 }
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal10240.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal10240.cs
new file mode 100644
index 0000000..60ef9c9
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal10240.cs
@@ -0,0 +1,83 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComInterfaceWrapper("IVirtualDesktopManagerInternal", 3, 10240)]
+	internal sealed class VirtualDesktopManagerInternal10240 : VirtualDesktopManagerInternal
+	{
+		public VirtualDesktopManagerInternal10240(ComInterfaceAssembly assembly)
+			: base(assembly, latestVersion: 3)
+		{
+		}
+
+		public override void MoveViewToDesktop(ApplicationView pView, VirtualDesktop desktop)
+		{
+			this.Invoke(Args(pView.ComObject, desktop.ComObject));
+		}
+
+		public override VirtualDesktop GetCurrentDesktop()
+		{
+			return this.GetDesktop();
+		}
+
+		public override IEnumerable<VirtualDesktop> GetDesktops()
+		{
+			var array = this.Invoke<IObjectArray>();
+			var count = array.GetCount();
+			var vdType = this.ComInterfaceAssembly.GetType("IVirtualDesktop");
+
+			for (var i = 0u; i < count; i++)
+			{
+				array.GetAt(i, vdType.GUID, out var ppvObject);
+				yield return VirtualDesktopCache.GetOrCreate(ppvObject);
+			}
+		}
+
+		public override VirtualDesktop GetAdjacentDesktop(VirtualDesktop pDesktopReference, AdjacentDesktop uDirection)
+		{
+			return this.GetDesktop(Args(pDesktopReference.ComObject, uDirection));
+		}
+
+		public override void SwitchDesktop(VirtualDesktop desktop)
+		{
+			this.Invoke(Args(desktop.ComObject));
+		}
+
+		public override VirtualDesktop CreateDesktopW()
+		{
+			return this.GetDesktop();
+		}
+
+		public override void MoveDesktop(VirtualDesktop desktop, int index)
+		{
+			throw new PlatformNotSupportedException("This Windows 10 version is not supported.");
+		}
+
+		public override void RemoveDesktop(VirtualDesktop pRemove, VirtualDesktop pFallbackDesktop)
+		{
+			this.Invoke(Args(pRemove.ComObject, pFallbackDesktop.ComObject));
+		}
+
+		public override VirtualDesktop FindDesktop(Guid desktopId)
+		{
+			return this.GetDesktop(Args(desktopId));
+		}
+
+		private VirtualDesktop GetDesktop(object[] parameters = null, [CallerMemberName] string methodName = "")
+			=> VirtualDesktopCache.GetOrCreate(this.Invoke<object>(parameters, methodName));
+
+		public override void SetName(VirtualDesktop desktop, string name)
+		{
+			if (this.ComVersion < 2) throw new PlatformNotSupportedException("This Windows 10 version is not supported.");
+
+			this.Invoke(Args(desktop.ComObject, name));
+		}
+
+		public override void SetWallpaperPath(VirtualDesktop desktop, string path)
+		{
+			throw new PlatformNotSupportedException("This Windows 10 version is not supported.");
+		}
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal20231.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal20231.cs
new file mode 100644
index 0000000..cc097cb
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal20231.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComInterfaceWrapper("IVirtualDesktopManagerInternal", 20231)]
+	internal sealed class VirtualDesktopManagerInternal20231 : VirtualDesktopManagerInternal
+	{
+		public VirtualDesktopManagerInternal20231(ComInterfaceAssembly assembly)
+			: base(assembly)
+		{
+		}
+
+		public override void MoveViewToDesktop(ApplicationView pView, VirtualDesktop desktop)
+		{
+			this.Invoke(Args(pView.ComObject, desktop.ComObject));
+		}
+
+		public override VirtualDesktop GetCurrentDesktop()
+		{
+			return this.GetDesktop(Args(IntPtr.Zero));
+		}
+
+		public override IEnumerable<VirtualDesktop> GetDesktops()
+		{
+			var array = this.Invoke<IObjectArray>(Args(IntPtr.Zero));
+			var count = array.GetCount();
+			var vdType = this.ComInterfaceAssembly.GetType("IVirtualDesktop");
+
+			for (var i = 0u; i < count; i++)
+			{
+				array.GetAt(i, vdType.GUID, out var ppvObject);
+				yield return VirtualDesktopCache.GetOrCreate(ppvObject);
+			}
+		}
+
+		public override VirtualDesktop GetAdjacentDesktop(VirtualDesktop pDesktopReference, AdjacentDesktop uDirection)
+		{
+			return this.GetDesktop(Args(pDesktopReference.ComObject, uDirection));
+		}
+
+		public override void SwitchDesktop(VirtualDesktop desktop)
+		{
+			this.Invoke(Args(IntPtr.Zero, desktop.ComObject));
+		}
+
+		public override VirtualDesktop CreateDesktopW()
+		{
+			return this.GetDesktop(Args(IntPtr.Zero));
+		}
+
+		public override void MoveDesktop(VirtualDesktop desktop, int index)
+		{
+			throw new PlatformNotSupportedException("This Windows 10 version is not supported.");
+		}
+
+		public override void RemoveDesktop(VirtualDesktop pRemove, VirtualDesktop pFallbackDesktop)
+		{
+			this.Invoke(Args(pRemove.ComObject, pFallbackDesktop.ComObject));
+		}
+
+		public override VirtualDesktop FindDesktop(Guid desktopId)
+		{
+			return this.GetDesktop(Args(desktopId));
+		}
+
+		private VirtualDesktop GetDesktop(object[] parameters = null, [CallerMemberName] string methodName = "")
+			=> VirtualDesktopCache.GetOrCreate(this.Invoke<object>(parameters, methodName));
+
+		public override void SetName(VirtualDesktop desktop, string name)
+		{
+			this.Invoke(Args(desktop.ComObject, name));
+		}
+
+		public override void SetWallpaperPath(VirtualDesktop desktop, string path)
+		{
+			throw new PlatformNotSupportedException("This Windows 10 version is not supported.");
+		}
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal21313.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal21313.cs
new file mode 100644
index 0000000..7605ecc
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal21313.cs
@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComInterfaceWrapper("IVirtualDesktopManagerInternal", 21313)]
+	internal class VirtualDesktopManagerInternal21313 : VirtualDesktopManagerInternal
+	{
+		public VirtualDesktopManagerInternal21313(ComInterfaceAssembly assembly)
+			: base(assembly)
+		{
+		}
+
+		public override void MoveViewToDesktop(ApplicationView pView, VirtualDesktop desktop)
+		{
+			this.Invoke(Args(pView.ComObject, desktop.ComObject));
+		}
+
+		public override VirtualDesktop GetCurrentDesktop()
+		{
+			return this.GetDesktop(Args(IntPtr.Zero));
+		}
+
+		public override IEnumerable<VirtualDesktop> GetDesktops()
+		{
+			var array = this.Invoke<IObjectArray>(Args(IntPtr.Zero));
+			var count = array.GetCount();
+			var vdType = this.ComInterfaceAssembly.GetType("IVirtualDesktop");
+
+			for (var i = 0u; i < count; i++)
+			{
+				array.GetAt(i, vdType.GUID, out var ppvObject);
+				yield return VirtualDesktopCache.GetOrCreate(ppvObject);
+			}
+		}
+
+		public override VirtualDesktop GetAdjacentDesktop(VirtualDesktop pDesktopReference, AdjacentDesktop uDirection)
+		{
+			return this.GetDesktop(Args(pDesktopReference.ComObject, uDirection));
+		}
+
+		public override void SwitchDesktop(VirtualDesktop desktop)
+		{
+			this.Invoke(Args(IntPtr.Zero, desktop.ComObject));
+		}
+
+		public override VirtualDesktop CreateDesktopW()
+		{
+			return this.GetDesktop(Args(IntPtr.Zero));
+		}
+
+		public override void MoveDesktop(VirtualDesktop desktop, int index)
+		{
+			this.Invoke(Args(desktop.ComObject, IntPtr.Zero, index));
+		}
+
+		public override void RemoveDesktop(VirtualDesktop pRemove, VirtualDesktop pFallbackDesktop)
+		{
+			this.Invoke(Args(pRemove.ComObject, pFallbackDesktop.ComObject));
+		}
+
+		public override VirtualDesktop FindDesktop(Guid desktopId)
+		{
+			return this.GetDesktop(Args(desktopId));
+		}
+
+		private VirtualDesktop GetDesktop(object[] parameters = null, [CallerMemberName] string methodName = "")
+			=> VirtualDesktopCache.GetOrCreate(this.Invoke<object>(parameters, methodName));
+
+		public override void SetName(VirtualDesktop desktop, string name)
+		{
+			this.Invoke(Args(desktop.ComObject, name));
+		}
+
+		public override void SetWallpaperPath(VirtualDesktop desktop, string path)
+		{
+			this.Invoke(Args(desktop.ComObject, path));
+		}
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal21359.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal21359.cs
new file mode 100644
index 0000000..64e7f9b
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopManagerInternal21359.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Runtime.CompilerServices;
+
+namespace WindowsDesktop.Interop
+{
+	[ComInterfaceWrapper("IVirtualDesktopManagerInternal", 21359)]
+	internal sealed class VirtualDesktopManagerInternal21359 : VirtualDesktopManagerInternal21313
+	{
+		public VirtualDesktopManagerInternal21359(ComInterfaceAssembly assembly)
+			: base(assembly)
+		{
+		}
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopNotification.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopNotification.cs
index dbb854f..409f78e 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopNotification.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/(wrappers)/VirtualDesktopNotification.cs
@@ -5,16 +5,24 @@
 
 namespace WindowsDesktop.Interop
 {
-	[ComInterfaceWrapper]
+	[ComInterfaceWrapper(2)]
 	[UsedImplicitly(ImplicitUseTargetFlags.Members)]
 	public abstract class VirtualDesktopNotification
 	{
 		internal static VirtualDesktopNotification CreateInstance(ComInterfaceAssembly assembly)
 		{
-			var type = assembly.GetType("VirtualDesktopNotificationListener");
-			var instance = (VirtualDesktopNotification)Activator.CreateInstance(type);
-
-			return instance;
+			var type2 = assembly.GetType("VirtualDesktopNotificationListener2");
+			if (type2 != null)
+			{
+				var instance = (VirtualDesktopNotification)Activator.CreateInstance(type2);
+				return instance;
+			}
+			else
+			{
+				var type = assembly.GetType("VirtualDesktopNotificationListener");
+				var instance = (VirtualDesktopNotification)Activator.CreateInstance(type);
+				return instance;
+			}
 		}
 
 		protected VirtualDesktop GetDesktop(object comObject)
@@ -40,7 +48,12 @@ protected void VirtualDesktopDestroyedCore(object pDesktopDestroyed, object pDes
 			VirtualDesktop.EventRaiser.RaiseDestroyed(this, VirtualDesktopCache.GetOrCreate(pDesktopDestroyed), VirtualDesktopCache.GetOrCreate(pDesktopFallback));
 		}
 
-		protected void ViewVirtualDesktopChangedCore(IntPtr pView)
+		protected void VirtualDesktopMovedCore(object pDesktop, int nFromIndex, int nToIndex)
+		{
+			VirtualDesktop.EventRaiser.RaiseMoved(this, VirtualDesktopCache.GetOrCreate(pDesktop), nFromIndex, nToIndex);
+		}
+
+		protected void ViewVirtualDesktopChangedCore(object pView)
 		{
 			VirtualDesktop.EventRaiser.RaiseApplicationViewChanged(this, pView);
 		}
@@ -49,5 +62,15 @@ protected void CurrentVirtualDesktopChangedCore(object pDesktopOld, object pDesk
 		{
 			VirtualDesktop.EventRaiser.RaiseCurrentChanged(this, VirtualDesktopCache.GetOrCreate(pDesktopOld), VirtualDesktopCache.GetOrCreate(pDesktopNew));
 		}
+
+		protected void VirtualDesktopRenamedCore(object pDesktop, string chName)
+		{
+			VirtualDesktop.EventRaiser.RaiseRenamed(this, VirtualDesktopCache.GetOrCreate(pDesktop), chName);
+		}
+
+		protected void VirtualDesktopWallpaperChangedCore(object pDesktop, string chPath)
+		{
+			VirtualDesktop.EventRaiser.RaiseWallpaperChanged(this, VirtualDesktopCache.GetOrCreate(pDesktop), chPath);
+		}
 	}
 }
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/ComInterfaceAssembly.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/ComInterfaceAssembly.cs
index b187424..5b16eae 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/Interop/ComInterfaceAssembly.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/ComInterfaceAssembly.cs
@@ -22,7 +22,7 @@ internal Type GetType(string typeName)
 			{
 				type = this._knownTypes[typeName] = this._compiledAssembly
 					.GetTypes()
-					.Single(x => x.Name.Split('.').Last() == typeName);
+					.SingleOrDefault(x => x.Name.Split('.').Last() == typeName);
 			}
 
 			return type;
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/ComInterfaceAssemblyProvider.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/ComInterfaceAssemblyProvider.cs
index 3d8b04c..9fcb588 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/Interop/ComInterfaceAssemblyProvider.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/ComInterfaceAssemblyProvider.cs
@@ -1,13 +1,14 @@
 using System;
-using System.CodeDom.Compiler;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.Loader;
 using System.Text;
 using System.Text.RegularExpressions;
 using WindowsDesktop.Properties;
-using Microsoft.CSharp;
+using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis.CSharp;
 
 namespace WindowsDesktop.Interop
 {
@@ -19,6 +20,7 @@ internal class ComInterfaceAssemblyProvider
 		private static readonly Regex _assemblyRegex = new Regex(@"VirtualDesktop\.(?<build>\d{5}?)(\.\w*|)\.dll");
 		private static readonly string _defaultAssemblyDirectoryPath = Path.Combine(ProductInfo.LocalAppData.FullName, "assemblies");
 		private static readonly Version _requireVersion = new Version("1.0");
+		private static readonly int[] _interfaceVersions = new[] { 10240, 20231, 21313, 21359 };
 
 		private readonly string _assemblyDirectoryPath;
 		
@@ -29,13 +31,13 @@ public ComInterfaceAssemblyProvider(string assemblyDirectoryPath)
 
 		public Assembly GetAssembly()
 		{
-			var assembly = this.GetExisitingAssembly();
+			var assembly = this.GetExistingAssembly();
 			if (assembly != null) return assembly;
 
 			return this.CreateAssembly();
 		}
 
-		private Assembly GetExisitingAssembly()
+		private Assembly GetExistingAssembly()
 		{
 			var searchTargets = new[]
 			{
@@ -73,9 +75,12 @@ private Assembly GetExisitingAssembly()
 		private Assembly CreateAssembly()
 		{
 			var executingAssembly = Assembly.GetExecutingAssembly();
+			var interfaceVersion = _interfaceVersions
+				.Reverse()
+				.First(build => build <= ProductInfo.OSBuild);
 			var interfaceNames = executingAssembly
 				.GetTypes()
-				.Select(x => x.GetComInterfaceNameIfWrapper())
+				.SelectMany(x => x.GetComInterfaceNamesIfWrapper(interfaceVersion))
 				.Where(x => x != null)
 				.ToArray();
 			var iids = IID.GetIIDs(interfaceNames);
@@ -87,7 +92,9 @@ private Assembly CreateAssembly()
 				{
 					using (var reader = new StreamReader(stream, Encoding.UTF8))
 					{
-						var sourceCode = reader.ReadToEnd().Replace("{VERSION}", ProductInfo.OSBuild.ToString());
+						var sourceCode = reader.ReadToEnd()
+							.Replace("{VERSION}", ProductInfo.OSBuild.ToString())
+							.Replace("{BUILD}", interfaceVersion.ToString());
 						compileTargets.Add(sourceCode);
 					}
 				}
@@ -95,11 +102,15 @@ private Assembly CreateAssembly()
 
 			foreach (var name in executingAssembly.GetManifestResourceNames())
 			{
-				var typeName = Path.GetFileNameWithoutExtension(name)?.Split('.').LastOrDefault();
+				var texts = Path.GetFileNameWithoutExtension(name)?.Split('.');
+				var typeName = texts.LastOrDefault();
 				if (typeName == null) continue;
 
+				if (int.TryParse(string.Concat(texts[texts.Length - 2].Skip(1)), out var build) && build != interfaceVersion) continue;
+
 				var interfaceName = interfaceNames.FirstOrDefault(x => typeName == x);
 				if (interfaceName == null) continue;
+				if (!iids.ContainsKey(interfaceName)) continue;
 
 				var stream = executingAssembly.GetManifestResourceStream(name);
 				if (stream == null) continue;
@@ -114,35 +125,35 @@ private Assembly CreateAssembly()
 			return this.Compile(compileTargets.ToArray());
 		}
 
-		private Assembly Compile(string[] sources)
+		private Assembly Compile(IEnumerable<string> sources)
 		{
 			var dir = new DirectoryInfo(this._assemblyDirectoryPath);
-			if (!dir.Exists) dir.Create();
-
-			using (var provider = new CSharpCodeProvider())
+			if (dir.Exists == false) dir.Create();
+
+			var path = Path.Combine(dir.FullName, string.Format(_assemblyName, ProductInfo.OSBuild));
+			var syntaxTrees = sources.Select(x => SyntaxFactory.ParseSyntaxTree(x));
+			var references = AppDomain.CurrentDomain.GetAssemblies()
+				.Concat(new[] { Assembly.GetExecutingAssembly(), })
+				.Select(x => x.Location)
+				.Select(x => MetadataReference.CreateFromFile(x));
+			var options = new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary);
+			var compilation = CSharpCompilation.Create(_assemblyName)
+				.WithOptions(options)
+				.WithReferences(references)
+				.AddSyntaxTrees(syntaxTrees);
+
+			var result = compilation.Emit(path);
+			if (result.Success)
 			{
-				var path = Path.Combine(dir.FullName, string.Format(_assemblyName, ProductInfo.OSBuild));
-				var cp = new CompilerParameters
-				{
-					OutputAssembly = path,
-					GenerateExecutable = false,
-					GenerateInMemory = false,
-				};
-				cp.ReferencedAssemblies.Add("System.dll");
-				cp.ReferencedAssemblies.Add(Assembly.GetExecutingAssembly().Location);
-
-				var result = provider.CompileAssemblyFromSource(cp, sources);
-				if (result.Errors.Count > 0)
-				{
-					var nl = Environment.NewLine;
-					var message = $"Failed to compile COM interfaces assembly.{nl}{string.Join(nl, result.Errors.OfType<CompilerError>().Select(x => $"  {x}"))}";
+				return AssemblyLoadContext.Default.LoadFromAssemblyPath(path);
+			}
 
-					throw new Exception(message);
-				}
+			File.Delete(path);
 
-				System.Diagnostics.Debug.WriteLine($"Assembly compiled: {path}");
-				return result.CompiledAssembly;
-			}
+			var nl = Environment.NewLine;
+			var message = $"Failed to compile COM interfaces assembly.{nl}{string.Join(nl, result.Diagnostics.Select(x => $"  {x.GetMessage()}"))}";
+
+			throw new Exception(message);
 		}
 	}
 }
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/ComInterfaceWrapperAttribute.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/ComInterfaceWrapperAttribute.cs
index 4084163..2cc3b93 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/Interop/ComInterfaceWrapperAttribute.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/ComInterfaceWrapperAttribute.cs
@@ -10,6 +10,10 @@ public class ComInterfaceWrapperAttribute : Attribute
 	{
 		public string InterfaceName { get; set; }
 
+		public uint LatestVersion { get; set; } = 1;
+
+		public int BuildVersion { get; set; } = -1;
+
 		public ComInterfaceWrapperAttribute() { }
 
 		public ComInterfaceWrapperAttribute(string interfaceName)
@@ -17,6 +21,24 @@ public ComInterfaceWrapperAttribute(string interfaceName)
 			this.InterfaceName = interfaceName;
 		}
 
+		public ComInterfaceWrapperAttribute(string interfaceName, int buildVersion)
+		{
+			this.InterfaceName = interfaceName;
+			this.BuildVersion = buildVersion;
+		}
+
+		public ComInterfaceWrapperAttribute(string interfaceName, uint latestVersion, int buildVersion)
+		{
+			this.InterfaceName = interfaceName;
+			this.LatestVersion = latestVersion;
+			this.BuildVersion = buildVersion;
+		}
+
+		public ComInterfaceWrapperAttribute(uint latestVersion)
+		{
+			this.LatestVersion = latestVersion;
+		}
+
 		public static string GetInterfaceName(Type wrapperType)
 			=> $"I{wrapperType.Name}";
 	}
@@ -29,9 +51,25 @@ public static class ComInterfaceWrapperAttributeExtensions
 		public static string GetComInterfaceNameIfWrapper(this Type type)
 		{
 			var attr = type.GetCustomAttribute<ComInterfaceWrapperAttribute>();
-			return attr != null 
-				? attr.InterfaceName ?? $"I{type.Name}" 
+			return attr != null
+				? attr.InterfaceName ?? $"I{type.Name}"
+				: null;
+		}
+
+		/// <summary>
+		/// Gets COM interface names if specific type has '<see cref="ComInterfaceWrapperAttribute"/>' attribute.
+		/// </summary>
+		public static IEnumerable<string> GetComInterfaceNamesIfWrapper(this Type type, int targetBuild = -1)
+		{
+			var attr = type.GetCustomAttribute<ComInterfaceWrapperAttribute>();
+			var baseName = attr != null
+				? attr.InterfaceName ?? $"I{type.Name}"
 				: null;
+			if (string.IsNullOrEmpty(baseName)) return Enumerable.Empty<string>();
+			if (targetBuild != -1 && attr.BuildVersion != -1 && attr.BuildVersion != targetBuild) return Enumerable.Empty<string>();
+
+			return Enumerable.Range(1, (int)attr.LatestVersion)
+				.Select(v => v == 1 ? baseName : $"{baseName}{v}");
 		}
 	}
 }
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/ComInterfaceWrapperBase.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/ComInterfaceWrapperBase.cs
index c9c8a24..ff67883 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/Interop/ComInterfaceWrapperBase.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/ComInterfaceWrapperBase.cs
@@ -17,20 +17,45 @@ public abstract class ComInterfaceWrapperBase
 
 		public object ComObject { get; }
 
-		private protected ComInterfaceWrapperBase(ComInterfaceAssembly assembly, string comInterfaceName = null, Guid? service = null)
+		public uint ComVersion { get; }
+
+		private protected ComInterfaceWrapperBase(ComInterfaceAssembly assembly, string comInterfaceName = null, uint latestVersion = 1, Guid? service = null)
 		{
-			var (type, instance) = assembly.CreateInstance(comInterfaceName ?? this.GetType().GetComInterfaceNameIfWrapper(), service);
+			var comInterfaceName2 = comInterfaceName ?? this.GetType().GetComInterfaceNameIfWrapper();
+			for (var version = latestVersion; version >= 1; version--)
+			{
+				var type = assembly.GetType(version != 1 ? $"{comInterfaceName2}{version}" : comInterfaceName2);
+				if (type != null)
+				{
+					var instance = assembly.CreateInstance(type, service);
+					this.ComInterfaceAssembly = assembly;
+					this.ComInterfaceType = type;
+					this.ComObject = instance;
+					this.ComVersion = version;
+					return;
+				}
+			}
 
-			this.ComInterfaceAssembly = assembly;
-			this.ComInterfaceType = type;
-			this.ComObject = instance;
+			throw new InvalidOperationException($"{comInterfaceName2} or later version is not found.");
 		}
 
-		private protected ComInterfaceWrapperBase(ComInterfaceAssembly assembly, object comObject, string comInterfaceName = null)
+		private protected ComInterfaceWrapperBase(ComInterfaceAssembly assembly, object comObject, string comInterfaceName = null, uint latestVersion = 1)
 		{
-			this.ComInterfaceAssembly = assembly;
-			this.ComInterfaceType = assembly.GetType(comInterfaceName ?? this.GetType().GetComInterfaceNameIfWrapper());
-			this.ComObject = comObject;
+			var comInterfaceName2 = comInterfaceName ?? this.GetType().GetComInterfaceNameIfWrapper();
+			for (var version = latestVersion; version >= 1; version--)
+			{
+				var type = assembly.GetType(version != 1 ? $"{comInterfaceName2}{version}" : comInterfaceName2);
+				if (type != null)
+				{
+					this.ComInterfaceAssembly = assembly;
+					this.ComInterfaceType = type;
+					this.ComObject = comObject;
+					this.ComVersion = version;
+					return;
+				}
+			}
+
+			throw new InvalidOperationException($"{comInterfaceName2} or later version is not found.");
 		}
 
 		protected static object[] Args(params object[] args)
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Interop/ComObjects.cs b/VirtualDesktop-master/source/VirtualDesktop/Interop/ComObjects.cs
index 85c2af5..99cf6e1 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/Interop/ComObjects.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/Interop/ComObjects.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Windows.Threading;
 using WindowsDesktop.Internal;
+using WindowsDesktop.Properties;
 
 namespace WindowsDesktop.Interop
 {
@@ -39,7 +40,22 @@ private void Initialize()
 			VirtualDesktopCache.Initialize(this._assembly);
 
 			this.VirtualDesktopManager = (IVirtualDesktopManager)Activator.CreateInstance(Type.GetTypeFromCLSID(CLSID.VirtualDesktopManager));
-			this.VirtualDesktopManagerInternal = new VirtualDesktopManagerInternal(this._assembly);
+			if (ProductInfo.OSBuild >= 21359)
+			{
+				this.VirtualDesktopManagerInternal = new VirtualDesktopManagerInternal21359(this._assembly);
+			}
+			else if (ProductInfo.OSBuild >= 21313)
+			{
+				this.VirtualDesktopManagerInternal = new VirtualDesktopManagerInternal21313(this._assembly);
+			}
+			else if (ProductInfo.OSBuild >= 20231)
+			{
+				this.VirtualDesktopManagerInternal = new VirtualDesktopManagerInternal20231(this._assembly);
+			}
+			else
+			{
+				this.VirtualDesktopManagerInternal = new VirtualDesktopManagerInternal10240(this._assembly);
+			}
 			this.VirtualDesktopNotificationService = new VirtualDesktopNotificationService(this._assembly);
 			this.VirtualDesktopPinnedApps = new VirtualDesktopPinnedApps(this._assembly);
 			this.ApplicationViewCollection = new ApplicationViewCollection(this._assembly);
@@ -56,7 +72,7 @@ public void Dispose()
 
 		private class ExplorerRestartListenerWindow : TransparentWindow
 		{
-			private uint _explorerRestertedMessage;
+			private uint _explorerRestartedMessage;
 			private readonly Action _action;
 
 			public ExplorerRestartListenerWindow(Action action)
@@ -68,12 +84,12 @@ public ExplorerRestartListenerWindow(Action action)
 			public override void Show()
 			{
 				base.Show();
-				this._explorerRestertedMessage = NativeMethods.RegisterWindowMessage("TaskbarCreated");
+				this._explorerRestartedMessage = NativeMethods.RegisterWindowMessage("TaskbarCreated");
 			}
 
 			protected override IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref bool handled)
 			{
-				if (msg == this._explorerRestertedMessage)
+				if (msg == this._explorerRestartedMessage)
 				{
 					this._action();
 					return IntPtr.Zero;
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Properties/Annotations.cs b/VirtualDesktop-master/source/VirtualDesktop/Properties/Annotations.cs
new file mode 100644
index 0000000..608ac81
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/Properties/Annotations.cs
@@ -0,0 +1,1235 @@
+/* MIT License
+
+Copyright (c) 2016 JetBrains http://www.jetbrains.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE. */
+
+using System;
+using System.Diagnostics;
+// ReSharper disable InheritdocConsiderUsage
+
+#pragma warning disable 1591
+// ReSharper disable UnusedMember.Global
+// ReSharper disable MemberCanBePrivate.Global
+// ReSharper disable UnusedAutoPropertyAccessor.Global
+// ReSharper disable IntroduceOptionalParameters.Global
+// ReSharper disable MemberCanBeProtected.Global
+// ReSharper disable InconsistentNaming
+// ReSharper disable CheckNamespace
+
+namespace JetBrains.Annotations
+{
+	/// <summary>
+	/// Indicates that the value of the marked element could be <c>null</c> sometimes,
+	/// so checking for <c>null</c> is required before its usage.
+	/// </summary>
+	/// <example><code>
+	/// [CanBeNull] object Test() => null;
+	/// 
+	/// void UseTest() {
+	///   var p = Test();
+	///   var s = p.ToString(); // Warning: Possible 'System.NullReferenceException'
+	/// }
+	/// </code></example>
+	[AttributeUsage(
+	  AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property |
+	  AttributeTargets.Delegate | AttributeTargets.Field | AttributeTargets.Event |
+	  AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.GenericParameter)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class CanBeNullAttribute : Attribute { }
+
+	/// <summary>
+	/// Indicates that the value of the marked element can never be <c>null</c>.
+	/// </summary>
+	/// <example><code>
+	/// [NotNull] object Foo() {
+	///   return null; // Warning: Possible 'null' assignment
+	/// }
+	/// </code></example>
+	[AttributeUsage(
+	  AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property |
+	  AttributeTargets.Delegate | AttributeTargets.Field | AttributeTargets.Event |
+	  AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.GenericParameter)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class NotNullAttribute : Attribute { }
+
+	/// <summary>
+	/// Can be applied to symbols of types derived from IEnumerable as well as to symbols of Task
+	/// and Lazy classes to indicate that the value of a collection item, of the Task.Result property
+	/// or of the Lazy.Value property can never be null.
+	/// </summary>
+	/// <example><code>
+	/// public void Foo([ItemNotNull]List&lt;string&gt; books)
+	/// {
+	///   foreach (var book in books) {
+	///     if (book != null) // Warning: Expression is always true
+	///      Console.WriteLine(book.ToUpper());
+	///   }
+	/// }
+	/// </code></example>
+	[AttributeUsage(
+	  AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property |
+	  AttributeTargets.Delegate | AttributeTargets.Field)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class ItemNotNullAttribute : Attribute { }
+
+	/// <summary>
+	/// Can be applied to symbols of types derived from IEnumerable as well as to symbols of Task
+	/// and Lazy classes to indicate that the value of a collection item, of the Task.Result property
+	/// or of the Lazy.Value property can be null.
+	/// </summary>
+	/// <example><code>
+	/// public void Foo([ItemCanBeNull]List&lt;string&gt; books)
+	/// {
+	///   foreach (var book in books)
+	///   {
+	///     // Warning: Possible 'System.NullReferenceException'
+	///     Console.WriteLine(book.ToUpper());
+	///   }
+	/// }
+	/// </code></example>
+	[AttributeUsage(
+	  AttributeTargets.Method | AttributeTargets.Parameter | AttributeTargets.Property |
+	  AttributeTargets.Delegate | AttributeTargets.Field)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class ItemCanBeNullAttribute : Attribute { }
+
+	/// <summary>
+	/// Indicates that the marked method builds string by the format pattern and (optional) arguments.
+	/// The parameter, which contains the format string, should be given in constructor. The format string
+	/// should be in <see cref="string.Format(IFormatProvider,string,object[])"/>-like form.
+	/// </summary>
+	/// <example><code>
+	/// [StringFormatMethod("message")]
+	/// void ShowError(string message, params object[] args) { /* do something */ }
+	/// 
+	/// void Foo() {
+	///   ShowError("Failed: {0}"); // Warning: Non-existing argument in format string
+	/// }
+	/// </code></example>
+	[AttributeUsage(
+	  AttributeTargets.Constructor | AttributeTargets.Method |
+	  AttributeTargets.Property | AttributeTargets.Delegate)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class StringFormatMethodAttribute : Attribute
+	{
+		/// <param name="formatParameterName">
+		/// Specifies which parameter of an annotated method should be treated as the format string
+		/// </param>
+		public StringFormatMethodAttribute([NotNull] string formatParameterName)
+		{
+			FormatParameterName = formatParameterName;
+		}
+
+		[NotNull] public string FormatParameterName { get; }
+	}
+
+	/// <summary>
+	/// Use this annotation to specify a type that contains static or const fields
+	/// with values for the annotated property/field/parameter.
+	/// The specified type will be used to improve completion suggestions.
+	/// </summary>
+	/// <example><code>
+	/// namespace TestNamespace
+	/// {
+	///   public class Constants
+	///   {
+	///     public static int INT_CONST = 1;
+	///     public const string STRING_CONST = "1";
+	///   }
+	///
+	///   public class Class1
+	///   {
+	///     [ValueProvider("TestNamespace.Constants")] public int myField;
+	///     public void Foo([ValueProvider("TestNamespace.Constants")] string str) { }
+	///
+	///     public void Test()
+	///     {
+	///       Foo(/*try completion here*/);//
+	///       myField = /*try completion here*/
+	///     }
+	///   }
+	/// }
+	/// </code></example>
+	[AttributeUsage(
+	  AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.Field,
+	  AllowMultiple = true)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class ValueProviderAttribute : Attribute
+	{
+		public ValueProviderAttribute([NotNull] string name)
+		{
+			Name = name;
+		}
+
+		[NotNull] public string Name { get; }
+	}
+
+	/// <summary>
+	/// Indicates that the function argument should be a string literal and match one
+	/// of the parameters of the caller function. For example, ReSharper annotates
+	/// the parameter of <see cref="System.ArgumentNullException"/>.
+	/// </summary>
+	/// <example><code>
+	/// void Foo(string param) {
+	///   if (param == null)
+	///     throw new ArgumentNullException("par"); // Warning: Cannot resolve symbol
+	/// }
+	/// </code></example>
+	[AttributeUsage(AttributeTargets.Parameter)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class InvokerParameterNameAttribute : Attribute { }
+
+	/// <summary>
+	/// Indicates that the method is contained in a type that implements
+	/// <c>System.ComponentModel.INotifyPropertyChanged</c> interface and this method
+	/// is used to notify that some property value changed.
+	/// </summary>
+	/// <remarks>
+	/// The method should be non-static and conform to one of the supported signatures:
+	/// <list>
+	/// <item><c>NotifyChanged(string)</c></item>
+	/// <item><c>NotifyChanged(params string[])</c></item>
+	/// <item><c>NotifyChanged{T}(Expression{Func{T}})</c></item>
+	/// <item><c>NotifyChanged{T,U}(Expression{Func{T,U}})</c></item>
+	/// <item><c>SetProperty{T}(ref T, T, string)</c></item>
+	/// </list>
+	/// </remarks>
+	/// <example><code>
+	/// public class Foo : INotifyPropertyChanged {
+	///   public event PropertyChangedEventHandler PropertyChanged;
+	/// 
+	///   [NotifyPropertyChangedInvocator]
+	///   protected virtual void NotifyChanged(string propertyName) { ... }
+	///
+	///   string _name;
+	/// 
+	///   public string Name {
+	///     get { return _name; }
+	///     set { _name = value; NotifyChanged("LastName"); /* Warning */ }
+	///   }
+	/// }
+	/// </code>
+	/// Examples of generated notifications:
+	/// <list>
+	/// <item><c>NotifyChanged("Property")</c></item>
+	/// <item><c>NotifyChanged(() =&gt; Property)</c></item>
+	/// <item><c>NotifyChanged((VM x) =&gt; x.Property)</c></item>
+	/// <item><c>SetProperty(ref myField, value, "Property")</c></item>
+	/// </list>
+	/// </example>
+	[AttributeUsage(AttributeTargets.Method)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class NotifyPropertyChangedInvocatorAttribute : Attribute
+	{
+		public NotifyPropertyChangedInvocatorAttribute() { }
+		public NotifyPropertyChangedInvocatorAttribute([NotNull] string parameterName)
+		{
+			ParameterName = parameterName;
+		}
+
+		[CanBeNull] public string ParameterName { get; }
+	}
+
+	/// <summary>
+	/// Describes dependency between method input and output.
+	/// </summary>
+	/// <syntax>
+	/// <p>Function Definition Table syntax:</p>
+	/// <list>
+	/// <item>FDT      ::= FDTRow [;FDTRow]*</item>
+	/// <item>FDTRow   ::= Input =&gt; Output | Output &lt;= Input</item>
+	/// <item>Input    ::= ParameterName: Value [, Input]*</item>
+	/// <item>Output   ::= [ParameterName: Value]* {halt|stop|void|nothing|Value}</item>
+	/// <item>Value    ::= true | false | null | notnull | canbenull</item>
+	/// </list>
+	/// If the method has a single input parameter, its name could be omitted.<br/>
+	/// Using <c>halt</c> (or <c>void</c>/<c>nothing</c>, which is the same) for the method output
+	/// means that the method doesn't return normally (throws or terminates the process).<br/>
+	/// Value <c>canbenull</c> is only applicable for output parameters.<br/>
+	/// You can use multiple <c>[ContractAnnotation]</c> for each FDT row, or use single attribute
+	/// with rows separated by semicolon. There is no notion of order rows, all rows are checked
+	/// for applicability and applied per each program state tracked by the analysis engine.<br/>
+	/// </syntax>
+	/// <examples><list>
+	/// <item><code>
+	/// [ContractAnnotation("=&gt; halt")]
+	/// public void TerminationMethod()
+	/// </code></item>
+	/// <item><code>
+	/// [ContractAnnotation("null &lt;= param:null")] // reverse condition syntax
+	/// public string GetName(string surname)
+	/// </code></item>
+	/// <item><code>
+	/// [ContractAnnotation("s:null =&gt; true")]
+	/// public bool IsNullOrEmpty(string s) // string.IsNullOrEmpty()
+	/// </code></item>
+	/// <item><code>
+	/// // A method that returns null if the parameter is null,
+	/// // and not null if the parameter is not null
+	/// [ContractAnnotation("null =&gt; null; notnull =&gt; notnull")]
+	/// public object Transform(object data)
+	/// </code></item>
+	/// <item><code>
+	/// [ContractAnnotation("=&gt; true, result: notnull; =&gt; false, result: null")]
+	/// public bool TryParse(string s, out Person result)
+	/// </code></item>
+	/// </list></examples>
+	[AttributeUsage(AttributeTargets.Method, AllowMultiple = true)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class ContractAnnotationAttribute : Attribute
+	{
+		public ContractAnnotationAttribute([NotNull] string contract)
+		  : this(contract, false) { }
+
+		public ContractAnnotationAttribute([NotNull] string contract, bool forceFullStates)
+		{
+			Contract = contract;
+			ForceFullStates = forceFullStates;
+		}
+
+		[NotNull] public string Contract { get; }
+
+		public bool ForceFullStates { get; }
+	}
+
+	/// <summary>
+	/// Indicates whether the marked element should be localized.
+	/// </summary>
+	/// <example><code>
+	/// [LocalizationRequiredAttribute(true)]
+	/// class Foo {
+	///   string str = "my string"; // Warning: Localizable string
+	/// }
+	/// </code></example>
+	[AttributeUsage(AttributeTargets.All)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class LocalizationRequiredAttribute : Attribute
+	{
+		public LocalizationRequiredAttribute() : this(true) { }
+
+		public LocalizationRequiredAttribute(bool required)
+		{
+			Required = required;
+		}
+
+		public bool Required { get; }
+	}
+
+	/// <summary>
+	/// Indicates that the value of the marked type (or its derivatives)
+	/// cannot be compared using '==' or '!=' operators and <c>Equals()</c>
+	/// should be used instead. However, using '==' or '!=' for comparison
+	/// with <c>null</c> is always permitted.
+	/// </summary>
+	/// <example><code>
+	/// [CannotApplyEqualityOperator]
+	/// class NoEquality { }
+	/// 
+	/// class UsesNoEquality {
+	///   void Test() {
+	///     var ca1 = new NoEquality();
+	///     var ca2 = new NoEquality();
+	///     if (ca1 != null) { // OK
+	///       bool condition = ca1 == ca2; // Warning
+	///     }
+	///   }
+	/// }
+	/// </code></example>
+	[AttributeUsage(AttributeTargets.Interface | AttributeTargets.Class | AttributeTargets.Struct)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class CannotApplyEqualityOperatorAttribute : Attribute { }
+
+	/// <summary>
+	/// When applied to a target attribute, specifies a requirement for any type marked
+	/// with the target attribute to implement or inherit specific type or types.
+	/// </summary>
+	/// <example><code>
+	/// [BaseTypeRequired(typeof(IComponent)] // Specify requirement
+	/// class ComponentAttribute : Attribute { }
+	/// 
+	/// [Component] // ComponentAttribute requires implementing IComponent interface
+	/// class MyComponent : IComponent { }
+	/// </code></example>
+	[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+	[BaseTypeRequired(typeof(Attribute))]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class BaseTypeRequiredAttribute : Attribute
+	{
+		public BaseTypeRequiredAttribute([NotNull] Type baseType)
+		{
+			BaseType = baseType;
+		}
+
+		[NotNull] public Type BaseType { get; }
+	}
+
+	/// <summary>
+	/// Indicates that the marked symbol is used implicitly (e.g. via reflection, in external library),
+	/// so this symbol will not be reported as unused (as well as by other usage inspections).
+	/// </summary>
+	[AttributeUsage(AttributeTargets.All, Inherited = false)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class UsedImplicitlyAttribute : Attribute
+	{
+		public UsedImplicitlyAttribute()
+		  : this(ImplicitUseKindFlags.Default, ImplicitUseTargetFlags.Default) { }
+
+		public UsedImplicitlyAttribute(ImplicitUseKindFlags useKindFlags)
+		  : this(useKindFlags, ImplicitUseTargetFlags.Default) { }
+
+		public UsedImplicitlyAttribute(ImplicitUseTargetFlags targetFlags)
+		  : this(ImplicitUseKindFlags.Default, targetFlags) { }
+
+		public UsedImplicitlyAttribute(ImplicitUseKindFlags useKindFlags, ImplicitUseTargetFlags targetFlags)
+		{
+			UseKindFlags = useKindFlags;
+			TargetFlags = targetFlags;
+		}
+
+		public ImplicitUseKindFlags UseKindFlags { get; }
+
+		public ImplicitUseTargetFlags TargetFlags { get; }
+	}
+
+	/// <summary>
+	/// Can be applied to attributes, type parameters, and parameters of a type assignable from <see cref="System.Type"/> .
+	/// When applied to an attribute, the decorated attribute behaves the same as <see cref="UsedImplicitlyAttribute"/>.
+	/// When applied to a type parameter or to a parameter of type <see cref="System.Type"/>,  indicates that the corresponding type
+	/// is used implicitly.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Class | AttributeTargets.GenericParameter | AttributeTargets.Parameter)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class MeansImplicitUseAttribute : Attribute
+	{
+		public MeansImplicitUseAttribute()
+		  : this(ImplicitUseKindFlags.Default, ImplicitUseTargetFlags.Default) { }
+
+		public MeansImplicitUseAttribute(ImplicitUseKindFlags useKindFlags)
+		  : this(useKindFlags, ImplicitUseTargetFlags.Default) { }
+
+		public MeansImplicitUseAttribute(ImplicitUseTargetFlags targetFlags)
+		  : this(ImplicitUseKindFlags.Default, targetFlags) { }
+
+		public MeansImplicitUseAttribute(ImplicitUseKindFlags useKindFlags, ImplicitUseTargetFlags targetFlags)
+		{
+			UseKindFlags = useKindFlags;
+			TargetFlags = targetFlags;
+		}
+
+		[UsedImplicitly] public ImplicitUseKindFlags UseKindFlags { get; }
+
+		[UsedImplicitly] public ImplicitUseTargetFlags TargetFlags { get; }
+	}
+
+	/// <summary>
+	/// Specify the details of implicitly used symbol when it is marked
+	/// with <see cref="MeansImplicitUseAttribute"/> or <see cref="UsedImplicitlyAttribute"/>.
+	/// </summary>
+	[Flags]
+	internal enum ImplicitUseKindFlags
+	{
+		Default = Access | Assign | InstantiatedWithFixedConstructorSignature,
+		/// <summary>Only entity marked with attribute considered used.</summary>
+		Access = 1,
+		/// <summary>Indicates implicit assignment to a member.</summary>
+		Assign = 2,
+		/// <summary>
+		/// Indicates implicit instantiation of a type with fixed constructor signature.
+		/// That means any unused constructor parameters won't be reported as such.
+		/// </summary>
+		InstantiatedWithFixedConstructorSignature = 4,
+		/// <summary>Indicates implicit instantiation of a type.</summary>
+		InstantiatedNoFixedConstructorSignature = 8,
+	}
+
+	/// <summary>
+	/// Specify what is considered to be used implicitly when marked
+	/// with <see cref="MeansImplicitUseAttribute"/> or <see cref="UsedImplicitlyAttribute"/>.
+	/// </summary>
+	[Flags]
+	internal enum ImplicitUseTargetFlags
+	{
+		Default = Itself,
+		Itself = 1,
+		/// <summary>Members of entity marked with attribute are considered used.</summary>
+		Members = 2,
+		/// <summary>Entity marked with attribute and all its members considered used.</summary>
+		WithMembers = Itself | Members
+	}
+
+	/// <summary>
+	/// This attribute is intended to mark publicly available API
+	/// which should not be removed and so is treated as used.
+	/// </summary>
+	[MeansImplicitUse(ImplicitUseTargetFlags.WithMembers)]
+	[AttributeUsage(AttributeTargets.All, Inherited = false)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class PublicAPIAttribute : Attribute
+	{
+		public PublicAPIAttribute() { }
+
+		public PublicAPIAttribute([NotNull] string comment)
+		{
+			Comment = comment;
+		}
+
+		[CanBeNull] public string Comment { get; }
+	}
+
+	/// <summary>
+	/// Tells code analysis engine if the parameter is completely handled when the invoked method is on stack.
+	/// If the parameter is a delegate, indicates that delegate is executed while the method is executed.
+	/// If the parameter is an enumerable, indicates that it is enumerated while the method is executed.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Parameter)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class InstantHandleAttribute : Attribute { }
+
+	/// <summary>
+	/// Indicates that a method does not make any observable state changes.
+	/// The same as <c>System.Diagnostics.Contracts.PureAttribute</c>.
+	/// </summary>
+	/// <example><code>
+	/// [Pure] int Multiply(int x, int y) => x * y;
+	/// 
+	/// void M() {
+	///   Multiply(123, 42); // Waring: Return value of pure method is not used
+	/// }
+	/// </code></example>
+	[AttributeUsage(AttributeTargets.Method)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class PureAttribute : Attribute { }
+
+	/// <summary>
+	/// Indicates that the return value of the method invocation must be used.
+	/// </summary>
+	/// <remarks>
+	/// Methods decorated with this attribute (in contrast to pure methods) might change state,
+	/// but make no sense without using their return value. <br/>
+	/// Similarly to <see cref="PureAttribute"/>, this attribute
+	/// will help detecting usages of the method when the return value in not used.
+	/// Additionally, you can optionally specify a custom message, which will be used when showing warnings, e.g.
+	/// <code>[MustUseReturnValue("Use the return value to...")]</code>.
+	/// </remarks>
+	[AttributeUsage(AttributeTargets.Method)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class MustUseReturnValueAttribute : Attribute
+	{
+		public MustUseReturnValueAttribute() { }
+
+		public MustUseReturnValueAttribute([NotNull] string justification)
+		{
+			Justification = justification;
+		}
+
+		[CanBeNull] public string Justification { get; }
+	}
+
+	/// <summary>
+	/// Indicates the type member or parameter of some type, that should be used instead of all other ways
+	/// to get the value of that type. This annotation is useful when you have some "context" value evaluated
+	/// and stored somewhere, meaning that all other ways to get this value must be consolidated with existing one.
+	/// </summary>
+	/// <example><code>
+	/// class Foo {
+	///   [ProvidesContext] IBarService _barService = ...;
+	/// 
+	///   void ProcessNode(INode node) {
+	///     DoSomething(node, node.GetGlobalServices().Bar);
+	///     //              ^ Warning: use value of '_barService' field
+	///   }
+	/// }
+	/// </code></example>
+	[AttributeUsage(
+	  AttributeTargets.Field | AttributeTargets.Property | AttributeTargets.Parameter | AttributeTargets.Method |
+	  AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Struct | AttributeTargets.GenericParameter)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class ProvidesContextAttribute : Attribute { }
+
+	/// <summary>
+	/// Indicates that a parameter is a path to a file or a folder within a web project.
+	/// Path can be relative or absolute, starting from web root (~).
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Parameter)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class PathReferenceAttribute : Attribute
+	{
+		public PathReferenceAttribute() { }
+
+		public PathReferenceAttribute([NotNull, PathReference] string basePath)
+		{
+			BasePath = basePath;
+		}
+
+		[CanBeNull] public string BasePath { get; }
+	}
+
+	/// <summary>
+	/// An extension method marked with this attribute is processed by code completion
+	/// as a 'Source Template'. When the extension method is completed over some expression, its source code
+	/// is automatically expanded like a template at call site.
+	/// </summary>
+	/// <remarks>
+	/// Template method body can contain valid source code and/or special comments starting with '$'.
+	/// Text inside these comments is added as source code when the template is applied. Template parameters
+	/// can be used either as additional method parameters or as identifiers wrapped in two '$' signs.
+	/// Use the <see cref="MacroAttribute"/> attribute to specify macros for parameters.
+	/// </remarks>
+	/// <example>
+	/// In this example, the 'forEach' method is a source template available over all values
+	/// of enumerable types, producing ordinary C# 'foreach' statement and placing caret inside block:
+	/// <code>
+	/// [SourceTemplate]
+	/// public static void forEach&lt;T&gt;(this IEnumerable&lt;T&gt; xs) {
+	///   foreach (var x in xs) {
+	///      //$ $END$
+	///   }
+	/// }
+	/// </code>
+	/// </example>
+	[AttributeUsage(AttributeTargets.Method)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class SourceTemplateAttribute : Attribute { }
+
+	/// <summary>
+	/// Allows specifying a macro for a parameter of a <see cref="SourceTemplateAttribute">source template</see>.
+	/// </summary>
+	/// <remarks>
+	/// You can apply the attribute on the whole method or on any of its additional parameters. The macro expression
+	/// is defined in the <see cref="MacroAttribute.Expression"/> property. When applied on a method, the target
+	/// template parameter is defined in the <see cref="MacroAttribute.Target"/> property. To apply the macro silently
+	/// for the parameter, set the <see cref="MacroAttribute.Editable"/> property value = -1.
+	/// </remarks>
+	/// <example>
+	/// Applying the attribute on a source template method:
+	/// <code>
+	/// [SourceTemplate, Macro(Target = "item", Expression = "suggestVariableName()")]
+	/// public static void forEach&lt;T&gt;(this IEnumerable&lt;T&gt; collection) {
+	///   foreach (var item in collection) {
+	///     //$ $END$
+	///   }
+	/// }
+	/// </code>
+	/// Applying the attribute on a template method parameter:
+	/// <code>
+	/// [SourceTemplate]
+	/// public static void something(this Entity x, [Macro(Expression = "guid()", Editable = -1)] string newguid) {
+	///   /*$ var $x$Id = "$newguid$" + x.ToString();
+	///   x.DoSomething($x$Id); */
+	/// }
+	/// </code>
+	/// </example>
+	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method, AllowMultiple = true)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class MacroAttribute : Attribute
+	{
+		/// <summary>
+		/// Allows specifying a macro that will be executed for a <see cref="SourceTemplateAttribute">source template</see>
+		/// parameter when the template is expanded.
+		/// </summary>
+		[CanBeNull] public string Expression { get; set; }
+
+		/// <summary>
+		/// Allows specifying which occurrence of the target parameter becomes editable when the template is deployed.
+		/// </summary>
+		/// <remarks>
+		/// If the target parameter is used several times in the template, only one occurrence becomes editable;
+		/// other occurrences are changed synchronously. To specify the zero-based index of the editable occurrence,
+		/// use values >= 0. To make the parameter non-editable when the template is expanded, use -1.
+		/// </remarks>
+		public int Editable { get; set; }
+
+		/// <summary>
+		/// Identifies the target parameter of a <see cref="SourceTemplateAttribute">source template</see> if the
+		/// <see cref="MacroAttribute"/> is applied on a template method.
+		/// </summary>
+		[CanBeNull] public string Target { get; set; }
+	}
+
+	[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcAreaMasterLocationFormatAttribute : Attribute
+	{
+		public AspMvcAreaMasterLocationFormatAttribute([NotNull] string format)
+		{
+			Format = format;
+		}
+
+		[NotNull] public string Format { get; }
+	}
+
+	[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcAreaPartialViewLocationFormatAttribute : Attribute
+	{
+		public AspMvcAreaPartialViewLocationFormatAttribute([NotNull] string format)
+		{
+			Format = format;
+		}
+
+		[NotNull] public string Format { get; }
+	}
+
+	[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcAreaViewLocationFormatAttribute : Attribute
+	{
+		public AspMvcAreaViewLocationFormatAttribute([NotNull] string format)
+		{
+			Format = format;
+		}
+
+		[NotNull] public string Format { get; }
+	}
+
+	[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcMasterLocationFormatAttribute : Attribute
+	{
+		public AspMvcMasterLocationFormatAttribute([NotNull] string format)
+		{
+			Format = format;
+		}
+
+		[NotNull] public string Format { get; }
+	}
+
+	[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcPartialViewLocationFormatAttribute : Attribute
+	{
+		public AspMvcPartialViewLocationFormatAttribute([NotNull] string format)
+		{
+			Format = format;
+		}
+
+		[NotNull] public string Format { get; }
+	}
+
+	[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Field | AttributeTargets.Property, AllowMultiple = true)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcViewLocationFormatAttribute : Attribute
+	{
+		public AspMvcViewLocationFormatAttribute([NotNull] string format)
+		{
+			Format = format;
+		}
+
+		[NotNull] public string Format { get; }
+	}
+
+	/// <summary>
+	/// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
+	/// is an MVC action. If applied to a method, the MVC action name is calculated
+	/// implicitly from the context. Use this attribute for custom wrappers similar to
+	/// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String)</c>.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method | AttributeTargets.Field | AttributeTargets.Property)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcActionAttribute : Attribute
+	{
+		public AspMvcActionAttribute() { }
+
+		public AspMvcActionAttribute([NotNull] string anonymousProperty)
+		{
+			AnonymousProperty = anonymousProperty;
+		}
+
+		[CanBeNull] public string AnonymousProperty { get; }
+	}
+
+	/// <summary>
+	/// ASP.NET MVC attribute. Indicates that the marked parameter is an MVC area.
+	/// Use this attribute for custom wrappers similar to
+	/// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String)</c>.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Field | AttributeTargets.Property)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcAreaAttribute : Attribute
+	{
+		public AspMvcAreaAttribute() { }
+
+		public AspMvcAreaAttribute([NotNull] string anonymousProperty)
+		{
+			AnonymousProperty = anonymousProperty;
+		}
+
+		[CanBeNull] public string AnonymousProperty { get; }
+	}
+
+	/// <summary>
+	/// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter is
+	/// an MVC controller. If applied to a method, the MVC controller name is calculated
+	/// implicitly from the context. Use this attribute for custom wrappers similar to
+	/// <c>System.Web.Mvc.Html.ChildActionExtensions.RenderAction(HtmlHelper, String, String)</c>.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method | AttributeTargets.Field | AttributeTargets.Property)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcControllerAttribute : Attribute
+	{
+		public AspMvcControllerAttribute() { }
+
+		public AspMvcControllerAttribute([NotNull] string anonymousProperty)
+		{
+			AnonymousProperty = anonymousProperty;
+		}
+
+		[CanBeNull] public string AnonymousProperty { get; }
+	}
+
+	/// <summary>
+	/// ASP.NET MVC attribute. Indicates that the marked parameter is an MVC Master. Use this attribute
+	/// for custom wrappers similar to <c>System.Web.Mvc.Controller.View(String, String)</c>.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Field | AttributeTargets.Property)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcMasterAttribute : Attribute { }
+
+	/// <summary>
+	/// ASP.NET MVC attribute. Indicates that the marked parameter is an MVC model type. Use this attribute
+	/// for custom wrappers similar to <c>System.Web.Mvc.Controller.View(String, Object)</c>.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Parameter)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcModelTypeAttribute : Attribute { }
+
+	/// <summary>
+	/// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter is an MVC
+	/// partial view. If applied to a method, the MVC partial view name is calculated implicitly
+	/// from the context. Use this attribute for custom wrappers similar to
+	/// <c>System.Web.Mvc.Html.RenderPartialExtensions.RenderPartial(HtmlHelper, String)</c>.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method | AttributeTargets.Field | AttributeTargets.Property)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcPartialViewAttribute : Attribute { }
+
+	/// <summary>
+	/// ASP.NET MVC attribute. Allows disabling inspections for MVC views within a class or a method.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Class | AttributeTargets.Method)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcSuppressViewErrorAttribute : Attribute { }
+
+	/// <summary>
+	/// ASP.NET MVC attribute. Indicates that a parameter is an MVC display template.
+	/// Use this attribute for custom wrappers similar to
+	/// <c>System.Web.Mvc.Html.DisplayExtensions.DisplayForModel(HtmlHelper, String)</c>.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Field | AttributeTargets.Property)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcDisplayTemplateAttribute : Attribute { }
+
+	/// <summary>
+	/// ASP.NET MVC attribute. Indicates that the marked parameter is an MVC editor template.
+	/// Use this attribute for custom wrappers similar to
+	/// <c>System.Web.Mvc.Html.EditorExtensions.EditorForModel(HtmlHelper, String)</c>.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Field | AttributeTargets.Property)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcEditorTemplateAttribute : Attribute { }
+
+	/// <summary>
+	/// ASP.NET MVC attribute. Indicates that the marked parameter is an MVC template.
+	/// Use this attribute for custom wrappers similar to
+	/// <c>System.ComponentModel.DataAnnotations.UIHintAttribute(System.String)</c>.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Field | AttributeTargets.Property)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcTemplateAttribute : Attribute { }
+
+	/// <summary>
+	/// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
+	/// is an MVC view component. If applied to a method, the MVC view name is calculated implicitly
+	/// from the context. Use this attribute for custom wrappers similar to
+	/// <c>System.Web.Mvc.Controller.View(Object)</c>.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method | AttributeTargets.Field | AttributeTargets.Property)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcViewAttribute : Attribute { }
+
+	/// <summary>
+	/// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
+	/// is an MVC view component name.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Field | AttributeTargets.Property)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcViewComponentAttribute : Attribute { }
+
+	/// <summary>
+	/// ASP.NET MVC attribute. If applied to a parameter, indicates that the parameter
+	/// is an MVC view component view. If applied to a method, the MVC view component view name is default.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method | AttributeTargets.Field | AttributeTargets.Property)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcViewComponentViewAttribute : Attribute { }
+
+	/// <summary>
+	/// ASP.NET MVC attribute. When applied to a parameter of an attribute,
+	/// indicates that this parameter is an MVC action name.
+	/// </summary>
+	/// <example><code>
+	/// [ActionName("Foo")]
+	/// public ActionResult Login(string returnUrl) {
+	///   ViewBag.ReturnUrl = Url.Action("Foo"); // OK
+	///   return RedirectToAction("Bar"); // Error: Cannot resolve action
+	/// }
+	/// </code></example>
+	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMvcActionSelectorAttribute : Attribute { }
+
+	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Property | AttributeTargets.Field)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class HtmlElementAttributesAttribute : Attribute
+	{
+		public HtmlElementAttributesAttribute() { }
+
+		public HtmlElementAttributesAttribute([NotNull] string name)
+		{
+			Name = name;
+		}
+
+		[CanBeNull] public string Name { get; }
+	}
+
+	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Field | AttributeTargets.Property)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class HtmlAttributeValueAttribute : Attribute
+	{
+		public HtmlAttributeValueAttribute([NotNull] string name)
+		{
+			Name = name;
+		}
+
+		[NotNull] public string Name { get; }
+	}
+
+	/// <summary>
+	/// Razor attribute. Indicates that the marked parameter or method is a Razor section.
+	/// Use this attribute for custom wrappers similar to
+	/// <c>System.Web.WebPages.WebPageBase.RenderSection(String)</c>.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Parameter | AttributeTargets.Method)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class RazorSectionAttribute : Attribute { }
+
+	/// <summary>
+	/// Indicates how method, constructor invocation, or property access
+	/// over collection type affects the contents of the collection.
+	/// Use <see cref="CollectionAccessType"/> to specify the access type.
+	/// </summary>
+	/// <remarks>
+	/// Using this attribute only makes sense if all collection methods are marked with this attribute.
+	/// </remarks>
+	/// <example><code>
+	/// public class MyStringCollection : List&lt;string&gt;
+	/// {
+	///   [CollectionAccess(CollectionAccessType.Read)]
+	///   public string GetFirstString()
+	///   {
+	///     return this.ElementAt(0);
+	///   }
+	/// }
+	/// class Test
+	/// {
+	///   public void Foo()
+	///   {
+	///     // Warning: Contents of the collection is never updated
+	///     var col = new MyStringCollection();
+	///     string x = col.GetFirstString();
+	///   }
+	/// }
+	/// </code></example>
+	[AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor | AttributeTargets.Property)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class CollectionAccessAttribute : Attribute
+	{
+		public CollectionAccessAttribute(CollectionAccessType collectionAccessType)
+		{
+			CollectionAccessType = collectionAccessType;
+		}
+
+		public CollectionAccessType CollectionAccessType { get; }
+	}
+
+	/// <summary>
+	/// Provides a value for the <see cref="CollectionAccessAttribute"/> to define
+	/// how the collection method invocation affects the contents of the collection.
+	/// </summary>
+	[Flags]
+	internal enum CollectionAccessType
+	{
+		/// <summary>Method does not use or modify content of the collection.</summary>
+		None = 0,
+		/// <summary>Method only reads content of the collection but does not modify it.</summary>
+		Read = 1,
+		/// <summary>Method can change content of the collection but does not add new elements.</summary>
+		ModifyExistingContent = 2,
+		/// <summary>Method can add new elements to the collection.</summary>
+		UpdatedContent = ModifyExistingContent | 4
+	}
+
+	/// <summary>
+	/// Indicates that the marked method is assertion method, i.e. it halts the control flow if
+	/// one of the conditions is satisfied. To set the condition, mark one of the parameters with
+	/// <see cref="AssertionConditionAttribute"/> attribute.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Method)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AssertionMethodAttribute : Attribute { }
+
+	/// <summary>
+	/// Indicates the condition parameter of the assertion method. The method itself should be
+	/// marked by <see cref="AssertionMethodAttribute"/> attribute. The mandatory argument of
+	/// the attribute is the assertion type.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Parameter)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AssertionConditionAttribute : Attribute
+	{
+		public AssertionConditionAttribute(AssertionConditionType conditionType)
+		{
+			ConditionType = conditionType;
+		}
+
+		public AssertionConditionType ConditionType { get; }
+	}
+
+	/// <summary>
+	/// Specifies assertion type. If the assertion method argument satisfies the condition,
+	/// then the execution continues. Otherwise, execution is assumed to be halted.
+	/// </summary>
+	internal enum AssertionConditionType
+	{
+		/// <summary>Marked parameter should be evaluated to true.</summary>
+		IS_TRUE = 0,
+		/// <summary>Marked parameter should be evaluated to false.</summary>
+		IS_FALSE = 1,
+		/// <summary>Marked parameter should be evaluated to null value.</summary>
+		IS_NULL = 2,
+		/// <summary>Marked parameter should be evaluated to not null value.</summary>
+		IS_NOT_NULL = 3,
+	}
+
+	/// <summary>
+	/// Indicates that the marked method unconditionally terminates control flow execution.
+	/// For example, it could unconditionally throw exception.
+	/// </summary>
+	[Obsolete("Use [ContractAnnotation('=> halt')] instead")]
+	[AttributeUsage(AttributeTargets.Method)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class TerminatesProgramAttribute : Attribute { }
+
+	/// <summary>
+	/// Indicates that method is pure LINQ method, with postponed enumeration (like Enumerable.Select,
+	/// .Where). This annotation allows inference of [InstantHandle] annotation for parameters
+	/// of delegate type by analyzing LINQ method chains.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Method)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class LinqTunnelAttribute : Attribute { }
+
+	/// <summary>
+	/// Indicates that IEnumerable passed as a parameter is not enumerated.
+	/// Use this annotation to suppress the 'Possible multiple enumeration of IEnumerable' inspection.
+	/// </summary>
+	/// <example><code>
+	/// static void ThrowIfNull&lt;T&gt;([NoEnumeration] T v, string n) where T : class
+	/// {
+	///   // custom check for null but no enumeration
+	/// }
+	/// 
+	/// void Foo(IEnumerable&lt;string&gt; values)
+	/// {
+	///   ThrowIfNull(values, nameof(values));
+	///   var x = values.ToList(); // No warnings about multiple enumeration
+	/// }
+	/// </code></example>
+	[AttributeUsage(AttributeTargets.Parameter)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class NoEnumerationAttribute : Attribute { }
+
+	/// <summary>
+	/// Indicates that the marked parameter is a regular expression pattern.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Parameter)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class RegexPatternAttribute : Attribute { }
+
+	/// <summary>
+	/// Prevents the Member Reordering feature from tossing members of the marked class.
+	/// </summary>
+	/// <remarks>
+	/// The attribute must be mentioned in your member reordering patterns.
+	/// </remarks>
+	[AttributeUsage(
+	  AttributeTargets.Class | AttributeTargets.Interface | AttributeTargets.Struct | AttributeTargets.Enum)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class NoReorderAttribute : Attribute { }
+
+	/// <summary>
+	/// XAML attribute. Indicates the type that has <c>ItemsSource</c> property and should be treated
+	/// as <c>ItemsControl</c>-derived type, to enable inner items <c>DataContext</c> type resolve.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Class)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class XamlItemsControlAttribute : Attribute { }
+
+	/// <summary>
+	/// XAML attribute. Indicates the property of some <c>BindingBase</c>-derived type, that
+	/// is used to bind some item of <c>ItemsControl</c>-derived type. This annotation will
+	/// enable the <c>DataContext</c> type resolve for XAML bindings for such properties.
+	/// </summary>
+	/// <remarks>
+	/// Property should have the tree ancestor of the <c>ItemsControl</c> type or
+	/// marked with the <see cref="XamlItemsControlAttribute"/> attribute.
+	/// </remarks>
+	[AttributeUsage(AttributeTargets.Property)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class XamlItemBindingOfItemsControlAttribute : Attribute { }
+
+	[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspChildControlTypeAttribute : Attribute
+	{
+		public AspChildControlTypeAttribute([NotNull] string tagName, [NotNull] Type controlType)
+		{
+			TagName = tagName;
+			ControlType = controlType;
+		}
+
+		[NotNull] public string TagName { get; }
+
+		[NotNull] public Type ControlType { get; }
+	}
+
+	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Method)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspDataFieldAttribute : Attribute { }
+
+	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Method)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspDataFieldsAttribute : Attribute { }
+
+	[AttributeUsage(AttributeTargets.Property)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspMethodPropertyAttribute : Attribute { }
+
+	[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspRequiredAttributeAttribute : Attribute
+	{
+		public AspRequiredAttributeAttribute([NotNull] string attribute)
+		{
+			Attribute = attribute;
+		}
+
+		[NotNull] public string Attribute { get; }
+	}
+
+	[AttributeUsage(AttributeTargets.Property)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class AspTypePropertyAttribute : Attribute
+	{
+		public bool CreateConstructorReferences { get; }
+
+		public AspTypePropertyAttribute(bool createConstructorReferences)
+		{
+			CreateConstructorReferences = createConstructorReferences;
+		}
+	}
+
+	[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class RazorImportNamespaceAttribute : Attribute
+	{
+		public RazorImportNamespaceAttribute([NotNull] string name)
+		{
+			Name = name;
+		}
+
+		[NotNull] public string Name { get; }
+	}
+
+	[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class RazorInjectionAttribute : Attribute
+	{
+		public RazorInjectionAttribute([NotNull] string type, [NotNull] string fieldName)
+		{
+			Type = type;
+			FieldName = fieldName;
+		}
+
+		[NotNull] public string Type { get; }
+
+		[NotNull] public string FieldName { get; }
+	}
+
+	[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class RazorDirectiveAttribute : Attribute
+	{
+		public RazorDirectiveAttribute([NotNull] string directive)
+		{
+			Directive = directive;
+		}
+
+		[NotNull] public string Directive { get; }
+	}
+
+	[AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class RazorPageBaseTypeAttribute : Attribute
+	{
+		public RazorPageBaseTypeAttribute([NotNull] string baseType)
+		{
+			BaseType = baseType;
+		}
+		public RazorPageBaseTypeAttribute([NotNull] string baseType, string pageName)
+		{
+			BaseType = baseType;
+			PageName = pageName;
+		}
+
+		[NotNull] public string BaseType { get; }
+		[CanBeNull] public string PageName { get; }
+	}
+
+	[AttributeUsage(AttributeTargets.Method)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class RazorHelperCommonAttribute : Attribute { }
+
+	[AttributeUsage(AttributeTargets.Property)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class RazorLayoutAttribute : Attribute { }
+
+	[AttributeUsage(AttributeTargets.Method)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class RazorWriteLiteralMethodAttribute : Attribute { }
+
+	[AttributeUsage(AttributeTargets.Method)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class RazorWriteMethodAttribute : Attribute { }
+
+	[AttributeUsage(AttributeTargets.Parameter)]
+	[Conditional("JETBRAINS_ANNOTATIONS")]
+	internal sealed class RazorWriteMethodParameterAttribute : Attribute { }
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Properties/AssemblyInfo.cs b/VirtualDesktop-master/source/VirtualDesktop/Properties/AssemblyInfo.cs
index 4e7a525..050a02b 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/Properties/AssemblyInfo.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/Properties/AssemblyInfo.cs
@@ -1,14 +1,4 @@
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-[assembly: AssemblyTitle("VirtualDesktop")]
-[assembly: AssemblyCompany("grabacr.net")]
-[assembly: AssemblyProduct("VirtualDesktop")]
-[assembly: AssemblyDescription("C# wrapper for IVirtualDesktopManager on Windows 10.")]
-[assembly: AssemblyCopyright("Copyright © 2018 Manato KAMEYA")]
+using System.Runtime.InteropServices;
 
 [assembly: ComVisible(false)]
 [assembly: Guid("ab848ecd-76aa-41c0-b63d-86a8591b25aa")]
-
-[assembly: AssemblyVersion("3.0.0")]
-[assembly: AssemblyInformationalVersion("3.0.0-beta1")]
diff --git a/VirtualDesktop-master/source/VirtualDesktop/Properties/Settings.Designer.cs b/VirtualDesktop-master/source/VirtualDesktop/Properties/Settings.Designer.cs
index 34dbdc7..e4685ea 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/Properties/Settings.Designer.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/Properties/Settings.Designer.cs
@@ -12,7 +12,7 @@ namespace WindowsDesktop.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
diff --git a/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.cs b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.cs
index cfb0e78..2cc2130 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Runtime.InteropServices;
 using WindowsDesktop.Interop;
+using WindowsDesktop.Properties;
 using JetBrains.Annotations;
 
 namespace WindowsDesktop
@@ -11,21 +12,76 @@ namespace WindowsDesktop
 	/// <summary>
 	/// Encapsulates a Windows 10 virtual desktop.
 	/// </summary>
-	[ComInterfaceWrapper]
+	[ComInterfaceWrapper(2)]
 	[DebuggerDisplay("{Id}")]
 	[UsedImplicitly(ImplicitUseTargetFlags.Members)]
-	public partial class VirtualDesktop : ComInterfaceWrapperBase
+	public partial class VirtualDesktop : ComInterfaceWrapperBase, IDisposable
 	{
 		/// <summary>
 		/// Gets the unique identifier for this virtual desktop.
 		/// </summary>
 		public Guid Id { get; }
 
+		/// <summary>
+		/// Gets the index for the virtual desktop.
+		/// </summary>
+		public int Index
+		{
+			get
+			{
+				var desktops = GetDesktops();
+				var index = Array.IndexOf(desktops, this);
+				return index;
+			}
+		}
+
+		private string _name = null;
+
+		/// <summary>
+		/// Gets the name for the virtual desktop.
+		/// </summary>
+		public string Name
+		{
+			get => this._name;
+			set
+			{
+				if (ProductInfo.OSBuild < 20231 && this.ComVersion < 2) throw new PlatformNotSupportedException("This Windows 10 version is not supported.");
+
+				ComInterface.VirtualDesktopManagerInternal.SetName(this, value);
+			}
+		}
+
+		private string _wallpaperPath = null;
+
+		/// <summary>
+		/// Gets the name for the virtual desktop.
+		/// </summary>
+		public string WallpaperPath
+		{
+			get => this._wallpaperPath;
+			set
+			{
+				if (ProductInfo.OSBuild < 21313) throw new PlatformNotSupportedException("This Windows 10 version is not supported.");
+
+				ComInterface.VirtualDesktopManagerInternal.SetWallpaperPath(this, value);
+			}
+		}
+
 		[UsedImplicitly]
 		internal VirtualDesktop(ComInterfaceAssembly assembly, Guid id, object comObject)
-			: base(assembly, comObject)
+			: base(assembly, comObject, latestVersion: 2)
 		{
 			this.Id = id;
+			
+			if (ProductInfo.OSBuild >= 20231 || this.ComVersion >= 2)
+			{
+				this._name = this.Invoke<string>(Args(), "GetName");
+
+				if (ProductInfo.OSBuild >= 21313)
+				{
+					this._wallpaperPath = this.Invoke<string>(Args(), "GetWallpaperPath");
+				}
+			}
 		}
 
 		/// <summary>
@@ -36,6 +92,15 @@ public void Switch()
 			ComInterface.VirtualDesktopManagerInternal.SwitchDesktop(this);
 		}
 
+		/// <summary>
+		/// Moves this virtual desktop to a new location.
+		/// </summary>
+		/// <param name="index">The zero-based index specifying the new location of the virtual desktop.</param>
+		public void Move(int index)
+		{
+			ComInterface.VirtualDesktopManagerInternal.MoveDesktop(this, index);
+		}
+
 		/// <summary>
 		/// Removes this virtual desktop and switches to an available one.
 		/// </summary>
@@ -86,5 +151,53 @@ public VirtualDesktop GetRight()
 				return null;
 			}
 		}
+
+		private void SetNameToCache(string name)
+		{
+			if (this._name == name) return;
+
+			this.RaisePropertyChanging(nameof(this.Name));
+			this._name = name;
+			this.RaisePropertyChanged(nameof(this.Name));
+		}
+
+		private void SetWallpaperPathToCache(string path)
+		{
+			if (this._wallpaperPath == path) return;
+
+			this.RaisePropertyChanging(nameof(this.WallpaperPath));
+			this._wallpaperPath = path;
+			this.RaisePropertyChanged(nameof(this.WallpaperPath));
+		}
+		
+#region IDisposable
+		private bool _disposed = false;
+
+		/// <summary>
+		/// Disposes of this <see cref="VirtualDesktop"/>.
+		/// </summary>
+		/// <param name="disposeOfManagedObjects">If <see langword="true"/>, disposes of managed objects.</param>
+		protected virtual void Dispose(bool disposeOfManagedObjects)
+		{
+			if (!this._disposed)
+			{
+				if (disposeOfManagedObjects)
+				{
+					this.Remove();
+				}
+
+				this._disposed = true;
+			}
+		}
+
+		/// <summary>
+		/// Disposes of this <see cref="VirtualDesktop"/>.
+		/// </summary>
+		public void Dispose()
+		{
+			this.Dispose(true);
+			GC.SuppressFinalize(this);
+		}
+#endregion
 	}
 }
diff --git a/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.csproj b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.csproj
index 7d3bee7..f544628 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.csproj
+++ b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.csproj
@@ -1,155 +1,101 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{AB848ECD-76AA-41C0-B63D-86A8591B25AA}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
+    <UseWPF>true</UseWPF>
     <RootNamespace>WindowsDesktop</RootNamespace>
-    <AssemblyName>VirtualDesktop</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <TargetPlatformVersion>10.0</TargetPlatformVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <PackageId>VirtualDesktop</PackageId>
+    <Version>4.0.1</Version>
+    <Company>grabacr.net</Company>
+    <Description>C# wrapper for IVirtualDesktopManager on Windows 10.</Description>
+    <Copyright>Copyright © 2020 Manato KAMEYA</Copyright>
+    <PackageProjectUrl>https://github.com/Grabacr07/VirtualDesktop</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/Grabacr07/VirtualDesktop</RepositoryUrl>
+    <Authors>Manato KAMEYA</Authors>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+    <PackageTags>Windows;Windows10;Desktop;VirtualDesktop;</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <LangVersion>latest</LangVersion>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DocumentationFile>bin\Release\$(TargetFramework)\VirtualDesktop.xml</DocumentationFile>
+    <NoWarn>1701,1702,1591</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\VirtualDesktop.xml</DocumentationFile>
-    <NoWarn>1591</NoWarn>
-    <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <DebugType>full</DebugType>
-    <DefineConstants>TRACE;DEBUG</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <ErrorReport>prompt</ErrorReport>
-    <DebugType>pdbonly</DebugType>
-    <DebugSymbols>true</DebugSymbols>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;JETBRAINS_ANNOTATIONS</DefineConstants>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="PresentationCore" />
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Windows.UI" />
-    <Reference Include="WindowsBase" />
+    <Compile Remove="Interop\(interfaces)\AssemblyInfo.cs" />
+    <Compile Remove="Interop\(interfaces)\IApplicationView.cs" />
+    <Compile Remove="Interop\(interfaces)\IApplicationViewCollection.cs" />
+    <Compile Remove="Interop\(interfaces)\10240\IVirtualDesktop.cs" />
+    <Compile Remove="Interop\(interfaces)\10240\IVirtualDesktop2.cs" />
+    <Compile Remove="Interop\(interfaces)\10240\IVirtualDesktopManagerInternal.cs" />
+    <Compile Remove="Interop\(interfaces)\10240\IVirtualDesktopManagerInternal2.cs" />
+    <Compile Remove="Interop\(interfaces)\10240\IVirtualDesktopManagerInternal3.cs" />
+    <Compile Remove="Interop\(interfaces)\10240\IVirtualDesktopNotification.cs" />
+    <Compile Remove="Interop\(interfaces)\10240\IVirtualDesktopNotification2.cs" />
+    <Compile Remove="Interop\(interfaces)\20231\IVirtualDesktop.cs" />
+    <Compile Remove="Interop\(interfaces)\20231\IVirtualDesktopManagerInternal.cs" />
+    <Compile Remove="Interop\(interfaces)\20231\IVirtualDesktopNotification.cs" />
+    <Compile Remove="Interop\(interfaces)\21313\IVirtualDesktop.cs" />
+    <Compile Remove="Interop\(interfaces)\21313\IVirtualDesktopManagerInternal.cs" />
+    <Compile Remove="Interop\(interfaces)\21313\IVirtualDesktopNotification.cs" />
+    <Compile Remove="Interop\(interfaces)\21359\IVirtualDesktop.cs" />
+    <Compile Remove="Interop\(interfaces)\21359\IVirtualDesktopManagerInternal.cs" />
+    <Compile Remove="Interop\(interfaces)\21359\IVirtualDesktopNotification.cs" />
+    <Compile Remove="Interop\(interfaces)\IVirtualDesktopNotificationService.cs" />
+    <Compile Remove="Interop\(interfaces)\IVirtualDesktopPinnedApps.cs" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="ApplicationHelper.cs" />
-    <Compile Include="App_Packages\Source.JetBrains.Annotations_11.1.1\JetBrains.Annotations.cs" />
-    <Compile Include="Internal\Disposable.cs" />
-    <Compile Include="Internal\RawWindow.cs" />
-    <Compile Include="Internal\TransparentWindow.cs" />
-    <EmbeddedResource Include="Interop\%28interfaces%29\AssemblyInfo.cs" />
-    <Compile Include="Interop\%28wrappers%29\VirtualDesktopNotification.cs" />
-    <Compile Include="Interop\%28wrappers%29\VirtualDesktopNotificationService.cs" />
-    <Compile Include="Interop\AdjacentDesktop.cs" />
-    <Compile Include="Interop\%28wrappers%29\ApplicationView.cs" />
-    <Compile Include="Interop\%28wrappers%29\ApplicationViewCollection.cs" />
-    <Compile Include="Interop\CLSID.cs" />
-    <Compile Include="Interop\ComInterface.cs" />
-    <Compile Include="Interop\ComInterfaceAssemblyProvider.cs" />
-    <Compile Include="Interop\ComInterfaceAssembly.cs" />
-    <Compile Include="Interop\ComInterfaceWrapperAttribute.cs" />
-    <Compile Include="Interop\ComInterfaceWrapperBase.cs" />
-    <Compile Include="Interop\ComObjects.cs" />
-    <Compile Include="Interop\HResult.cs" />
-    <Compile Include="VirtualDesktopCache.cs" />
-    <Compile Include="VirtualDesktopProvider.cs" />
-    <EmbeddedResource Include="Interop\%28interfaces%29\IApplicationView.cs" />
-    <EmbeddedResource Include="Interop\%28interfaces%29\IApplicationViewCollection.cs" />
-    <Compile Include="Interop\IID.cs" />
-    <Compile Include="Interop\IObjectArray.cs" />
-    <Compile Include="Interop\IServiceProvider.cs" />
-    <EmbeddedResource Include="Interop\%28interfaces%29\IVirtualDesktop.cs" />
-    <Compile Include="Interop\IVirtualDesktopManager.cs" />
-    <EmbeddedResource Include="Interop\%28interfaces%29\IVirtualDesktopManagerInternal.cs" />
-    <EmbeddedResource Include="Interop\%28interfaces%29\IVirtualDesktopNotification.cs" />
-    <EmbeddedResource Include="Interop\%28interfaces%29\IVirtualDesktopNotificationService.cs" />
-    <EmbeddedResource Include="Interop\%28interfaces%29\IVirtualDesktopPinnedApps.cs" />
-    <Compile Include="Interop\NativeMethods.cs" />
-    <Compile Include="Interop\%28wrappers%29\VirtualDesktopManagerInternal.cs" />
-    <Compile Include="Interop\%28wrappers%29\VirtualDesktopPinnedApps.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\ProductInfo.cs" />
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
+    <None Remove="VirtualDesktop.csproj.DotSettings" />
+    <EmbeddedResource Include="Interop\(interfaces)\AssemblyInfo.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\IApplicationView.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\IApplicationViewCollection.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\10240\IVirtualDesktop.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\10240\IVirtualDesktop2.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\10240\IVirtualDesktopManagerInternal.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\10240\IVirtualDesktopManagerInternal2.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\10240\IVirtualDesktopManagerInternal3.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\10240\IVirtualDesktopNotification.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\10240\IVirtualDesktopNotification2.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\20231\IVirtualDesktop.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\20231\IVirtualDesktopManagerInternal.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\20231\IVirtualDesktopNotification.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\21313\IVirtualDesktop.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\21313\IVirtualDesktopManagerInternal.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\21313\IVirtualDesktopNotification.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\21359\IVirtualDesktop.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\21359\IVirtualDesktopManagerInternal.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\21359\IVirtualDesktopNotification.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\IVirtualDesktopNotificationService.cs" />
+    <EmbeddedResource Include="Interop\(interfaces)\IVirtualDesktopPinnedApps.cs" />
+    <None Include="..\..\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.5.0" />
+    <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Update="Properties\Settings.Designer.cs">
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <AutoGen>True</AutoGen>
       <DependentUpon>Settings.settings</DependentUpon>
     </Compile>
-    <Compile Include="VirtualDesktop.static.pin.cs" />
-    <Compile Include="VirtualDesktop.static.cs" />
-    <Compile Include="VirtualDesktop.cs" />
-    <Compile Include="VirtualDesktopChangedEventArgs.cs" />
-    <Compile Include="VirtualDesktopDestroyEventArgs.cs" />
-    <Compile Include="VirtualDesktopHelper.cs" />
-    <Compile Include="VirtualDesktop.static.notification.cs" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
+    <None Update="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
-    <None Include="VirtualDesktop.nuspec" />
   </ItemGroup>
-  <ItemGroup />
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+
 </Project>
diff --git a/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.notification.cs b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.notification.cs
new file mode 100644
index 0000000..a563944
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.notification.cs
@@ -0,0 +1,26 @@
+using System;
+using System.ComponentModel;
+using System.Linq;
+using System.Runtime.CompilerServices;
+
+namespace WindowsDesktop
+{
+	partial class VirtualDesktop : INotifyPropertyChanging, INotifyPropertyChanged
+	{
+		/// <summary>
+		/// Occurs when a virtual desktop property changing.
+		/// </summary>
+		public event PropertyChangingEventHandler PropertyChanging;
+
+		private void RaisePropertyChanging([CallerMemberName] string propertyName = "")
+			=> PropertyChanging?.Invoke(this, new PropertyChangingEventArgs(propertyName));
+
+		/// <summary>
+		/// Occurs when a virtual desktop property changed.
+		/// </summary>
+		public event PropertyChangedEventHandler PropertyChanged;
+
+		private void RaisePropertyChanged([CallerMemberName] string propertyName = "")
+			=> PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.nuspec b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.nuspec
deleted file mode 100644
index caf760a..0000000
--- a/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.nuspec
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <metadata>
-    <id>$id$</id>
-    <title>$title$</title>
-    <version>$version$</version>
-    <authors>$author$</authors>
-    <owners>$author$</owners>
-    <licenseUrl>https://github.com/Grabacr07/VirtualDesktop/blob/master/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/Grabacr07/VirtualDesktop</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$ You must target Windows 10 in your app.manifest.</description>
-    <language>en-US</language>
-    <tags>Windows Windows10 Desktop VirtualDesktop</tags>
-  </metadata>
-</package>
diff --git a/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.static.cs b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.static.cs
index baa9c1d..b2af78f 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.static.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.static.cs
@@ -60,7 +60,7 @@ public static VirtualDesktop FromId(Guid desktopId)
 
 			try
 			{
-				return ComInterface.VirtualDesktopManagerInternal.FindDesktop(ref desktopId);
+				return ComInterface.VirtualDesktopManagerInternal.FindDesktop(desktopId);
 			}
 			catch (COMException ex) when (ex.Match(HResult.TYPE_E_ELEMENTNOTFOUND))
 			{
@@ -82,7 +82,7 @@ public static VirtualDesktop FromHwnd(IntPtr hWnd)
 			try
 			{
 				var desktopId = ComInterface.VirtualDesktopManager.GetWindowDesktopId(hWnd);
-				return ComInterface.VirtualDesktopManagerInternal.FindDesktop(ref desktopId);
+				return ComInterface.VirtualDesktopManagerInternal.FindDesktop(desktopId);
 			}
 			catch (COMException ex) when (ex.Match(HResult.REGDB_E_CLASSNOTREG, HResult.TYPE_E_ELEMENTNOTFOUND))
 			{
@@ -97,7 +97,7 @@ internal static bool GetIsSupported()
 			bool Core()
 			{
 #if DEBUG
-				//if (Environment.OSVersion.Version.Major < 10) return false;
+				if (Environment.OSVersion.Version.Major < 10) return false;
 #endif
 				try
 				{
diff --git a/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.static.notification.cs b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.static.notification.cs
index 6e069ab..d8c8fe6 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.static.notification.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktop.static.notification.cs
@@ -29,7 +29,22 @@ partial class VirtualDesktop
 		/// Occurs when the current virtual desktop is changed.
 		/// </summary>
 		public static event EventHandler<VirtualDesktopChangedEventArgs> CurrentChanged;
-		
+
+		/// <summary>
+		/// Occurs when a virtual desktop is moved.
+		/// </summary>
+		public static event EventHandler<VirtualDesktopMovedEventArgs> Moved;
+
+		/// <summary>
+		/// Occurs when a virtual desktop is renamed.
+		/// </summary>
+		public static event EventHandler<VirtualDesktopRenamedEventArgs> Renamed;
+
+		/// <summary>
+		/// Occurs when the wallpaper in the virtual desktop is changed.
+		/// </summary>
+		public static event EventHandler<VirtualDesktopWallpaperChangedEventArgs> WallpaperChanged;
+
 		internal static class EventRaiser
 		{
 			public static void RaiseCreated(object sender, VirtualDesktop pDesktop)
@@ -55,7 +70,7 @@ public static void RaiseDestroyed(object sender, VirtualDesktop pDesktopDestroye
 				Destroyed?.Invoke(sender, args);
 			}
 
-			public static void RaiseApplicationViewChanged(object sender, IntPtr pView)
+			public static void RaiseApplicationViewChanged(object sender, object pView)
 			{
 				ApplicationViewChanged?.Invoke(sender, EventArgs.Empty);
 			}
@@ -65,6 +80,30 @@ public static void RaiseCurrentChanged(object sender, VirtualDesktop pDesktopOld
 				var args = new VirtualDesktopChangedEventArgs(pDesktopOld, pDesktopNew);
 				CurrentChanged?.Invoke(sender, args);
 			}
+
+			public static void RaiseMoved(object sender, VirtualDesktop pDesktopMoved, int oldIndex, int newIndex)
+			{
+				var args = new VirtualDesktopMovedEventArgs(pDesktopMoved, oldIndex, newIndex);
+				Moved?.Invoke(sender, args);
+			}
+
+			public static void RaiseRenamed(object sender, VirtualDesktop pDesktop, string name)
+			{
+				var oldName = pDesktop.Name;
+				pDesktop.SetNameToCache(name);
+
+				var args = new VirtualDesktopRenamedEventArgs(pDesktop, oldName, name);
+				Renamed?.Invoke(sender, args);
+			}
+
+			public static void RaiseWallpaperChanged(object sender, VirtualDesktop pDesktop, string path)
+			{
+				var oldPath = pDesktop.WallpaperPath;
+				pDesktop.SetWallpaperPathToCache(path);
+
+				var args = new VirtualDesktopWallpaperChangedEventArgs(pDesktop, oldPath, path);
+				WallpaperChanged?.Invoke(sender, args);
+			}
 		}
 	}
 }
diff --git a/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopCache.cs b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopCache.cs
index 22418f6..3318add 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopCache.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopCache.cs
@@ -20,9 +20,18 @@ public static void Initialize(ComInterfaceAssembly assembly)
 		{
 			if (_cache == null)
 			{
-				var type = assembly.GetType("VirtualDesktopCacheImpl");
-				_cache = (IVirtualDesktopCache)Activator.CreateInstance(type);
-				_cache.Factory = (id, comObject) => new VirtualDesktop(assembly, id, comObject);
+				var type2 = assembly.GetType("VirtualDesktopCacheImpl2");
+				if (type2 != null)
+				{
+					_cache = (IVirtualDesktopCache)Activator.CreateInstance(type2);
+					_cache.Factory = (id, comObject) => new VirtualDesktop(assembly, id, comObject);
+				}
+				else
+				{
+					var type = assembly.GetType("VirtualDesktopCacheImpl");
+					_cache = (IVirtualDesktopCache)Activator.CreateInstance(type);
+					_cache.Factory = (id, comObject) => new VirtualDesktop(assembly, id, comObject);
+				}
 			}
 			else
 			{
diff --git a/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopMovedEventArgs.cs b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopMovedEventArgs.cs
new file mode 100644
index 0000000..339ba4d
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopMovedEventArgs.cs
@@ -0,0 +1,32 @@
+using System;
+
+namespace WindowsDesktop
+{
+	/// <summary>
+	/// Provides data for the <see cref="VirtualDesktop.WallpaperChanged" /> event.
+	/// </summary>
+	public class VirtualDesktopMovedEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Gets the virtual desktop that was moved.
+		/// </summary>
+		public VirtualDesktop Source { get; }
+
+		/// <summary>
+		/// Gets the old index of the virtual desktop.
+		/// </summary>
+		public int OldIndex { get; }
+
+		/// <summary>
+		/// Gets the new index of the virtual desktop.
+		/// </summary>
+		public int NewIndex { get; }
+
+		public VirtualDesktopMovedEventArgs(VirtualDesktop source, int oldIndex, int newIndex)
+		{
+			this.Source = source;
+			this.OldIndex = oldIndex;
+			this.NewIndex = newIndex;
+		}
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopProvider.cs b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopProvider.cs
index 157efe6..9b08df2 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopProvider.cs
+++ b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopProvider.cs
@@ -26,7 +26,7 @@ public class VirtualDesktopProvider : IDisposable
 		internal ComObjects ComObjects { get; private set; }
 		
 		public Task Initialize()
-			=> this.Initialize(TaskScheduler.FromCurrentSynchronizationContext());
+			=> this.Initialize(TaskScheduler.Current);
 
 		public Task Initialize(TaskScheduler scheduler)
 		{
diff --git a/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopRenamedEventArgs.cs b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopRenamedEventArgs.cs
new file mode 100644
index 0000000..e6bd0c2
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopRenamedEventArgs.cs
@@ -0,0 +1,32 @@
+using System;
+
+namespace WindowsDesktop
+{
+	/// <summary>
+	/// Provides data for the <see cref="VirtualDesktop.Renamed" /> event.
+	/// </summary>
+	public class VirtualDesktopRenamedEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Gets the virtual desktop that was renamed.
+		/// </summary>
+		public VirtualDesktop Source { get; }
+
+		/// <summary>
+		/// Gets the old name of the virtual desktop.
+		/// </summary>
+		public string OldName { get; }
+
+		/// <summary>
+		/// Gets the new name of the virtual desktop.
+		/// </summary>
+		public string NewName { get; }
+
+		public VirtualDesktopRenamedEventArgs(VirtualDesktop source, string oldName, string newName)
+		{
+			this.Source = source;
+			this.OldName = oldName;
+			this.NewName = newName;
+		}
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopWallpaperChangedEventArgs.cs b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopWallpaperChangedEventArgs.cs
new file mode 100644
index 0000000..d8798c2
--- /dev/null
+++ b/VirtualDesktop-master/source/VirtualDesktop/VirtualDesktopWallpaperChangedEventArgs.cs
@@ -0,0 +1,32 @@
+using System;
+
+namespace WindowsDesktop
+{
+	/// <summary>
+	/// Provides data for the <see cref="VirtualDesktop.WallpaperChanged" /> event.
+	/// </summary>
+	public class VirtualDesktopWallpaperChangedEventArgs : EventArgs
+	{
+		/// <summary>
+		/// Gets the virtual desktop whose wallpaper path was changed.
+		/// </summary>
+		public VirtualDesktop Source { get; }
+
+		/// <summary>
+		/// Gets the old wallpaper path of the virtual desktop.
+		/// </summary>
+		public string OldPath { get; }
+
+		/// <summary>
+		/// Gets the new wallpaper path of the virtual desktop.
+		/// </summary>
+		public string NewPath { get; }
+
+		public VirtualDesktopWallpaperChangedEventArgs(VirtualDesktop source, string oldPath, string newPath)
+		{
+			this.Source = source;
+			this.OldPath = oldPath;
+			this.NewPath = newPath;
+		}
+	}
+}
diff --git a/VirtualDesktop-master/source/VirtualDesktop/app.config b/VirtualDesktop-master/source/VirtualDesktop/app.config
index 8f99d3a..49573ed 100644
--- a/VirtualDesktop-master/source/VirtualDesktop/app.config
+++ b/VirtualDesktop-master/source/VirtualDesktop/app.config
@@ -1,46 +1,66 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <configSections>
-        <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
-            <section name="WindowsDesktop.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-        </sectionGroup>
-    </configSections>
-    <applicationSettings>
-        <WindowsDesktop.Properties.Settings>
-            <setting name="v_17134" serializeAs="Xml">
-                <value>
-                    <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                        xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-                        <string>IApplicationView,{871F602A-2B58-42B4-8C4B-6C43D642C06F}</string>
-                        <string>IApplicationViewCollection,{2C08ADF0-A386-4B35-9250-0FE183476FCC} </string>
-                        <string>IObjectArray,{92CA9DCD-5622-4BBA-A805-5E9F541BD8C9} </string>
-                        <string>IServiceProvider,{6D5140C1-7436-11CE-8034-00AA006009FA} </string>
-                        <string>IVirtualDesktop,{FF72FFDD-BE7E-43FC-9C03-AD81681E88E4} </string>
-                        <string>IVirtualDesktopManager,{A5CD92FF-29BE-454C-8D04-D82879FB3F1B} </string>
-                        <string>IVirtualDesktopManagerInternal,{F31574D6-B682-4CDC-BD56-1827860ABEC6} </string>
-                        <string>IVirtualDesktopNotification,{C179334C-4295-40D3-BEA1-C654D965605A} </string>
-                        <string>IVirtualDesktopNotificationService,{0CD45E71-D927-4F15-8B0A-8FEF525337BF} </string>
-                        <string>IVirtualDesktopPinnedApps,{4CE81583-1E4C-4632-A621-07A53543148F} </string>
-                    </ArrayOfString>
-                </value>
-            </setting>
-            <setting name="v_16299" serializeAs="Xml">
-                <value>
-                    <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                        xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-                        <string>IApplicationView,{9AC0B5C8-1484-4C5B-9533-4134A0F97CEA} </string>
-                        <string>IApplicationViewCollection,{2C08ADF0-A386-4B35-9250-0FE183476FCC} </string>
-                        <string>IObjectArray,{92CA9DCD-5622-4BBA-A805-5E9F541BD8C9} </string>
-                        <string>IServiceProvider,{6D5140C1-7436-11CE-8034-00AA006009FA} </string>
-                        <string>IVirtualDesktop,{FF72FFDD-BE7E-43FC-9C03-AD81681E88E4} </string>
-                        <string>IVirtualDesktopManager,{A5CD92FF-29BE-454C-8D04-D82879FB3F1B} </string>
-                        <string>IVirtualDesktopManagerInternal,{F31574D6-B682-4CDC-BD56-1827860ABEC6} </string>
-                        <string>IVirtualDesktopNotification,{C179334C-4295-40D3-BEA1-C654D965605A} </string>
-                        <string>IVirtualDesktopNotificationService,{0CD45E71-D927-4F15-8B0A-8FEF525337BF} </string>
-                        <string>IVirtualDesktopPinnedApps,{4CE81583-1E4C-4632-A621-07A53543148F} </string>
-                    </ArrayOfString>
-                </value>
-            </setting>
-        </WindowsDesktop.Properties.Settings>
-    </applicationSettings>
-</configuration>
\ No newline at end of file
+  <configSections>
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="WindowsDesktop.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+    </sectionGroup>
+  </configSections>
+  <applicationSettings>
+    <WindowsDesktop.Properties.Settings>
+      <setting name="v_18975" serializeAs="Xml">
+        <value>
+          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                         xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+            <string>IApplicationView,{871F602A-2B58-42B4-8C4B-6C43D642C06F}</string>
+            <string>IApplicationViewCollection,{2C08ADF0-A386-4B35-9250-0FE183476FCC} </string>
+            <string>IObjectArray,{92CA9DCD-5622-4BBA-A805-5E9F541BD8C9} </string>
+            <string>IServiceProvider,{6D5140C1-7436-11CE-8034-00AA006009FA} </string>
+            <string>IVirtualDesktop,{FF72FFDD-BE7E-43FC-9C03-AD81681E88E4} </string>
+            <string>IVirtualDesktop2,{31EBDE3F-6EC3-4CBD-B9FB-0EF6D09B41F4} </string>
+            <string>IVirtualDesktopManager,{A5CD92FF-29BE-454C-8D04-D82879FB3F1B} </string>
+            <string>IVirtualDesktopManagerInternal,{F31574D6-B682-4CDC-BD56-1827860ABEC6} </string>
+            <string>IVirtualDesktopManagerInternal2,{0F3A72B0-4566-487E-9A33-4ED302F6D6CE} </string>
+            <string>IVirtualDesktopNotification,{C179334C-4295-40D3-BEA1-C654D965605A} </string>
+            <string>IVirtualDesktopNotification2,{1BA7CF30-3591-43FA-ABFA-4AAF7ABEEDB7} </string>
+            <string>IVirtualDesktopNotificationService,{0CD45E71-D927-4F15-8B0A-8FEF525337BF} </string>
+            <string>IVirtualDesktopPinnedApps,{4CE81583-1E4C-4632-A621-07A53543148F} </string>
+          </ArrayOfString>
+        </value>
+      </setting>
+      <setting name="v_17134" serializeAs="Xml">
+        <value>
+          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                         xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+            <string>IApplicationView,{871F602A-2B58-42B4-8C4B-6C43D642C06F}</string>
+            <string>IApplicationViewCollection,{2C08ADF0-A386-4B35-9250-0FE183476FCC} </string>
+            <string>IObjectArray,{92CA9DCD-5622-4BBA-A805-5E9F541BD8C9} </string>
+            <string>IServiceProvider,{6D5140C1-7436-11CE-8034-00AA006009FA} </string>
+            <string>IVirtualDesktop,{FF72FFDD-BE7E-43FC-9C03-AD81681E88E4} </string>
+            <string>IVirtualDesktopManager,{A5CD92FF-29BE-454C-8D04-D82879FB3F1B} </string>
+            <string>IVirtualDesktopManagerInternal,{F31574D6-B682-4CDC-BD56-1827860ABEC6} </string>
+            <string>IVirtualDesktopNotification,{C179334C-4295-40D3-BEA1-C654D965605A} </string>
+            <string>IVirtualDesktopNotificationService,{0CD45E71-D927-4F15-8B0A-8FEF525337BF} </string>
+            <string>IVirtualDesktopPinnedApps,{4CE81583-1E4C-4632-A621-07A53543148F} </string>
+          </ArrayOfString>
+        </value>
+      </setting>
+      <setting name="v_16299" serializeAs="Xml">
+        <value>
+          <ArrayOfString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                         xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+            <string>IApplicationView,{9AC0B5C8-1484-4C5B-9533-4134A0F97CEA} </string>
+            <string>IApplicationViewCollection,{2C08ADF0-A386-4B35-9250-0FE183476FCC} </string>
+            <string>IObjectArray,{92CA9DCD-5622-4BBA-A805-5E9F541BD8C9} </string>
+            <string>IServiceProvider,{6D5140C1-7436-11CE-8034-00AA006009FA} </string>
+            <string>IVirtualDesktop,{FF72FFDD-BE7E-43FC-9C03-AD81681E88E4} </string>
+            <string>IVirtualDesktopManager,{A5CD92FF-29BE-454C-8D04-D82879FB3F1B} </string>
+            <string>IVirtualDesktopManagerInternal,{F31574D6-B682-4CDC-BD56-1827860ABEC6} </string>
+            <string>IVirtualDesktopNotification,{C179334C-4295-40D3-BEA1-C654D965605A} </string>
+            <string>IVirtualDesktopNotificationService,{0CD45E71-D927-4F15-8B0A-8FEF525337BF} </string>
+            <string>IVirtualDesktopPinnedApps,{4CE81583-1E4C-4632-A621-07A53543148F} </string>
+          </ArrayOfString>
+        </value>
+      </setting>
+    </WindowsDesktop.Properties.Settings>
+  </applicationSettings>
+</configuration>
diff --git a/VirtualDesktop-master/source/VirtualDesktop/packages.config b/VirtualDesktop-master/source/VirtualDesktop/packages.config
deleted file mode 100644
index e3d6fdb..0000000
--- a/VirtualDesktop-master/source/VirtualDesktop/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Source.JetBrains.Annotations" version="11.1.1" targetFramework="net47" developmentDependency="true" />
-</packages>
\ No newline at end of file