diff --git a/.azuredevops/templates/DirectXTex-build-gdk.yml b/.azuredevops/templates/DirectXTex-build-gdk.yml
index 3d029e597..98f15e595 100644
--- a/.azuredevops/templates/DirectXTex-build-gdk.yml
+++ b/.azuredevops/templates/DirectXTex-build-gdk.yml
@@ -22,7 +22,7 @@ steps:
     displayName: Build solution DirectXTex_GDK_${{ parameters.vsYear }} pcdbg
     continueOnError: true
     inputs:
-      solution: DirectXTex_GDK_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GDK_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: Gaming.Desktop.x64
       configuration: Debug
@@ -32,7 +32,7 @@ steps:
     displayName: Build solution DirectXTex_GDK_${{ parameters.vsYear }} pcrel
     continueOnError: true
     inputs:
-      solution: DirectXTex_GDK_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GDK_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: Gaming.Desktop.x64
       configuration: Release
@@ -42,7 +42,7 @@ steps:
     displayName: Build solution DirectXTex_GDK_${{ parameters.vsYear }} xbdbg
     continueOnError: true
     inputs:
-      solution: DirectXTex_GDK_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GDK_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: Gaming.Xbox.XboxOne.x64
       configuration: Debug
@@ -52,7 +52,7 @@ steps:
     displayName: Build solution DirectXTex_GDK_${{ parameters.vsYear }} xbrel
     continueOnError: true
     inputs:
-      solution: DirectXTex_GDK_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GDK_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: Gaming.Xbox.XboxOne.x64
       configuration: Release
@@ -62,7 +62,7 @@ steps:
     displayName: Build solution DirectXTex_GDK_${{ parameters.vsYear }} scardbg
     continueOnError: true
     inputs:
-      solution: DirectXTex_GDK_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GDK_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: Gaming.Xbox.Scarlett.x64
       configuration: Debug
@@ -72,7 +72,7 @@ steps:
     displayName: Build solution DirectXTex_GDK_${{ parameters.vsYear }} scarrel
     continueOnError: true
     inputs:
-      solution: DirectXTex_GDK_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GDK_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: Gaming.Xbox.Scarlett.x64
       configuration: Release
@@ -82,7 +82,7 @@ steps:
     displayName: Build solution DirectXTex_GDK_PC_${{ parameters.vsYear }} dbg
     continueOnError: true
     inputs:
-      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: x64
       configuration: Debug
@@ -92,7 +92,7 @@ steps:
     displayName: Build solution DirectXTex_GDK_PC_${{ parameters.vsYear }} rel
     continueOnError: true
     inputs:
-      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: x64
       configuration: Release
@@ -102,7 +102,7 @@ steps:
     displayName: Build solution DirectXTex_GDK_PC_${{ parameters.vsYear }} scardbg
     continueOnError: true
     inputs:
-      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: x64
       configuration: Debug_Scarlett
@@ -112,7 +112,7 @@ steps:
     displayName: Build solution DirectXTex_GDK_PC_${{ parameters.vsYear }} scarrel
     continueOnError: true
     inputs:
-      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: x64
       configuration: Release_Scarlett
diff --git a/.azuredevops/templates/DirectXTex-build-gdkx.yml b/.azuredevops/templates/DirectXTex-build-gdkx.yml
index 8ebf87c6d..602cea344 100644
--- a/.azuredevops/templates/DirectXTex-build-gdkx.yml
+++ b/.azuredevops/templates/DirectXTex-build-gdkx.yml
@@ -10,10 +10,12 @@ parameters:
     type: string
     values:
       - '17.0'
+      - '18.0'
   - name: vsYear
     type: number
     values:
       - 2022
+      - 2026
   - name: scarlett
     type: boolean
     default: true
@@ -26,7 +28,7 @@ steps:
     displayName: Build solution DirectXTex_GDKX_${{ parameters.vsYear }} pcdbg
     continueOnError: true
     inputs:
-      solution: DirectXTex_GDKX_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GDKX_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: x64
       configuration: Debug
@@ -36,7 +38,7 @@ steps:
     displayName: Build solution DirectXTex_GDKX_${{ parameters.vsYear }} pcrel
     continueOnError: true
     inputs:
-      solution: DirectXTex_GDKX_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GDKX_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: x64
       configuration: Release
@@ -47,7 +49,7 @@ steps:
     condition: eq(${{ parameters.xboxone }}, true)
     continueOnError: true
     inputs:
-      solution: DirectXTex_GDKX_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GDKX_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: Gaming.Xbox.XboxOne.x64
       configuration: Debug
@@ -58,7 +60,7 @@ steps:
     condition: eq(${{ parameters.xboxone }}, true)
     continueOnError: true
     inputs:
-      solution: DirectXTex_GDKX_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GDKX_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: Gaming.Xbox.XboxOne.x64
       configuration: Release
@@ -69,7 +71,7 @@ steps:
     condition: eq(${{ parameters.scarlett }}, true)
     continueOnError: true
     inputs:
-      solution: DirectXTex_GDKX_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GDKX_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: Gaming.Xbox.Scarlett.x64
       configuration: Debug
@@ -80,7 +82,7 @@ steps:
     condition: eq(${{ parameters.scarlett }}, true)
     continueOnError: true
     inputs:
-      solution: DirectXTex_GDKX_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GDKX_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: Gaming.Xbox.Scarlett.x64
       configuration: Release
@@ -91,7 +93,7 @@ steps:
     condition: eq(${{ parameters.xboxone }}, true)
     continueOnError: true
     inputs:
-      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: x64
       configuration: Debug
@@ -102,7 +104,7 @@ steps:
     condition: eq(${{ parameters.xboxone }}, true)
     continueOnError: true
     inputs:
-      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: x64
       configuration: Release
@@ -113,7 +115,7 @@ steps:
     condition: eq(${{ parameters.scarlett }}, true)
     continueOnError: true
     inputs:
-      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: x64
       configuration: Debug_Scarlett
@@ -124,7 +126,7 @@ steps:
     condition: eq(${{ parameters.scarlett }}, true)
     continueOnError: true
     inputs:
-      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.sln
+      solution: DirectXTex_GXDK_PC_${{ parameters.vsYear }}.slnx
       vsVersion: ${{ parameters.msVersion }}
       platform: x64
       configuration: Release_Scarlett
diff --git a/.azuredevops/templates/DirectXTex-build-uwp.yml b/.azuredevops/templates/DirectXTex-build-uwp.yml
index 2a9f16f5e..9f8bc26a7 100644
--- a/.azuredevops/templates/DirectXTex-build-uwp.yml
+++ b/.azuredevops/templates/DirectXTex-build-uwp.yml
@@ -7,50 +7,50 @@
 
 steps:
   - task: VSBuild@1
-    displayName: Build solution DirectXTex_Windows10_2022.sln 32dbg
+    displayName: Build solution DirectXTex_Windows10_2022 32dbg
     inputs:
-      solution: DirectXTex_Windows10_2022.sln
+      solution: DirectXTex_Windows10_2022.slnx
       platform: x86
       configuration: Debug
       msbuildArchitecture: x64
       msbuildArgs: /p:PreferredToolArchitecture=x64
   - task: VSBuild@1
-    displayName: Build solution DirectXTex_Windows10_2022.sln 32rel
+    displayName: Build solution DirectXTex_Windows10_2022 32rel
     inputs:
-      solution: DirectXTex_Windows10_2022.sln
+      solution: DirectXTex_Windows10_2022.slnx
       platform: x86
       configuration: Release
       msbuildArchitecture: x64
       msbuildArgs: /p:PreferredToolArchitecture=x64
   - task: VSBuild@1
-    displayName: Build solution DirectXTex_Windows10_2022.sln 64dbg
+    displayName: Build solution DirectXTex_Windows10_2022 64dbg
     inputs:
-      solution: DirectXTex_Windows10_2022.sln
+      solution: DirectXTex_Windows10_2022.slnx
       platform: x64
       configuration: Debug
       msbuildArchitecture: x64
       msbuildArgs: /p:PreferredToolArchitecture=x64
   - task: VSBuild@1
-    displayName: Build solution DirectXTex_Windows10_2022.sln 64rel
+    displayName: Build solution DirectXTex_Windows10_2022 64rel
     inputs:
-      solution: DirectXTex_Windows10_2022.sln
+      solution: DirectXTex_Windows10_2022.slnx
       platform: x64
       configuration: Release
       msbuildArchitecture: x64
       msbuildArgs: /p:PreferredToolArchitecture=x64
   # Windows on ARM 32-bit is deprecated. https://learn.microsoft.com/windows/arm/arm32-to-arm64
   - task: VSBuild@1
-    displayName: Build solution DirectXTex_Windows10_2022.sln arm64dbg
+    displayName: Build solution DirectXTex_Windows10_2022 arm64dbg
     inputs:
-      solution: DirectXTex_Windows10_2022.sln
+      solution: DirectXTex_Windows10_2022.slnx
       platform: ARM64
       configuration: Debug
       msbuildArchitecture: x64
       msbuildArgs: /p:PreferredToolArchitecture=x64
   - task: VSBuild@1
-    displayName: Build solution DirectXTex_Windows10_2022.sln arm64rel
+    displayName: Build solution DirectXTex_Windows10_2022 arm64rel
     inputs:
-      solution: DirectXTex_Windows10_2022.sln
+      solution: DirectXTex_Windows10_2022.slnx
       platform: ARM64
       configuration: Release
       msbuildArchitecture: x64
diff --git a/.azuredevops/templates/DirectXTex-build-win32.yml b/.azuredevops/templates/DirectXTex-build-win32.yml
index dd3e214b3..760fcd14d 100644
--- a/.azuredevops/templates/DirectXTex-build-win32.yml
+++ b/.azuredevops/templates/DirectXTex-build-win32.yml
@@ -7,81 +7,81 @@
 
 steps:
   - task: VSBuild@1
-    displayName: Build solution DirectXTex_Desktop_2022.sln 32dbg
+    displayName: Build solution DirectXTex_Desktop_2022 32dbg
     inputs:
-      solution: DirectXTex_Desktop_2022.sln
+      solution: DirectXTex_Desktop_2022.slnx
       platform: x86
       configuration: Debug
       msbuildArchitecture: x64
       msbuildArgs: /p:PreferredToolArchitecture=x64
   - task: VSBuild@1
-    displayName: Build solution DirectXTex_Desktop_2022.sln 32rel
+    displayName: Build solution DirectXTex_Desktop_2022 32rel
     inputs:
-      solution: DirectXTex_Desktop_2022.sln
+      solution: DirectXTex_Desktop_2022.slnx
       platform: x86
       configuration: Release
       msbuildArchitecture: x64
       msbuildArgs: /p:PreferredToolArchitecture=x64
   - task: VSBuild@1
-    displayName: Build solution DirectXTex_Desktop_2022.sln 64dbg
+    displayName: Build solution DirectXTex_Desktop_2022 64dbg
     inputs:
-      solution: DirectXTex_Desktop_2022.sln
+      solution: DirectXTex_Desktop_2022.slnx
       platform: x64
       configuration: Debug
       msbuildArchitecture: x64
       msbuildArgs: /p:PreferredToolArchitecture=x64
   - task: VSBuild@1
-    displayName: Build solution DirectXTex_Desktop_2022.sln 64rel
+    displayName: Build solution DirectXTex_Desktop_2022 64rel
     inputs:
-      solution: DirectXTex_Desktop_2022.sln
+      solution: DirectXTex_Desktop_2022.slnx
       platform: x64
       configuration: Release
       msbuildArchitecture: x64
       msbuildArgs: /p:PreferredToolArchitecture=x64
   - task: VSBuild@1
-    displayName: Build solution DirectXTex_Desktop_2022_Win10.sln 32dbg
+    displayName: Build solution DirectXTex_Desktop_2022_Win10 32dbg
     inputs:
-      solution: DirectXTex_Desktop_2022_Win10.sln
+      solution: DirectXTex_Desktop_2022_Win10.slnx
       platform: x86
       configuration: Debug
       msbuildArchitecture: x64
       msbuildArgs: /p:PreferredToolArchitecture=x64
   - task: VSBuild@1
-    displayName: Build solution DirectXTex_Desktop_2022_Win10.sln 32rel
+    displayName: Build solution DirectXTex_Desktop_2022_Win10 32rel
     inputs:
-      solution: DirectXTex_Desktop_2022_Win10.sln
+      solution: DirectXTex_Desktop_2022_Win10.slnx
       platform: x86
       configuration: Release
       msbuildArchitecture: x64
       msbuildArgs: /p:PreferredToolArchitecture=x64
   - task: VSBuild@1
-    displayName: Build solution DirectXTex_Desktop_2022_Win10.sln 64dbg
+    displayName: Build solution DirectXTex_Desktop_2022_Win10 64dbg
     inputs:
-      solution: DirectXTex_Desktop_2022_Win10.sln
+      solution: DirectXTex_Desktop_2022_Win10.slnx
       platform: x64
       configuration: Debug
       msbuildArchitecture: x64
       msbuildArgs: /p:PreferredToolArchitecture=x64
   - task: VSBuild@1
-    displayName: Build solution DirectXTex_Desktop_2022_Win10.sln 64rel
+    displayName: Build solution DirectXTex_Desktop_2022_Win10 64rel
     inputs:
-      solution: DirectXTex_Desktop_2022_Win10.sln
+      solution: DirectXTex_Desktop_2022_Win10.slnx
       platform: x64
       configuration: Release
       msbuildArchitecture: x64
       msbuildArgs: /p:PreferredToolArchitecture=x64
   - task: VSBuild@1
-    displayName: Build solution DirectXTex_Desktop_2022_Win10.sln arm64dbg
+    displayName: Build solution DirectXTex_Desktop_2022_Win10 arm64dbg
     inputs:
-      solution: DirectXTex_Desktop_2022_Win10.sln
+      solution: DirectXTex_Desktop_2022_Win10.slnx
       platform: ARM64
       configuration: Debug
       msbuildArchitecture: x64
       msbuildArgs: /p:PreferredToolArchitecture=x64
   - task: VSBuild@1
-    displayName: Build solution DirectXTex_Desktop_2022_Win10.sln arm64rel
+    displayName: Build solution DirectXTex_Desktop_2022_Win10 arm64rel
     inputs:
-      solution: DirectXTex_Desktop_2022_Win10.sln
+      solution: DirectXTex_Desktop_2022_Win10.slnx
       platform: ARM64
       configuration: Release
       msbuildArchitecture: x64
diff --git a/.github/workflows/msbuild.yml b/.github/workflows/msbuild.yml
index 374bb7d5b..c8a1a37e7 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 }}
-          DirectXTex_Desktop_2022.sln
+          DirectXTex_Desktop_2022.slnx
 
       - name: 'Build (Windows 10)'
         working-directory: ${{ github.workspace }}
         run: >
           msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
-          DirectXTex_Desktop_2022_Win10.sln
+          DirectXTex_Desktop_2022_Win10.slnx
 
       - name: 'Build (UWP)'
         working-directory: ${{ github.workspace }}
         run: >
           msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
-          DirectXTex_Windows10_2022.sln
+          DirectXTex_Windows10_2022.slnx
 
       - if: matrix.platform != 'ARM64'
         name: 'Build (Spectre)'
@@ -72,7 +72,7 @@ jobs:
         run: >
           msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=${{ matrix.platform }}
           /p:SpectreMitigation=Spectre
-          DirectXTex_Desktop_2022.sln
+          DirectXTex_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
-          DirectXTex_Desktop_2022_Win10.sln
+          DirectXTex_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
-          DirectXTex_Desktop_2022_Win10.sln
+          DirectXTex_Desktop_2022_Win10.slnx
 
       - name: 'Build (UWP)'
         working-directory: ${{ github.workspace }}
         run: >
           msbuild /m /p:Configuration=${{ matrix.build_type }} /p:Platform=ARM64
-          DirectXTex_Windows10_2022.sln
+          DirectXTex_Windows10_2022.slnx
diff --git a/DirectXTex_Desktop_2022.sln b/DirectXTex_Desktop_2022.sln
deleted file mode 100644
index 57cb16f3c..000000000
--- a/DirectXTex_Desktop_2022.sln
+++ /dev/null
@@ -1,107 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 16.0.28729.10
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "DirectXTex\DirectXTex_Desktop_2022.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texassemble", "Texassemble\Texassemble_Desktop_2022.vcxproj", "{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texconv", "Texconv\Texconv_Desktop_2022.vcxproj", "{C3A65381-8FD3-4F69-B29E-654B4B0ED136}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DDSView", "DDSView\DDSView_Desktop_2022.vcxproj", "{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{AEA1D9F7-EA95-4BF7-8E6D-0EA068077943}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sample", "Sample", "{E14090F7-2FE9-47EE-A331-14ED71801FDE}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texdiag", "Texdiag\texdiag_Desktop_2022.vcxproj", "{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A40FB626-EA42-48D5-AE40-EE5A6FD3742E}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x86 = Debug|x86
-		Debug|x64 = Debug|x64
-		Profile|x86 = Profile|x86
-		Profile|x64 = Profile|x64
-		Release|x86 = Release|x86
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x86.ActiveCfg = Debug|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x86.Build.0 = Debug|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x64.ActiveCfg = Debug|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x64.Build.0 = Debug|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x86.ActiveCfg = Profile|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x86.Build.0 = Profile|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x64.ActiveCfg = Profile|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x64.Build.0 = Profile|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x86.ActiveCfg = Release|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x86.Build.0 = Release|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x64.ActiveCfg = Release|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x64.Build.0 = Release|x64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x86.ActiveCfg = Debug|Win32
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x86.Build.0 = Debug|Win32
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x64.ActiveCfg = Debug|x64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x64.Build.0 = Debug|x64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x86.ActiveCfg = Profile|Win32
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x86.Build.0 = Profile|Win32
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x64.ActiveCfg = Profile|x64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x64.Build.0 = Profile|x64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x86.ActiveCfg = Release|Win32
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x86.Build.0 = Release|Win32
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x64.ActiveCfg = Release|x64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x64.Build.0 = Release|x64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x86.ActiveCfg = Debug|Win32
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x86.Build.0 = Debug|Win32
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x64.ActiveCfg = Debug|x64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x64.Build.0 = Debug|x64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x86.ActiveCfg = Profile|Win32
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x86.Build.0 = Profile|Win32
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x64.ActiveCfg = Profile|x64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x64.Build.0 = Profile|x64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x86.ActiveCfg = Release|Win32
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x86.Build.0 = Release|Win32
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x64.ActiveCfg = Release|x64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x64.Build.0 = Release|x64
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|x86.ActiveCfg = Debug|Win32
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|x86.Build.0 = Debug|Win32
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|x64.ActiveCfg = Debug|x64
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Debug|x64.Build.0 = Debug|x64
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|x86.ActiveCfg = Profile|Win32
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|x86.Build.0 = Profile|Win32
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|x64.ActiveCfg = Profile|x64
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Profile|x64.Build.0 = Profile|x64
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|x86.ActiveCfg = Release|Win32
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|x86.Build.0 = Release|Win32
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|x64.ActiveCfg = Release|x64
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84}.Release|x64.Build.0 = Release|x64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x86.ActiveCfg = Debug|Win32
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x86.Build.0 = Debug|Win32
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x64.ActiveCfg = Debug|x64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x64.Build.0 = Debug|x64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x86.ActiveCfg = Profile|Win32
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x86.Build.0 = Profile|Win32
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x64.ActiveCfg = Profile|x64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x64.Build.0 = Profile|x64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x86.ActiveCfg = Release|Win32
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x86.Build.0 = Release|Win32
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x64.ActiveCfg = Release|x64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1} = {AEA1D9F7-EA95-4BF7-8E6D-0EA068077943}
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136} = {AEA1D9F7-EA95-4BF7-8E6D-0EA068077943}
-		{9D3EDCAD-A800-43F0-B77F-FE6E4DFA3D84} = {E14090F7-2FE9-47EE-A331-14ED71801FDE}
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D} = {AEA1D9F7-EA95-4BF7-8E6D-0EA068077943}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {CFB3C228-4C26-4746-8E0C-71C310403E8C}
-	EndGlobalSection
-EndGlobal
diff --git a/DirectXTex_Desktop_2022.slnx b/DirectXTex_Desktop_2022.slnx
new file mode 100644
index 000000000..76df80611
--- /dev/null
+++ b/DirectXTex_Desktop_2022.slnx
@@ -0,0 +1,21 @@
+<Solution>
+  <Configurations>
+    <BuildType Name="Debug" />
+    <BuildType Name="Profile" />
+    <BuildType Name="Release" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/Sample/">
+    <Project Path="DDSView/DDSView_Desktop_2022.vcxproj" Id="9d3edcad-a800-43f0-b77f-fe6e4dfa3d84" />
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+  </Folder>
+  <Folder Name="/Tools/">
+    <Project Path="Texassemble/Texassemble_Desktop_2022.vcxproj" Id="8f18cbd7-4116-4956-bcd8-20d688a4cbd1" />
+    <Project Path="Texconv/Texconv_Desktop_2022.vcxproj" Id="c3a65381-8fd3-4f69-b29e-654b4b0ed136" />
+    <Project Path="Texdiag/texdiag_Desktop_2022.vcxproj" Id="8e31a619-f4f8-413f-a973-4ee37b1aaa5d" />
+  </Folder>
+  <Project DefaultStartup="true" Path="DirectXTex/DirectXTex_Desktop_2022.vcxproj" Id="371b9fa9-4c90-4ac6-a123-aced756d6c77" />
+</Solution>
diff --git a/DirectXTex_Desktop_2022_Win10.sln b/DirectXTex_Desktop_2022_Win10.sln
deleted file mode 100644
index a4eed58f4..000000000
--- a/DirectXTex_Desktop_2022_Win10.sln
+++ /dev/null
@@ -1,117 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.5.33516.290
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "DirectXTex\DirectXTex_Desktop_2022_Win10.vcxproj", "{371B9FA9-4C90-4AC6-A123-ACED756D6C77}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{5200A2F8-5215-421E-BCE6-E8DCDAB7779D}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texassemble", "Texassemble\Texassemble_Desktop_2022_Win10.vcxproj", "{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texconv", "Texconv\Texconv_Desktop_2022_Win10.vcxproj", "{C3A65381-8FD3-4F69-B29E-654B4B0ED136}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "texdiag", "Texdiag\texdiag_Desktop_2022_Win10.vcxproj", "{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{1D8F4A7D-3102-44C6-B9B7-617F263675F2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM64 = Debug|ARM64
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Profile|ARM64 = Profile|ARM64
-		Profile|x64 = Profile|x64
-		Profile|x86 = Profile|x86
-		Release|ARM64 = Release|ARM64
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|ARM64.Build.0 = Debug|ARM64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x64.ActiveCfg = Debug|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x64.Build.0 = Debug|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x86.ActiveCfg = Debug|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Debug|x86.Build.0 = Debug|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|ARM64.ActiveCfg = Profile|ARM64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|ARM64.Build.0 = Profile|ARM64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x64.ActiveCfg = Profile|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x64.Build.0 = Profile|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x86.ActiveCfg = Profile|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Profile|x86.Build.0 = Profile|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|ARM64.ActiveCfg = Release|ARM64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|ARM64.Build.0 = Release|ARM64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x64.ActiveCfg = Release|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x64.Build.0 = Release|x64
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x86.ActiveCfg = Release|Win32
-		{371B9FA9-4C90-4AC6-A123-ACED756D6C77}.Release|x86.Build.0 = Release|Win32
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|ARM64.Build.0 = Debug|ARM64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x64.ActiveCfg = Debug|x64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x64.Build.0 = Debug|x64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x86.ActiveCfg = Debug|Win32
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Debug|x86.Build.0 = Debug|Win32
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|ARM64.ActiveCfg = Profile|ARM64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|ARM64.Build.0 = Profile|ARM64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x64.ActiveCfg = Profile|x64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x64.Build.0 = Profile|x64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x86.ActiveCfg = Profile|Win32
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Profile|x86.Build.0 = Profile|Win32
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|ARM64.ActiveCfg = Release|ARM64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|ARM64.Build.0 = Release|ARM64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x64.ActiveCfg = Release|x64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x64.Build.0 = Release|x64
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x86.ActiveCfg = Release|Win32
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1}.Release|x86.Build.0 = Release|Win32
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|ARM64.Build.0 = Debug|ARM64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x64.ActiveCfg = Debug|x64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x64.Build.0 = Debug|x64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x86.ActiveCfg = Debug|Win32
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Debug|x86.Build.0 = Debug|Win32
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|ARM64.ActiveCfg = Profile|ARM64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|ARM64.Build.0 = Profile|ARM64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x64.ActiveCfg = Profile|x64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x64.Build.0 = Profile|x64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x86.ActiveCfg = Profile|Win32
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Profile|x86.Build.0 = Profile|Win32
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|ARM64.ActiveCfg = Release|ARM64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|ARM64.Build.0 = Release|ARM64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x64.ActiveCfg = Release|x64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x64.Build.0 = Release|x64
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x86.ActiveCfg = Release|Win32
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136}.Release|x86.Build.0 = Release|Win32
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|ARM64.Build.0 = Debug|ARM64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x64.ActiveCfg = Debug|x64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x64.Build.0 = Debug|x64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x86.ActiveCfg = Debug|Win32
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Debug|x86.Build.0 = Debug|Win32
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|ARM64.ActiveCfg = Profile|ARM64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|ARM64.Build.0 = Profile|ARM64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x64.ActiveCfg = Profile|x64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x64.Build.0 = Profile|x64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x86.ActiveCfg = Profile|Win32
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Profile|x86.Build.0 = Profile|Win32
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|ARM64.ActiveCfg = Release|ARM64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|ARM64.Build.0 = Release|ARM64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x64.ActiveCfg = Release|x64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x64.Build.0 = Release|x64
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x86.ActiveCfg = Release|Win32
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{8F18CBD7-4116-4956-BCD8-20D688A4CBD1} = {1D8F4A7D-3102-44C6-B9B7-617F263675F2}
-		{C3A65381-8FD3-4F69-B29E-654B4B0ED136} = {1D8F4A7D-3102-44C6-B9B7-617F263675F2}
-		{8E31A619-F4F8-413F-A973-4EE37B1AAA5D} = {1D8F4A7D-3102-44C6-B9B7-617F263675F2}
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {22D52797-6BAE-4409-AE3B-513587E92758}
-	EndGlobalSection
-EndGlobal
diff --git a/DirectXTex_Desktop_2022_Win10.slnx b/DirectXTex_Desktop_2022_Win10.slnx
new file mode 100644
index 000000000..f77fe4807
--- /dev/null
+++ b/DirectXTex_Desktop_2022_Win10.slnx
@@ -0,0 +1,19 @@
+<Solution>
+  <Configurations>
+    <BuildType Name="Debug" />
+    <BuildType Name="Profile" />
+    <BuildType Name="Release" />
+    <Platform Name="ARM64" />
+    <Platform Name="x64" />
+    <Platform Name="x86" />
+  </Configurations>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+  </Folder>
+  <Folder Name="/Tools/">
+    <Project Path="Texassemble/Texassemble_Desktop_2022_Win10.vcxproj" Id="8f18cbd7-4116-4956-bcd8-20d688a4cbd1" />
+    <Project Path="Texconv/Texconv_Desktop_2022_Win10.vcxproj" Id="c3a65381-8fd3-4f69-b29e-654b4b0ed136" />
+    <Project Path="Texdiag/texdiag_Desktop_2022_Win10.vcxproj" Id="8e31a619-f4f8-413f-a973-4ee37b1aaa5d" />
+  </Folder>
+  <Project DefaultStartup="true" Path="DirectXTex/DirectXTex_Desktop_2022_Win10.vcxproj" Id="371b9fa9-4c90-4ac6-a123-aced756d6c77" />
+</Solution>
diff --git a/DirectXTex_Desktop_2026.slnx b/DirectXTex_Desktop_2026.slnx
index 6bedb9760..388929da9 100644
--- a/DirectXTex_Desktop_2026.slnx
+++ b/DirectXTex_Desktop_2026.slnx
@@ -8,15 +8,15 @@
     <Platform Name="x86" />
   </Configurations>
   <Folder Name="/Sample/">
-    <Project Path="DDSView/DDSView_Desktop_2026.vcxproj" />
+    <Project Path="DDSView/DDSView_Desktop_2026.vcxproj" Id="9d3edcad-a800-43f0-b77f-fe6e4dfa3d84" />
   </Folder>
   <Folder Name="/Solution Items/">
     <File Path=".editorconfig" />
   </Folder>
   <Folder Name="/Tools/">
-    <Project Path="Texassemble/Texassemble_Desktop_2026.vcxproj" />
-    <Project Path="Texconv/Texconv_Desktop_2026.vcxproj" />
-    <Project Path="Texdiag/texdiag_Desktop_2026.vcxproj" />
+    <Project Path="Texassemble/Texassemble_Desktop_2026.vcxproj" Id="8f18cbd7-4116-4956-bcd8-20d688a4cbd1" />
+    <Project Path="Texconv/Texconv_Desktop_2026.vcxproj" Id="c3a65381-8fd3-4f69-b29e-654b4b0ed136" />
+    <Project Path="Texdiag/texdiag_Desktop_2026.vcxproj" Id="8e31a619-f4f8-413f-a973-4ee37b1aaa5d" />
   </Folder>
-  <Project Path="DirectXTex/DirectXTex_Desktop_2026.vcxproj" />
+  <Project DefaultStartup="true" Path="DirectXTex/DirectXTex_Desktop_2026.vcxproj" Id="371b9fa9-4c90-4ac6-a123-aced756d6c77" />
 </Solution>
diff --git a/DirectXTex_GDKX_2022.sln b/DirectXTex_GDKX_2022.sln
deleted file mode 100644
index e86ae467e..000000000
--- a/DirectXTex_GDKX_2022.sln
+++ /dev/null
@@ -1,46 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.14.36603.0 d17.14
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex_GDKX_2022", "DirectXTex\DirectXTex_GDKX_2022.vcxproj", "{5815EA10-8178-456D-B1A4-E37A406883AF}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Gaming.Xbox.Scarlett.x64 = Debug|Gaming.Xbox.Scarlett.x64
-		Debug|Gaming.Xbox.XboxOne.x64 = Debug|Gaming.Xbox.XboxOne.x64
-		Debug|x64 = Debug|x64
-		Profile|Gaming.Xbox.Scarlett.x64 = Profile|Gaming.Xbox.Scarlett.x64
-		Profile|Gaming.Xbox.XboxOne.x64 = Profile|Gaming.Xbox.XboxOne.x64
-		Profile|x64 = Profile|x64
-		Release|Gaming.Xbox.Scarlett.x64 = Release|Gaming.Xbox.Scarlett.x64
-		Release|Gaming.Xbox.XboxOne.x64 = Release|Gaming.Xbox.XboxOne.x64
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5815EA10-8178-456D-B1A4-E37A406883AF}.Debug|Gaming.Xbox.Scarlett.x64.ActiveCfg = Debug|Gaming.Xbox.Scarlett.x64
-		{5815EA10-8178-456D-B1A4-E37A406883AF}.Debug|Gaming.Xbox.Scarlett.x64.Build.0 = Debug|Gaming.Xbox.Scarlett.x64
-		{5815EA10-8178-456D-B1A4-E37A406883AF}.Debug|Gaming.Xbox.XboxOne.x64.ActiveCfg = Debug|Gaming.Xbox.XboxOne.x64
-		{5815EA10-8178-456D-B1A4-E37A406883AF}.Debug|Gaming.Xbox.XboxOne.x64.Build.0 = Debug|Gaming.Xbox.XboxOne.x64
-		{5815EA10-8178-456D-B1A4-E37A406883AF}.Debug|x64.ActiveCfg = Debug|x64
-		{5815EA10-8178-456D-B1A4-E37A406883AF}.Debug|x64.Build.0 = Debug|x64
-		{5815EA10-8178-456D-B1A4-E37A406883AF}.Profile|Gaming.Xbox.Scarlett.x64.ActiveCfg = Profile|Gaming.Xbox.Scarlett.x64
-		{5815EA10-8178-456D-B1A4-E37A406883AF}.Profile|Gaming.Xbox.Scarlett.x64.Build.0 = Profile|Gaming.Xbox.Scarlett.x64
-		{5815EA10-8178-456D-B1A4-E37A406883AF}.Profile|Gaming.Xbox.XboxOne.x64.ActiveCfg = Profile|Gaming.Xbox.XboxOne.x64
-		{5815EA10-8178-456D-B1A4-E37A406883AF}.Profile|Gaming.Xbox.XboxOne.x64.Build.0 = Profile|Gaming.Xbox.XboxOne.x64
-		{5815EA10-8178-456D-B1A4-E37A406883AF}.Profile|x64.ActiveCfg = Profile|x64
-		{5815EA10-8178-456D-B1A4-E37A406883AF}.Profile|x64.Build.0 = Profile|x64
-		{5815EA10-8178-456D-B1A4-E37A406883AF}.Release|Gaming.Xbox.Scarlett.x64.ActiveCfg = Release|Gaming.Xbox.Scarlett.x64
-		{5815EA10-8178-456D-B1A4-E37A406883AF}.Release|Gaming.Xbox.Scarlett.x64.Build.0 = Release|Gaming.Xbox.Scarlett.x64
-		{5815EA10-8178-456D-B1A4-E37A406883AF}.Release|Gaming.Xbox.XboxOne.x64.ActiveCfg = Release|Gaming.Xbox.XboxOne.x64
-		{5815EA10-8178-456D-B1A4-E37A406883AF}.Release|Gaming.Xbox.XboxOne.x64.Build.0 = Release|Gaming.Xbox.XboxOne.x64
-		{5815EA10-8178-456D-B1A4-E37A406883AF}.Release|x64.ActiveCfg = Release|x64
-		{5815EA10-8178-456D-B1A4-E37A406883AF}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F1AD6333-A2CA-4A6F-AF62-8EEA11434A8C}
-	EndGlobalSection
-EndGlobal
diff --git a/DirectXTex_GDKX_2022.slnx b/DirectXTex_GDKX_2022.slnx
new file mode 100644
index 000000000..ce97d44e6
--- /dev/null
+++ b/DirectXTex_GDKX_2022.slnx
@@ -0,0 +1,11 @@
+<Solution>
+  <Configurations>
+    <BuildType Name="Debug" />
+    <BuildType Name="Profile" />
+    <BuildType Name="Release" />
+    <Platform Name="Gaming.Xbox.Scarlett.x64" />
+    <Platform Name="Gaming.Xbox.XboxOne.x64" />
+    <Platform Name="x64" />
+  </Configurations>
+  <Project Path="DirectXTex/DirectXTex_GDKX_2022.vcxproj" Id="5815ea10-8178-456d-b1a4-e37a406883af" />
+</Solution>
diff --git a/DirectXTex_GDK_2022.sln b/DirectXTex_GDK_2022.sln
deleted file mode 100644
index 55e53904a..000000000
--- a/DirectXTex_GDK_2022.sln
+++ /dev/null
@@ -1,51 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 16.0.30404.54
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex_GDK_2022", "DirectXTex\DirectXTex_GDK_2022.vcxproj", "{E66DD892-857B-4E89-B135-5E2A971A9933}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AB602393-CA4A-4D64-913E-E37D85A6CC6D}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Gaming.Desktop.x64 = Debug|Gaming.Desktop.x64
-		Debug|Gaming.Xbox.Scarlett.x64 = Debug|Gaming.Xbox.Scarlett.x64
-		Debug|Gaming.Xbox.XboxOne.x64 = Debug|Gaming.Xbox.XboxOne.x64
-		Profile|Gaming.Desktop.x64 = Profile|Gaming.Desktop.x64
-		Profile|Gaming.Xbox.Scarlett.x64 = Profile|Gaming.Xbox.Scarlett.x64
-		Profile|Gaming.Xbox.XboxOne.x64 = Profile|Gaming.Xbox.XboxOne.x64
-		Release|Gaming.Desktop.x64 = Release|Gaming.Desktop.x64
-		Release|Gaming.Xbox.Scarlett.x64 = Release|Gaming.Xbox.Scarlett.x64
-		Release|Gaming.Xbox.XboxOne.x64 = Release|Gaming.Xbox.XboxOne.x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E66DD892-857B-4E89-B135-5E2A971A9933}.Debug|Gaming.Desktop.x64.ActiveCfg = Debug|Gaming.Desktop.x64
-		{E66DD892-857B-4E89-B135-5E2A971A9933}.Debug|Gaming.Desktop.x64.Build.0 = Debug|Gaming.Desktop.x64
-		{E66DD892-857B-4E89-B135-5E2A971A9933}.Debug|Gaming.Xbox.Scarlett.x64.ActiveCfg = Debug|Gaming.Xbox.Scarlett.x64
-		{E66DD892-857B-4E89-B135-5E2A971A9933}.Debug|Gaming.Xbox.Scarlett.x64.Build.0 = Debug|Gaming.Xbox.Scarlett.x64
-		{E66DD892-857B-4E89-B135-5E2A971A9933}.Debug|Gaming.Xbox.XboxOne.x64.ActiveCfg = Debug|Gaming.Xbox.XboxOne.x64
-		{E66DD892-857B-4E89-B135-5E2A971A9933}.Debug|Gaming.Xbox.XboxOne.x64.Build.0 = Debug|Gaming.Xbox.XboxOne.x64
-		{E66DD892-857B-4E89-B135-5E2A971A9933}.Profile|Gaming.Desktop.x64.ActiveCfg = Profile|Gaming.Desktop.x64
-		{E66DD892-857B-4E89-B135-5E2A971A9933}.Profile|Gaming.Desktop.x64.Build.0 = Profile|Gaming.Desktop.x64
-		{E66DD892-857B-4E89-B135-5E2A971A9933}.Profile|Gaming.Xbox.Scarlett.x64.ActiveCfg = Profile|Gaming.Xbox.Scarlett.x64
-		{E66DD892-857B-4E89-B135-5E2A971A9933}.Profile|Gaming.Xbox.Scarlett.x64.Build.0 = Profile|Gaming.Xbox.Scarlett.x64
-		{E66DD892-857B-4E89-B135-5E2A971A9933}.Profile|Gaming.Xbox.XboxOne.x64.ActiveCfg = Profile|Gaming.Xbox.XboxOne.x64
-		{E66DD892-857B-4E89-B135-5E2A971A9933}.Profile|Gaming.Xbox.XboxOne.x64.Build.0 = Profile|Gaming.Xbox.XboxOne.x64
-		{E66DD892-857B-4E89-B135-5E2A971A9933}.Release|Gaming.Desktop.x64.ActiveCfg = Release|Gaming.Desktop.x64
-		{E66DD892-857B-4E89-B135-5E2A971A9933}.Release|Gaming.Desktop.x64.Build.0 = Release|Gaming.Desktop.x64
-		{E66DD892-857B-4E89-B135-5E2A971A9933}.Release|Gaming.Xbox.Scarlett.x64.ActiveCfg = Release|Gaming.Xbox.Scarlett.x64
-		{E66DD892-857B-4E89-B135-5E2A971A9933}.Release|Gaming.Xbox.Scarlett.x64.Build.0 = Release|Gaming.Xbox.Scarlett.x64
-		{E66DD892-857B-4E89-B135-5E2A971A9933}.Release|Gaming.Xbox.XboxOne.x64.ActiveCfg = Release|Gaming.Xbox.XboxOne.x64
-		{E66DD892-857B-4E89-B135-5E2A971A9933}.Release|Gaming.Xbox.XboxOne.x64.Build.0 = Release|Gaming.Xbox.XboxOne.x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {40D61785-B6CB-4A60-89E6-544E89B61BE0}
-	EndGlobalSection
-EndGlobal
diff --git a/DirectXTex_GDK_2022.slnx b/DirectXTex_GDK_2022.slnx
new file mode 100644
index 000000000..4d877d999
--- /dev/null
+++ b/DirectXTex_GDK_2022.slnx
@@ -0,0 +1,14 @@
+<Solution>
+  <Configurations>
+    <BuildType Name="Debug" />
+    <BuildType Name="Profile" />
+    <BuildType Name="Release" />
+    <Platform Name="Gaming.Desktop.x64" />
+    <Platform Name="Gaming.Xbox.Scarlett.x64" />
+    <Platform Name="Gaming.Xbox.XboxOne.x64" />
+  </Configurations>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+  </Folder>
+  <Project Path="DirectXTex/DirectXTex_GDK_2022.vcxproj" Id="e66dd892-857b-4e89-b135-5e2a971a9933" />
+</Solution>
diff --git a/DirectXTex_GXDK_PC_2022.sln b/DirectXTex_GXDK_PC_2022.sln
deleted file mode 100644
index eda35f0e3..000000000
--- a/DirectXTex_GXDK_PC_2022.sln
+++ /dev/null
@@ -1,36 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 15.0.28307.1259
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DirectXTex", "DirectXTex\DirectXTex_GXDK_PC_2022.vcxproj", "{9E4D1C18-9E5E-4B35-83BE-74830B9B3C34}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{06070D23-4542-4B1C-9DC2-846B1694E365}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-	EndProjectSection
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_Scarlett|x64 = Debug_Scarlett|x64
-		Debug|x64 = Debug|x64
-		Release_Scarlett|x64 = Release_Scarlett|x64
-		Release|x64 = Release|x64
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{9E4D1C18-9E5E-4B35-83BE-74830B9B3C34}.Debug_Scarlett|x64.ActiveCfg = Debug_Scarlett|x64
-		{9E4D1C18-9E5E-4B35-83BE-74830B9B3C34}.Debug_Scarlett|x64.Build.0 = Debug_Scarlett|x64
-		{9E4D1C18-9E5E-4B35-83BE-74830B9B3C34}.Debug|x64.ActiveCfg = Debug|x64
-		{9E4D1C18-9E5E-4B35-83BE-74830B9B3C34}.Debug|x64.Build.0 = Debug|x64
-		{9E4D1C18-9E5E-4B35-83BE-74830B9B3C34}.Release_Scarlett|x64.ActiveCfg = Release_Scarlett|x64
-		{9E4D1C18-9E5E-4B35-83BE-74830B9B3C34}.Release_Scarlett|x64.Build.0 = Release_Scarlett|x64
-		{9E4D1C18-9E5E-4B35-83BE-74830B9B3C34}.Release|x64.ActiveCfg = Release|x64
-		{9E4D1C18-9E5E-4B35-83BE-74830B9B3C34}.Release|x64.Build.0 = Release|x64
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {8EC36707-6F26-43CF-8458-C3E4E1113C22}
-	EndGlobalSection
-EndGlobal
diff --git a/DirectXTex_GXDK_PC_2022.slnx b/DirectXTex_GXDK_PC_2022.slnx
new file mode 100644
index 000000000..a681a775a
--- /dev/null
+++ b/DirectXTex_GXDK_PC_2022.slnx
@@ -0,0 +1,13 @@
+<Solution>
+  <Configurations>
+    <BuildType Name="Debug" />
+    <BuildType Name="Debug_Scarlett" />
+    <BuildType Name="Release" />
+    <BuildType Name="Release_Scarlett" />
+    <Platform Name="x64" />
+  </Configurations>
+  <Folder Name="/Solution Items/">
+    <File Path=".editorconfig" />
+  </Folder>
+  <Project Path="DirectXTex/DirectXTex_GXDK_PC_2022.vcxproj" Id="9e4d1c18-9e5e-4b35-83be-74830b9b3c34" />
+</Solution>
diff --git a/DirectXTex_Windows10_2022.sln b/DirectXTex_Windows10_2022.sln
deleted file mode 100644
index b21950c2d..000000000
--- a/DirectXTex_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}") = "DirectXTex", "DirectXTex\DirectXTex_Windows10_2022.vcxproj", "{FB3F52B5-BFE8-43FD-836F-363735DAB738}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8D3EE191-AC2D-4DA6-97EB-058D8A28B933}"
-	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
-		{FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|ARM64.Build.0 = Debug|ARM64
-		{FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|x64.ActiveCfg = Debug|x64
-		{FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|x64.Build.0 = Debug|x64
-		{FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|x86.ActiveCfg = Debug|Win32
-		{FB3F52B5-BFE8-43FD-836F-363735DAB738}.Debug|x86.Build.0 = Debug|Win32
-		{FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|ARM64.ActiveCfg = Release|ARM64
-		{FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|ARM64.Build.0 = Release|ARM64
-		{FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|x64.ActiveCfg = Release|x64
-		{FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|x64.Build.0 = Release|x64
-		{FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|x86.ActiveCfg = Release|Win32
-		{FB3F52B5-BFE8-43FD-836F-363735DAB738}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {E507EBC0-EBB7-4519-A886-15B7E0917E2F}
-	EndGlobalSection
-EndGlobal
diff --git a/DirectXTex_Windows10_2022.slnx b/DirectXTex_Windows10_2022.slnx
new file mode 100644
index 000000000..0a702c454
--- /dev/null
+++ b/DirectXTex_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="DirectXTex/DirectXTex_Windows10_2022.vcxproj" Id="fb3f52b5-bfe8-43fd-836f-363735dab738" />
+</Solution>