February 28, 2022

microsoft · Mar 1, 2022 · 3d8b4c1 · 3d8b4c1
1 parent e8c7fe7
commit 3d8b4c1
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 17 deletions.
diff --git a/.nuget/uvatlas_desktop_2017.nuspec b/.nuget/uvatlas_desktop_2017.nuspec
@@ -10,7 +10,7 @@
         <description>This version is for Windows desktop applications using Visual Studio 2017, Visual Studio 2019, or Visual Studio 2022.
 
 UVAtlas, a shared source library for creating and packing an isochart texture atlas.</description>
-        <releaseNotes>Matches the November 8, 2021 release on GitHub.</releaseNotes>
+        <releaseNotes>Matches the February 28, 2022 release on GitHub.</releaseNotes>
         <projectUrl>http://go.microsoft.com/fwlink/?LinkID=512686</projectUrl>
         <repository type="git" url="https://github.com/microsoft/UVAtlas" />
         <icon>images\icon.jpg</icon>

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 cmake_minimum_required (VERSION 3.11)
 
-set(UVATLAS_VERSION 1.8.3)
+set(UVATLAS_VERSION 1.8.4)
 
 project (UVAtlas
   VERSION ${UVATLAS_VERSION}

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
 
+### February 28, 2022
+* Code and project review including fixing clang v13 warnings
+* Added CMakePresets.json
+* uvatlastool: Updated for February 2022 DirectXTex & DirectXMesh releases
+
 ### November 8, 2021
 * VS 2022 support
 * Fixed locale issue with WaveFront OBJ reading/writing

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ http://go.microsoft.com/fwlink/?LinkID=512686
 
 Copyright (c) Microsoft Corporation.
 
-**November 8, 2021**
+**February 28, 2022**
 
 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
@@ -291,14 +291,14 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\directxmesh_desktop_2017.2021.11.8.1\build\native\directxmesh_desktop_2017.targets" Condition="Exists('..\packages\directxmesh_desktop_2017.2021.11.8.1\build\native\directxmesh_desktop_2017.targets')" />
-    <Import Project="..\packages\directxtex_desktop_2017.2021.11.8.1\build\native\directxtex_desktop_2017.targets" Condition="Exists('..\packages\directxtex_desktop_2017.2021.11.8.1\build\native\directxtex_desktop_2017.targets')" />
+    <Import Project="..\packages\directxmesh_desktop_2017.2022.3.1.1\build\native\directxmesh_desktop_2017.targets" Condition="Exists('..\packages\directxmesh_desktop_2017.2022.3.1.1\build\native\directxmesh_desktop_2017.targets')" />
+    <Import Project="..\packages\directxtex_desktop_2017.2022.3.1.1\build\native\directxtex_desktop_2017.targets" Condition="Exists('..\packages\directxtex_desktop_2017.2022.3.1.1\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.11.8.1\build\native\directxmesh_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2017.2021.11.8.1\build\native\directxmesh_desktop_2017.targets'))" />
-    <Error Condition="!Exists('..\packages\directxtex_desktop_2017.2021.11.8.1\build\native\directxtex_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2017.2021.11.8.1\build\native\directxtex_desktop_2017.targets'))" />
+    <Error Condition="!Exists('..\packages\directxmesh_desktop_2017.2022.3.1.1\build\native\directxmesh_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2017.2022.3.1.1\build\native\directxmesh_desktop_2017.targets'))" />
+    <Error Condition="!Exists('..\packages\directxtex_desktop_2017.2022.3.1.1\build\native\directxtex_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2017.2022.3.1.1\build\native\directxtex_desktop_2017.targets'))" />
   </Target>
 </Project>
diff --git a/UVAtlasTool/UVAtlasTool_2019.vcxproj b/UVAtlasTool/UVAtlasTool_2019.vcxproj
@@ -297,14 +297,14 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\directxmesh_desktop_2017.2021.11.8.1\build\native\directxmesh_desktop_2017.targets" Condition="Exists('..\packages\directxmesh_desktop_2017.2021.11.8.1\build\native\directxmesh_desktop_2017.targets')" />
-    <Import Project="..\packages\directxtex_desktop_2017.2021.11.8.1\build\native\directxtex_desktop_2017.targets" Condition="Exists('..\packages\directxtex_desktop_2017.2021.11.8.1\build\native\directxtex_desktop_2017.targets')" />
+    <Import Project="..\packages\directxmesh_desktop_2017.2022.3.1.1\build\native\directxmesh_desktop_2017.targets" Condition="Exists('..\packages\directxmesh_desktop_2017.2022.3.1.1\build\native\directxmesh_desktop_2017.targets')" />
+    <Import Project="..\packages\directxtex_desktop_2017.2022.3.1.1\build\native\directxtex_desktop_2017.targets" Condition="Exists('..\packages\directxtex_desktop_2017.2022.3.1.1\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.11.8.1\build\native\directxmesh_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2017.2021.11.8.1\build\native\directxmesh_desktop_2017.targets'))" />
-    <Error Condition="!Exists('..\packages\directxtex_desktop_2017.2021.11.8.1\build\native\directxtex_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2017.2021.11.8.1\build\native\directxtex_desktop_2017.targets'))" />
+    <Error Condition="!Exists('..\packages\directxmesh_desktop_2017.2022.3.1.1\build\native\directxmesh_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2017.2022.3.1.1\build\native\directxmesh_desktop_2017.targets'))" />
+    <Error Condition="!Exists('..\packages\directxtex_desktop_2017.2022.3.1.1\build\native\directxtex_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2017.2022.3.1.1\build\native\directxtex_desktop_2017.targets'))" />
   </Target>
 </Project>
diff --git a/UVAtlasTool/UVAtlasTool_2022.vcxproj b/UVAtlasTool/UVAtlasTool_2022.vcxproj
@@ -297,14 +297,14 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\directxmesh_desktop_2017.2021.11.8.1\build\native\directxmesh_desktop_2017.targets" Condition="Exists('..\packages\directxmesh_desktop_2017.2021.11.8.1\build\native\directxmesh_desktop_2017.targets')" />
-    <Import Project="..\packages\directxtex_desktop_2017.2021.11.8.1\build\native\directxtex_desktop_2017.targets" Condition="Exists('..\packages\directxtex_desktop_2017.2021.11.8.1\build\native\directxtex_desktop_2017.targets')" />
+    <Import Project="..\packages\directxmesh_desktop_2017.2022.3.1.1\build\native\directxmesh_desktop_2017.targets" Condition="Exists('..\packages\directxmesh_desktop_2017.2022.3.1.1\build\native\directxmesh_desktop_2017.targets')" />
+    <Import Project="..\packages\directxtex_desktop_2017.2022.3.1.1\build\native\directxtex_desktop_2017.targets" Condition="Exists('..\packages\directxtex_desktop_2017.2022.3.1.1\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.11.8.1\build\native\directxmesh_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2017.2021.11.8.1\build\native\directxmesh_desktop_2017.targets'))" />
-    <Error Condition="!Exists('..\packages\directxtex_desktop_2017.2021.11.8.1\build\native\directxtex_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2017.2021.11.8.1\build\native\directxtex_desktop_2017.targets'))" />
+    <Error Condition="!Exists('..\packages\directxmesh_desktop_2017.2022.3.1.1\build\native\directxmesh_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2017.2022.3.1.1\build\native\directxmesh_desktop_2017.targets'))" />
+    <Error Condition="!Exists('..\packages\directxtex_desktop_2017.2022.3.1.1\build\native\directxtex_desktop_2017.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2017.2022.3.1.1\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.11.8.1" targetFramework="native" />
-  <package id="directxtex_desktop_2017" version="2021.11.8.1" targetFramework="native" />
+  <package id="directxmesh_desktop_2017" version="2022.3.1.1" targetFramework="native" />
+  <package id="directxtex_desktop_2017" version="2022.3.1.1" targetFramework="native" />
 </packages>