diff --git a/.nuget/directxtex_desktop_2017.nuspec b/.nuget/directxtex_desktop_2017.nuspec
index 45e7e50..cf6fbe4 100644
--- a/.nuget/directxtex_desktop_2017.nuspec
+++ b/.nuget/directxtex_desktop_2017.nuspec
@@ -10,7 +10,7 @@
This version is for Windows desktop applications using Visual Studio 2017 or Visual Studio 2019 and supports Windows 7 / DirectX 11.
DirectXTex, a shared source library for reading and writing .DDS files, and performing various texture content processing operations including resizing, format conversion, mip-map generation, block compression for Direct3D runtime texture resources, and height-map to normal-map conversion. This library makes use of the Windows Image Component (WIC) APIs. It also includes simple .TGA and .HDR readers and writers since these image file format are commonly used for texture content processing pipelines, but are not currently supported by a built-in WIC codec.
- Matches the November 11, 2020 release on GitHub.
+ Matches the January 9, 2021 release on GitHub.
http://go.microsoft.com/fwlink/?LinkId=248926
images\icon.jpg
MIT
@@ -39,8 +39,8 @@ DirectXTex, a shared source library for reading and writing .DDS files, and perf
-
+
-
\ No newline at end of file
+
diff --git a/.nuget/directxtex_desktop_win10.nuspec b/.nuget/directxtex_desktop_win10.nuspec
index 34d0676..b62ec55 100644
--- a/.nuget/directxtex_desktop_win10.nuspec
+++ b/.nuget/directxtex_desktop_win10.nuspec
@@ -10,7 +10,7 @@
This version is for Windows desktop applications using Visual Studio 2017 or Visual Studio 2019 and supports Windows 10 including both DirectX 11 and DirectX 12.
DirectXTex, a shared source library for reading and writing .DDS files, and performing various texture content processing operations including resizing, format conversion, mip-map generation, block compression for Direct3D runtime texture resources, and height-map to normal-map conversion. This library makes use of the Windows Image Component (WIC) APIs. It also includes simple .TGA and .HDR readers and writers since these image file format are commonly used for texture content processing pipelines, but are not currently supported by a built-in WIC codec.
- Matches the November 11, 2020 release on GitHub.
+ Matches the January 9, 2021 release on GitHub.
http://go.microsoft.com/fwlink/?LinkId=248926
images\icon.jpg
MIT
@@ -45,8 +45,8 @@ DirectXTex, a shared source library for reading and writing .DDS files, and perf
-
+
-
\ No newline at end of file
+
diff --git a/.nuget/directxtex_uwp.nuspec b/.nuget/directxtex_uwp.nuspec
index b962dba..a6631d2 100644
--- a/.nuget/directxtex_uwp.nuspec
+++ b/.nuget/directxtex_uwp.nuspec
@@ -10,7 +10,7 @@
This version is for Universal Windows Platform apps on Windows 10 using Visual Studio 2017 or Visual Studio 2019.
DirectXTex, a shared source library for reading and writing .DDS files, and performing various texture content processing operations including resizing, format conversion, mip-map generation, block compression for Direct3D runtime texture resources, and height-map to normal-map conversion. This library makes use of the Windows Image Component (WIC) APIs. It also includes simple .TGA and .HDR readers and writers since these image file format are commonly used for texture content processing pipelines, but are not currently supported by a built-in WIC codec.
- Matches the November 11, 2020 release on GitHub.
+ Matches the January 9, 2021 release on GitHub.
http://go.microsoft.com/fwlink/?LinkId=248926
images\icon.jpg
MIT
@@ -37,7 +37,7 @@ DirectXTex, a shared source library for reading and writing .DDS files, and perf
-
+
@@ -51,8 +51,8 @@ DirectXTex, a shared source library for reading and writing .DDS files, and perf
-
+
-
\ No newline at end of file
+
diff --git a/HISTORY.md b/HISTORY.md
index c6998d6..0fcabbd 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -6,6 +6,13 @@ Release available for download on [GitHub](https://github.com/microsoft/DirectXT
## Release History
+### January 9, 2021
+* Windows Subsystem for Linux support
+* Code review for improved conformance
+* CMake updated to support package install
+* texassemble: Merge command now supports ``-swizzle`` option
+* texconv: Updated with ``-r:keep`` and ``-swizzle`` options
+
### November 11, 2020
* Use ``SHCreateMemStream`` instead of ``CreateStreamOnHGlobal`` for Win32 on Windows 8.x or Windows 10
* Updated D3DX12 internal copy with latest change from GitHub
diff --git a/LICENSE b/LICENSE
index a1df24b..74684a0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,21 +1,20 @@
The MIT License (MIT)
-Copyright (c) 2011-2020 Microsoft Corp
+Copyright (c) 2011-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
index 58068d8..743559e 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ http://go.microsoft.com/fwlink/?LinkId=248926
Copyright (c) Microsoft Corporation. All rights reserved.
-**November 11, 2020**
+**January 9, 2021**
This package contains DirectXTex, a shared source library for reading and writing ``.DDS`` files, and performing various texture content processing operations including resizing, format conversion, mip-map generation, block compression for Direct3D runtime texture resources, and height-map to normal-map conversion. This library makes use of the Windows Image Component (WIC) APIs. It also includes ``.TGA`` and ``.HDR`` readers and writers since these image file formats are commonly used for texture content processing pipelines, but are not currently supported by a built-in WIC codec.