diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index c7dc2acb61..7b4dade004 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -15,6 +15,7 @@
                 "GitHub.copilot"
             ],
             "settings": {
+                "dotnet.defaultSolution": "Microsoft.DotNet.Docker.sln",
                 "remote.autoForwardPorts": true,
                 "remote.autoForwardPortsSource": "hybrid",
                 "remote.otherPortsAttributes": {
diff --git a/Microsoft.DotNet.Docker.sln b/Microsoft.DotNet.Docker.sln
new file mode 100644
index 0000000000..34b8787527
--- /dev/null
+++ b/Microsoft.DotNet.Docker.sln
@@ -0,0 +1,56 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{0AB3BF05-4346-4AA6-1389-037BE0695223}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.Docker.Tests", "tests\Microsoft.DotNet.Docker.Tests\Microsoft.DotNet.Docker.Tests.csproj", "{70F07079-3009-4DE0-833A-995D71907FEC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "eng", "eng", "{7525B257-249C-EE79-B10A-65D0BC27ABA9}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "update-dependencies", "eng\update-dependencies\update-dependencies.csproj", "{211B4694-06D9-43B3-AC62-9461744E1E85}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{70F07079-3009-4DE0-833A-995D71907FEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{70F07079-3009-4DE0-833A-995D71907FEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{70F07079-3009-4DE0-833A-995D71907FEC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{70F07079-3009-4DE0-833A-995D71907FEC}.Debug|x64.Build.0 = Debug|Any CPU
+		{70F07079-3009-4DE0-833A-995D71907FEC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{70F07079-3009-4DE0-833A-995D71907FEC}.Debug|x86.Build.0 = Debug|Any CPU
+		{70F07079-3009-4DE0-833A-995D71907FEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{70F07079-3009-4DE0-833A-995D71907FEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{70F07079-3009-4DE0-833A-995D71907FEC}.Release|x64.ActiveCfg = Release|Any CPU
+		{70F07079-3009-4DE0-833A-995D71907FEC}.Release|x64.Build.0 = Release|Any CPU
+		{70F07079-3009-4DE0-833A-995D71907FEC}.Release|x86.ActiveCfg = Release|Any CPU
+		{70F07079-3009-4DE0-833A-995D71907FEC}.Release|x86.Build.0 = Release|Any CPU
+		{211B4694-06D9-43B3-AC62-9461744E1E85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{211B4694-06D9-43B3-AC62-9461744E1E85}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{211B4694-06D9-43B3-AC62-9461744E1E85}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{211B4694-06D9-43B3-AC62-9461744E1E85}.Debug|x64.Build.0 = Debug|Any CPU
+		{211B4694-06D9-43B3-AC62-9461744E1E85}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{211B4694-06D9-43B3-AC62-9461744E1E85}.Debug|x86.Build.0 = Debug|Any CPU
+		{211B4694-06D9-43B3-AC62-9461744E1E85}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{211B4694-06D9-43B3-AC62-9461744E1E85}.Release|Any CPU.Build.0 = Release|Any CPU
+		{211B4694-06D9-43B3-AC62-9461744E1E85}.Release|x64.ActiveCfg = Release|Any CPU
+		{211B4694-06D9-43B3-AC62-9461744E1E85}.Release|x64.Build.0 = Release|Any CPU
+		{211B4694-06D9-43B3-AC62-9461744E1E85}.Release|x86.ActiveCfg = Release|Any CPU
+		{211B4694-06D9-43B3-AC62-9461744E1E85}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{70F07079-3009-4DE0-833A-995D71907FEC} = {0AB3BF05-4346-4AA6-1389-037BE0695223}
+		{211B4694-06D9-43B3-AC62-9461744E1E85} = {7525B257-249C-EE79-B10A-65D0BC27ABA9}
+	EndGlobalSection
+EndGlobal
diff --git a/eng/update-dependencies/update-dependencies.sln b/eng/update-dependencies/update-dependencies.sln
deleted file mode 100644
index 44decf4a83..0000000000
--- a/eng/update-dependencies/update-dependencies.sln
+++ /dev/null
@@ -1,22 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31903.59
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "update-dependencies", "update-dependencies.csproj", "{494B3B6A-69AF-4C95-9B66-CF59E0594168}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{494B3B6A-69AF-4C95-9B66-CF59E0594168}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{494B3B6A-69AF-4C95-9B66-CF59E0594168}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{494B3B6A-69AF-4C95-9B66-CF59E0594168}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{494B3B6A-69AF-4C95-9B66-CF59E0594168}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-EndGlobal
diff --git a/tests/Microsoft.DotNet.Docker.Tests/Microsoft.DotNet.Docker.Tests.sln b/tests/Microsoft.DotNet.Docker.Tests/Microsoft.DotNet.Docker.Tests.sln
deleted file mode 100644
index 987cf55edf..0000000000
--- a/tests/Microsoft.DotNet.Docker.Tests/Microsoft.DotNet.Docker.Tests.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26923.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Docker.Tests", "Microsoft.DotNet.Docker.Tests.csproj", "{C645FD53-8170-49F6-9ECB-B9C4B6683284}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C645FD53-8170-49F6-9ECB-B9C4B6683284}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C645FD53-8170-49F6-9ECB-B9C4B6683284}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C645FD53-8170-49F6-9ECB-B9C4B6683284}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C645FD53-8170-49F6-9ECB-B9C4B6683284}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {23A3AC51-ED6C-46EB-B451-EDEF76476E0D}
-	EndGlobalSection
-EndGlobal