diff --git a/.gitattributes b/.gitattributes
index bcc64d4cd3bab..620a38a250395 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -10,6 +10,6 @@
 *.xml    text
 
 *.csproj text merge=union
-*.sln    text merge=union eol=crlf
+*.slnx    text merge=union eol=crlf
 
 *.docx   diff=astextplain
diff --git a/dotnet/Selenium.sln b/dotnet/Selenium.sln
deleted file mode 100644
index 59907c6346ca5..0000000000000
--- a/dotnet/Selenium.sln
+++ /dev/null
@@ -1,79 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.27130.2026
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver", "src\webdriver\Selenium.WebDriver.csproj", "{ACCB2D1E-E2C9-4AC1-8EE3-6BF1C30AD713}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Support", "src\support\Selenium.WebDriver.Support.csproj", "{2AF7986A-68F8-4EDE-9C44-1BD11ED2B329}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Common.Tests", "test\common\Selenium.WebDriver.Common.Tests.csproj", "{1869A2D9-3782-41E4-84DD-EB1A5E971C93}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Chrome.Tests", "test\chrome\Selenium.WebDriver.Chrome.Tests.csproj", "{F5751636-2F68-4BE3-B383-D4F4937A1946}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Edge.Tests", "test\edge\Selenium.WebDriver.Edge.Tests.csproj", "{EF99FB04-94C3-4AA0-8809-B514B253DF51}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.IE.Tests", "test\ie\Selenium.WebDriver.IE.Tests.csproj", "{E54A6F7B-3939-4DE5-85CC-28158615A967}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Firefox.Tests", "test\firefox\Selenium.WebDriver.Firefox.Tests.csproj", "{F912F647-04A0-4081-91B4-985EE0E9097C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Remote.Tests", "test\remote\Selenium.WebDriver.Remote.Tests.csproj", "{B9C6B276-445A-400F-BE74-1E068F50A54D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Safari.Tests", "test\safari\Selenium.WebDriver.Safari.Tests.csproj", "{BB08F673-1553-4A56-882A-A2A115AC06C2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Selenium.WebDriver.Support.Tests", "test\support\Selenium.WebDriver.Support.Tests.csproj", "{2136C695-2526-45E0-AE1D-68FBBC6A9DE2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{ACCB2D1E-E2C9-4AC1-8EE3-6BF1C30AD713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACCB2D1E-E2C9-4AC1-8EE3-6BF1C30AD713}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACCB2D1E-E2C9-4AC1-8EE3-6BF1C30AD713}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ACCB2D1E-E2C9-4AC1-8EE3-6BF1C30AD713}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2AF7986A-68F8-4EDE-9C44-1BD11ED2B329}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2AF7986A-68F8-4EDE-9C44-1BD11ED2B329}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2AF7986A-68F8-4EDE-9C44-1BD11ED2B329}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2AF7986A-68F8-4EDE-9C44-1BD11ED2B329}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1869A2D9-3782-41E4-84DD-EB1A5E971C93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1869A2D9-3782-41E4-84DD-EB1A5E971C93}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1869A2D9-3782-41E4-84DD-EB1A5E971C93}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1869A2D9-3782-41E4-84DD-EB1A5E971C93}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F5751636-2F68-4BE3-B383-D4F4937A1946}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F5751636-2F68-4BE3-B383-D4F4937A1946}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F5751636-2F68-4BE3-B383-D4F4937A1946}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F5751636-2F68-4BE3-B383-D4F4937A1946}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EF99FB04-94C3-4AA0-8809-B514B253DF51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF99FB04-94C3-4AA0-8809-B514B253DF51}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF99FB04-94C3-4AA0-8809-B514B253DF51}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF99FB04-94C3-4AA0-8809-B514B253DF51}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E54A6F7B-3939-4DE5-85CC-28158615A967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E54A6F7B-3939-4DE5-85CC-28158615A967}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E54A6F7B-3939-4DE5-85CC-28158615A967}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E54A6F7B-3939-4DE5-85CC-28158615A967}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F912F647-04A0-4081-91B4-985EE0E9097C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F912F647-04A0-4081-91B4-985EE0E9097C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F912F647-04A0-4081-91B4-985EE0E9097C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F912F647-04A0-4081-91B4-985EE0E9097C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B9C6B276-445A-400F-BE74-1E068F50A54D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B9C6B276-445A-400F-BE74-1E068F50A54D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9C6B276-445A-400F-BE74-1E068F50A54D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B9C6B276-445A-400F-BE74-1E068F50A54D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BB08F673-1553-4A56-882A-A2A115AC06C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB08F673-1553-4A56-882A-A2A115AC06C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB08F673-1553-4A56-882A-A2A115AC06C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BB08F673-1553-4A56-882A-A2A115AC06C2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2136C695-2526-45E0-AE1D-68FBBC6A9DE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2136C695-2526-45E0-AE1D-68FBBC6A9DE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2136C695-2526-45E0-AE1D-68FBBC6A9DE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2136C695-2526-45E0-AE1D-68FBBC6A9DE2}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {35671DC1-25B5-4FD5-B5D9-919C3E4A503C}
-	EndGlobalSection
-EndGlobal
diff --git a/dotnet/Selenium.slnx b/dotnet/Selenium.slnx
new file mode 100644
index 0000000000000..e846145cb9231
--- /dev/null
+++ b/dotnet/Selenium.slnx
@@ -0,0 +1,14 @@
+<Solution>
+  <Folder Name="/test/">
+    <Project Path="test/chrome/Selenium.WebDriver.Chrome.Tests.csproj" />
+    <Project Path="test/common/Selenium.WebDriver.Common.Tests.csproj" />
+    <Project Path="test/edge/Selenium.WebDriver.Edge.Tests.csproj" />
+    <Project Path="test/firefox/Selenium.WebDriver.Firefox.Tests.csproj" />
+    <Project Path="test/ie/Selenium.WebDriver.IE.Tests.csproj" />
+    <Project Path="test/remote/Selenium.WebDriver.Remote.Tests.csproj" />
+    <Project Path="test/safari/Selenium.WebDriver.Safari.Tests.csproj" />
+    <Project Path="test/support/Selenium.WebDriver.Support.Tests.csproj" />
+  </Folder>
+  <Project Path="src/support/Selenium.WebDriver.Support.csproj" />
+  <Project Path="src/webdriver/Selenium.WebDriver.csproj" />
+</Solution>
diff --git a/third_party/dotnet/devtools/DevToolsProtocolGenerator.sln b/third_party/dotnet/devtools/DevToolsProtocolGenerator.sln
deleted file mode 100644
index 2c7acdc34243f..0000000000000
--- a/third_party/dotnet/devtools/DevToolsProtocolGenerator.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30611.23
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DevToolsGenerator", "src\generator\DevToolsGenerator.csproj", "{E5D54A93-645D-4D0F-956F-C467208AD14F}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E5D54A93-645D-4D0F-956F-C467208AD14F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E5D54A93-645D-4D0F-956F-C467208AD14F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E5D54A93-645D-4D0F-956F-C467208AD14F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E5D54A93-645D-4D0F-956F-C467208AD14F}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {D5EC947F-DEE4-4E69-A71D-1B1117C489DD}
-	EndGlobalSection
-EndGlobal
diff --git a/third_party/dotnet/devtools/DevToolsProtocolGenerator.slnx b/third_party/dotnet/devtools/DevToolsProtocolGenerator.slnx
new file mode 100644
index 0000000000000..ed8b895fe5fd7
--- /dev/null
+++ b/third_party/dotnet/devtools/DevToolsProtocolGenerator.slnx
@@ -0,0 +1,6 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path="generator_settings_template.json" />
+  </Folder>
+  <Project Path="src/generator/DevToolsGenerator.csproj" />
+</Solution>