diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/GlobalSuppressions.cs b/src/NuGet.Clients/NuGet.PackageManagement.UI/GlobalSuppressions.cs
index 5f3289e6faa..3481ef66a36 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/GlobalSuppressions.cs
+++ b/src/NuGet.Clients/NuGet.PackageManagement.UI/GlobalSuppressions.cs
@@ -81,19 +81,19 @@
 [assembly: SuppressMessage("Build", "CA1501:'ActionsAndVersions' has an object hierarchy '9' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'UserControl, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.ActionsAndVersions")]
 [assembly: SuppressMessage("Build", "CA1501:'ArrowGlyphAdorner' has an object hierarchy '7' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'Adorner, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.ArrowGlyphAdorner")]
 [assembly: SuppressMessage("Build", "CA1501:'AuthorAndDownloadCount' has an object hierarchy '9' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'UserControl, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.AuthorAndDownloadCount")]
-[assembly: SuppressMessage("Build", "CA1501:'DeprecatedFrameworkWindow' has an object hierarchy '12' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'VsDialogWindow, DialogWindow, DialogWindowBase, Window, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.DeprecatedFrameworkWindow")]
+[assembly: SuppressMessage("Build", "CA1501:'DeprecatedFrameworkWindow' has an object hierarchy '11' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': `DialogWindow, DialogWindowBase, Window, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.DeprecatedFrameworkWindow")]
 [assembly: SuppressMessage("Build", "CA1501:'DeprecationControl' has an object hierarchy '9' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'UserControl, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.DeprecationControl")]
 [assembly: SuppressMessage("Build", "CA1501:'DetailControl' has an object hierarchy '9' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'UserControl, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.DetailControl")]
-[assembly: SuppressMessage("Build", "CA1501:'FileConflictDialog' has an object hierarchy '12' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'VsDialogWindow, DialogWindow, DialogWindowBase, Window, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.FileConflictDialog")]
+[assembly: SuppressMessage("Build", "CA1501:'FileConflictDialog' has an object hierarchy '11' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'DialogWindow, DialogWindowBase, Window, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.FileConflictDialog")]
 [assembly: SuppressMessage("Build", "CA1501:'InfiniteScrollList' has an object hierarchy '9' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'UserControl, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.InfiniteScrollList")]
 [assembly: SuppressMessage("Build", "CA1501:'InfiniteScrollListBox' has an object hierarchy '10' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'ListBox, Selector, ItemsControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.InfiniteScrollListBox")]
-[assembly: SuppressMessage("Build", "CA1501:'LicenseAcceptanceWindow' has an object hierarchy '12' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'VsDialogWindow, DialogWindow, DialogWindowBase, Window, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.LicenseAcceptanceWindow")]
-[assembly: SuppressMessage("Build", "CA1501:'LicenseFileWindow' has an object hierarchy '12' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'VsDialogWindow, DialogWindow, DialogWindowBase, Window, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.LicenseFileWindow")]
+[assembly: SuppressMessage("Build", "CA1501:'LicenseAcceptanceWindow' has an object hierarchy '11' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'DialogWindow, DialogWindowBase, Window, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.LicenseAcceptanceWindow")]
+[assembly: SuppressMessage("Build", "CA1501:'LicenseFileWindow' has an object hierarchy '11' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'DialogWindow, DialogWindowBase, Window, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.LicenseFileWindow")]
 [assembly: SuppressMessage("Build", "CA1501:'LoadingStatusBar' has an object hierarchy '9' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'UserControl, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.LoadingStatusBar")]
-[assembly: SuppressMessage("Build", "CA1501:'NuGetProjectUpgradeWindow' has an object hierarchy '12' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'VsDialogWindow, DialogWindow, DialogWindowBase, Window, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.NuGetProjectUpgradeWindow")]
+[assembly: SuppressMessage("Build", "CA1501:'NuGetProjectUpgradeWindow' has an object hierarchy '11' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'DialogWindow, DialogWindowBase, Window, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.NuGetProjectUpgradeWindow")]
 [assembly: SuppressMessage("Build", "CA1501:'OptionsControl' has an object hierarchy '9' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'UserControl, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.OptionsControl")]
 [assembly: SuppressMessage("Build", "CA1501:'PackageItemControl' has an object hierarchy '9' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'UserControl, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.PackageItemControl")]
-[assembly: SuppressMessage("Build", "CA1501:'PackageManagementFormatWindow' has an object hierarchy '12' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'VsDialogWindow, DialogWindow, DialogWindowBase, Window, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.PackageManagementFormatWindow")]
+[assembly: SuppressMessage("Build", "CA1501:'PackageManagementFormatWindow' has an object hierarchy '11' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'DialogWindow, DialogWindowBase, Window, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.PackageManagementFormatWindow")]
 [assembly: SuppressMessage("Build", "CA1501:'ListBoxToggleableItemsAutomationPeer' has an object hierarchy '8' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'ListBoxAutomationPeer, SelectorAutomationPeer, ItemsControlAutomationPeer, FrameworkElementAutomationPeer, UIElementAutomationPeer, AutomationPeer, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.ListBoxToggleableItemsAutomationPeer")]
 [assembly: SuppressMessage("Build", "CA1501:'ListViewToggleableItemsAutomationPeer' has an object hierarchy '9' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'ListViewAutomationPeer, ListBoxAutomationPeer, SelectorAutomationPeer, ItemsControlAutomationPeer, FrameworkElementAutomationPeer, UIElementAutomationPeer, AutomationPeer, DispatcherObject, Object'", Justification = "Default WPF automation peer hierarchy", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.ListViewToggleableItemsAutomationPeer")]
 [assembly: SuppressMessage("Build", "CA1501:'ToggleableItemAutomationPeer' has an object hierarchy '6' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'ListBoxItemAutomationPeer, SelectorItemAutomationPeer, ItemAutomationPeer, AutomationPeer, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.ToggleableItemAutomationPeer")]
@@ -103,7 +103,7 @@
 [assembly: SuppressMessage("Build", "CA1501:'PackageManagerTopPanel' has an object hierarchy '9' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'UserControl, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.PackageManagerTopPanel")]
 [assembly: SuppressMessage("Build", "CA1501:'PackageMetadataControl' has an object hierarchy '9' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'UserControl, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.PackageMetadataControl")]
 [assembly: SuppressMessage("Build", "CA1501:'PackageRestoreBar' has an object hierarchy '9' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'UserControl, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.PackageRestoreBar")]
-[assembly: SuppressMessage("Build", "CA1501:'PreviewWindow' has an object hierarchy '12' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'VsDialogWindow, DialogWindow, DialogWindowBase, Window, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.PreviewWindow")]
+[assembly: SuppressMessage("Build", "CA1501:'PreviewWindow' has an object hierarchy '11' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'DialogWindow, DialogWindowBase, Window, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.PreviewWindow")]
 [assembly: SuppressMessage("Build", "CA1501:'PRMigratorBar' has an object hierarchy '9' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'UserControl, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.PRMigratorBar")]
 [assembly: SuppressMessage("Build", "CA1501:'ProductUpdateBar' has an object hierarchy '9' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'UserControl, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.ProductUpdateBar")]
 [assembly: SuppressMessage("Build", "CA1501:'ProjectsListView' has an object hierarchy '10' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'ListBox, Selector, ItemsControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.ProjectsListView")]
@@ -111,7 +111,6 @@
 [assembly: SuppressMessage("Build", "CA1501:'RestartRequestBar' has an object hierarchy '9' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'UserControl, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.RestartRequestBar")]
 [assembly: SuppressMessage("Build", "CA1501:'SolutionView' has an object hierarchy '9' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'UserControl, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.SolutionView")]
 [assembly: SuppressMessage("Build", "CA1501:'Spinner' has an object hierarchy '9' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'UserControl, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.Spinner")]
-[assembly: SuppressMessage("Build", "CA1501:'VsDialogWindow' has an object hierarchy '11' levels deep within the defining module. If possible, eliminate base classes within the hierarchy to decrease its hierarchy level below '6': 'DialogWindow, DialogWindowBase, Window, ContentControl, Control, FrameworkElement, UIElement, Visual, DependencyObject, DispatcherObject, Object'", Justification = "<Pending>", Scope = "type", Target = "~T:NuGet.PackageManagement.UI.VsDialogWindow")]
 [assembly: SuppressMessage("Build", "CA1821:Remove empty Finalizers", Justification = "<Pending>", Scope = "member", Target = "~M:NuGet.PackageManagement.UI.DataStreamFromComStream.Finalize")]
 [assembly: SuppressMessage("ApiDesign", "RS0026:Do not add multiple public overloads with optional parameters", Justification = "API already shipped", Scope = "member", Target = "~M:NuGet.PackageManagement.UI.DisplayVersion.#ctor(NuGet.Versioning.NuGetVersion,System.String,System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.String)")]
 [assembly: SuppressMessage("ApiDesign", "RS0026:Do not add multiple public overloads with optional parameters", Justification = "API already shipped", Scope = "member", Target = "~M:NuGet.PackageManagement.UI.DisplayVersion.#ctor(NuGet.Versioning.VersionRange,System.String,System.Boolean,System.Boolean,System.Boolean,System.Boolean,System.String)")]
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/NuGet.PackageManagement.UI.csproj b/src/NuGet.Clients/NuGet.PackageManagement.UI/NuGet.PackageManagement.UI.csproj
index 92a27e78600..6053d6e67d6 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/NuGet.PackageManagement.UI.csproj
+++ b/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>
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/VsDialogWindow.cs b/src/NuGet.Clients/NuGet.PackageManagement.UI/VsDialogWindow.cs
deleted file mode 100644
index c55b8d0f00b..00000000000
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/VsDialogWindow.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-using Microsoft.VisualStudio.PlatformUI;
-
-namespace NuGet.PackageManagement.UI
-{
-    public class VsDialogWindow : DialogWindow
-    {
-        // Wrapper for the VS dialog
-    }
-}
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/DeprecatedFrameworkWindow.xaml b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/DeprecatedFrameworkWindow.xaml
index c6633657b4d..891298f42da 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/DeprecatedFrameworkWindow.xaml
+++ b/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>
\ No newline at end of file
+</vs:DialogWindow>
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/DeprecatedFrameworkWindow.xaml.cs b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/DeprecatedFrameworkWindow.xaml.cs
index aea0a64843b..746ec5edd12 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/DeprecatedFrameworkWindow.xaml.cs
+++ b/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;
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/FileConflictDialog.xaml b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/FileConflictDialog.xaml
index e79a8674480..7fc4bed6b45 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/FileConflictDialog.xaml
+++ b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/FileConflictDialog.xaml
@@ -1,4 +1,4 @@
-<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"
@@ -6,6 +6,7 @@
   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>
\ No newline at end of file
+</vs:DialogWindow>
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/FileConflictDialog.xaml.cs b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/FileConflictDialog.xaml.cs
index 5d3b50f743c..78e133c02a0 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/FileConflictDialog.xaml.cs
+++ b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/FileConflictDialog.xaml.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Windows;
 using System.Windows.Controls;
+using Microsoft.VisualStudio.PlatformUI;
 using NuGet.ProjectManagement;
 
 namespace NuGet.PackageManagement.UI
@@ -11,7 +12,7 @@ namespace NuGet.PackageManagement.UI
     /// <summary>
     /// Interaction logic for FileConflictDialog.xaml
     /// </summary>
-    public partial class FileConflictDialog : VsDialogWindow
+    public partial class FileConflictDialog : DialogWindow
     {
         public FileConflictDialog()
         {
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/LicenseAcceptanceWindow.xaml b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/LicenseAcceptanceWindow.xaml
index fb38e69de94..3a47d10e6dd 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/LicenseAcceptanceWindow.xaml
+++ b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/LicenseAcceptanceWindow.xaml
@@ -1,4 +1,4 @@
-<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"
@@ -6,7 +6,8 @@
   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>
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/LicenseAcceptanceWindow.xaml.cs b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/LicenseAcceptanceWindow.xaml.cs
index 4f280c9db3f..c454bcd288f 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/LicenseAcceptanceWindow.xaml.cs
+++ b/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()
         {
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/LicenseFileWindow.xaml b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/LicenseFileWindow.xaml
index bf067fc7716..e6ae46fff25 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/LicenseFileWindow.xaml
+++ b/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>
\ No newline at end of file
+</vs:DialogWindow>
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/LicenseFileWindow.xaml.cs b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/LicenseFileWindow.xaml.cs
index 63f5b351aec..92e167ee59e 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/LicenseFileWindow.xaml.cs
+++ b/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()
         {
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/NuGetProjectUpgradeWindow.xaml b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/NuGetProjectUpgradeWindow.xaml
index 337e44f38a8..f0ce4466b2f 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/NuGetProjectUpgradeWindow.xaml
+++ b/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>
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/NuGetProjectUpgradeWindow.xaml.cs b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/NuGetProjectUpgradeWindow.xaml.cs
index e466c4e29f3..484c7099980 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/NuGetProjectUpgradeWindow.xaml.cs
+++ b/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)
         {
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageManagementFormatWindow.xaml b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageManagementFormatWindow.xaml
index 0c8eaceebb1..629b371ac19 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageManagementFormatWindow.xaml
+++ b/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>
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageManagementFormatWindow.xaml.cs b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageManagementFormatWindow.xaml.cs
index e6183aa68da..69c350e5788 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageManagementFormatWindow.xaml.cs
+++ b/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;
 
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PreviewWindow.xaml b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PreviewWindow.xaml
index 9d4af6cc461..380486221b4 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PreviewWindow.xaml
+++ b/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>
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PreviewWindow.xaml.cs b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PreviewWindow.xaml.cs
index 2d740b83722..36f18d2f8c3 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PreviewWindow.xaml.cs
+++ b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PreviewWindow.xaml.cs
@@ -5,6 +5,7 @@
 using System.Text;
 using System.Windows;
 using System.Windows.Input;
+using Microsoft.VisualStudio.PlatformUI;
 using NuGet.PackageManagement.VisualStudio;
 
 namespace NuGet.PackageManagement.UI
@@ -12,7 +13,7 @@ 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;