Skip to content

Cherry-pick Docker 'Platform' returns an object instead of a string in Docker Desktop v4.42.0 to rel/d17.14 and Security Updates #1506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WardenGnaw merged 2 commits into from
Jun 24, 2025
Merged

Cherry-pick Docker 'Platform' returns an object instead of a string in Docker Desktop v4.42.0 to rel/d17.14 and Security Updates #1506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffed47c
Docker 'Platform' returns an object instead of a string in Docker Des…
Copilot Jun 19, 2025
3ba2f8e
Update MS.VS. Packages for CG Alert (#1508)
WardenGnaw Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions build/package_versions.settings.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<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.12.40391</Microsoft_VisualStudio_Interop_Version>
<Microsoft_VisualStudio_Interop_Version>17.13.40008</Microsoft_VisualStudio_Interop_Version>
<Newtonsoft_Json_Version>13.0.3</Newtonsoft_Json_Version>
<Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>17.14.10225.1</Microsoft_VisualStudio_Shared_VSCodeDebugProtocol_Version>

Expand All @@ -26,13 +26,13 @@
<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.12.40392</Microsoft_VisualStudio_Shell_15_0_Version>
<Microsoft_VisualStudio_Shell_Framework_Version>17.12.40391</Microsoft_VisualStudio_Shell_Framework_Version>
<Microsoft_VisualStudio_Threading_Version>17.12.19</Microsoft_VisualStudio_Threading_Version>
<Microsoft_VisualStudio_Utilities_Version>17.12.40391</Microsoft_VisualStudio_Utilities_Version>
<Microsoft_VisualStudio_Shell_Framework_Version>17.13.40008</Microsoft_VisualStudio_Shell_Framework_Version>
<Microsoft_VisualStudio_Threading_Version>17.13.2</Microsoft_VisualStudio_Threading_Version>
<Microsoft_VisualStudio_Utilities_Version>17.13.40008</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.12.40391</Microsoft_VisualStudio_TextManager_Interop_Version>
<Microsoft_VisualStudio_TextManager_Interop_Version>17.13.40008</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>

Expand Down
1 change: 1 addition & 0 deletions src/SSHDebugPS/Docker/DockerContainerInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ private DockerContainerInstance() { }
[JsonProperty("CreatedAt")]
public string Created { get; private set; }

[JsonIgnore]
public string Platform { get; set; }

#endregion
Expand Down
2 changes: 2 additions & 0 deletions src/tools/MakePIAPortableTool/MakePIAPortableTool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ class Program
{ "System.Collections.Generic.IEnumerable", System_Runtime },
{ "System.Reflection.DefaultMemberAttribute", System_Runtime },
{ "System.Reflection.AssemblyDelaySignAttribute", System_Runtime},
{ "System.Reflection.AssemblyKeyFileAttribute", System_Runtime },
{ "System.Reflection.AssemblySignatureKeyAttribute", System_Runtime },
{ "System.Runtime.CompilerServices.CompilationRelaxationsAttribute", System_Runtime },
{ "System.Runtime.CompilerServices.RuntimeCompatibilityAttribute", System_Runtime },
{ "System.Diagnostics.DebuggableAttribute", System_Runtime },
Expand Down