April 6, 2021

microsoft · Apr 7, 2021 · 425abbc · 425abbc
1 parent 16cce16
commit 425abbc
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 13 deletions.
diff --git a/.nuget/uvatlas_desktop_2017.nuspec b/.nuget/uvatlas_desktop_2017.nuspec
@@ -10,12 +10,12 @@
         <description>This version is for Windows desktop applications using Visual Studio 2017 or Visual Studio 2019.
 
 UVAtlas, a shared source library for creating and packing an isochart texture atlas.</description>
-        <releaseNotes>Matches the January 9, 2021 release on GitHub.</releaseNotes>
+        <releaseNotes>Matches the April 6, 2021 release on GitHub.</releaseNotes>
         <projectUrl>http://go.microsoft.com/fwlink/?LinkID=512686</projectUrl>
         <icon>images\icon.jpg</icon>
         <license type="expression">MIT</license>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <copyright>© Microsoft Corporation.</copyright>
+        <copyright>&#169; Microsoft Corporation. All rights reserved.</copyright>
         <tags>DirectX  UVAtlas  native nativepackage</tags>
     </metadata>
 

diff --git a/HISTORY.md b/HISTORY.md
@@ -6,6 +6,11 @@ Release available for download on [GitHub](https://github.com/microsoft/UVAtlas/
 
 ## Release History
 
+### April 6, 2021
+* Minor code and project cleanup
+* uvatlastool: Updated with descriptions for HRESULT failure codes
+* uvatlastool: Updated for April 2021 DirectXTex & DirectXMesh releases
+
 ### January 9, 2021
 * Windows Subsystem for Linux support
 * Code review for improved conformance

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ http://go.microsoft.com/fwlink/?LinkID=512686
 
 Copyright (c) Microsoft Corporation.
 
-**January 9, 2021**
+**April 6, 2021**
 
 This package contains UVAtlas, a shared source library for creating and packing an isochart texture atlas.
 

diff --git a/UVAtlasTool/UVAtlasTool_2017.vcxproj b/UVAtlasTool/UVAtlasTool_2017.vcxproj
@@ -339,14 +339,14 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\directxmesh_desktop_2017.2021.1.10.1\build\native\directxmesh_desktop_2017.targets" Condition="Exists('..\packages\directxmesh_desktop_2017.2021.1.10.1\build\native\directxmesh_desktop_2017.targets')" />
-    <Import Project="..\packages\directxtex_desktop_2017.2021.1.10.2\build\native\directxtex_desktop_2017.targets" Condition="Exists('..\packages\directxtex_desktop_2017.2021.1.10.2\build\native\directxtex_desktop_2017.targets')" />
+    <Import Project="..\packages\directxmesh_desktop_2017.2021.4.7.2\build\native\directxmesh_desktop_2017.targets" Condition="Exists('..\packages\directxmesh_desktop_2017.2021.4.7.2\build\native\directxmesh_desktop_2017.targets')" />
+    <Import Project="..\packages\directxtex_desktop_2017.2021.4.7.2\build\native\directxtex_desktop_2017.targets" Condition="Exists('..\packages\directxtex_desktop_2017.2021.4.7.2\build\native\directxtex_desktop_2017.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\directxmesh_desktop_2017.2021.1.10.1\build\native\directxmesh_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2017.2021.1.10.1\build\native\directxmesh_desktop_2017.targets'))" />
-    <Error Condition="!Exists('..\packages\directxtex_desktop_2017.2021.1.10.2\build\native\directxtex_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2017.2021.1.10.2\build\native\directxtex_desktop_2017.targets'))" />
+    <Error Condition="!Exists('..\packages\directxmesh_desktop_2017.2021.4.7.2\build\native\directxmesh_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2017.2021.4.7.2\build\native\directxmesh_desktop_2017.targets'))" />
+    <Error Condition="!Exists('..\packages\directxtex_desktop_2017.2021.4.7.2\build\native\directxtex_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2017.2021.4.7.2\build\native\directxtex_desktop_2017.targets'))" />
   </Target>
 </Project>
diff --git a/UVAtlasTool/UVAtlasTool_2019.vcxproj b/UVAtlasTool/UVAtlasTool_2019.vcxproj
@@ -345,14 +345,14 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\directxmesh_desktop_2017.2021.1.10.1\build\native\directxmesh_desktop_2017.targets" Condition="Exists('..\packages\directxmesh_desktop_2017.2021.1.10.1\build\native\directxmesh_desktop_2017.targets')" />
-    <Import Project="..\packages\directxtex_desktop_2017.2021.1.10.2\build\native\directxtex_desktop_2017.targets" Condition="Exists('..\packages\directxtex_desktop_2017.2021.1.10.2\build\native\directxtex_desktop_2017.targets')" />
+    <Import Project="..\packages\directxmesh_desktop_2017.2021.4.7.2\build\native\directxmesh_desktop_2017.targets" Condition="Exists('..\packages\directxmesh_desktop_2017.2021.4.7.2\build\native\directxmesh_desktop_2017.targets')" />
+    <Import Project="..\packages\directxtex_desktop_2017.2021.4.7.2\build\native\directxtex_desktop_2017.targets" Condition="Exists('..\packages\directxtex_desktop_2017.2021.4.7.2\build\native\directxtex_desktop_2017.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\directxmesh_desktop_2017.2021.1.10.1\build\native\directxmesh_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2017.2021.1.10.1\build\native\directxmesh_desktop_2017.targets'))" />
-    <Error Condition="!Exists('..\packages\directxtex_desktop_2017.2021.1.10.2\build\native\directxtex_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2017.2021.1.10.2\build\native\directxtex_desktop_2017.targets'))" />
+    <Error Condition="!Exists('..\packages\directxmesh_desktop_2017.2021.4.7.2\build\native\directxmesh_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2017.2021.4.7.2\build\native\directxmesh_desktop_2017.targets'))" />
+    <Error Condition="!Exists('..\packages\directxtex_desktop_2017.2021.4.7.2\build\native\directxtex_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2017.2021.4.7.2\build\native\directxtex_desktop_2017.targets'))" />
   </Target>
 </Project>
diff --git a/UVAtlasTool/packages.config b/UVAtlasTool/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="directxmesh_desktop_2017" version="2021.1.10.1" targetFramework="native" />
-  <package id="directxtex_desktop_2017" version="2021.1.10.2" targetFramework="native" />
+  <package id="directxmesh_desktop_2017" version="2021.4.7.2" targetFramework="native" />
+  <package id="directxtex_desktop_2017" version="2021.4.7.2" targetFramework="native" />
 </packages>