diff --git a/Castle.Core.sln b/Castle.Core.sln
deleted file mode 100644
index 5f1450a217..0000000000
--- a/Castle.Core.sln
+++ /dev/null
@@ -1,83 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30011.22
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Castle Build", "Castle Build", "{1B999D24-B7AB-4997-96E7-08FA05325694}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-		.gitattributes = .gitattributes
-		.gitignore = .gitignore
-		appveyor.yml = appveyor.yml
-		build.cmd = build.cmd
-		build.sh = build.sh
-		CHANGELOG.md = CHANGELOG.md
-		buildscripts\common.props = buildscripts\common.props
-		CONTRIBUTING.md = CONTRIBUTING.md
-		LICENSE = LICENSE
-		README.md = README.md
-	EndProjectSection
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.Core", "src\Castle.Core\Castle.Core.csproj", "{C31C55D2-32FD-4158-8EC5-0FBB56DCE4D4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.Core.Tests", "src\Castle.Core.Tests\Castle.Core.Tests.csproj", "{F32D049E-C486-4F29-BAD5-FC5EA06E7B88}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.Services.Logging.log4netIntegration", "src\Castle.Services.Logging.log4netIntegration\Castle.Services.Logging.log4netIntegration.csproj", "{AFD3B071-E971-499B-A95B-E98155EB66E8}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.Services.Logging.NLogIntegration", "src\Castle.Services.Logging.NLogIntegration\Castle.Services.Logging.NLogIntegration.csproj", "{344D907D-6641-4A61-94C2-4980B5804FE2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.Services.Logging.SerilogIntegration", "src\Castle.Services.Logging.SerilogIntegration\Castle.Services.Logging.SerilogIntegration.csproj", "{91B2A82F-63F6-46B1-8EDC-5D029BCF6A2B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Castle Services", "Castle Services", "{A598EE9B-41CE-4BE8-BF93-2C91F919F97E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Castle.Core.Tests.WeakNamed", "src\Castle.Core.Tests.WeakNamed\Castle.Core.Tests.WeakNamed.csproj", "{14D86762-CF9B-4560-80C9-10C16DBE246C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Actions", "GitHub Actions", "{149DB291-CBD6-4F82-A6A6-758E328DB946}"
-	ProjectSection(SolutionItems) = preProject
-		.github\workflows\build.yml = .github\workflows\build.yml
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C31C55D2-32FD-4158-8EC5-0FBB56DCE4D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C31C55D2-32FD-4158-8EC5-0FBB56DCE4D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C31C55D2-32FD-4158-8EC5-0FBB56DCE4D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C31C55D2-32FD-4158-8EC5-0FBB56DCE4D4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F32D049E-C486-4F29-BAD5-FC5EA06E7B88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F32D049E-C486-4F29-BAD5-FC5EA06E7B88}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F32D049E-C486-4F29-BAD5-FC5EA06E7B88}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F32D049E-C486-4F29-BAD5-FC5EA06E7B88}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AFD3B071-E971-499B-A95B-E98155EB66E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{AFD3B071-E971-499B-A95B-E98155EB66E8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AFD3B071-E971-499B-A95B-E98155EB66E8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{AFD3B071-E971-499B-A95B-E98155EB66E8}.Release|Any CPU.Build.0 = Release|Any CPU
-		{344D907D-6641-4A61-94C2-4980B5804FE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{344D907D-6641-4A61-94C2-4980B5804FE2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{344D907D-6641-4A61-94C2-4980B5804FE2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{344D907D-6641-4A61-94C2-4980B5804FE2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{91B2A82F-63F6-46B1-8EDC-5D029BCF6A2B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{91B2A82F-63F6-46B1-8EDC-5D029BCF6A2B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{91B2A82F-63F6-46B1-8EDC-5D029BCF6A2B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{91B2A82F-63F6-46B1-8EDC-5D029BCF6A2B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{14D86762-CF9B-4560-80C9-10C16DBE246C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{14D86762-CF9B-4560-80C9-10C16DBE246C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14D86762-CF9B-4560-80C9-10C16DBE246C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{14D86762-CF9B-4560-80C9-10C16DBE246C}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{AFD3B071-E971-499B-A95B-E98155EB66E8} = {A598EE9B-41CE-4BE8-BF93-2C91F919F97E}
-		{344D907D-6641-4A61-94C2-4980B5804FE2} = {A598EE9B-41CE-4BE8-BF93-2C91F919F97E}
-		{91B2A82F-63F6-46B1-8EDC-5D029BCF6A2B} = {A598EE9B-41CE-4BE8-BF93-2C91F919F97E}
-		{149DB291-CBD6-4F82-A6A6-758E328DB946} = {1B999D24-B7AB-4997-96E7-08FA05325694}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {682D4399-4863-4813-B495-5FEDD22496ED}
-	EndGlobalSection
-EndGlobal
diff --git a/Castle.Core.slnx b/Castle.Core.slnx
new file mode 100644
index 0000000000..fdf13f26fa
--- /dev/null
+++ b/Castle.Core.slnx
@@ -0,0 +1,26 @@
+<Solution>
+  <Folder Name="/Castle Build/">
+    <File Path=".editorconfig" />
+    <File Path=".gitattributes" />
+    <File Path=".gitignore" />
+    <File Path="appveyor.yml" />
+    <File Path="build.cmd" />
+    <File Path="build.sh" />
+    <File Path="buildscripts/common.props" />
+    <File Path="CHANGELOG.md" />
+    <File Path="CONTRIBUTING.md" />
+    <File Path="LICENSE" />
+    <File Path="README.md" />
+  </Folder>
+  <Folder Name="/Castle Build/GitHub Actions/">
+    <File Path=".github/workflows/build.yml" />
+  </Folder>
+  <Folder Name="/Castle Services/">
+    <Project Path="src/Castle.Services.Logging.log4netIntegration/Castle.Services.Logging.log4netIntegration.csproj" />
+    <Project Path="src/Castle.Services.Logging.NLogIntegration/Castle.Services.Logging.NLogIntegration.csproj" />
+    <Project Path="src/Castle.Services.Logging.SerilogIntegration/Castle.Services.Logging.SerilogIntegration.csproj" />
+  </Folder>
+  <Project Path="src/Castle.Core.Tests.WeakNamed/Castle.Core.Tests.WeakNamed.csproj" />
+  <Project Path="src/Castle.Core.Tests/Castle.Core.Tests.csproj" />
+  <Project Path="src/Castle.Core/Castle.Core.csproj" />
+</Solution>
diff --git a/build.sh b/build.sh
index 5295af8061..3544cbd13e 100755
--- a/build.sh
+++ b/build.sh
@@ -21,7 +21,7 @@ echo ---------------------------
 echo Build
 echo ---------------------------
 
-dotnet build ./Castle.Core.sln --configuration Release --tl:off
+dotnet build ./Castle.Core.slnx --configuration Release --tl:off
 
 echo ---------------------------
 echo Running NET8.0 Tests
diff --git a/buildscripts/build.cmd b/buildscripts/build.cmd
index c182894491..370537fd9e 100644
--- a/buildscripts/build.cmd
+++ b/buildscripts/build.cmd
@@ -26,7 +26,7 @@ SET Configuration=Release
 GOTO build
 
 :build
-dotnet build ./tools/Explicit.NuGet.Versions/Explicit.NuGet.Versions.sln
+dotnet build ./tools/Explicit.NuGet.Versions/Explicit.NuGet.Versions.slnx
 dotnet build --configuration %Configuration% || exit /b 1
 .\tools\Explicit.NuGet.Versions\build\nev.exe ".\build" "castle."
 GOTO test
diff --git a/tools/Explicit.NuGet.Versions/Explicit.NuGet.Versions.sln b/tools/Explicit.NuGet.Versions/Explicit.NuGet.Versions.sln
deleted file mode 100644
index cc8b35f51d..0000000000
--- a/tools/Explicit.NuGet.Versions/Explicit.NuGet.Versions.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.26730.15
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Explicit.NuGet.Versions", "Explicit.NuGet.Versions.csproj", "{9F0F7F9B-4CC0-4D92-B241-0F55B41E9AE5}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9F0F7F9B-4CC0-4D92-B241-0F55B41E9AE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9F0F7F9B-4CC0-4D92-B241-0F55B41E9AE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9F0F7F9B-4CC0-4D92-B241-0F55B41E9AE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9F0F7F9B-4CC0-4D92-B241-0F55B41E9AE5}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {23752286-176D-4D60-BAEE-1617FD00D5B6}
-	EndGlobalSection
-EndGlobal
diff --git a/tools/Explicit.NuGet.Versions/Explicit.NuGet.Versions.slnx b/tools/Explicit.NuGet.Versions/Explicit.NuGet.Versions.slnx
new file mode 100644
index 0000000000..ad225d84f1
--- /dev/null
+++ b/tools/Explicit.NuGet.Versions/Explicit.NuGet.Versions.slnx
@@ -0,0 +1,3 @@
+<Solution>
+  <Project Path="Explicit.NuGet.Versions.csproj" />
+</Solution>