From be5dfc7e391aefaa4eeab8e8a08f7e2669e56cbb Mon Sep 17 00:00:00 2001
From: Chuck Walbourn <walbourn@users.noreply.github.com>
Date: Mon, 28 Oct 2024 17:14:56 -0700
Subject: [PATCH] October 28, 2024 (#279)

---
 .nuget/directxtk12_desktop_2019.nuspec | 2 +-
 .nuget/directxtk12_uwp.nuspec          | 2 +-
 CHANGELOG.md                           | 8 ++++++++
 CMakeLists.txt                         | 2 +-
 README.md                              | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.nuget/directxtk12_desktop_2019.nuspec b/.nuget/directxtk12_desktop_2019.nuspec
index 50d84563..b7a3144d 100644
--- a/.nuget/directxtk12_desktop_2019.nuspec
+++ b/.nuget/directxtk12_desktop_2019.nuspec
@@ -34,7 +34,7 @@ SpriteBatch - simple &amp; efficient 2D sprite rendering
 SpriteFont - bitmap based text rendering
 VertexTypes - structures for commonly used vertex data formats
 WICTextureLoader - WIC-based image file texture loader</description>
-        <releaseNotes>Matches the September 4, 2024 release on GitHub.</releaseNotes>
+        <releaseNotes>Matches the October 28, 2024 release on GitHub.</releaseNotes>
         <projectUrl>http://go.microsoft.com/fwlink/?LinkID=615561</projectUrl>
         <repository type="git" url="https://github.com/microsoft/DirectXTK12.git" />
         <icon>images\icon.jpg</icon>
diff --git a/.nuget/directxtk12_uwp.nuspec b/.nuget/directxtk12_uwp.nuspec
index f523c590..b6af5761 100644
--- a/.nuget/directxtk12_uwp.nuspec
+++ b/.nuget/directxtk12_uwp.nuspec
@@ -34,7 +34,7 @@ SpriteBatch - simple &amp; efficient 2D sprite rendering
 SpriteFont - bitmap based text rendering
 VertexTypes - structures for commonly used vertex data formats
 WICTextureLoader - WIC-based image file texture loader</description>
-        <releaseNotes>Matches the September 4, 2024 release on GitHub.</releaseNotes>
+        <releaseNotes>Matches the October 28, 2024 release on GitHub.</releaseNotes>
         <projectUrl>http://go.microsoft.com/fwlink/?LinkID=615561</projectUrl>
         <repository type="git" url="https://github.com/microsoft/DirectXTK12.git" />
         <icon>images\icon.jpg</icon>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f8258e0c..9fa15001 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,14 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT
 
 ## Release History
 
+### October 28, 2024
+* All enums now use ``uint32_t`` as the underlying type rather than ``unsigned long`` or ``int``.
+* Added `DDS_LOADER_INGNORE_MIPS` flag to DDSTextureLoader
+* Fixed bug in ScreenGrab for MSAA resolve state handling
+* Added ctor to RenderTargetState for MSAA scenarios
+* Refactored CMO structures into their own header
+* CMake and MSBuild project updates
+
 ### September 4, 2024
 * HLSL shaders built with `-HV 2021` when using DXIL
 * *DirectX Tool Kit for Audio* update
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 771619c7..5c8d413c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 cmake_minimum_required (VERSION 3.20)
 
-set(DIRECTXTK12_VERSION 1.6.0)
+set(DIRECTXTK12_VERSION 1.6.1)
 
 if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))
   set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
diff --git a/README.md b/README.md
index 8134b9ff..36ac0286 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ http://go.microsoft.com/fwlink/?LinkID=615561
 
 Copyright (c) Microsoft Corporation.
 
-**September 4, 2024**
+**October 28, 2024**
 
 This package contains the "DirectX Tool Kit", a collection of helper classes for writing Direct3D 12 C++ code for Universal Windows Platform (UWP) apps for Windows 11 and Windows 10, game titles for Xbox Series X\|S and Xbox One, and Win32 desktop applications for Windows 11 and Windows 10.