diff --git a/Build.proj b/Build.proj
index f4763555..7ecd19f4 100644
--- a/Build.proj
+++ b/Build.proj
@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 
     <RootDir>$(MSBuildThisFileDirectory)</RootDir>
-    <Solution>$(RootDir)\Dlr.sln</Solution>
+    <Solution>$(RootDir)\Dlr.slnx</Solution>
 
     <UtilDir>$(RootDir)\Util</UtilDir>
     <BinDir>$(RootDir)\bin</BinDir>
diff --git a/Dlr.sln b/Dlr.sln
deleted file mode 100644
index 6476e25d..00000000
--- a/Dlr.sln
+++ /dev/null
@@ -1,107 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.3.32811.315
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{9C454D45-326F-4EA1-8177-64341267A17F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClrAssembly", "Tests\ClrAssembly\ClrAssembly.csproj", "{BEE737B9-18D5-48D9-8672-9A896213C98B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{EB66B766-6354-4208-A3D4-AACBDCB5C3B3} = {EB66B766-6354-4208-A3D4-AACBDCB5C3B3}
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Dynamic", "Src\Microsoft.Dynamic\Microsoft.Dynamic.csproj", "{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Scripting", "Src\Microsoft.Scripting\Microsoft.Scripting.csproj", "{02FF0909-F5AD-48CF-A86A-345E721B7E40}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Scripting.Metadata", "Src\Microsoft.Scripting.Metadata\Microsoft.Scripting.Metadata.csproj", "{ACDD9B9E-8FE6-439C-9521-1CCBA47F6143}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Metadata", "Tests\Metadata\Metadata.csproj", "{848BBEB0-63E6-4736-B60C-23A9D733593D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BFEE2666-74E5-49B0-BEB7-1F01CECD7F98}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		Build.proj = Build.proj
-		CurrentVersion.props = CurrentVersion.props
-		Directory.Build.props = Directory.Build.props
-		DLR.ruleset = DLR.ruleset
-		global.json = global.json
-		LICENSE = LICENSE
-		make.ps1 = make.ps1
-		NuGet.config = NuGet.config
-		README.md = README.md
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{60056F49-17D6-4C5C-80EC-F203BA2F7E3B}"
-	ProjectSection(SolutionItems) = preProject
-		Build\After.targets = Build\After.targets
-		Build\net462.props = Build\net462.props
-		Build\net8.0.props = Build\net8.0.props
-		Build\net9.0.props = Build\net9.0.props
-		Build\net10.0.props = Build\net10.0.props
-		Build\netstandard2.0.props = Build\netstandard2.0.props
-		Build\steps.yml = Build\steps.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Package", "Package", "{006DB050-2A71-4F36-BBE1-4AF6AF310C13}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{88E65B67-BFB5-4BB3-A22C-5B7EDD082B2E}"
-	ProjectSection(SolutionItems) = preProject
-		Package\nuget\DynamicLanguageRuntime.nuspec = Package\nuget\DynamicLanguageRuntime.nuspec
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Dynamic.Test", "Tests\Microsoft.Dynamic.Test\Microsoft.Dynamic.Test.csproj", "{CBDDAD40-D44E-458A-AA53-9A6DB62EC4A1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Scripting.Test", "Tests\Microsoft.Scripting.Test\Microsoft.Scripting.Test.csproj", "{56B4AA3A-42BC-4CA6-A022-703A777332AF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BEE737B9-18D5-48D9-8672-9A896213C98B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BEE737B9-18D5-48D9-8672-9A896213C98B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BEE737B9-18D5-48D9-8672-9A896213C98B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BEE737B9-18D5-48D9-8672-9A896213C98B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EB66B766-6354-4208-A3D4-AACBDCB5C3B3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{02FF0909-F5AD-48CF-A86A-345E721B7E40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02FF0909-F5AD-48CF-A86A-345E721B7E40}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02FF0909-F5AD-48CF-A86A-345E721B7E40}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{02FF0909-F5AD-48CF-A86A-345E721B7E40}.Release|Any CPU.Build.0 = Release|Any CPU
-		{ACDD9B9E-8FE6-439C-9521-1CCBA47F6143}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{ACDD9B9E-8FE6-439C-9521-1CCBA47F6143}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{ACDD9B9E-8FE6-439C-9521-1CCBA47F6143}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{ACDD9B9E-8FE6-439C-9521-1CCBA47F6143}.Release|Any CPU.Build.0 = Release|Any CPU
-		{848BBEB0-63E6-4736-B60C-23A9D733593D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{848BBEB0-63E6-4736-B60C-23A9D733593D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{848BBEB0-63E6-4736-B60C-23A9D733593D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{848BBEB0-63E6-4736-B60C-23A9D733593D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CBDDAD40-D44E-458A-AA53-9A6DB62EC4A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CBDDAD40-D44E-458A-AA53-9A6DB62EC4A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CBDDAD40-D44E-458A-AA53-9A6DB62EC4A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CBDDAD40-D44E-458A-AA53-9A6DB62EC4A1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{56B4AA3A-42BC-4CA6-A022-703A777332AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{56B4AA3A-42BC-4CA6-A022-703A777332AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{56B4AA3A-42BC-4CA6-A022-703A777332AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{56B4AA3A-42BC-4CA6-A022-703A777332AF}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{BEE737B9-18D5-48D9-8672-9A896213C98B} = {9C454D45-326F-4EA1-8177-64341267A17F}
-		{848BBEB0-63E6-4736-B60C-23A9D733593D} = {9C454D45-326F-4EA1-8177-64341267A17F}
-		{60056F49-17D6-4C5C-80EC-F203BA2F7E3B} = {BFEE2666-74E5-49B0-BEB7-1F01CECD7F98}
-		{006DB050-2A71-4F36-BBE1-4AF6AF310C13} = {BFEE2666-74E5-49B0-BEB7-1F01CECD7F98}
-		{88E65B67-BFB5-4BB3-A22C-5B7EDD082B2E} = {006DB050-2A71-4F36-BBE1-4AF6AF310C13}
-		{CBDDAD40-D44E-458A-AA53-9A6DB62EC4A1} = {9C454D45-326F-4EA1-8177-64341267A17F}
-		{56B4AA3A-42BC-4CA6-A022-703A777332AF} = {9C454D45-326F-4EA1-8177-64341267A17F}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {408269A6-9EA8-42FE-8C65-33A9DCF776B7}
-	EndGlobalSection
-EndGlobal
diff --git a/Dlr.slnx b/Dlr.slnx
new file mode 100644
index 00000000..ce58660a
--- /dev/null
+++ b/Dlr.slnx
@@ -0,0 +1,47 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path=".gitattributes" />
+    <File Path=".gitignore" />
+    <File Path="Build.proj" />
+    <File Path="CurrentVersion.props" />
+    <File Path="Directory.Build.props" />
+    <File Path="LICENSE" />
+    <File Path="make.ps1" />
+    <File Path="NuGet.config" />
+    <File Path="README.md" />
+  </Folder>
+  <Folder Name="/Solution Items/Build/">
+    <File Path="Build/After.targets" />
+    <File Path="Build/net10.0.props" />
+    <File Path="Build/net462.props" />
+    <File Path="Build/net8.0.props" />
+    <File Path="Build/net9.0.props" />
+    <File Path="Build/netstandard2.0.props" />
+    <File Path="Build/Tasks.targets" />
+  </Folder>
+  <Folder Name="/Solution Items/CI/" />
+  <Folder Name="/Solution Items/CI/Azure/">
+    <File Path=".vsts-ci.yml" />
+    <File Path="Build/steps.yml" />
+  </Folder>
+  <Folder Name="/Solution Items/CI/GitHub/">
+    <File Path=".github/workflows/main.yml" />
+  </Folder>
+  <Folder Name="/Solution Items/Package/" />
+  <Folder Name="/Solution Items/Package/nuget/">
+    <File Path="Package/nuget/DynamicLanguageRuntime.nuspec" />
+    <File Path="Package/nuget/NuGet.Packaging.csproj" />
+  </Folder>
+  <Folder Name="/Tests/">
+    <Project Path="Tests/ClrAssembly/ClrAssembly.csproj">
+      <BuildDependency Project="Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj" />
+    </Project>
+    <Project Path="Tests/Metadata/Metadata.csproj" />
+    <Project Path="Tests/Microsoft.Dynamic.Test/Microsoft.Dynamic.Test.csproj" />
+    <Project Path="Tests/Microsoft.Scripting.Test/Microsoft.Scripting.Test.csproj" />
+  </Folder>
+  <Project Path="Src/Microsoft.Dynamic/Microsoft.Dynamic.csproj" />
+  <Project Path="Src/Microsoft.Scripting.Metadata/Microsoft.Scripting.Metadata.csproj" />
+  <Project Path="Src/Microsoft.Scripting/Microsoft.Scripting.csproj" />
+</Solution>
diff --git a/Tests/DlrComLibrary/DlrComLibrary.sln b/Tests/DlrComLibrary/DlrComLibrary.sln
deleted file mode 100644
index 332654f1..00000000
--- a/Tests/DlrComLibrary/DlrComLibrary.sln
+++ /dev/null
@@ -1,51 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DlrComLibrary", "DlrComLibrary.vcxproj", "{36658253-C676-41E7-997F-018CAF277EBB}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DlrComLibraryPS", "DlrComLibraryPS.vcxproj", "{6ECF7674-7549-455D-933B-DBBB7016F3E9}"
-EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{B8CB580D-1482-4899-8C32-5E26F5B74250}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Itanium = Debug|Itanium
-		Debug|Win32 = Debug|Win32
-		Debug|x64 = Debug|x64
-		Release|Itanium = Release|Itanium
-		Release|Win32 = Release|Win32
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{36658253-C676-41E7-997F-018CAF277EBB}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{36658253-C676-41E7-997F-018CAF277EBB}.Debug|Itanium.Build.0 = Debug|Itanium
-		{36658253-C676-41E7-997F-018CAF277EBB}.Debug|Win32.ActiveCfg = Debug|Win32
-		{36658253-C676-41E7-997F-018CAF277EBB}.Debug|Win32.Build.0 = Debug|Win32
-		{36658253-C676-41E7-997F-018CAF277EBB}.Debug|x64.ActiveCfg = Debug|x64
-		{36658253-C676-41E7-997F-018CAF277EBB}.Debug|x64.Build.0 = Debug|x64
-		{36658253-C676-41E7-997F-018CAF277EBB}.Release|Itanium.ActiveCfg = Release|Itanium
-		{36658253-C676-41E7-997F-018CAF277EBB}.Release|Itanium.Build.0 = Release|Itanium
-		{36658253-C676-41E7-997F-018CAF277EBB}.Release|Win32.ActiveCfg = Release|Win32
-		{36658253-C676-41E7-997F-018CAF277EBB}.Release|Win32.Build.0 = Release|Win32
-		{36658253-C676-41E7-997F-018CAF277EBB}.Release|x64.ActiveCfg = Release|x64
-		{36658253-C676-41E7-997F-018CAF277EBB}.Release|x64.Build.0 = Release|x64
-		{6ECF7674-7549-455D-933B-DBBB7016F3E9}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{6ECF7674-7549-455D-933B-DBBB7016F3E9}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6ECF7674-7549-455D-933B-DBBB7016F3E9}.Debug|x64.ActiveCfg = Debug|x64
-		{6ECF7674-7549-455D-933B-DBBB7016F3E9}.Release|Itanium.ActiveCfg = Release|Itanium
-		{6ECF7674-7549-455D-933B-DBBB7016F3E9}.Release|Win32.ActiveCfg = Release|Win32
-		{6ECF7674-7549-455D-933B-DBBB7016F3E9}.Release|x64.ActiveCfg = Release|x64
-		{B8CB580D-1482-4899-8C32-5E26F5B74250}.Debug|Itanium.ActiveCfg = Debug
-		{B8CB580D-1482-4899-8C32-5E26F5B74250}.Debug|Win32.ActiveCfg = Debug
-		{B8CB580D-1482-4899-8C32-5E26F5B74250}.Debug|x64.ActiveCfg = Debug
-		{B8CB580D-1482-4899-8C32-5E26F5B74250}.Debug|x64.Build.0 = Debug
-		{B8CB580D-1482-4899-8C32-5E26F5B74250}.Release|Itanium.ActiveCfg = Release
-		{B8CB580D-1482-4899-8C32-5E26F5B74250}.Release|Itanium.Build.0 = Release
-		{B8CB580D-1482-4899-8C32-5E26F5B74250}.Release|Win32.ActiveCfg = Release
-		{B8CB580D-1482-4899-8C32-5E26F5B74250}.Release|x64.ActiveCfg = Release
-		{B8CB580D-1482-4899-8C32-5E26F5B74250}.Release|x64.Build.0 = Release
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/Tests/DlrComLibrary/DlrComLibrary.slnx b/Tests/DlrComLibrary/DlrComLibrary.slnx
new file mode 100644
index 00000000..2c4cc407
--- /dev/null
+++ b/Tests/DlrComLibrary/DlrComLibrary.slnx
@@ -0,0 +1,15 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Itanium" />
+    <Platform Name="Win32" />
+    <Platform Name="x64" />
+  </Configurations>
+  <Project Path="DlrComLibrary.vcxproj" />
+  <Project Path="DlrComLibraryPS.vcxproj">
+    <Build Project="false" />
+  </Project>
+  <Project Path="Setup/Setup.vdproj" Type="Installer">
+    <Build Solution="*|x64" />
+    <Build Solution="Release|Itanium" />
+  </Project>
+</Solution>