January 9, 2021

microsoft · Jan 10, 2021 · ca007a7 · ca007a7
1 parent cac6bb3
commit ca007a7
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 49 deletions.
diff --git a/.nuget/directxtk12_desktop_2017.nuspec b/.nuget/directxtk12_desktop_2017.nuspec
@@ -13,28 +13,28 @@ Features:
 Audio - low-level audio API using XAudio2
 BufferHelpers - C++ helpers for creating D3D resources from CPU data
 CommonStates - common D3D state combinations
-DDSTextureLoader - light-weight DDS file texture loader 
+DDSTextureLoader - light-weight DDS file texture loader
 DescriptorHeap - helper for managing DX12 descriptor heaps
-DirectXHelpers - misc C++ helpers for D3D programming 
-Effects - set of built-in shaders for common rendering tasks 
-EffectPipelineStateDescription - helper for creating PSOs 
-GamePad - gamepad controller helper using XInput 
-GeometricPrimitive - draws basic shapes such as cubes and spheres 
+DirectXHelpers - misc C++ helpers for D3D programming
+Effects - set of built-in shaders for common rendering tasks
+EffectPipelineStateDescription - helper for creating PSOs
+GamePad - gamepad controller helper using XInput
+GeometricPrimitive - draws basic shapes such as cubes and spheres
 GraphicsMemory - helper for managing graphics memory allocation
 Keyboard - keyboard state tracking helper
-Model - draws simple meshes loaded from .SDKMESH or .VBO files 
+Model - draws simple meshes loaded from .SDKMESH or .VBO files
 Mouse - mouse helper
 PostProcess - set of built-in shaders for common post-processing operations
-PrimitiveBatch - simple and efficient way to draw user primitives 
+PrimitiveBatch - simple and efficient way to draw user primitives
 RenderTargetState - helper for communicating render target requirements when creating PSOs
 ResourceUploadBatch - helper for managing texture resource upload to the GPU
-ScreenGrab - light-weight screen shot saver 
-SimpleMath - simplified C++ wrapper for DirectXMath 
-SpriteBatch - simple &amp; efficient 2D sprite rendering 
-SpriteFont - bitmap based text rendering 
-VertexTypes - structures for commonly used vertex data formats 
+ScreenGrab - light-weight screen shot saver
+SimpleMath - simplified C++ wrapper for DirectXMath
+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 November 11, 2020 release on GitHub.</releaseNotes>
+        <releaseNotes>Matches the January 9, 2021 release on GitHub.</releaseNotes>
         <projectUrl>http://go.microsoft.com/fwlink/?LinkID=615561</projectUrl>
         <icon>images\icon.jpg</icon>
         <license type="expression">MIT</license>
@@ -68,8 +68,8 @@ WICTextureLoader - WIC-based image file texture loader</description>
         <file target="native\lib\ARM64\Release" src="Bin\Desktop_2017_Win10\ARM64\Release\*.pdb" />
 
         <file src=".nuget/directxtk12_desktop_2017.targets" target="build\native" />
-      
+
         <file src=".nuget/icon.jpg" target="images\" />
 
     </files>
-</package>
+</package>
diff --git a/.nuget/directxtk12_uwp.nuspec b/.nuget/directxtk12_uwp.nuspec
@@ -13,28 +13,28 @@ Features:
 Audio - low-level audio API using XAudio2
 BufferHelpers - C++ helpers for creating D3D resources from CPU data
 CommonStates - common D3D state combinations
-DDSTextureLoader - light-weight DDS file texture loader 
+DDSTextureLoader - light-weight DDS file texture loader
 DescriptorHeap - helper for managing DX12 descriptor heaps
-DirectXHelpers - misc C++ helpers for D3D programming 
-Effects - set of built-in shaders for common rendering tasks 
-EffectPipelineStateDescription - helper for creating PSOs 
-GamePad - gamepad controller helper using XInput 
-GeometricPrimitive - draws basic shapes such as cubes and spheres 
+DirectXHelpers - misc C++ helpers for D3D programming
+Effects - set of built-in shaders for common rendering tasks
+EffectPipelineStateDescription - helper for creating PSOs
+GamePad - gamepad controller helper using XInput
+GeometricPrimitive - draws basic shapes such as cubes and spheres
 GraphicsMemory - helper for managing graphics memory allocation
 Keyboard - keyboard state tracking helper
-Model - draws simple meshes loaded from .SDKMESH or .VBO files 
+Model - draws simple meshes loaded from .SDKMESH or .VBO files
 Mouse - mouse helper
 PostProcess - set of built-in shaders for common post-processing operations
-PrimitiveBatch - simple and efficient way to draw user primitives 
+PrimitiveBatch - simple and efficient way to draw user primitives
 RenderTargetState - helper for communicating render target requirements when creating PSOs
 ResourceUploadBatch - helper for managing texture resource upload to the GPU
-ScreenGrab - light-weight screen shot saver 
-SimpleMath - simplified C++ wrapper for DirectXMath 
-SpriteBatch - simple &amp; efficient 2D sprite rendering 
-SpriteFont - bitmap based text rendering 
-VertexTypes - structures for commonly used vertex data formats 
+ScreenGrab - light-weight screen shot saver
+SimpleMath - simplified C++ wrapper for DirectXMath
+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 November 11, 2020 release on GitHub.</releaseNotes>
+        <releaseNotes>Matches the January 9, 2021 release on GitHub.</releaseNotes>
         <projectUrl>http://go.microsoft.com/fwlink/?LinkID=615561</projectUrl>
         <icon>images\icon.jpg</icon>
         <license type="expression">MIT</license>
@@ -60,7 +60,7 @@ WICTextureLoader - WIC-based image file texture loader</description>
 
         <file target="native\lib\ARM64\Release" src="Bin\Windows10_2017\ARM64\Release\*.lib" />
         <file target="native\lib\ARM64\Release" src="Bin\Windows10_2017\ARM64\Release\*.pdb" />
-      
+
         <file target="native\lib\Win32\Debug" src="Bin\Windows10_2017\Win32\Debug\*.lib" />
         <file target="native\lib\Win32\Debug" src="Bin\Windows10_2017\Win32\Debug\*.pdb" />
 
@@ -76,6 +76,6 @@ WICTextureLoader - WIC-based image file texture loader</description>
         <file src=".nuget/directxtk12_uwp.targets" target="build\native" />
 
         <file src=".nuget/icon.jpg" target="images\" />
-      
+
     </files>
-</package>
+</package>
diff --git a/HISTORY.md b/HISTORY.md
@@ -6,6 +6,10 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT
 
 ## Release History
 
+### January 9, 2021
+* Code review for improved conformance
+* CMake updated to support package install
+
 ### November 11, 2020
 * Fixed ``/analyze`` warnings in GameInput usage
 * Updated D3DX12 internal copy with latest change from GitHub

diff --git a/LICENSE b/LICENSE
@@ -1,21 +1,20 @@
                                The MIT License (MIT)
 
-Copyright (c) 2016-2020 Microsoft Corp
+Copyright (c) 2016-2021 Microsoft Corp
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this 
-software and associated documentation files (the "Software"), to deal in the Software 
-without restriction, including without limitation the rights to use, copy, modify, 
-merge, publish, distribute, sublicense, and/or sell copies of the Software, and to 
-permit persons to whom the Software is furnished to do so, subject to the following 
-conditions: 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this
+software and associated documentation files (the "Software"), to deal in the Software
+without restriction, including without limitation the rights to use, copy, modify,
+merge, publish, distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to the following
+conditions:
 
-The above copyright notice and this permission notice shall be included in all copies 
-or substantial portions of the Software.  
+The above copyright notice and this permission notice shall be included in all copies
+or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, 
-INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A 
-PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT 
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF 
-CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
 OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ http://go.microsoft.com/fwlink/?LinkID=615561
 
 Copyright (c) Microsoft Corporation. All rights reserved.
 
-**November 11, 2020**
+**January 9, 2021**
 
 This package contains the "DirectX Tool Kit", a collection of helper classes for writing Direct3D 12 C++ code for Universal Windows Platform (UWP) apps, Win32 desktop applications for Windows 10, and Xbox.