Use DialogWindow directly from Microsoft.VisualStudio.PlatformUI

src/NuGet.Clients/NuGet.PackageManagement.UI/NuGet.PackageManagement.UI.csproj

@@ -239,7 +239,6 @@
     <Compile Include="UserInterfaceService\NuGetUIProjectContext.cs" />
     <Compile Include="UserSettings.cs" />
     <Compile Include="Utility\UIUtility.cs" />
-    <Compile Include="VsDialogWindow.cs" />
     <Compile Include="Xamls\ActionsAndVersions.xaml.cs">
       <DependentUpon>ActionsAndVersions.xaml</DependentUpon>
     </Compile>

src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/DeprecatedFrameworkWindow.xaml

@@ -1,8 +1,9 @@
-<nuget:VsDialogWindow
+<vs:DialogWindow
   x:Class="NuGet.PackageManagement.UI.DeprecatedFrameworkWindow"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:nuget="clr-namespace:NuGet.PackageManagement.UI"
+  xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
   x:Name="_self"
   ShowInTaskbar="False"
   WindowStyle="SingleBorderWindow"
@@ -108,4 +109,4 @@
         Click="CancelButtonClicked" />
     </Grid>
   </Grid>
-</nuget:VsDialogWindow>
+</vs:DialogWindow>

src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/DeprecatedFrameworkWindow.xaml.cs

@@ -3,11 +3,12 @@
 
 using System.Windows;
 using System.Windows.Documents;
+using Microsoft.VisualStudio.PlatformUI;
 using NuGet.PackageManagement.VisualStudio;
 
 namespace NuGet.PackageManagement.UI
 {
-    public partial class DeprecatedFrameworkWindow : VsDialogWindow
+    public partial class DeprecatedFrameworkWindow : DialogWindow
     {
         private bool _initialized;
         private INuGetUIContext _uiContext;

src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/FileConflictDialog.xaml

@@ -1,11 +1,12 @@
-<ui:VsDialogWindow
+<vs:DialogWindow
   x:Class="NuGet.PackageManagement.UI.FileConflictDialog"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
   xmlns:resx="clr-namespace:NuGet.PackageManagement.UI"
   xmlns:ui="clr-namespace:NuGet.PackageManagement.UI"
+  xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
   Background="{DynamicResource {x:Static resx:Brushes.BackgroundBrushKey}}"
   Foreground="{DynamicResource {x:Static resx:Brushes.UIText}}"
   Title="{x:Static resx:Resources.WindowTitle_FileConflict}"
@@ -75,4 +76,4 @@
       VerticalAlignment="Top"
       AutomationProperties.Name="{Binding Text}"/>
   </DockPanel>
-</ui:VsDialogWindow>
+</vs:DialogWindow>

src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/FileConflictDialog.xaml.cs

@@ -4,14 +4,15 @@
 using System;
 using System.Windows;
 using System.Windows.Controls;
+using Microsoft.VisualStudio.PlatformUI;
 using NuGet.ProjectManagement;
 
 namespace NuGet.PackageManagement.UI
 {
     /// <summary>
     /// Interaction logic for FileConflictDialog.xaml
     /// </summary>
-    public partial class FileConflictDialog : VsDialogWindow
+    public partial class FileConflictDialog : DialogWindow
     {
         public FileConflictDialog()
         {

src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/LicenseAcceptanceWindow.xaml

@@ -1,12 +1,13 @@
-<nuget:VsDialogWindow
+<vs:DialogWindow
   x:Class="NuGet.PackageManagement.UI.LicenseAcceptanceWindow"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
   xmlns:nuget="clr-namespace:NuGet.PackageManagement.UI"
   xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"  
-  xmlns:catalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"  
+  xmlns:catalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
+  xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
   x:Name="_self"
   Width="450"
   Height="450"
@@ -185,4 +186,4 @@
       </Grid>
     </Grid>
   </ScrollViewer>
-</nuget:VsDialogWindow>
+</vs:DialogWindow>

src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/LicenseAcceptanceWindow.xaml.cs

@@ -7,6 +7,7 @@
 using System.Windows.Forms;
 using System.Windows.Input;
 using System.Windows.Media;
+using Microsoft.VisualStudio.PlatformUI;
 using NuGet.VisualStudio;
 using NuGet.VisualStudio.Telemetry;
 
@@ -15,7 +16,7 @@ namespace NuGet.PackageManagement.UI
     /// <summary>
     /// Interaction logic for UserControl1.xaml
     /// </summary>
-    public partial class LicenseAcceptanceWindow : VsDialogWindow
+    public partial class LicenseAcceptanceWindow : DialogWindow
     {
         public LicenseAcceptanceWindow()
         {

src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/LicenseFileWindow.xaml

@@ -1,10 +1,11 @@
-<nuget:VsDialogWindow
+<vs:DialogWindow
   x:Class="NuGet.PackageManagement.UI.LicenseFileWindow"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
   xmlns:nuget="clr-namespace:NuGet.PackageManagement.UI"
+  xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
   x:Name="_self"
   MinWidth="450"
   MinHeight="450"
@@ -42,4 +43,4 @@
       </FlowDocumentScrollViewer>
     </Border>
   </Grid>
-</nuget:VsDialogWindow>
+</vs:DialogWindow>

src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/LicenseFileWindow.xaml.cs

@@ -16,13 +16,14 @@
 using System.Windows.Media.Imaging;
 using System.Windows.Navigation;
 using System.Windows.Shapes;
+using Microsoft.VisualStudio.PlatformUI;
 
 namespace NuGet.PackageManagement.UI
 {
     /// <summary>
     /// Interaction logic for LicenseFileWindow.xaml
     /// </summary>
-    public partial class LicenseFileWindow : VsDialogWindow
+    public partial class LicenseFileWindow : DialogWindow
     {
         public LicenseFileWindow()
         {

src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/NuGetProjectUpgradeWindow.xaml

@@ -1,4 +1,4 @@
-<nuget:VsDialogWindow
+<vs:DialogWindow
   x:Class="NuGet.PackageManagement.UI.NuGetProjectUpgradeWindow"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -8,6 +8,7 @@
   xmlns:imaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
   xmlns:catalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
   xmlns:imagingTheme="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Imaging"
+  xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
   mc:Ignorable="d"
   x:Name="_self"
   Background="{DynamicResource {x:Static nuget:Brushes.BackgroundBrushKey}}"
@@ -399,4 +400,4 @@
 
     </Grid>
   </Grid>
-</nuget:VsDialogWindow>
+</vs:DialogWindow>

src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/NuGetProjectUpgradeWindow.xaml.cs

@@ -6,13 +6,14 @@
 using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Input;
+using Microsoft.VisualStudio.PlatformUI;
 
 namespace NuGet.PackageManagement.UI
 {
     /// <summary>
     /// Interaction logic for NuGetProjectUpgradeWindow.xaml
     /// </summary>
-    public partial class NuGetProjectUpgradeWindow : VsDialogWindow
+    public partial class NuGetProjectUpgradeWindow : DialogWindow
     {
         public NuGetProjectUpgradeWindow(NuGetProjectUpgradeWindowModel model)
         {

src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageManagementFormatWindow.xaml

@@ -1,10 +1,11 @@
-<nuget:VsDialogWindow 
+<vs:DialogWindow
   x:Class="NuGet.PackageManagement.UI.PackageManagementFormatWindow"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:nuget="clr-namespace:NuGet.PackageManagement.UI"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+  xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
   Background="{DynamicResource {x:Static nuget:Brushes.HeaderBackground}}"
   Foreground="{DynamicResource {x:Static nuget:Brushes.UIText}}"
   mc:Ignorable="d"
@@ -155,4 +156,4 @@
         Click="CancelButtonClicked" />
     </Grid>
   </Grid>
-</nuget:VsDialogWindow>
+</vs:DialogWindow>

src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageManagementFormatWindow.xaml.cs

@@ -4,6 +4,7 @@
 using System.Windows;
 using System.Windows.Documents;
 using System.Windows.Input;
+using Microsoft.VisualStudio.PlatformUI;
 using NuGet.PackageManagement.VisualStudio;
 using NuGet.VisualStudio;
 
@@ -12,7 +13,7 @@ namespace NuGet.PackageManagement.UI
     /// <summary>
     /// Interaction logic for PackageManagementFormatWindow.xaml
     /// </summary>
-    public partial class PackageManagementFormatWindow : VsDialogWindow
+    public partial class PackageManagementFormatWindow : DialogWindow
     {
         private INuGetUIContext _uiContext;
 

src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PreviewWindow.xaml

@@ -1,8 +1,9 @@
-<nuget:VsDialogWindow
+<vs:DialogWindow
   x:Class="NuGet.PackageManagement.UI.PreviewWindow"
   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
   xmlns:nuget="clr-namespace:NuGet.PackageManagement.UI"
+  xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
   x:Name="_self"
   ShowInTaskbar="False"
   WindowStyle="SingleBorderWindow"
@@ -21,11 +22,11 @@
       </ResourceDictionary.MergedDictionaries>
     </ResourceDictionary>
   </Window.Resources>
-  <nuget:VsDialogWindow.CommandBindings>
+  <vs:DialogWindow.CommandBindings>
     <CommandBinding
       Command="{x:Static ApplicationCommands.Copy}"
       Executed="ExecuteCopyToClipboard" />
-  </nuget:VsDialogWindow.CommandBindings>
+  </vs:DialogWindow.CommandBindings>
   <Grid>
     <Grid.RowDefinitions>
       <RowDefinition
@@ -186,4 +187,4 @@
         Click="CancelButtonClicked" />
     </Grid>
   </Grid>
-</nuget:VsDialogWindow>
+</vs:DialogWindow>

src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PreviewWindow.xaml.cs

@@ -5,14 +5,15 @@
 using System.Text;
 using System.Windows;
 using System.Windows.Input;
+using Microsoft.VisualStudio.PlatformUI;
 using NuGet.PackageManagement.VisualStudio;
 
 namespace NuGet.PackageManagement.UI
 {
     /// <summary>
     /// Interaction logic for PreviewWindow.xaml
     /// </summary>
-    public partial class PreviewWindow : VsDialogWindow
+    public partial class PreviewWindow : DialogWindow
     {
         private bool _initialized;
         private INuGetUIContext _uiContext;