diff --git a/.azuredevops/pipelines/DirectXTK-GitHub-GDK-Dev17.yml b/.azuredevops/pipelines/DirectXTK-GitHub-GDK-Dev17.yml
index 59a1c89c7..6067c5404 100644
--- a/.azuredevops/pipelines/DirectXTK-GitHub-GDK-Dev17.yml
+++ b/.azuredevops/pipelines/DirectXTK-GitHub-GDK-Dev17.yml
@@ -132,7 +132,7 @@ jobs:
         displayName: Build solution DirectXTK_GDK_2022 pcdbg
         continueOnError: true
         inputs:
-          solution: DirectXTK_GDK_2022.sln
+          solution: DirectXTK_GDK_2022.slnx
           platform: Gaming.Desktop.x64
           configuration: Debug
           msbuildArchitecture: x64
@@ -141,7 +141,7 @@ jobs:
         displayName: Build solution DirectXTK_GDK_2022 pcrel
         continueOnError: true
         inputs:
-          solution: DirectXTK_GDK_2022.sln
+          solution: DirectXTK_GDK_2022.slnx
           platform: Gaming.Desktop.x64
           configuration: Release
           msbuildArchitecture: x64
@@ -345,7 +345,7 @@ jobs:
         displayName: Build arm64dbg
         continueOnError: true
         inputs:
-          solution: '**\*GDKW_2022*.sln'
+          solution: '**\*GDKW_2022*.slnx'
           platform: ARM64
           configuration: Debug
           msbuildArchitecture: x64
@@ -354,7 +354,7 @@ jobs:
         displayName: Build arm64rel
         continueOnError: true
         inputs:
-          solution: '**\*GDKW_2022*.sln'
+          solution: '**\*GDKW_2022*.slnx'
           platform: ARM64
           configuration: Release
           msbuildArchitecture: x64
@@ -363,7 +363,7 @@ jobs:
         displayName: Build x64dbg
         continueOnError: true
         inputs:
-          solution: '**\*GDKW_2022*.sln'
+          solution: '**\*GDKW_2022*.slnx'
           platform: x64
           configuration: Debug
           msbuildArchitecture: x64
@@ -372,7 +372,7 @@ jobs:
         displayName: Build x64rel
         continueOnError: true
         inputs:
-          solution: '**\*GDKW_2022*.sln'
+          solution: '**\*GDKW_2022*.slnx'
           platform: x64
           configuration: Release
           msbuildArchitecture: x64
diff --git a/.azuredevops/templates/DirectXTK-build-uwp-arm64.yml b/.azuredevops/templates/DirectXTK-build-uwp-arm64.yml
index 537e079e1..ef0cca697 100644
--- a/.azuredevops/templates/DirectXTK-build-uwp-arm64.yml
+++ b/.azuredevops/templates/DirectXTK-build-uwp-arm64.yml
@@ -7,16 +7,16 @@
 
 steps:
   - task: VSBuild@1
-    displayName: Build solution DirectXTK_Windows10_2022.sln arm64dbg
+    displayName: Build solution DirectXTK_Windows10_2022 arm64dbg
     inputs:
-      solution: DirectXTK_Windows10_2022.sln
+      solution: DirectXTK_Windows10_2022.slnx
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: ARM64
       configuration: Debug
   - task: VSBuild@1
-    displayName: Build solution DirectXTK_Windows10_2022.sln arm64rel
+    displayName: Build solution DirectXTK_Windows10_2022 arm64rel
     inputs:
-      solution: DirectXTK_Windows10_2022.sln
+      solution: DirectXTK_Windows10_2022.slnx
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: ARM64
       configuration: Release
diff --git a/.azuredevops/templates/DirectXTK-build-uwp.yml b/.azuredevops/templates/DirectXTK-build-uwp.yml
index e4c06e149..5e430c11d 100644
--- a/.azuredevops/templates/DirectXTK-build-uwp.yml
+++ b/.azuredevops/templates/DirectXTK-build-uwp.yml
@@ -7,30 +7,30 @@
 
 steps:
   - task: VSBuild@1
-    displayName: Build solution DirectXTK_Windows10_2022.sln 32dbg
+    displayName: Build solution DirectXTK_Windows10_2022 32dbg
     inputs:
-      solution: DirectXTK_Windows10_2022.sln
+      solution: DirectXTK_Windows10_2022.slnx
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: x86
       configuration: Debug
   - task: VSBuild@1
-    displayName: Build solution DirectXTK_Windows10_2022.sln 32rel
+    displayName: Build solution DirectXTK_Windows10_2022 32rel
     inputs:
-      solution: DirectXTK_Windows10_2022.sln
+      solution: DirectXTK_Windows10_2022.slnx
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: x86
       configuration: Release
   - task: VSBuild@1
-    displayName: Build solution DirectXTK_Windows10_2022.sln 64dbg
+    displayName: Build solution DirectXTK_Windows10_2022 64dbg
     inputs:
-      solution: DirectXTK_Windows10_2022.sln
+      solution: DirectXTK_Windows10_2022.slnx
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: x64
       configuration: Debug
   - task: VSBuild@1
-    displayName: Build solution DirectXTK_Windows10_2022.sln 64rel
+    displayName: Build solution DirectXTK_Windows10_2022 64rel
     inputs:
-      solution: DirectXTK_Windows10_2022.sln
+      solution: DirectXTK_Windows10_2022.slnx
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: x64
       configuration: Release
diff --git a/.azuredevops/templates/DirectXTK-build-win32.yml b/.azuredevops/templates/DirectXTK-build-win32.yml
index 89b31d65e..5d11e90f2 100644
--- a/.azuredevops/templates/DirectXTK-build-win32.yml
+++ b/.azuredevops/templates/DirectXTK-build-win32.yml
@@ -7,30 +7,30 @@
 
 steps:
   - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2022.sln 32dbg
+    displayName: Build solution DirectXTK_Desktop_2022 32dbg
     inputs:
-      solution: DirectXTK_Desktop_2022.sln
+      solution: DirectXTK_Desktop_2022.slnx
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: x86
       configuration: Debug
   - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2022.sln 32rel
+    displayName: Build solution DirectXTK_Desktop_2022 32rel
     inputs:
-      solution: DirectXTK_Desktop_2022.sln
+      solution: DirectXTK_Desktop_2022.slnx
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: x86
       configuration: Release
   - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2022.sln 64dbg
+    displayName: Build solution DirectXTK_Desktop_2022 64dbg
     inputs:
-      solution: DirectXTK_Desktop_2022.sln
+      solution: DirectXTK_Desktop_2022.slnx
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: x64
       configuration: Debug
   - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2022.sln 64rel
+    displayName: Build solution DirectXTK_Desktop_2022 64rel
     inputs:
-      solution: DirectXTK_Desktop_2022.sln
+      solution: DirectXTK_Desktop_2022.slnx
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: x64
       configuration: Release
@@ -41,58 +41,58 @@ steps:
       workingDirectory: $(Build.SourcesDirectory)
       failOnStderr: false
   - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2022.sln managed dbg
+    displayName: Build solution DirectXTK_Desktop_2022 managed dbg
     inputs:
-      solution: DirectXTK_Desktop_2022.sln
+      solution: DirectXTK_Desktop_2022.slnx
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: Mixed Platforms
       configuration: Debug
   - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2022.sln managed rel
+    displayName: Build solution DirectXTK_Desktop_2022 managed rel
     inputs:
-      solution: DirectXTK_Desktop_2022.sln
+      solution: DirectXTK_Desktop_2022.slnx
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: Mixed Platforms
       configuration: Release
   - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2022_Win10.sln 32dbg
+    displayName: Build solution DirectXTK_Desktop_2022_Win10 32dbg
     inputs:
-      solution: DirectXTK_Desktop_2022_Win10.sln
+      solution: DirectXTK_Desktop_2022_Win10.slnx
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: x86
       configuration: Debug
   - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2022_Win10.sln 32rel
+    displayName: Build solution DirectXTK_Desktop_2022_Win10 32rel
     inputs:
-      solution: DirectXTK_Desktop_2022_Win10.sln
+      solution: DirectXTK_Desktop_2022_Win10.slnx
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: x86
       configuration: Release
   - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2022_Win10.sln 64dbg
+    displayName: Build solution DirectXTK_Desktop_2022_Win10 64dbg
     inputs:
-      solution: DirectXTK_Desktop_2022_Win10.sln
+      solution: DirectXTK_Desktop_2022_Win10.slnx
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: x64
       configuration: Debug
   - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2022_Win10.sln 64rel
+    displayName: Build solution DirectXTK_Desktop_2022_Win10 64rel
     inputs:
-      solution: DirectXTK_Desktop_2022_Win10.sln
+      solution: DirectXTK_Desktop_2022_Win10.slnx
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: x64
       configuration: Release
   - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2022_Win10.sln arm64dbg
+    displayName: Build solution DirectXTK_Desktop_2022_Win10 arm64dbg
     inputs:
-      solution: DirectXTK_Desktop_2022_Win10.sln
+      solution: DirectXTK_Desktop_2022_Win10.slnx
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: ARM64
       configuration: Debug
   - task: VSBuild@1
-    displayName: Build solution DirectXTK_Desktop_2022_Win10.sln arm64rel
+    displayName: Build solution DirectXTK_Desktop_2022_Win10 arm64rel
     inputs:
-      solution: DirectXTK_Desktop_2022_Win10.sln
+      solution: DirectXTK_Desktop_2022_Win10.slnx
       msbuildArgs: /p:PreferredToolArchitecture=x64
       platform: ARM64
       configuration: Release
diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index 0c8714a35..2c7380306 100644
--- a/.github/workflows/msbuild.yml
+++ b/.github/workflows/msbuild.yml
@@ -40,7 +40,7 @@ jobs:
         platform: [x86, x64, ARM64]
 
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Add MSBuild to PATH
         uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0
@@ -52,19 +52,19 @@ jobs:
         working-directory: ${{ github.workspace }}
         run: >
           msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
-          DirectXTK_Desktop_2022.sln
+          DirectXTK_Desktop_2022.slnx
 
       - name: 'Build (Windows 10)'
         working-directory: ${{ github.workspace }}
         run: >
           msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
-          DirectXTK_Desktop_2022_Win10.sln
+          DirectXTK_Desktop_2022_Win10.slnx
 
       - name: 'Build (UWP)'
         working-directory: ${{ github.workspace }}
         run: >
           msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
-          DirectXTK_Windows10_2022.sln
+          DirectXTK_Windows10_2022.slnx
 
       - if: matrix.platform != 'ARM64'
         name: 'Build (Windows 8.1 w/ Spectre)'
@@ -72,7 +72,7 @@ jobs:
         run: >
           msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
           /p:SpectreMitigation=Spectre
-          DirectXTK_Desktop_2022.sln
+          DirectXTK_Desktop_2022.slnx
 
       - if: matrix.platform != 'ARM64'
         name: 'Build (Spectre Windows 10)'
@@ -80,7 +80,7 @@ jobs:
         run: >
           msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
           /p:SpectreMitigation=Spectre
-          DirectXTK_Desktop_2022_Win10.sln
+          DirectXTK_Desktop_2022_Win10.slnx
 
   build2026:
     runs-on: windows-2025-vs2026
@@ -93,7 +93,7 @@ jobs:
         platform: [x86, x64, ARM64]
 
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Add MSBuild to PATH
         uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0
@@ -116,7 +116,7 @@ jobs:
         build_type: [Debug, Release]
 
     steps:
-      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - name: Add MSBuild to PATH
         uses: microsoft/setup-msbuild@30375c66a4eea26614e0d39710365f22f8b0af57 # v3.0.0
@@ -127,10 +127,10 @@ jobs:
         working-directory: ${{ github.workspace }}
         run: >
           msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=ARM64
-          DirectXTK_Desktop_2022_Win10.sln
+          DirectXTK_Desktop_2022_Win10.slnx
 
       - name: 'Build (UWP)'
         working-directory: ${{ github.workspace }}
         run: >
           msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=ARM64
-          DirectXTK_Windows10_2022.sln
+          DirectXTK_Windows10_2022.slnx
diff --git a/.github/workflows/testuwp.yml b/.github/workflows/testuwp.yml
index e5c33b5d6..124f313b9 100644
--- a/.github/workflows/testuwp.yml
+++ b/.github/workflows/testuwp.yml
@@ -59,4 +59,4 @@ jobs:
         run: >
           msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
           /T:Build /p:AppxPackage=false
-          DirectXTK_Tests_Windows10.sln
+          DirectXTK_Tests_Windows10.slnx
diff --git a/DirectXTK_Desktop_2022.sln b/DirectXTK_Desktop_2022.sln
deleted file mode 100644
index 0f2d8386b..000000000
--- a/DirectXTK_Desktop_2022.sln
+++ /dev/null
@@ -1,69 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.12.35514.174 d17.12
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK_Desktop_2022", "DirectXTK_Desktop_2022.vcxproj", "{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakeSpriteFont", "MakeSpriteFont\MakeSpriteFont.csproj", "{7329B02D-C504-482A-A156-181D48CE493C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XWBTool_Desktop_2022", "XWBTool\XWBTool_Desktop_2022.vcxproj", "{C7AB4186-54B2-4244-A533-77494763EA1D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0317D9F7-1BFB-4422-8B2F-670E7956F12D}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x64.ActiveCfg = Debug|x64
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x64.Build.0 = Debug|x64
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x86.ActiveCfg = Debug|Win32
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x86.Build.0 = Debug|Win32
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.ActiveCfg = Release|x64
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.Build.0 = Release|x64
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.ActiveCfg = Release|Win32
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.Build.0 = Release|Win32
-		{7329B02D-C504-482A-A156-181D48CE493C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Debug|x64.Build.0 = Debug|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Debug|x86.Build.0 = Debug|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Release|x64.ActiveCfg = Release|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Release|x64.Build.0 = Release|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.ActiveCfg = Release|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.Build.0 = Release|Any CPU
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x64.ActiveCfg = Debug|x64
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x64.Build.0 = Debug|x64
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x86.ActiveCfg = Debug|Win32
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x86.Build.0 = Debug|Win32
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x64.ActiveCfg = Release|x64
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x64.Build.0 = Release|x64
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.ActiveCfg = Release|Win32
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {A26A07B7-AF41-47A4-B21F-8C772153EAA4}
-	EndGlobalSection
-EndGlobal
diff --git a/DirectXTK_Desktop_2022.slnx b/DirectXTK_Desktop_2022.slnx
new file mode 100644
index 000000000..b8ff535b7
--- /dev/null
+++ b/DirectXTK_Desktop_2022.slnx
@@ -0,0 +1,17 @@
+<Solution>
+  <Configurations>
+    <Platform Name="Mixed Platforms" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+  </Folder>
+  <Project DefaultStartup="true" Path="DirectXTK_Desktop_2022.vcxproj" Id="e0b52ae7-e160-4d32-bf3f-910b785e5a8e">
+    <Platform Solution="*|Mixed Platforms" Project="Win32" />
+  </Project>
+  <Project Path="MakeSpriteFont/MakeSpriteFont.csproj" Id="7329b02d-c504-482a-a156-181d48ce493c" />
+  <Project Path="XWBTool/XWBTool_Desktop_2022.vcxproj" Id="c7ab4186-54b2-4244-a533-77494763ea1d">
+    <Platform Solution="*|Mixed Platforms" Project="Win32" />
+  </Project>
+</Solution>
diff --git a/DirectXTK_Desktop_2022_Win10.sln b/DirectXTK_Desktop_2022_Win10.sln
deleted file mode 100644
index 458266a04..000000000
--- a/DirectXTK_Desktop_2022_Win10.sln
+++ /dev/null
@@ -1,84 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 16.0.29609.76
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK_Desktop_2022_Win10", "DirectXTK_Desktop_2022_Win10.vcxproj", "{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MakeSpriteFont", "MakeSpriteFont\MakeSpriteFont.csproj", "{7329B02D-C504-482A-A156-181D48CE493C}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XWBTool_Desktop_2022", "XWBTool\XWBTool_Desktop_2022.vcxproj", "{C7AB4186-54B2-4244-A533-77494763EA1D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BD5A62C9-FE7B-4491-82C2-BD46EA64D1C8}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM64 = Debug|ARM64
-		Debug|Mixed Platforms = Debug|Mixed Platforms
-		Debug|x86 = Debug|x86
-		Debug|x64 = Debug|x64
-		Release|ARM64 = Release|ARM64
-		Release|Mixed Platforms = Release|Mixed Platforms
-		Release|x86 = Release|x86
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|ARM64.Build.0 = Debug|ARM64
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x86.ActiveCfg = Debug|Win32
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x86.Build.0 = Debug|Win32
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x64.ActiveCfg = Debug|x64
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Debug|x64.Build.0 = Debug|x64
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|ARM64.ActiveCfg = Release|ARM64
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|ARM64.Build.0 = Release|ARM64
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.ActiveCfg = Release|Win32
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x86.Build.0 = Release|Win32
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.ActiveCfg = Release|x64
-		{E0B52AE7-E160-4D32-BF3F-910B785E5A8E}.Release|x64.Build.0 = Release|x64
-		{7329B02D-C504-482A-A156-181D48CE493C}.Debug|ARM64.ActiveCfg = Debug|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Debug|ARM64.Build.0 = Debug|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Debug|x86.Build.0 = Debug|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Debug|x64.Build.0 = Debug|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Release|ARM64.ActiveCfg = Release|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Release|ARM64.Build.0 = Release|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.ActiveCfg = Release|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Release|x86.Build.0 = Release|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Release|x64.ActiveCfg = Release|Any CPU
-		{7329B02D-C504-482A-A156-181D48CE493C}.Release|x64.Build.0 = Release|Any CPU
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|ARM64.Build.0 = Debug|ARM64
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|Mixed Platforms.Build.0 = Debug|Win32
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x86.ActiveCfg = Debug|Win32
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x86.Build.0 = Debug|Win32
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x64.ActiveCfg = Debug|x64
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Debug|x64.Build.0 = Debug|x64
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Release|ARM64.ActiveCfg = Release|ARM64
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Release|ARM64.Build.0 = Release|ARM64
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Release|Mixed Platforms.ActiveCfg = Release|Win32
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Release|Mixed Platforms.Build.0 = Release|Win32
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.ActiveCfg = Release|Win32
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x86.Build.0 = Release|Win32
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x64.ActiveCfg = Release|x64
-		{C7AB4186-54B2-4244-A533-77494763EA1D}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {0F7A0290-0AF9-47AB-A91D-1346B9433995}
-	EndGlobalSection
-EndGlobal
diff --git a/DirectXTK_Desktop_2022_Win10.slnx b/DirectXTK_Desktop_2022_Win10.slnx
new file mode 100644
index 000000000..62dd47637
--- /dev/null
+++ b/DirectXTK_Desktop_2022_Win10.slnx
@@ -0,0 +1,18 @@
+<Solution>
+  <Configurations>
+    <Platform Name="ARM64" />
+    <Platform Name="Mixed Platforms" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+  </Folder>
+  <Project DefaultStartup="true" Path="DirectXTK_Desktop_2022_Win10.vcxproj" Id="e0b52ae7-e160-4d32-bf3f-910b785e5a8e">
+    <Platform Solution="*|Mixed Platforms" Project="Win32" />
+  </Project>
+  <Project Path="MakeSpriteFont/MakeSpriteFont.csproj" Id="7329b02d-c504-482a-a156-181d48ce493c" />
+  <Project Path="XWBTool/XWBTool_Desktop_2022.vcxproj" Id="c7ab4186-54b2-4244-a533-77494763ea1d">
+    <Platform Solution="*|Mixed Platforms" Project="Win32" />
+  </Project>
+</Solution>
diff --git a/DirectXTK_Desktop_2026.slnx b/DirectXTK_Desktop_2026.slnx
index 18982815e..b2a3ca587 100644
--- a/DirectXTK_Desktop_2026.slnx
+++ b/DirectXTK_Desktop_2026.slnx
@@ -8,11 +8,11 @@
   <Folder Name="/Solution Items/">
     <File Path=".editorconfig" />
   </Folder>
-  <Project Path="DirectXTK_Desktop_2026.vcxproj">
+  <Project DefaultStartup="true" Path="DirectXTK_Desktop_2026.vcxproj" Id="e0b52ae7-e160-4d32-bf3f-910b785e5a8e">
     <Platform Solution="*|Mixed Platforms" Project="Win32" />
   </Project>
-  <Project Path="MakeSpriteFont/MakeSpriteFont.csproj" />
-  <Project Path="XWBTool/XWBTool_Desktop_2026.vcxproj">
+  <Project Path="MakeSpriteFont/MakeSpriteFont.csproj" Id="7329b02d-c504-482a-a156-181d48ce493c" />
+  <Project Path="XWBTool/XWBTool_Desktop_2026.vcxproj" Id="c7ab4186-54b2-4244-a533-77494763ea1d">
     <Platform Solution="*|Mixed Platforms" Project="Win32" />
   </Project>
 </Solution>
diff --git a/DirectXTK_GDKW_2022.sln b/DirectXTK_GDKW_2022.sln
deleted file mode 100644
index 51d3e65e0..000000000
--- a/DirectXTK_GDKW_2022.sln
+++ /dev/null
@@ -1,37 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.14.37111.16 d17.14
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK", "DirectXTK_GDKW_2022.vcxproj", "{26BE66BD-6E77-43BA-B363-725F9FC827C1}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM64 = Debug|ARM64
-		Debug|x64 = Debug|x64
-		Profile|ARM64 = Profile|ARM64
-		Profile|x64 = Profile|x64
-		Release|ARM64 = Release|ARM64
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{26BE66BD-6E77-43BA-B363-725F9FC827C1}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{26BE66BD-6E77-43BA-B363-725F9FC827C1}.Debug|ARM64.Build.0 = Debug|ARM64
-		{26BE66BD-6E77-43BA-B363-725F9FC827C1}.Debug|x64.ActiveCfg = Debug|x64
-		{26BE66BD-6E77-43BA-B363-725F9FC827C1}.Debug|x64.Build.0 = Debug|x64
-		{26BE66BD-6E77-43BA-B363-725F9FC827C1}.Profile|ARM64.ActiveCfg = Profile|ARM64
-		{26BE66BD-6E77-43BA-B363-725F9FC827C1}.Profile|ARM64.Build.0 = Profile|ARM64
-		{26BE66BD-6E77-43BA-B363-725F9FC827C1}.Profile|x64.ActiveCfg = Profile|x64
-		{26BE66BD-6E77-43BA-B363-725F9FC827C1}.Profile|x64.Build.0 = Profile|x64
-		{26BE66BD-6E77-43BA-B363-725F9FC827C1}.Release|ARM64.ActiveCfg = Release|ARM64
-		{26BE66BD-6E77-43BA-B363-725F9FC827C1}.Release|ARM64.Build.0 = Release|ARM64
-		{26BE66BD-6E77-43BA-B363-725F9FC827C1}.Release|x64.ActiveCfg = Release|x64
-		{26BE66BD-6E77-43BA-B363-725F9FC827C1}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {C9774FA7-D1E4-4559-A33C-120FAA21EE34}
-	EndGlobalSection
-EndGlobal
diff --git a/DirectXTK_GDKW_2022.slnx b/DirectXTK_GDKW_2022.slnx
new file mode 100644
index 000000000..b55350844
--- /dev/null
+++ b/DirectXTK_GDKW_2022.slnx
@@ -0,0 +1,10 @@
+<Solution>
+  <Configurations>
+    <BuildType Name="Debug" />
+    <BuildType Name="Profile" />
+    <BuildType Name="Release" />
+    <Platform Name="ARM64" />
+    <Platform Name="x64" />
+  </Configurations>
+  <Project Path="DirectXTK_GDKW_2022.vcxproj" Id="26be66bd-6e77-43ba-b363-725f9fc827c1" />
+</Solution>
diff --git a/DirectXTK_GDK_2022.sln b/DirectXTK_GDK_2022.sln
deleted file mode 100644
index d74f1d026..000000000
--- a/DirectXTK_GDK_2022.sln
+++ /dev/null
@@ -1,33 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.1.32228.430
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK", "DirectXTK_GDK_2022.vcxproj", "{26BE66BD-6E77-43BA-B363-725F9FC827C1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8CD5AD55-FCE2-447A-B906-AA5764123738}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Gaming.Desktop.x64 = Debug|Gaming.Desktop.x64
-		Profile|Gaming.Desktop.x64 = Profile|Gaming.Desktop.x64
-		Release|Gaming.Desktop.x64 = Release|Gaming.Desktop.x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{26BE66BD-6E77-43BA-B363-725F9FC827C1}.Debug|Gaming.Desktop.x64.ActiveCfg = Debug|Gaming.Desktop.x64
-		{26BE66BD-6E77-43BA-B363-725F9FC827C1}.Debug|Gaming.Desktop.x64.Build.0 = Debug|Gaming.Desktop.x64
-		{26BE66BD-6E77-43BA-B363-725F9FC827C1}.Profile|Gaming.Desktop.x64.ActiveCfg = Profile|Gaming.Desktop.x64
-		{26BE66BD-6E77-43BA-B363-725F9FC827C1}.Profile|Gaming.Desktop.x64.Build.0 = Profile|Gaming.Desktop.x64
-		{26BE66BD-6E77-43BA-B363-725F9FC827C1}.Release|Gaming.Desktop.x64.ActiveCfg = Release|Gaming.Desktop.x64
-		{26BE66BD-6E77-43BA-B363-725F9FC827C1}.Release|Gaming.Desktop.x64.Build.0 = Release|Gaming.Desktop.x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {61313088-A570-4AE2-A5E4-1169FE8F2562}
-	EndGlobalSection
-EndGlobal
diff --git a/DirectXTK_GDK_2022.slnx b/DirectXTK_GDK_2022.slnx
new file mode 100644
index 000000000..93a2d1db3
--- /dev/null
+++ b/DirectXTK_GDK_2022.slnx
@@ -0,0 +1,12 @@
+<Solution>
+  <Configurations>
+    <BuildType Name="Debug" />
+    <BuildType Name="Profile" />
+    <BuildType Name="Release" />
+    <Platform Name="Gaming.Desktop.x64" />
+  </Configurations>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+  </Folder>
+  <Project Path="DirectXTK_GDK_2022.vcxproj" Id="26be66bd-6e77-43ba-b363-725f9fc827c1" />
+</Solution>
diff --git a/DirectXTK_Windows10_2022.sln b/DirectXTK_Windows10_2022.sln
deleted file mode 100644
index 38c1e9df1..000000000
--- a/DirectXTK_Windows10_2022.sln
+++ /dev/null
@@ -1,41 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.7.34009.444
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTK", "DirectXTK_Windows10_2022.vcxproj", "{F4776924-619C-42C7-88B2-82C947CCC9E7}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{88140C29-E1F8-41E0-9126-6912B6A713BA}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM64 = Debug|ARM64
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|ARM64 = Release|ARM64
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|ARM64.Build.0 = Debug|ARM64
-		{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|x64.ActiveCfg = Debug|x64
-		{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|x64.Build.0 = Debug|x64
-		{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|x86.ActiveCfg = Debug|Win32
-		{F4776924-619C-42C7-88B2-82C947CCC9E7}.Debug|x86.Build.0 = Debug|Win32
-		{F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|ARM64.ActiveCfg = Release|ARM64
-		{F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|ARM64.Build.0 = Release|ARM64
-		{F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|x64.ActiveCfg = Release|x64
-		{F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|x64.Build.0 = Release|x64
-		{F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|x86.ActiveCfg = Release|Win32
-		{F4776924-619C-42C7-88B2-82C947CCC9E7}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {FFD89A12-8620-47B9-A00E-6FD1824BFAC5}
-	EndGlobalSection
-EndGlobal
diff --git a/DirectXTK_Windows10_2022.slnx b/DirectXTK_Windows10_2022.slnx
new file mode 100644
index 000000000..10d9c7b21
--- /dev/null
+++ b/DirectXTK_Windows10_2022.slnx
@@ -0,0 +1,11 @@
+<Solution>
+  <Configurations>
+    <Platform Name="ARM64" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+  </Folder>
+  <Project Path="DirectXTK_Windows10_2022.vcxproj" Id="f4776924-619c-42c7-88b2-82c947ccc9e7" />
+</Solution>