diff --git a/EFCore.PG.sln b/EFCore.PG.sln
deleted file mode 100644
index 9ccd15d74..000000000
--- a/EFCore.PG.sln
+++ /dev/null
@@ -1,113 +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("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4A5A60DD-41B6-40BF-B677-227A921ECCC8}"
-	ProjectSection(SolutionItems) = preProject
-		Npgsql.snk = Npgsql.snk
-		Directory.Build.props = Directory.Build.props
-		Directory.Packages.props = Directory.Packages.props
-		README.md = README.md
-		NuGet.config = NuGet.config
-		global.json = global.json
-		.editorconfig = .editorconfig
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{ED612DB1-AB32-4603-95E7-891BACA71C39}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.PG", "src\EFCore.PG\EFCore.PG.csproj", "{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.PG.Tests", "test\EFCore.PG.Tests\EFCore.PG.Tests.csproj", "{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.PG.FunctionalTests", "test\EFCore.PG.FunctionalTests\EFCore.PG.FunctionalTests.csproj", "{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.PG.NodaTime", "src\EFCore.PG.NodaTime\EFCore.PG.NodaTime.csproj", "{77F0608F-6D0C-481C-9108-D5176E2EAD69}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.PG.NTS", "src\EFCore.PG.NTS\EFCore.PG.NTS.csproj", "{D7106D61-C7CA-4005-B31F-43281BB397AD}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Github", "Github", "{26203F54-A3C1-43AD-A101-8F589D2D67AD}"
-	ProjectSection(SolutionItems) = preProject
-		.github\workflows\build.yml = .github\workflows\build.yml
-		.github\dependabot.yml = .github\dependabot.yml
-		.github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml
-	EndProjectSection
-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
-		{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A}.Release|x64.ActiveCfg = Release|Any CPU
-		{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A}.Release|x86.ActiveCfg = Release|Any CPU
-		{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01}.Release|x64.ActiveCfg = Release|Any CPU
-		{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01}.Release|x86.ActiveCfg = Release|Any CPU
-		{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D}.Release|x64.ActiveCfg = Release|Any CPU
-		{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D}.Release|x86.ActiveCfg = Release|Any CPU
-		{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Debug|x64.Build.0 = Debug|Any CPU
-		{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Debug|x86.Build.0 = Debug|Any CPU
-		{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Release|Any CPU.Build.0 = Release|Any CPU
-		{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Release|x64.ActiveCfg = Release|Any CPU
-		{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Release|x64.Build.0 = Release|Any CPU
-		{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Release|x86.ActiveCfg = Release|Any CPU
-		{77F0608F-6D0C-481C-9108-D5176E2EAD69}.Release|x86.Build.0 = Release|Any CPU
-		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Debug|x64.Build.0 = Debug|Any CPU
-		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Debug|x86.Build.0 = Debug|Any CPU
-		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Release|x64.ActiveCfg = Release|Any CPU
-		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Release|x64.Build.0 = Release|Any CPU
-		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Release|x86.ActiveCfg = Release|Any CPU
-		{D7106D61-C7CA-4005-B31F-43281BB397AD}.Release|x86.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{FADDA2D1-03B4-4DEF-8D24-DD1CA4E81F4A} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
-		{E1D99AD4-D88B-42BA-86DF-90B98B2E9A01} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
-		{05A7D0B7-4AE1-4BC8-A1BE-2389F1593B2D} = {ED612DB1-AB32-4603-95E7-891BACA71C39}
-		{77F0608F-6D0C-481C-9108-D5176E2EAD69} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
-		{D7106D61-C7CA-4005-B31F-43281BB397AD} = {8537E50E-CF7F-49CB-B4EF-3E2A1B11F050}
-		{26203F54-A3C1-43AD-A101-8F589D2D67AD} = {4A5A60DD-41B6-40BF-B677-227A921ECCC8}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F4EAAE6D-758C-4184-9D8C-7113384B61A8}
-	EndGlobalSection
-	GlobalSection(MonoDevelopProperties) = preSolution
-		StartupItem = Npgsql.csproj
-	EndGlobalSection
-EndGlobal
diff --git a/EFCore.PG.slnx b/EFCore.PG.slnx
new file mode 100644
index 000000000..8166ab441
--- /dev/null
+++ b/EFCore.PG.slnx
@@ -0,0 +1,25 @@
+<Solution>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Packages.props" />
+    <File Path="global.json" />
+    <File Path="Npgsql.snk" />
+    <File Path="NuGet.config" />
+    <File Path="README.md" />
+  </Folder>
+  <Folder Name="/Github/">
+    <File Path=".github/dependabot.yml" />
+    <File Path=".github/workflows/build.yml" />
+    <File Path=".github/workflows/codeql-analysis.yml" />
+  </Folder>
+  <Folder Name="/src/">
+    <Project Path="src/EFCore.PG.NodaTime/EFCore.PG.NodaTime.csproj" />
+    <Project Path="src/EFCore.PG.NTS/EFCore.PG.NTS.csproj" />
+    <Project Path="src/EFCore.PG/EFCore.PG.csproj" />
+  </Folder>
+  <Folder Name="/test/">
+    <Project Path="test/EFCore.PG.FunctionalTests/EFCore.PG.FunctionalTests.csproj" />
+    <Project Path="test/EFCore.PG.Tests/EFCore.PG.Tests.csproj" />
+  </Folder>
+</Solution>
diff --git a/EFCore.PG.sln.DotSettings b/EFCore.PG.slnx.DotSettings
similarity index 100%
rename from EFCore.PG.sln.DotSettings
rename to EFCore.PG.slnx.DotSettings