diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6784072..533fefd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -43,10 +43,10 @@ jobs:
           dotnet-version: 10.0.x
 
       - name: Restore
-        run: dotnet restore d2lang-cs.sln
+        run: dotnet restore d2lang-cs.slnx
 
       - name: Build
-        run: dotnet build d2lang-cs.sln --configuration Release --no-restore -p:ContinuousIntegrationBuild=true
+        run: dotnet build d2lang-cs.slnx --configuration Release --no-restore -p:ContinuousIntegrationBuild=true
 
       - name: Install pinned D2 CLI
         if: runner.os == 'Linux'
@@ -130,7 +130,7 @@ jobs:
           dotnet-version: 10.0.x
 
       - name: Restore
-        run: dotnet restore d2lang-cs.sln
+        run: dotnet restore d2lang-cs.slnx
 
       - name: Pack core package with package validation
         run: dotnet pack src/d2lang-cs.csproj --configuration Release --no-restore --output artifacts/packages -p:ContinuousIntegrationBuild=true -p:EnablePackageValidation=true
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index acf78a7..424be35 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -48,7 +48,7 @@ jobs:
           echo "version=$version" >> "$GITHUB_OUTPUT"
 
       - name: Restore
-        run: dotnet restore d2lang-cs.sln
+        run: dotnet restore d2lang-cs.slnx
 
       - name: Test
         run: dotnet test test/Tests.csproj --configuration Release --no-restore -p:ContinuousIntegrationBuild=true
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6bf8876..19a02ed 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -17,8 +17,8 @@ git switch -c feature/short-description
 Restore, build, and test from the repository root:
 
 ```bash
-dotnet restore d2lang-cs.sln
-dotnet build d2lang-cs.sln --configuration Release --no-restore
+dotnet restore d2lang-cs.slnx
+dotnet build d2lang-cs.slnx --configuration Release --no-restore
 dotnet test test/Tests.csproj --configuration Release --no-build
 ```
 
diff --git a/d2lang-cs.sln b/d2lang-cs.sln
deleted file mode 100644
index 1107236..0000000
--- a/d2lang-cs.sln
+++ /dev/null
@@ -1,48 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.5.002.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "d2lang-cs", "src\d2lang-cs.csproj", "{BB0ABCF8-5B09-438A-9FCE-9CD3D70E4CBB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "D2Lang.EntityFrameworkCore", "src\D2Lang.EntityFrameworkCore\D2Lang.EntityFrameworkCore.csproj", "{89767467-C35E-4A72-9D3D-12CA41D48A82}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "example", "example", "{5C588B55-FBDC-4C2F-B65F-14BB31282E33}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "d2-sample-cli", "example\cli\d2-sample-cli.csproj", "{327CF66B-11FC-460F-A018-F0A602482A03}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "test\Tests.csproj", "{BC01588F-4480-4AF0-A1C2-364A983E9F58}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{BB0ABCF8-5B09-438A-9FCE-9CD3D70E4CBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BB0ABCF8-5B09-438A-9FCE-9CD3D70E4CBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BB0ABCF8-5B09-438A-9FCE-9CD3D70E4CBB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BB0ABCF8-5B09-438A-9FCE-9CD3D70E4CBB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{89767467-C35E-4A72-9D3D-12CA41D48A82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{89767467-C35E-4A72-9D3D-12CA41D48A82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{89767467-C35E-4A72-9D3D-12CA41D48A82}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{89767467-C35E-4A72-9D3D-12CA41D48A82}.Release|Any CPU.Build.0 = Release|Any CPU
-		{327CF66B-11FC-460F-A018-F0A602482A03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{327CF66B-11FC-460F-A018-F0A602482A03}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{327CF66B-11FC-460F-A018-F0A602482A03}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{327CF66B-11FC-460F-A018-F0A602482A03}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BC01588F-4480-4AF0-A1C2-364A983E9F58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC01588F-4480-4AF0-A1C2-364A983E9F58}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC01588F-4480-4AF0-A1C2-364A983E9F58}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BC01588F-4480-4AF0-A1C2-364A983E9F58}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {10D35D6E-F298-4AA0-AC44-FEFFF3CA9EEB}
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{327CF66B-11FC-460F-A018-F0A602482A03} = {5C588B55-FBDC-4C2F-B65F-14BB31282E33}
-	EndGlobalSection
-EndGlobal
diff --git a/d2lang-cs.slnx b/d2lang-cs.slnx
new file mode 100644
index 0000000..a941ac3
--- /dev/null
+++ b/d2lang-cs.slnx
@@ -0,0 +1,8 @@
+<Solution>
+  <Folder Name="/example/">
+    <Project Path="example/cli/d2-sample-cli.csproj" />
+  </Folder>
+  <Project Path="src/d2lang-cs.csproj" />
+  <Project Path="src/D2Lang.EntityFrameworkCore/D2Lang.EntityFrameworkCore.csproj" />
+  <Project Path="test/Tests.csproj" />
+</Solution>