January 9, 2021

microsoft · Jan 10, 2021 · 63a0243 · 63a0243
1 parent 1be9ae0
commit 63a0243
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 28 deletions.
diff --git a/.nuget/directxtk_desktop_2017.nuspec b/.nuget/directxtk_desktop_2017.nuspec
@@ -30,7 +30,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 November 11, 2020 release on GitHub.
+        <releaseNotes>Matches the January 9, 2021 release on GitHub.
 
 DirectX Tool Kit for Audio in this package uses XAudio2Redist NuGet package to support Windows 7 or later.</releaseNotes>
         <projectUrl>http://go.microsoft.com/fwlink/?LinkId=248929</projectUrl>
@@ -73,6 +73,6 @@ DirectX Tool Kit for Audio in this package uses XAudio2Redist NuGet package to s
         <file src=".nuget/directxtk_desktop_2017.targets" target="build\native" />
 
         <file src=".nuget/icon.jpg" target="images\" />
-      
+
     </files>
 </package>
diff --git a/.nuget/directxtk_desktop_win10.nuspec b/.nuget/directxtk_desktop_win10.nuspec
@@ -30,7 +30,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 November 11, 2020 release on GitHub.
+        <releaseNotes>Matches the January 9, 2021 release on GitHub.
 
 DirectX Tool Kit for Audio in this package uses XAudio 2.9 which requires Windows 10.</releaseNotes>
         <projectUrl>http://go.microsoft.com/fwlink/?LinkId=248929</projectUrl>
@@ -68,6 +68,6 @@ DirectX Tool Kit for Audio in this package uses XAudio 2.9 which requires Window
         <file src=".nuget/directxtk_desktop_win10.targets" target="build\native" />
 
         <file src=".nuget/icon.jpg" target="images\" />
-      
+
     </files>
-</package>
+</package>
diff --git a/.nuget/directxtk_uwp.nuspec b/.nuget/directxtk_uwp.nuspec
@@ -16,12 +16,12 @@ CommonStates - factory providing commonly used D3D state objects
 DirectXHelpers - misc C++ helpers for D3D programming
 DDSTextureLoader - light-weight DDS file texture loader
 Effects - set of built-in shaders for common rendering tasks
-GamePad - gamepad controller helper using XInput 
+GamePad - gamepad controller helper using XInput
 GeometricPrimitive - draws basic shapes such as cubes and spheres
 GraphicsMemory - helper for managing dynamic graphics memory allocation
-Keyboard - keyboard state tracking helper 
+Keyboard - keyboard state tracking helper
 Model - draws meshes loaded from .CMO, .SDKMESH, or .VBO files
-Mouse - mouse helper 
+Mouse - mouse helper
 PostProcess - set of built-in shaders for common post-processing operations
 PrimitiveBatch - simple and efficient way to draw user primitives
 ScreenGrab - light-weight screen shot saver
@@ -30,7 +30,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 November 11, 2020 release on GitHub.</releaseNotes>
+        <releaseNotes>Matches the January 9, 2021 release on GitHub.</releaseNotes>
         <projectUrl>http://go.microsoft.com/fwlink/?LinkId=248929</projectUrl>
         <icon>images\icon.jpg</icon>
         <license type="expression">MIT</license>
@@ -56,7 +56,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" />
 
@@ -72,6 +72,6 @@ WICTextureLoader - WIC-based image file texture loader</description>
         <file src=".nuget/directxtk_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
 * Fixed *DirectX Tool Kit for Audio* use of XAudio 2.8 for Windows 8 w/ Windows 10 SDK

diff --git a/LICENSE b/LICENSE
@@ -1,21 +1,20 @@
                                The MIT License (MIT)
 
-Copyright (c) 2012-2020 Microsoft Corp
+Copyright (c) 2012-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=248929
 
 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 11 C++ code for Universal Windows Platform (UWP) apps for Windows 10, Xbox One, and Win32 desktop applications for Windows 7 Service Pack 1 or later.