Skip to content

Commit

Permalink
Theme Docker Container Selector Dialog (#1430)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
WardenGnaw authored Jan 2, 2024
1 parent 2a0f9ef commit 4017519
Show file tree
Hide file tree
Showing 12 changed files with 247 additions and 200 deletions.
26 changes: 13 additions & 13 deletions build/package_versions.settings.targets
Original file line number Diff line number Diff line change
@@ -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 -->
Expand All @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions src/DebugEngineHost/DebugEngineHost.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
2 changes: 0 additions & 2 deletions src/MIDebugPackage/MIDebugPackage.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
14 changes: 7 additions & 7 deletions src/MakePIAPortable/MakePIAPortable.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions src/SSHDebugPS/SSHDebugPS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Loading

0 comments on commit 4017519

Please sign in to comment.