diff --git a/.github/workflows/uwp.yml b/.github/workflows/uwp.yml
index e77a404f..8dcc56f6 100644
--- a/.github/workflows/uwp.yml
+++ b/.github/workflows/uwp.yml
@@ -70,3 +70,15 @@ jobs:
     - name: 'Build'
       working-directory: ${{ github.workspace }}
       run: cmake --build out\build\${{ matrix.build_type }}
+
+    - name: 'Clean up'
+      working-directory: ${{ github.workspace }}
+      run: Remove-Item -Path out -Recurse -Force
+
+    - name: 'Configure CMake (DLL)'
+      working-directory: ${{ github.workspace }}
+      run: cmake --preset=${{ matrix.build_type }} -DBUILD_SHARED_LIBS=ON
+
+    - name: 'Build (DLL)'
+      working-directory: ${{ github.workspace }}
+      run: cmake --build out\build\${{ matrix.build_type }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0d38f4ce..d50fc47d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,10 +5,6 @@ cmake_minimum_required (VERSION 3.20)
 
 set(DIRECTXTEX_VERSION 2.0.6)
 
-if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))
-  set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
-endif()
-
 project (DirectXTex
   VERSION ${DIRECTXTEX_VERSION}
   DESCRIPTION "DirectX Texture Library"
diff --git a/build/DirectXTex-GitHub-CMake-Dev17.yml b/build/DirectXTex-GitHub-CMake-Dev17.yml
index af88055a..94cb2256 100644
--- a/build/DirectXTex-GitHub-CMake-Dev17.yml
+++ b/build/DirectXTex-GitHub-CMake-Dev17.yml
@@ -81,7 +81,10 @@ jobs:
     displayName: 'CMake (MSVC): Config x64'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out
+        -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_DX12=OFF
   - task: CMake@1
     displayName: 'CMake (MSVC): Build x64 Debug'
     inputs:
@@ -96,7 +99,10 @@ jobs:
     displayName: 'CMake (MSVC): Config x86'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A Win32 -B out2 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A Win32 -B out2
+        -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_DX12=OFF
   - task: CMake@1
     displayName: 'CMake (MSVC): Build x86 Debug'
     inputs:
@@ -111,7 +117,10 @@ jobs:
     displayName: 'CMake (MSVC): Config ARM64'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A ARM64 -B out3 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A ARM64 -B out3
+        -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_DX12=OFF
   - task: CMake@1
     displayName: 'CMake (MSVC): Build ARM64 Debug'
     inputs:
@@ -126,7 +135,9 @@ jobs:
     displayName: 'CMake (UWP): Config x64'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out4 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out4
+        -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
   - task: CMake@1
     displayName: 'CMake (UWP): Build x64'
     inputs:
@@ -136,87 +147,142 @@ jobs:
     displayName: 'CMake (ClangCl): Config x64'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out6 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out5
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
   - task: CMake@1
     displayName: 'CMake (ClangCl): Build x64 Debug'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: --build out6 -v --config Debug
+      cmakeArgs: --build out5 -v --config Debug
   - task: CMake@1
     displayName: 'CMake (ClangCl): Build x64 Release'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: --build out6 -v --config RelWithDebInfo
+      cmakeArgs: --build out5 -v --config RelWithDebInfo
   - task: CMake@1
     displayName: 'CMake (ClangCl): Config ARM64'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A ARM64 -T clangcl -B out7 -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A ARM64 -T clangcl -B out6
+        -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)
   - task: CMake@1
     displayName: 'CMake (ClangCl): Build ARM64'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: --build out7 -v --config Debug
+      cmakeArgs: --build out6 -v --config Debug
   - task: CMake@1
     displayName: 'CMake (Win10): Config'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out8 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out7
+        -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_DX12=ON
   - task: CMake@1
     displayName: 'CMake (Win10): Build'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: --build out8 -v --config Debug
+      cmakeArgs: --build out7 -v --config Debug
   - task: CMake@1
     displayName: 'CMake (MSVC Spectre): Config x64'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out9 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out8
+        -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_DX12=OFF
   - task: CMake@1
     displayName: 'CMake (MSVC Spectre): Build x64 Debug'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: --build out9 -v --config Debug
+      cmakeArgs: --build out8 -v --config Debug
   - task: CMake@1
     displayName: 'CMake (MSVC Spectre): Build x64 Release'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: --build out9 -v --config RelWithDebInfo
+      cmakeArgs: --build out8 -v --config RelWithDebInfo
   - task: CMake@1
     displayName: 'CMake (MSVC Spectre): Config ARM64'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A ARM64 -B out10 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A ARM64 -B out9
+        -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_DX12=OFF
   - task: CMake@1
     displayName: 'CMake (MSVC Spectre): Build ARM64 Debug'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: --build out10 -v --config Debug
+      cmakeArgs: --build out9 -v --config Debug
   - task: CMake@1
     displayName: 'CMake (MSVC Spectre): Build ARM64 Release'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: --build out10 -v --config RelWithDebInfo
+      cmakeArgs: --build out9 -v --config RelWithDebInfo
   - task: CMake@1
     displayName: 'CMake (Win10 Spectre): Config'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out11 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out10
+        -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_DX12=ON
   - task: CMake@1
     displayName: 'CMake (Win10 Spectre): Build'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: --build out11 -v --config Debug
+      cmakeArgs: --build out10 -v --config Debug
   - task: CMake@1
     displayName: 'CMake (NO_WCHAR_T): Config'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out12 -DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) -DBUILD_DX12=ON
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out11
+        -DNO_WCHAR_T=ON
+        -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)
+        -DBUILD_DX12=ON
   - task: CMake@1
     displayName: 'CMake (NO_WCHAR_T): Build'
+    inputs:
+      cwd: $(Build.SourcesDirectory)
+      cmakeArgs: --build out11 -v --config Debug
+  - task: CMake@1
+    displayName: 'CMake (DLL): Config x64'
+    inputs:
+      cwd: $(Build.SourcesDirectory)
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out12
+        -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_DX12=ON
+        -DBUILD_SHARED_LIBS=ON
+  - task: CMake@1
+    displayName: 'CMake (DLL): Build x64 Debug'
     inputs:
       cwd: $(Build.SourcesDirectory)
       cmakeArgs: --build out12 -v --config Debug
+  - task: CMake@1
+    displayName: 'CMake (DLL): Build x64 Release'
+    inputs:
+      cwd: $(Build.SourcesDirectory)
+      cmakeArgs: --build out12 -v --config RelWithDebInfo
+  - task: CMake@1
+    displayName: 'CMake (UWP DLL): Config x64'
+    inputs:
+      cwd: $(Build.SourcesDirectory)
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out13
+        -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
+        -DBUILD_SHARED_LIBS=ON
+  - task: CMake@1
+    displayName: 'CMake (UWP DLL): Build x64'
+    inputs:
+      cwd: $(Build.SourcesDirectory)
+      cmakeArgs: --build out13 -v
 
 - job: CMAKE_BUILD_VCPKG
   displayName: CMake using VCPKG
diff --git a/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml b/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml
index fde88d36..173af6aa 100644
--- a/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml
+++ b/build/DirectXTex-GitHub-CMake-Xbox-Dev17.yml
@@ -97,7 +97,10 @@ jobs:
     displayName: 'CMake (MSVC): Config x64 (Xbox Series X|S)'
     inputs:
       cwd: ''
-      cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF'
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
   - task: CMake@1
     displayName: 'CMake (MSVC): Build x64 Debug (Xbox Series X|S)'
     inputs:
@@ -112,7 +115,10 @@ jobs:
     displayName: 'CMake (ClangCl): Config x64 (Xbox Series X|S)'
     inputs:
       cwd: ''
-      cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out2 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF'
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out2
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
   - task: CMake@1
     displayName: 'CMake (ClangCl): Build x64 Debug (Xbox Series X|S)'
     inputs:
@@ -127,7 +133,10 @@ jobs:
     displayName: 'CMake (MSVC): Config x64 (Xbox One)'
     inputs:
       cwd: ''
-      cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out3 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF'
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out3
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
   - task: CMake@1
     displayName: 'CMake (MSVC): Build x64 Debug (Xbox One)'
     inputs:
@@ -142,7 +151,10 @@ jobs:
     displayName: 'CMake (ClangCl): Config x64 (Xbox One)'
     inputs:
       cwd: ''
-      cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF'
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
   - task: CMake@1
     displayName: 'CMake (ClangCl): Build x64 Debug (Xbox One)'
     inputs:
@@ -154,22 +166,28 @@ jobs:
       cwd: ''
       cmakeArgs: --build out4 -v --config RelWithDebInfo
   - task: CMake@1
-    displayName: 'CMake (MSVC): Config x64 (Xbox Series X|S, DLL)'
+    displayName: 'CMake (DLL): Config x64 (Xbox Series X|S)'
     inputs:
       cwd: ''
-      cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out5 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF -DBUILD_SHARED_LIBS=ON'
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out5
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF -DBUILD_SHARED_LIBS=ON
   - task: CMake@1
-    displayName: 'CMake (MSVC): Build x64 Debug (Xbox Series X|S, DLL)'
+    displayName: 'CMake (DLL): Build x64 Debug (Xbox Series X|S)'
     inputs:
       cwd: ''
       cmakeArgs: --build out5 -v --config Debug
   - task: CMake@1
-    displayName: 'CMake (MSVC): Config x64 (Xbox One, DLL)'
+    displayName: 'CMake (DLL): Config x64 (Xbox One)'
     inputs:
       cwd: ''
-      cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out6 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF -DBUILD_SHARED_LIBS=ON'
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out6
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF -DBUILD_SHARED_LIBS=ON
   - task: CMake@1
-    displayName: 'CMake (MSVC): Build x64 Debug (Xbox One, DLL)'
+    displayName: 'CMake (DLL): Build x64 Debug (Xbox One)'
     inputs:
       cwd: ''
       cmakeArgs: --build out6 -v --config Debug
diff --git a/build/DirectXTex-GitHub-CMake-Xbox.yml b/build/DirectXTex-GitHub-CMake-Xbox.yml
index 73d072df..b63e5ecb 100644
--- a/build/DirectXTex-GitHub-CMake-Xbox.yml
+++ b/build/DirectXTex-GitHub-CMake-Xbox.yml
@@ -114,7 +114,10 @@ jobs:
     displayName: 'CMake (MSVC): Config x64 (Xbox Series X|S)'
     inputs:
       cwd: ''
-      cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF'
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
   - task: CMake@1
     displayName: 'CMake (MSVC): Build x64 Debug (Xbox Series X|S)'
     inputs:
@@ -129,7 +132,10 @@ jobs:
     displayName: 'CMake (ClangCl): Config x64 (Xbox Series X|S)'
     inputs:
       cwd: ''
-      cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out2 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF'
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out2
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
   - task: CMake@1
     displayName: 'CMake (ClangCl): Build x64 Debug (Xbox Series X|S)'
     inputs:
@@ -144,7 +150,10 @@ jobs:
     displayName: 'CMake (MSVC): Config x64 (Xbox One)'
     inputs:
       cwd: ''
-      cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -B out3 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF'
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out3
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
   - task: CMake@1
     displayName: 'CMake (MSVC): Build x64 Debug (Xbox One)'
     inputs:
@@ -159,7 +168,10 @@ jobs:
     displayName: 'CMake (ClangCl): Config x64 (Xbox One)'
     inputs:
       cwd: ''
-      cmakeArgs: '-G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF'
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
   - task: CMake@1
     displayName: 'CMake (ClangCl): Build x64 Debug (Xbox One)'
     inputs:
@@ -170,3 +182,41 @@ jobs:
     inputs:
       cwd: ''
       cmakeArgs: --build out4 -v --config RelWithDebInfo
+  - task: CMake@1
+    displayName: 'CMake (DLL): Config x64 (Xbox Series X|S)'
+    inputs:
+      cwd: ''
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out5
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_XBOX_EXTS_SCARLETT=ON -DBUILD_SAMPLE=OFF
+        -DBUILD_SHARED_LIBS=ON
+  - task: CMake@1
+    displayName: 'CMake (DLL): Build x64 Debug (Xbox Series X|S)'
+    inputs:
+      cwd: ''
+      cmakeArgs: --build out5 -v --config Debug
+  - task: CMake@1
+    displayName: 'CMake (DLL): Build x64 Release (Xbox Series X|S)'
+    inputs:
+      cwd: ''
+      cmakeArgs: --build out5 -v --config RelWithDebInfo
+  - task: CMake@1
+    displayName: 'CMake (DLL): Config x64 (Xbox One)'
+    inputs:
+      cwd: ''
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out6
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_XBOX_EXTS_XBOXONE=ON -DBUILD_SAMPLE=OFF
+        -DBUILD_SHARED_LIBS=ON
+  - task: CMake@1
+    displayName: 'CMake (DLL): Build x64 Debug (Xbox One)'
+    inputs:
+      cwd: ''
+      cmakeArgs: --build out6 -v --config Debug
+  - task: CMake@1
+    displayName: 'CMake (DLL): Build x64 Release (Xbox One)'
+    inputs:
+      cwd: ''
+      cmakeArgs: --build out6 -v --config RelWithDebInfo
diff --git a/build/DirectXTex-GitHub-CMake.yml b/build/DirectXTex-GitHub-CMake.yml
index 53b0f2b1..bf662629 100644
--- a/build/DirectXTex-GitHub-CMake.yml
+++ b/build/DirectXTex-GitHub-CMake.yml
@@ -81,7 +81,10 @@ jobs:
     displayName: 'CMake (MSVC): Config x64'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out
+        -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_DX12=OFF
   - task: CMake@1
     displayName: 'CMake (MSVC): Build x64 Debug'
     inputs:
@@ -96,7 +99,10 @@ jobs:
     displayName: 'CMake (MSVC): Config x86'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A Win32 -B out2 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A Win32 -B out2
+        -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_DX12=OFF
   - task: CMake@1
     displayName: 'CMake (MSVC): Build x86 Debug'
     inputs:
@@ -111,7 +117,9 @@ jobs:
     displayName: 'CMake (UWP): Config x64'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out3 -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out3
+        -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
   - task: CMake@1
     displayName: 'CMake (UWP): Build x64'
     inputs:
@@ -121,7 +129,9 @@ jobs:
     displayName: 'CMake (ClangCl): Config x64'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4 -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -T clangcl -B out4
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
   - task: CMake@1
     displayName: 'CMake (ClangCl): Build x64 Debug'
     inputs:
@@ -136,7 +146,10 @@ jobs:
     displayName: 'CMake (Win10): Config'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out5 -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out5
+        -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_DX12=ON
   - task: CMake@1
     displayName: 'CMake (Win10): Build'
     inputs:
@@ -146,7 +159,11 @@ jobs:
     displayName: 'CMake (MSVC Spectre): Config x64'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out6 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=OFF
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out6
+        -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_DX12=OFF
   - task: CMake@1
     displayName: 'CMake (MSVC Spectre): Build x64 Debug'
     inputs:
@@ -161,7 +178,11 @@ jobs:
     displayName: 'CMake (Win10 Spectre): Config'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out7 -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK) -DBUILD_DX12=ON
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out7
+        -DENABLE_SPECTRE_MITIGATION=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
+        -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_DX12=ON
   - task: CMake@1
     displayName: 'CMake (Win10 Spectre): Build'
     inputs:
@@ -171,12 +192,48 @@ jobs:
     displayName: 'CMake (NO_WCHAR_T): Config'
     inputs:
       cwd: $(Build.SourcesDirectory)
-      cmakeArgs: -G "$(VS_GENERATOR)" -A x64 -B out8 -DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK) -DBUILD_DX12=ON
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out8
+        -DNO_WCHAR_T=ON -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON
+        -DCMAKE_SYSTEM_VERSION=$(WIN11_SDK)
+        -DBUILD_DX12=ON
   - task: CMake@1
     displayName: 'CMake (NO_WCHAR_T): Build'
     inputs:
       cwd: $(Build.SourcesDirectory)
       cmakeArgs: --build out8 -v --config Debug
+  - task: CMake@1
+    displayName: 'CMake (DLL): Config x64'
+    inputs:
+      cwd: $(Build.SourcesDirectory)
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out9
+        -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=$(WIN10_SDK)
+        -DBUILD_DX12=ON
+        -DBUILD_SHARED_LIBS=ON
+  - task: CMake@1
+    displayName: 'CMake (DLL): Build x64 Debug'
+    inputs:
+      cwd: $(Build.SourcesDirectory)
+      cmakeArgs: --build out9 -v --config Debug
+  - task: CMake@1
+    displayName: 'CMake (DLL): Build x64 Release'
+    inputs:
+      cwd: $(Build.SourcesDirectory)
+      cmakeArgs: --build out9 -v --config RelWithDebInfo
+  - task: CMake@1
+    displayName: 'CMake (UWP DLL): Config x64'
+    inputs:
+      cwd: $(Build.SourcesDirectory)
+      cmakeArgs: >
+        -G "$(VS_GENERATOR)" -A x64 -B out10
+        -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON -DCMAKE_SYSTEM_VERSION=10.0
+        -DBUILD_SHARED_LIBS=ON
+  - task: CMake@1
+    displayName: 'CMake (UWP DLL): Build x64'
+    inputs:
+      cwd: $(Build.SourcesDirectory)
+      cmakeArgs: --build out10 -v
 
 - job: CMAKE_BUILD_VCPKG
   displayName: CMake using VCPKG
diff --git a/build/DirectXTex-GitHub-GDK-Dev17.yml b/build/DirectXTex-GitHub-GDK-Dev17.yml
index 014f3180..8ba4d3f3 100644
--- a/build/DirectXTex-GitHub-GDK-Dev17.yml
+++ b/build/DirectXTex-GitHub-GDK-Dev17.yml
@@ -311,12 +311,12 @@ jobs:
     inputs:
       Contents: 'out/build'
   - task: CMake@1
-    displayName: 'CMake (MSVC, DLL): Config Scarlett Debug'
+    displayName: 'CMake (DLL): Config Scarlett Debug'
     inputs:
       cwd: '$(Build.SourcesDirectory)'
       cmakeArgs: --preset=x64-Debug-Scarlett -DBUILD_SHARED_LIBS=ON
   - task: CMake@1
-    displayName: 'CMake (MSVC, DLL): Build Scarlett Debug'
+    displayName: 'CMake (DLL): Build Scarlett Debug'
     inputs:
       cwd: '$(Build.SourcesDirectory)'
       cmakeArgs: --build out\build\x64-Debug-Scarlett
@@ -430,12 +430,12 @@ jobs:
     inputs:
       Contents: 'out/build'
   - task: CMake@1
-    displayName: 'CMake (MSVC, DLL): Config XboxOne Debug'
+    displayName: 'CMake (DLL): Config XboxOne Debug'
     inputs:
       cwd: '$(Build.SourcesDirectory)'
       cmakeArgs: --preset=x64-Debug-XboxOne -DBUILD_SHARED_LIBS=ON
   - task: CMake@1
-    displayName: 'CMake (MSVC, DLL): Build XboxOne Debug'
+    displayName: 'CMake (DLL): Build XboxOne Debug'
     inputs:
       cwd: '$(Build.SourcesDirectory)'
       cmakeArgs: --build out\build\x64-Debug-XboxOne