From 97b44d777a6417cd4d7b49f3c4aa1585ee916976 Mon Sep 17 00:00:00 2001
From: Anton Burticica <mouse@ya.ru>
Date: Mon, 4 Dec 2023 19:56:27 +0200
Subject: [PATCH 1/3] Reverse sort sourceMap (#1428)

Do reverse sort of the `sourceMap`.

In my `launch.json` configuration I have the following `sourceFileMap`:
```
            "sourceFileMap": {
                "/usr/src/debug/my-project/git-r0/build/src/../../git": "${workspaceFolder}",
                "/usr/src/debug": {
                    "editorPath": "${config:YOCTO_ARCH}",
                    "useForBreakpoints": false
                }
            },
```

The YOCTO_ARCH set in `settings.json` to:
```
    "terminal.integrated.env.linux": {
        "YOCTO_ARCH": "/home/mouse/linux-bsp/linux-devel-build/build/work/cortexa7t2hf-neon-vfpv4_linux-linux-gnueabi"
    },
```

This PR addresses an issue encountered while debugging a binary that's running on a remote system and built using Yocto. Currently, when debugging, the source files are being referenced from the Yocto build tree instead of the local workspace. This issue prevents setting breakpoints effectively in the local workspace source files.

To resolve this, the change involves modifying the way source mappings are processed. Specifically, it proposes sorting the mappings in reverse order, starting with the longer, more specific paths and moving towards the more general ones. By doing this, the debugger will first consider the project-specific paths defined in `sourceFileMap`. If it doesn't find a match there, it will then fall back to the more general paths. This reverse sorting ensures that the local workspace sources are prioritized over the Yocto build tree sources, allowing for effective breakpoint setting and debugging in the local workspace.
---
 src/MICore/LaunchOptions.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/MICore/LaunchOptions.cs b/src/MICore/LaunchOptions.cs
index 7c102711f..95f1ee049 100644
--- a/src/MICore/LaunchOptions.cs
+++ b/src/MICore/LaunchOptions.cs
@@ -370,7 +370,7 @@ public static ReadOnlyCollection<SourceMapEntry> CreateCollection(Xml.LaunchOpti
 
         public static ReadOnlyCollection<SourceMapEntry> CreateCollection(Dictionary<string, object> source)
         {
-            IList<SourceMapEntry> sourceMaps = new List<SourceMapEntry>(source.Keys.Count);
+            var sourceMaps = new List<SourceMapEntry>(source.Keys.Count);
 
             foreach (var item in source)
             {
@@ -416,6 +416,11 @@ public static ReadOnlyCollection<SourceMapEntry> CreateCollection(Dictionary<str
                     throw new InvalidLaunchOptionsException(String.Format(CultureInfo.CurrentCulture, MICoreResources.Error_SourceFileMapInvalidEditorPath));
                 }
             }
+
+            // Ensure the map is sorted such that more specific directories are in front of less specific by sorting the map
+            // in descending order of the compile time path
+            sourceMaps.Sort((x, y) => string.CompareOrdinal(y.CompileTimePath, x.CompileTimePath));
+            
             return new ReadOnlyCollection<SourceMapEntry>(sourceMaps);
         }
     }

From 2a0f9efa65869f9ae64f1f5782c50998d31baa22 Mon Sep 17 00:00:00 2001
From: nikitalita <69168929+nikitalita@users.noreply.github.com>
Date: Thu, 21 Dec 2023 15:02:19 -0800
Subject: [PATCH 2/3] Fix missing s32 format specifier support (#1431)

Fix s32 format specifier support
---
 src/MIDebugEngine/Engine.Impl/Variables.cs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/MIDebugEngine/Engine.Impl/Variables.cs b/src/MIDebugEngine/Engine.Impl/Variables.cs
index 32e6b78b7..8c297998f 100644
--- a/src/MIDebugEngine/Engine.Impl/Variables.cs
+++ b/src/MIDebugEngine/Engine.Impl/Variables.cs
@@ -425,6 +425,9 @@ private string ProcessFormatSpecifiers(string exp, out string formatSpecifier)
                 case "su":
                 case "sub":
                     return "(const char16_t*)(" + exp.Substring(0, lastComma) + ")";
+                case "s32":
+                case "s32b":
+                    return "(const char32_t*)(" + exp.Substring(0, lastComma) + ")";
                 case "c":
                     return "(char)(" + exp.Substring(0, lastComma) + ")";
                 // just remove and ignore these

From 40175199ebe98db558c5fc609ffb85fec51bc9ce Mon Sep 17 00:00:00 2001
From: Andrew Wang <waan@microsoft.com>
Date: Tue, 2 Jan 2024 14:48:16 -0800
Subject: [PATCH 3/3] Theme Docker Container Selector Dialog (#1430)

* Theme Docker Container Selector Dialog

This PR updates the Docker Container Selector Dialog in Visual Studio to
be themed. The following changes were done:
- Updates VS packages since some of the newer theming was in newer
  packages.
- Newer packages had new attributes that needed to be handled with
  MakePIAPortableTool.
- Converted ListBox to ListView for ContainerPickerDialog and modified
  associated automation peers

* Address PR issues

* Revert to 17.5.33428.366

* Remove Maximize Functionality

* Address title bar issues
---
 build/package_versions.settings.targets       |  26 +-
 src/DebugEngineHost/DebugEngineHost.csproj    |   2 -
 src/MIDebugPackage/MIDebugPackage.csproj      |   2 -
 src/MakePIAPortable/MakePIAPortable.csproj    |  14 +-
 src/SSHDebugPS/SSHDebugPS.csproj              |   2 -
 .../UI/ContainerPickerDialogWindow.xaml       | 350 ++++++++++--------
 .../UI/ContainerPickerDialogWindow.xaml.cs    |  27 +-
 .../ContainerListBoxItemAutomationPeer.cs     |   4 +-
 ....cs => ContainerListViewAutomationPeer.cs} |   6 +-
 .../UI/Controls/ContainerListBox.cs           |   4 +-
 .../Converters/BoolToVisibilityConverter.cs   |   5 +-
 .../MakePIAPortableTool.cs                    |   5 +-
 12 files changed, 247 insertions(+), 200 deletions(-)
 rename src/SSHDebugPS/UI/Controls/Automation/{ContainerListBoxAutomationPeer.cs => ContainerListViewAutomationPeer.cs} (61%)

diff --git a/build/package_versions.settings.targets b/build/package_versions.settings.targets
index c1eee41bb..470194d01 100644
--- a/build/package_versions.settings.targets
+++ b/build/package_versions.settings.targets
@@ -1,8 +1,8 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <Microsoft_VisualStudio_Debugger_Interop_Portable_Version>1.0.1</Microsoft_VisualStudio_Debugger_Interop_Portable_Version>
-        <Microsoft_VisualStudio_Interop_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Interop_Version>
-        <Newtonsoft_Json_Version>13.0.1</Newtonsoft_Json_Version>
+        <Microsoft_VisualStudio_Interop_Version>17.8.37221</Microsoft_VisualStudio_Interop_Version>
+        <Newtonsoft_Json_Version>13.0.3</Newtonsoft_Json_Version>
         <Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>17.2.60629.1</Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>
 
         <!-- Test Packages -->
@@ -19,20 +19,20 @@
     <PropertyGroup>
         <Microsoft_VisualStudio_ComponentModelHost_Version>17.0.28-g439d20ddd3</Microsoft_VisualStudio_ComponentModelHost_Version>
         <Microsoft_VisualStudio_Debugger_Engine_Version>17.0.1051901-preview</Microsoft_VisualStudio_Debugger_Engine_Version>
-        <Microsoft_VisualStudio_Debugger_Interop_10_0_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Debugger_Interop_10_0_Version>
-        <Microsoft_VisualStudio_Debugger_Interop_11_0_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Debugger_Interop_11_0_Version>
-        <Microsoft_VisualStudio_Debugger_Interop_12_0_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Debugger_Interop_12_0_Version>
-        <Microsoft_VisualStudio_Debugger_Interop_15_0_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Debugger_Interop_15_0_Version>
-        <Microsoft_VisualStudio_Debugger_Interop_16_0_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Debugger_Interop_16_0_Version>
-        <Microsoft_VisualStudio_Debugger_InteropA_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Debugger_InteropA_Version>
-        <Microsoft_VisualStudio_Shell_15_0_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Shell_15_0_Version>
-        <Microsoft_VisualStudio_Shell_Framework_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Shell_Framework_Version>
-        <Microsoft_VisualStudio_Threading_Version>17.0.17-alpha</Microsoft_VisualStudio_Threading_Version>
-        <Microsoft_VisualStudio_Utilities_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_Utilities_Version>
+        <Microsoft_VisualStudio_Debugger_Interop_10_0_Version>17.5.33428.388</Microsoft_VisualStudio_Debugger_Interop_10_0_Version>
+        <Microsoft_VisualStudio_Debugger_Interop_11_0_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_Interop_11_0_Version>
+        <Microsoft_VisualStudio_Debugger_Interop_12_0_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_Interop_12_0_Version>
+        <Microsoft_VisualStudio_Debugger_Interop_15_0_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_Interop_15_0_Version>
+        <Microsoft_VisualStudio_Debugger_Interop_16_0_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_Interop_16_0_Version>
+        <Microsoft_VisualStudio_Debugger_InteropA_Version>17.5.33428.366</Microsoft_VisualStudio_Debugger_InteropA_Version>
+        <Microsoft_VisualStudio_Shell_15_0_Version>17.8.37221</Microsoft_VisualStudio_Shell_15_0_Version>
+        <Microsoft_VisualStudio_Shell_Framework_Version>17.8.37221</Microsoft_VisualStudio_Shell_Framework_Version>
+        <Microsoft_VisualStudio_Threading_Version>17.8.14</Microsoft_VisualStudio_Threading_Version>
+        <Microsoft_VisualStudio_Utilities_Version>17.8.37221</Microsoft_VisualStudio_Utilities_Version>
         <Microsoft_VisualStudio_Shell_Interop_15_0_DesignTime_Version>15.0.26932</Microsoft_VisualStudio_Shell_Interop_15_0_DesignTime_Version>
         <Microsoft_VisualStudio_Workspace_Version>15.0.392</Microsoft_VisualStudio_Workspace_Version>
         <Microsoft_VisualStudio_Workspace_VSIntegration_Version>15.0.392</Microsoft_VisualStudio_Workspace_VSIntegration_Version>
-        <Microsoft_VisualStudio_TextManager_Interop_Version>17.0.0-previews-1-31410-258</Microsoft_VisualStudio_TextManager_Interop_Version>
+        <Microsoft_VisualStudio_TextManager_Interop_Version>17.8.37221</Microsoft_VisualStudio_TextManager_Interop_Version>
         <Microsoft_VSSDK_BuildTools_Version>17.3.2093</Microsoft_VSSDK_BuildTools_Version>
         <System_Runtime_Loader_Version>4.3.0</System_Runtime_Loader_Version>
     </PropertyGroup>
diff --git a/src/DebugEngineHost/DebugEngineHost.csproj b/src/DebugEngineHost/DebugEngineHost.csproj
index 5a09a365d..03bd58c69 100755
--- a/src/DebugEngineHost/DebugEngineHost.csproj
+++ b/src/DebugEngineHost/DebugEngineHost.csproj
@@ -88,8 +88,6 @@
       <IncludeAssets>compile</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-
-    <PackageReference Include="Microsoft.VisualStudio.Validation" Version="17.0.16-alpha" />
   </ItemGroup>
 
   <ItemGroup Label="Assembly to Generate">
diff --git a/src/MIDebugPackage/MIDebugPackage.csproj b/src/MIDebugPackage/MIDebugPackage.csproj
index 67e436c68..fe7a3a4ad 100755
--- a/src/MIDebugPackage/MIDebugPackage.csproj
+++ b/src/MIDebugPackage/MIDebugPackage.csproj
@@ -38,8 +38,6 @@
     <PackageReference Include="Microsoft.VisualStudio.Shell.15.0" Version="$(Microsoft_VisualStudio_Shell_15_0_Version)" />
     <PackageReference Include="Microsoft.VisualStudio.OLE.Interop" Version="17.0.0-previews-1-31410-258" />
 
-    <PackageReference Include="Microsoft.VisualStudio.Validation" Version="17.0.16-alpha" />
-
     <PackageReference Include="Microsoft.VisualStudio.Debugger.Interop.16.0" Version="$(Microsoft_VisualStudio_Debugger_Interop_16_0_Version)">
       <IncludeAssets>compile</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/MakePIAPortable/MakePIAPortable.csproj b/src/MakePIAPortable/MakePIAPortable.csproj
index 16fd00340..235f6baf0 100644
--- a/src/MakePIAPortable/MakePIAPortable.csproj
+++ b/src/MakePIAPortable/MakePIAPortable.csproj
@@ -41,13 +41,13 @@
   </ItemGroup>
 
   <ItemGroup> 
-    <MakePIAPortableFiles Include="$(PkgMicrosoft_VisualStudio_Debugger_InteropA)\lib\net45\Microsoft.VisualStudio.Debugger.InteropA.dll" />
-    <MakePIAPortableFiles Include="$(PkgMicrosoft_VisualStudio_Debugger_Interop_10_0)\lib\net45\Microsoft.VisualStudio.Debugger.Interop.10.0.dll" />
-    <MakePIAPortableFiles Include="$(PkgMicrosoft_VisualStudio_Debugger_Interop_11_0)\lib\net45\Microsoft.VisualStudio.Debugger.Interop.11.0.dll" />
-    <MakePIAPortableFiles Include="$(PkgMicrosoft_VisualStudio_Debugger_Interop_12_0)\lib\net45\Microsoft.VisualStudio.Debugger.Interop.12.0.dll" />
-    <MakePIAPortableFiles Include="$(PkgMicrosoft_VisualStudio_Debugger_Interop_15_0)\lib\net45\Microsoft.VisualStudio.Debugger.Interop.15.0.dll" />
-    <MakePIAPortableFiles Include="$(PkgMicrosoft_VisualStudio_Debugger_Interop_16_0)\lib\net45\Microsoft.VisualStudio.Debugger.Interop.16.0.dll" />
-    <MakePIAPortableFiles Include="$(PkgMicrosoft_VisualStudio_Interop)\lib\net45\Microsoft.VisualStudio.Interop.dll" />
+    <MakePIAPortableFiles Include="$(PkgMicrosoft_VisualStudio_Debugger_InteropA)\lib\net472\Microsoft.VisualStudio.Debugger.InteropA.dll" />
+    <MakePIAPortableFiles Include="$(PkgMicrosoft_VisualStudio_Debugger_Interop_10_0)\lib\net472\Microsoft.VisualStudio.Debugger.Interop.10.0.dll" />
+    <MakePIAPortableFiles Include="$(PkgMicrosoft_VisualStudio_Debugger_Interop_11_0)\lib\net472\Microsoft.VisualStudio.Debugger.Interop.11.0.dll" />
+    <MakePIAPortableFiles Include="$(PkgMicrosoft_VisualStudio_Debugger_Interop_12_0)\lib\net472\Microsoft.VisualStudio.Debugger.Interop.12.0.dll" />
+    <MakePIAPortableFiles Include="$(PkgMicrosoft_VisualStudio_Debugger_Interop_15_0)\lib\net472\Microsoft.VisualStudio.Debugger.Interop.15.0.dll" />
+    <MakePIAPortableFiles Include="$(PkgMicrosoft_VisualStudio_Debugger_Interop_16_0)\lib\net472\Microsoft.VisualStudio.Debugger.Interop.16.0.dll" />
+    <MakePIAPortableFiles Include="$(PkgMicrosoft_VisualStudio_Interop)\lib\net472\Microsoft.VisualStudio.Interop.dll" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/src/SSHDebugPS/SSHDebugPS.csproj b/src/SSHDebugPS/SSHDebugPS.csproj
index 677a34d63..f270e64e6 100644
--- a/src/SSHDebugPS/SSHDebugPS.csproj
+++ b/src/SSHDebugPS/SSHDebugPS.csproj
@@ -27,8 +27,6 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
 
-    <PackageReference Include="Microsoft.VisualStudio.Validation" Version="17.0.16-alpha" />
-
     <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" Version="$(Microsoft_VisualStudioEng_MicroBuild_Core_Version)" GeneratePathProperty="true" />
   </ItemGroup>
 
diff --git a/src/SSHDebugPS/UI/ContainerPickerDialogWindow.xaml b/src/SSHDebugPS/UI/ContainerPickerDialogWindow.xaml
index c765009f6..cfdc1e8d6 100644
--- a/src/SSHDebugPS/UI/ContainerPickerDialogWindow.xaml
+++ b/src/SSHDebugPS/UI/ContainerPickerDialogWindow.xaml
@@ -6,7 +6,7 @@
                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                  xmlns:platformui="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
-                 xmlns:vsui="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell"
+                 xmlns:vsui="clr-namespace:Microsoft.VisualStudio.Shell;assembly=Microsoft.VisualStudio.Shell.15.0"
                  xmlns:vsimaging="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.Imaging"
                  xmlns:catalog="clr-namespace:Microsoft.VisualStudio.Imaging;assembly=Microsoft.VisualStudio.ImageCatalog"
                  xmlns:local="clr-namespace:Microsoft.SSHDebugPS"
@@ -18,22 +18,116 @@
                  Height="600"
                  ShowInTaskbar="False"
                  Name="ContainerPickerDialog"
+                 Background="{DynamicResource {x:Static platformui:ThemedDialogColors.WindowPanelBrushKey}}"
+                 Foreground="{DynamicResource {x:Static platformui:ThemedDialogColors.WindowPanelTextBrushKey}}"
                  FontFamily="{DynamicResource VsFont.EnvironmentFontFamily}"
                  FontSize="{DynamicResource VsFont.EnvironmentFontSize}"
                  Title="{x:Static local:UIResources.DialogTitle}"
                  WindowStartupLocation="CenterOwner">
+    <WindowChrome.WindowChrome>
+        <WindowChrome
+            CaptionHeight="32"
+            GlassFrameThickness="1"
+            ResizeBorderThickness="5"
+            UseAeroCaptionButtons="False" />
+    </WindowChrome.WindowChrome>
+
+
     <platformui:DialogWindow.Resources>
         <!-- Converters-->
         <docker:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+        <docker:BoolToVisibilityConverter x:Key="InverseBoolToVisibilityConverter" Negative="True" />
         <docker:TextToVisibilityConverter x:Key="TextToVisibilityConverter" />
         <!--Styles-->
+        <!-- Title Bar -->
+        <Style x:Key="TitleBarButtonStyle" TargetType="Button">
+            <Setter Property="Focusable" Value="False" />
+            <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+            <Setter Property="Background" Value="{Binding Background, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" />
+            <Setter Property="Foreground" Value="{Binding Foreground, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}" />
+            <Setter Property="BorderBrush" Value="Transparent" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="HorizontalContentAlignment" Value="Center" />
+            <Setter Property="VerticalContentAlignment" Value="Center" />
+            <Setter Property="Width" Value="46" />
+            <Setter Property="Height" Value="32" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <Border x:Name="border"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Background="{TemplateBinding Background}"
+                                SnapsToDevicePixels="True">
+                            <ContentPresenter Focusable="False"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    RecognizesAccessKey="True"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" Value="{DynamicResource {x:Static platformui:ThemedDialogColors.WindowButtonHoverBrushKey}}" />
+                                <Setter Property="Foreground" Value="{DynamicResource {x:Static platformui:ThemedDialogColors.WindowButtonHoverGlyphBrushKey}}" />
+                                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static platformui:ThemedDialogColors.WindowButtonHoverBorderBrushKey}}" />
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Background" Value="{DynamicResource {x:Static platformui:ThemedDialogColors.WindowButtonDownBrushKey}}" />
+                                <Setter Property="Foreground" Value="{DynamicResource {x:Static platformui:ThemedDialogColors.WindowButtonDownGlyphBrushKey}}" />
+                                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static platformui:ThemedDialogColors.WindowButtonDownBorderBrushKey}}" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+        <Style x:Key="ExpanderButtonStyle" TargetType="{x:Type Button}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type Button}">
+                        <Border x:Name="border"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                Background="{TemplateBinding Background}"
+                                SnapsToDevicePixels="True">
+                            <ContentPresenter Focusable="False"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    RecognizesAccessKey="True"
+                                    SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter Property="Background" Value="{DynamicResource {x:Static platformui:ThemedDialogColors.WindowButtonHoverBrushKey}}" />
+                                <Setter Property="Foreground" Value="{DynamicResource {x:Static platformui:ThemedDialogColors.WindowButtonHoverGlyphBrushKey}}" />
+                                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static platformui:ThemedDialogColors.WindowButtonHoverBorderBrushKey}}" />
+                            </Trigger>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter Property="Background" Value="{DynamicResource {x:Static platformui:ThemedDialogColors.WindowButtonDownBrushKey}}" />
+                                <Setter Property="Foreground" Value="{DynamicResource {x:Static platformui:ThemedDialogColors.WindowButtonDownGlyphBrushKey}}" />
+                                <Setter Property="BorderBrush" Value="{DynamicResource {x:Static platformui:ThemedDialogColors.WindowButtonDownBorderBrushKey}}" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+
+        <Style x:Key="TitleBarButtonPathStyle" TargetType="{x:Type Path}">
+            <Setter Property="Width" Value="16" />
+            <Setter Property="Height" Value="16" />
+            <Setter Property="HorizontalAlignment" Value="Center" />
+            <Setter Property="VerticalAlignment" Value="Center" />
+            <Setter Property="Fill" Value="{Binding Path=(TextElement.Foreground), RelativeSource={RelativeSource Self}}" />
+        </Style>
+
         <Style x:Key="GlyphPathStyle"
                TargetType="{x:Type Path}">
             <Setter Property="Stroke"
                             Value="{Binding Foreground, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=ListBoxItem}}" />
         </Style>
         <Style x:Key="ConnectionTypeComboBoxStyle"
-               TargetType="{x:Type ComboBox}">
+               TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Static vsui:VsResourceKeys.ComboBoxStyleKey}}">
             <Setter Property="Grid.ColumnSpan"
                             Value="1" />
             <Setter Property="IsEnabled"
@@ -54,6 +148,7 @@
                     Value="0" />
             <Setter Property="Margin"
                     Value="0" />
+            <Setter Property="Foreground" Value="{DynamicResource {x:Static platformui:ThemedDialogColors.WindowButtonGlyphBrushKey}}" />
         </Style>
         <Style x:Key="HeaderLabelStyle"
                TargetType="{x:Type TextBlock}">
@@ -92,7 +187,7 @@
                     Value="6,4,12,0" />
         </Style>
         <Style x:Key="ComboBoxItemStyle"
-               TargetType="{x:Type ComboBoxItem}">
+               TargetType="{x:Type ComboBoxItem}" BasedOn="{StaticResource {x:Static vsui:VsResourceKeys.ComboBoxItemStyleKey}}">
             <Setter Property="AutomationProperties.Name"
                     Value="{Binding DisplayName}" />
         </Style>
@@ -103,7 +198,7 @@
                     Value="Transparent" />
         </Style>
         <Style x:Key="ListBoxStyle"
-               TargetType="{x:Type ListBox}">
+               TargetType="{x:Type ListBox}" BasedOn="{StaticResource {x:Static vsui:VsResourceKeys.ThemedDialogListBoxStyleKey}}">
             <EventSetter Event="GotKeyboardFocus"
                          Handler="ListBox_GotKeyboardFocus" />
             <Setter Property="ItemTemplate"
@@ -132,18 +227,8 @@
             </Setter>
         </Style>
         <Style x:Key="ListBoxContainerStyle"
-               TargetType="{x:Type ListBoxItem}">
-            <Style.Triggers>
-                <Trigger Property="IsSelected"
-                         Value="true">
-                    <Setter Property="BorderThickness"
-                            Value="1" />
-                    <Setter Property="BorderBrush"
-                            Value="{DynamicResource {x:Static platformui:EnvironmentColors.SystemActiveBorderBrushKey}}" />
-                    <Setter Property="Padding"
-                            Value="0" />
-                </Trigger>
-            </Style.Triggers>
+               TargetType="{x:Type ListViewItem}" BasedOn="{StaticResource {x:Static vsui:VsResourceKeys.ThemedDialogListViewItemStyleKey}}">
+
             <Setter Property="AutomationProperties.Name"
                     Value="{Binding DockerViewModelAutomationName, Mode=OneWay}" />
             <Setter Property="DockPanel.Dock"
@@ -177,93 +262,6 @@
                 </Setter.Value>
             </Setter>
         </Style>
-        <!-- ***** Hyperlink Button Styles ***** -->
-        <!--
-        NOTE: This style was copied from vsproject\connectedservices\package\styles\hyperlinkbutton.xaml
-
-        This style only makes sense if the Button content is a string!
-        A "proper" button template might use a ContentPresenter for the
-        content, but that makes adding the underline decoration on
-        mouseover much more arduous.  (It's possible, but ugly.)
-
-        Since a HyperlinkButton with content *other* than text doesn't
-        really make much sense, we simplify the template and go directly
-        to a TextBlock.
-        -->
-        <Style x:Key="HyperlinkButton"
-               TargetType="{x:Type Button}">
-            <Setter Property="Background"
-                    Value="Transparent" />
-            <Setter Property="Foreground"
-                    Value="{DynamicResource {x:Static platformui:EnvironmentColors.ControlLinkTextBrushKey}}" />
-            <Setter Property="Margin"
-                    Value="0" />
-            <Setter Property="Padding"
-                    Value="0" />
-            <Setter Property="HorizontalAlignment"
-                    Value="Center" />
-            <Setter Property="VerticalAlignment"
-                    Value="Center" />
-            <Setter Property="SnapsToDevicePixels"
-                    Value="True" />
-            <Setter Property="FocusVisualStyle"
-                    Value="{StaticResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type Button}">
-                        <TextBlock x:Name="text"
-                                   Foreground="{TemplateBinding Foreground}"
-                                   Padding="{TemplateBinding Padding}"
-                                   HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
-                                   VerticalAlignment="{TemplateBinding VerticalAlignment}"
-                                   SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}">
-                        <AccessText x:Name="accessText"
-                                    Text="{TemplateBinding Content}" />
-                        </TextBlock>
-                        <ControlTemplate.Triggers>
-                            <!-- same visual treatment for mouse-over, focus, and pressed (activated) -->
-                            <Trigger Property="IsFocused"
-                                     Value="True">
-                                <Setter Property="Foreground"
-                                        Value="{DynamicResource {x:Static platformui:EnvironmentColors.ControlLinkTextBrushKey}}" />
-                            </Trigger>
-                            <Trigger Property="IsMouseOver"
-                                     Value="True">
-                                <Setter Property="Foreground"
-                                        Value="{DynamicResource {x:Static platformui:EnvironmentColors.ControlLinkTextBrushKey}}" />
-                                <Setter TargetName="accessText"
-                                        Property="TextDecorations"
-                                        Value="Underline" />
-                                <Setter Property="Cursor"
-                                        Value="Hand" />
-                            </Trigger>
-                            <Trigger Property="IsPressed"
-                                     Value="True">
-                                <Setter Property="Foreground"
-                                        Value="{DynamicResource {x:Static platformui:EnvironmentColors.ControlLinkTextBrushKey}}" />
-                            </Trigger>
-                            <!-- None of our links should be disabled, but keep the style just in case -->
-                            <Trigger Property="IsEnabled"
-                                     Value="False">
-                                <Setter Property="Foreground"
-                                        Value="{DynamicResource {x:Static platformui:EnvironmentColors.PanelHyperlinkDisabledBrushKey}}" />
-                                <!--
-                                When more than one active trigger set the same property,
-                                the last trigger wins.  Thus, we also set the decoration
-                                and cursor to ensure the button/link doesn't appear active.
-                            -->
-                                <Setter TargetName="accessText"
-                                        Property="TextDecorations"
-                                        Value="None" />
-                                <Setter Property="Cursor"
-                                        Value="Arrow" />
-                            </Trigger>
-
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
         <DataTemplate x:Key="instanceLayout"
                       DataType="DockerContainerViewModel">
             <Grid>
@@ -278,6 +276,7 @@
                 <Button x:Name="ContainerDetailsExpander" 
                         Grid.Row="0"
                         Grid.Column="0"
+                        Style="{StaticResource ExpanderButtonStyle}"
                         AutomationProperties.Name="{x:Static local:UIResources.ExpandCommandAutomationName}"
                         AutomationProperties.ItemStatus="{Binding ExpanderItemStatus}"
                         Command="{Binding ExpandCommand}"
@@ -295,7 +294,7 @@
                               SnapsToDevicePixels="false"
                               StrokeThickness="2"
                               VerticalAlignment="Center"
-                              Visibility="{Binding IsExpanded, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter=flip, Mode=OneWay}" />
+                              Visibility="{Binding IsExpanded, Converter={StaticResource InverseBoolToVisibilityConverter}, Mode=OneWay}" />
                         <Path x:Name="downArrow"
                               AutomationProperties.HelpText="{x:Static local:UIResources.Expanded}"
                               Style="{StaticResource GlyphPathStyle}"
@@ -448,32 +447,64 @@
     </platformui:DialogWindow.Resources>
 
     <!-- Main layout grid -->
-    <Grid Margin="12">
+    <Grid Focusable="False">
         <Grid.RowDefinitions>
-            <!--0:Connection label-->
-            <RowDefinition Height="Auto" />
-            <!--1:Connection combo box, Add new connection-->
-            <RowDefinition Height="Auto" />
-            <!--2:Hostname label-->
-            <RowDefinition Height="Auto" />
-            <!--3:Hostname textbox -->
-            <RowDefinition Height="Auto" />
-            <!--4:Container status/refresh button-->
-            <RowDefinition Height="Auto" />
-            <!--5:ContainerList-->
+            <RowDefinition Height="32" />
             <RowDefinition Height="*" />
-            <!--6:Warning Icon and Status Text -->
-            <RowDefinition Height="Auto" />
-            <!--7:OK/Cancel -->
-            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
-        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
-        </Grid.ColumnDefinitions>
 
-        <!--Connection Type Picker-->
-        <Label Grid.Row="0"
+        <!-- Title Bar -->
+        <Grid Grid.Row="0">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Grid.Column="0"
+                    FontSize="14"
+                    Margin="12,2,0,0"
+                    VerticalAlignment="Center"
+                    Text="{x:Static local:UIResources.DialogTitle}">
+            </TextBlock>
+            <StackPanel Grid.Column="1"
+                    Orientation="Horizontal"
+                    HorizontalAlignment="Right"
+                    WindowChrome.IsHitTestVisibleInChrome="true">
+
+                <Button Style="{DynamicResource TitleBarButtonStyle}" Click="CloseButton_Click">
+                    <Path Data="F1M8.583,8L13,12.424 12.424,13 8,8.583 3.576,13 3,12.424 7.417,8 3,3.576 3.576,3 8,7.417 12.424,3 13,3.576z"
+                          Style="{StaticResource TitleBarButtonPathStyle}" />
+                </Button>
+            </StackPanel>
+        </Grid>
+        
+        <!-- Content -->
+        <Grid Grid.Row="1" Margin="12" >
+            <Grid.RowDefinitions>
+                <!--0:Connection label-->
+                <RowDefinition Height="Auto" />
+                <!--1:Connection combo box, Add new connection-->
+                <RowDefinition Height="Auto" />
+                <!--2:Hostname label-->
+                <RowDefinition Height="Auto" />
+                <!--3:Hostname textbox -->
+                <RowDefinition Height="Auto" />
+                <!--4:Container status/refresh button-->
+                <RowDefinition Height="Auto" />
+                <!--5:ContainerList-->
+                <RowDefinition Height="*" />
+                <!--6:Warning Icon and Status Text -->
+                <RowDefinition Height="Auto" />
+                <!--7:OK/Cancel -->
+                <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="*" />
+                <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+
+            <!--Connection Type Picker-->
+            <Label Grid.Row="0"
                Grid.ColumnSpan="2"
                x:Uid="uidConnectionTypeLabel"
                x:Name="ConnectionTypeLabel"
@@ -482,7 +513,7 @@
                Style="{StaticResource MainLabelStyle}"
                Target="{Binding ElementName=ConnectionTypeComboBox}"
                Content="{x:Static local:UIResources.ConnectionLabel}" />
-        <ComboBox Grid.Row="1"
+            <ComboBox Grid.Row="1"
                   Grid.Column="0"
                   x:Uid="uidConnectionTypeComboBox"
                   x:Name="ConnectionTypeComboBox"
@@ -494,11 +525,12 @@
                   DisplayMemberPath="DisplayName"
                   ItemContainerStyle="{StaticResource ComboBoxItemStyle}"
                   Style="{StaticResource ConnectionTypeComboBoxStyle}">
-        </ComboBox>
-        <Button Grid.Row="1"
+            </ComboBox>
+            <Button Grid.Row="1"
                 Grid.Column="1"
                 x:Uid="uidAddConnection"
-                x:Name="AddConnection"  
+                x:Name="AddConnection"
+                Style="{StaticResource {x:Static vsui:VsResourceKeys.ButtonStyleKey}}"
                 AutomationProperties.Name="{x:Static local:UIResources.AddNewSSHConnectionAutomationName}"
                 Margin="12,4,0,0"
                 MinWidth="75"
@@ -509,9 +541,9 @@
                 ToolTip="{Binding AddSSHConnectionCommand.ToolTip}"
                 Visibility="{Binding SupportSSHConnections, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}"/>
 
-        <!-- Hostname label and textbox -->
+            <!-- Hostname label and textbox -->
 
-        <Label Grid.Row="2"
+            <Label Grid.Row="2"
                Grid.ColumnSpan="2"
                x:Uid="uidHostnameLabel"
                x:Name="HostnameLabel"
@@ -521,8 +553,9 @@
                Style="{StaticResource MainLabelStyle}"
                Target="{Binding ElementName=hostnameTextBox}"
                Content="{x:Static local:UIResources.HostnameLabel}" />
-        <TextBox Grid.Row="3"
+            <TextBox Grid.Row="3"
                  Grid.ColumnSpan="2"
+                Style="{StaticResource {x:Static vsui:VsResourceKeys.TextBoxStyleKey}}"
                  Margin="0,4,0,0"
                  Padding="2"
                  x:Uid="uidHostnameTextBox"
@@ -530,13 +563,13 @@
                  AutomationProperties.Name="{x:Static local:UIResources.HostnameAutomationName}"
                  Text="{Binding Path=Hostname, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
                  ToolTip="{x:Static local:UIResources.HostnameTip}">
-            <TextBox.InputBindings>
-                <KeyBinding Key="Enter" Command="{Binding RefreshCommand}" />
-            </TextBox.InputBindings>
-        </TextBox>
+                <TextBox.InputBindings>
+                    <KeyBinding Key="Enter" Command="{Binding RefreshCommand}" />
+                </TextBox.InputBindings>
+            </TextBox>
 
-        <!-- Container Count Text and Refresh Button -->
-        <platformui:LiveTextBlock Grid.Row="4"
+            <!-- Container Count Text and Refresh Button -->
+            <platformui:LiveTextBlock Grid.Row="4"
                    Grid.Column="0"
                    Margin="0,9,0,0"
                    x:Uid="uidStatusLabel"
@@ -544,7 +577,7 @@
                    Text="{Binding ContainersFoundText, Mode=OneWay}"
                    TextWrapping="Wrap" />
 
-        <Button Grid.Row="4"
+            <Button Grid.Row="4"
                 Grid.Column="1"
                 x:Name="RefreshContainerListButton"
                 Margin="12,9,0,0"
@@ -552,28 +585,28 @@
                 Command="{Binding RefreshCommand}"
                 Content="{Binding RefreshCommand.Label}"
                 ToolTip="{Binding RefreshCommand.ToolTip}"
-                Style="{StaticResource HyperlinkButton}" />
+                Style="{StaticResource {x:Static vsui:VsResourceKeys.ButtonStyleKey}}"/>
 
-        <!-- Container Instance display-->
-        <ui:ContainerListBox Grid.Row="5"
+            <!-- Container Instance display-->
+            <ui:ContainerListView Grid.Row="5"
                  Grid.ColumnSpan="2"
                  Margin="0,4,0,0"
                  Padding="4"
-                 x:Name="ContainerListBox"
+                 x:Name="ContainerListView"
                  AutomationProperties.Name="{x:Static local:UIResources.ContainerList}"
-                 AutomationProperties.AutomationId="aidContainerListBox"
+                 AutomationProperties.AutomationId="aidContainerListView"
                  ItemsSource="{Binding Path=ContainerInstances, Mode=OneWay }"
                  SelectedValue="{Binding SelectedContainerInstance}"
+                 GotKeyboardFocus="ContainerListView_GotKeyboardFocus"
                  ItemContainerStyle="{StaticResource ListBoxContainerStyle}"
-                 GotKeyboardFocus="ContainerListBox_GotKeyboardFocus"
                  Style="{StaticResource ListBoxStyle}"
-                 PreviewKeyDown="ContainerListBox_PreviewKeyDown" />
+                 PreviewKeyDown="ContainerListView_PreviewKeyDown" />
 
-        <!-- Status text -->
-        <DockPanel Grid.Row="6"
+            <!-- Status text -->
+            <DockPanel Grid.Row="6"
                    Grid.ColumnSpan="2"
                    Visibility="{Binding StatusMessage, Converter={StaticResource TextToVisibilityConverter}, Mode=Oneway}">
-            <vsimaging:CrispImage DockPanel.Dock="Left"
+                <vsimaging:CrispImage DockPanel.Dock="Left"
                                   x:Name="WarningIcon"
                                   Width="16"
                                   Height="16"
@@ -582,31 +615,33 @@
                                   Margin="4,4,0,0"
                                   Visibility="{Binding StatusIsError, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}"
                                   Moniker="{x:Static catalog:KnownMonikers.StatusWarning}" />
-            <platformui:LiveTextBlock DockPanel.Dock="Right"
+                <platformui:LiveTextBlock DockPanel.Dock="Right"
                        x:Name="StatusMessage"
                        TextWrapping="WrapWithOverflow"
                        Margin="6,12,9,6"
                        Text="{Binding StatusMessage}" />
-        </DockPanel>
+            </DockPanel>
 
-        <!-- OK / Cancel buttons -->
-        <UniformGrid Grid.Row="7"
+            <!-- OK / Cancel buttons -->
+            <UniformGrid Grid.Row="7"
                      Grid.ColumnSpan="2"
                      Margin="0,12,0,0"
                      HorizontalAlignment="Right"
                      VerticalAlignment="Bottom"
                      Rows="1"
                      Columns="2">
-            <Button x:Uid="uidOkayButton"
+                <Button x:Uid="uidOkayButton"
                     x:Name="OkayButton"
+                    Style="{StaticResource {x:Static vsui:VsResourceKeys.ButtonStyleKey}}"
                     MinHeight="23"
                     MinWidth="75"
                     IsDefault="True"
                     Command="{Binding OKCommand}"
                     CommandParameter="{Binding ElementName=ContainerPickerDialog}"
                     Content="{Binding OKCommand.Label}"/>
-            <Button x:Uid="uidCancelButton"
+                <Button x:Uid="uidCancelButton"
                     x:Name="CancelButton"
+                    Style="{StaticResource {x:Static vsui:VsResourceKeys.ButtonStyleKey}}"
                     Margin="6,0,0,0"
                     MinHeight="23"
                     MinWidth="75"
@@ -614,7 +649,8 @@
                     Command="{Binding CancelCommand}"
                     CommandParameter="{Binding ElementName=ContainerPickerDialog}"
                     Content="{Binding CancelCommand.Label}" />
-        </UniformGrid>
+            </UniformGrid>
+        </Grid>
 
     </Grid>
 </platformui:DialogWindow>
diff --git a/src/SSHDebugPS/UI/ContainerPickerDialogWindow.xaml.cs b/src/SSHDebugPS/UI/ContainerPickerDialogWindow.xaml.cs
index adcdacffc..feec9e5b7 100644
--- a/src/SSHDebugPS/UI/ContainerPickerDialogWindow.xaml.cs
+++ b/src/SSHDebugPS/UI/ContainerPickerDialogWindow.xaml.cs
@@ -4,15 +4,18 @@
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Runtime.InteropServices;
 using System.Windows;
 using System.Windows.Automation;
 using System.Windows.Automation.Provider;
 using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Input;
+using System.Windows.Interop;
 using Microsoft.SSHDebugPS.Docker;
 using Microsoft.SSHDebugPS.UI;
 using Microsoft.SSHDebugPS.Utilities;
+using Microsoft.VisualStudio.OLE.Interop;
 using Microsoft.VisualStudio.PlatformUI;
 
 namespace Microsoft.SSHDebugPS.UI
@@ -24,10 +27,11 @@ public partial class ContainerPickerDialogWindow : DialogWindow
     {
         public ContainerPickerDialogWindow(bool supportSSHConnections)
         {
-            InitializeComponent();
             _model = new ContainerPickerViewModel(supportSSHConnections);
             this.DataContext = _model;
             this.Loaded += OnWindowLoaded;
+
+            InitializeComponent();
         }
 
         private void OnWindowLoaded(object sender, RoutedEventArgs e)
@@ -35,13 +39,13 @@ private void OnWindowLoaded(object sender, RoutedEventArgs e)
             bool listItemFocused = false;
             try
             {
-                if (ContainerListBox != null && ContainerListBox.HasItems)
+                if (ContainerListView != null && ContainerListView.HasItems)
                 {
-                    if (ContainerListBox.SelectedItem == null)
+                    if (ContainerListView.SelectedItem == null)
                     {
-                        ContainerListBox.SelectedIndex = 0;
+                        ContainerListView.SelectedIndex = 0;
                     }
-                    ((ListBoxItem)ContainerListBox.ItemContainerGenerator.ContainerFromItem(ContainerListBox.SelectedItem)).Focus();
+                    ((ListBoxItem)ContainerListView.ItemContainerGenerator.ContainerFromItem(ContainerListView.SelectedItem)).Focus();
                     listItemFocused = true;
                 }
             }
@@ -57,6 +61,15 @@ private void OnWindowLoaded(object sender, RoutedEventArgs e)
             }
             e.Handled = true;
         }
+        private void CloseButton_Click(object sender, RoutedEventArgs e)
+        {
+            CloseWindow();
+        }
+
+        private void CloseWindow()
+        {
+            Close();
+        }
 
         #region Properties
         public event PropertyChangedEventHandler PropertyChanged;
@@ -87,7 +100,7 @@ private void ListBox_GotKeyboardFocus(object sender, RoutedEventArgs e)
             }
         }
 
-        private void ContainerListBox_GotKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
+        private void ContainerListView_GotKeyboardFocus(object sender, KeyboardFocusChangedEventArgs e)
         {
             ListBoxItem item = e.OriginalSource as ListBoxItem;
 
@@ -97,7 +110,7 @@ private void ContainerListBox_GotKeyboardFocus(object sender, KeyboardFocusChang
             }
         }
 
-        private void ContainerListBox_PreviewKeyDown(object sender, KeyEventArgs e)
+        private void ContainerListView_PreviewKeyDown(object sender, KeyEventArgs e)
         {
             if (sender is ListBox list)
             {
diff --git a/src/SSHDebugPS/UI/Controls/Automation/ContainerListBoxItemAutomationPeer.cs b/src/SSHDebugPS/UI/Controls/Automation/ContainerListBoxItemAutomationPeer.cs
index dbf23fa38..47c660e2b 100644
--- a/src/SSHDebugPS/UI/Controls/Automation/ContainerListBoxItemAutomationPeer.cs
+++ b/src/SSHDebugPS/UI/Controls/Automation/ContainerListBoxItemAutomationPeer.cs
@@ -11,12 +11,12 @@ namespace Microsoft.SSHDebugPS.UI
     /// This automationpeer class is here to support the custom expand/collapse action on the listbox item
     /// </summary>
     /// <typeparam name="T">Must be IContainerViewModel</typeparam>
-    public class ContainerListBoxItemAutomationPeer<T> : 
+    public class ContainerListViewItemAutomationPeer<T> : 
         ListBoxItemAutomationPeer, 
         IExpandCollapseProvider 
         where T : IContainerViewModel
     {
-        public ContainerListBoxItemAutomationPeer(object item, ContainerListBoxAutomationPeer ownerAutomationPeer)
+        public ContainerListViewItemAutomationPeer(object item, ContainerListViewAutomationPeer ownerAutomationPeer)
             : base(item, ownerAutomationPeer)
         { }
 
diff --git a/src/SSHDebugPS/UI/Controls/Automation/ContainerListBoxAutomationPeer.cs b/src/SSHDebugPS/UI/Controls/Automation/ContainerListViewAutomationPeer.cs
similarity index 61%
rename from src/SSHDebugPS/UI/Controls/Automation/ContainerListBoxAutomationPeer.cs
rename to src/SSHDebugPS/UI/Controls/Automation/ContainerListViewAutomationPeer.cs
index 8c204eab8..9efcf9650 100644
--- a/src/SSHDebugPS/UI/Controls/Automation/ContainerListBoxAutomationPeer.cs
+++ b/src/SSHDebugPS/UI/Controls/Automation/ContainerListViewAutomationPeer.cs
@@ -5,15 +5,15 @@
 
 namespace Microsoft.SSHDebugPS.UI
 {
-    public class ContainerListBoxAutomationPeer : ListBoxAutomationPeer
+    public class ContainerListViewAutomationPeer : ListViewAutomationPeer
     {
-        public ContainerListBoxAutomationPeer(ContainerListBox owner)
+        public ContainerListViewAutomationPeer(ContainerListView owner)
             : base(owner)
         { }
 
         protected override ItemAutomationPeer CreateItemAutomationPeer(object item)
         {
-            return new ContainerListBoxItemAutomationPeer<DockerContainerViewModel>(item, this);
+            return new ContainerListViewItemAutomationPeer<DockerContainerViewModel>(item, this);
         }
     }
 }
diff --git a/src/SSHDebugPS/UI/Controls/ContainerListBox.cs b/src/SSHDebugPS/UI/Controls/ContainerListBox.cs
index 40d84cd6c..30e8d5c5b 100644
--- a/src/SSHDebugPS/UI/Controls/ContainerListBox.cs
+++ b/src/SSHDebugPS/UI/Controls/ContainerListBox.cs
@@ -6,11 +6,11 @@
 
 namespace Microsoft.SSHDebugPS.UI
 {
-    public class ContainerListBox : ListBox
+    public class ContainerListView : ListView
     {
         protected override AutomationPeer OnCreateAutomationPeer()
         {
-            return new ContainerListBoxAutomationPeer(this);
+            return new ContainerListViewAutomationPeer(this);
         }
     }
 }
diff --git a/src/SSHDebugPS/UI/Converters/BoolToVisibilityConverter.cs b/src/SSHDebugPS/UI/Converters/BoolToVisibilityConverter.cs
index b2a983bb3..81e7bf42a 100644
--- a/src/SSHDebugPS/UI/Converters/BoolToVisibilityConverter.cs
+++ b/src/SSHDebugPS/UI/Converters/BoolToVisibilityConverter.cs
@@ -9,12 +9,13 @@ namespace Microsoft.SSHDebugPS.Docker
 {
     internal class BoolToVisibilityConverter : IValueConverter
     {
+        public bool Negative { get; set; }
+
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
             if (targetType == typeof(Visibility))
             {
-                // Could have a parameter
-                if (parameter != null)
+                if (Negative)
                 {
                     // Only allowed param is flip
                     return (bool)value ? Visibility.Collapsed : Visibility.Visible;
diff --git a/src/tools/MakePIAPortableTool/MakePIAPortableTool.cs b/src/tools/MakePIAPortableTool/MakePIAPortableTool.cs
index a4740d4f7..7019f918e 100644
--- a/src/tools/MakePIAPortableTool/MakePIAPortableTool.cs
+++ b/src/tools/MakePIAPortableTool/MakePIAPortableTool.cs
@@ -67,6 +67,8 @@ class Program
             { "System.DateTime", System_Runtime },
             { "System.ObsoleteAttribute", System_Runtime },
             { "System.Attribute", System_Runtime },
+            { "System.AttributeUsageAttribute", System_Runtime },
+            { "System.AttributeTargets", System_Runtime },
 
             // System.Runtime.InteropServices
             { "System.Runtime.InteropServices.ClassInterfaceAttribute", System_Runtime_InteropServices },
@@ -302,7 +304,8 @@ private static bool IsIgnoredCustomAttributeLine(string line)
                 line.Contains(".custom instance void [mscorlib]System.Runtime.InteropServices.TypeLibFuncAttribute::.ctor(") ||
                 line.Contains(".custom instance void [mscorlib]System.Runtime.InteropServices.TypeLibFuncAttribute::.ctor(") ||
                 line.Contains(".custom instance void [mscorlib]System.Resources.SatelliteContractVersionAttribute::.ctor(") ||
-                line.Contains(".custom instance void [mscorlib]System.Runtime.CompilerServices.DateTimeConstantAttribute::.ctor(");
+                line.Contains(".custom instance void [mscorlib]System.Runtime.CompilerServices.DateTimeConstantAttribute::.ctor(") ||
+                line.Contains(".custom instance void System.Runtime.CompilerServices.NullableAttribute::.ctor(");
         }
 
         private static void SkipClass(InputFile inputFile)