From 77bfb072b93ad0c27d9b47896698c05b94827acb Mon Sep 17 00:00:00 2001
From: Chuck Walbourn <walbourn@users.noreply.github.com>
Date: Tue, 31 Oct 2023 20:52:35 -0700
Subject: [PATCH] October 31, 2023 (#126)

---
 .nuget/uvatlas_desktop_2019.nuspec           |  2 +-
 CMakeLists.txt                               |  2 +-
 HISTORY.md                                   |  6 ++++++
 README.md                                    |  2 +-
 UVAtlasTool/UVAtlasTool_2019.vcxproj         | 12 ++++++------
 UVAtlasTool/UVAtlasTool_2019.vcxproj.filters |  6 +++---
 UVAtlasTool/UVAtlasTool_2022.vcxproj         | 12 ++++++------
 UVAtlasTool/UVAtlasTool_2022.vcxproj.filters |  6 +++---
 UVAtlasTool/packages.config                  |  4 ++--
 9 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/.nuget/uvatlas_desktop_2019.nuspec b/.nuget/uvatlas_desktop_2019.nuspec
index 768996d..979cefb 100644
--- a/.nuget/uvatlas_desktop_2019.nuspec
+++ b/.nuget/uvatlas_desktop_2019.nuspec
@@ -10,7 +10,7 @@
         <description>This version is for Windows desktop applications using Visual Studio 2019 (16.11) or Visual Studio 2022.
 
 UVAtlas, a shared source library for creating and packing an isochart texture atlas.</description>
-        <releaseNotes>Matches the June 13, 2023 release on GitHub.</releaseNotes>
+        <releaseNotes>Matches the October 31, 2023 release on GitHub.</releaseNotes>
         <projectUrl>http://go.microsoft.com/fwlink/?LinkID=512686</projectUrl>
         <repository type="git" url="https://github.com/microsoft/UVAtlas.git" />
         <icon>images\icon.jpg</icon>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d29f444..b54d2a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ cmake_minimum_required (VERSION 3.20)
 
 set(UVATLAS_VERSION 1.8.5)
 
-if(DEFINED XBOX_CONSOLE_TARGET)
+if(WINDOWS_STORE OR (DEFINED XBOX_CONSOLE_TARGET))
   set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
 endif()
 
diff --git a/HISTORY.md b/HISTORY.md
index c58ca6b..dc6b4c1 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -6,6 +6,12 @@ Release available for download on [GitHub](https://github.com/microsoft/UVAtlas/
 
 ## Release History
 
+### October 31, 2023
+* Retired ARM (32-bit) support for the UWP platform
+* CMake project updates
+* uvatlastool: -flist option updated to support filenames with spaces
+* uvatlastool: Updated for October 2023 DirectXTex & DirectXMesh releases
+
 ### June 13, 2023
 * CMake project updates
 * uvatlastool: Fix minor display issue with error messages
diff --git a/README.md b/README.md
index bdb3365..18265a5 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@ http://go.microsoft.com/fwlink/?LinkID=512686
 
 Copyright (c) Microsoft Corporation.
 
-**June 13, 2023**
+**October 31, 2023**
 
 This package contains UVAtlas, a shared source library for creating and packing an isochart texture atlas.
 
diff --git a/UVAtlasTool/UVAtlasTool_2019.vcxproj b/UVAtlasTool/UVAtlasTool_2019.vcxproj
index 63fdd36..27a3fc9 100644
--- a/UVAtlasTool/UVAtlasTool_2019.vcxproj
+++ b/UVAtlasTool/UVAtlasTool_2019.vcxproj
@@ -301,21 +301,21 @@
     <ResourceCompile Include="UVAtlas.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <Manifest Include="settings.manifest" />
   </ItemGroup>
   <ItemGroup>
-    <Manifest Include="settings.manifest" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\directxmesh_desktop_2019.2023.4.28.1\build\native\directxmesh_desktop_2019.targets" Condition="Exists('..\packages\directxmesh_desktop_2019.2023.4.28.1\build\native\directxmesh_desktop_2019.targets')" />
-    <Import Project="..\packages\directxtex_desktop_2019.2023.6.14.1\build\native\directxtex_desktop_2019.targets" Condition="Exists('..\packages\directxtex_desktop_2019.2023.6.14.1\build\native\directxtex_desktop_2019.targets')" />
+    <Import Project="..\packages\directxmesh_desktop_2019.2023.10.31.2\build\native\directxmesh_desktop_2019.targets" Condition="Exists('..\packages\directxmesh_desktop_2019.2023.10.31.2\build\native\directxmesh_desktop_2019.targets')" />
+    <Import Project="..\packages\directxtex_desktop_2019.2023.10.31.1\build\native\directxtex_desktop_2019.targets" Condition="Exists('..\packages\directxtex_desktop_2019.2023.10.31.1\build\native\directxtex_desktop_2019.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_2019.2023.4.28.1\build\native\directxmesh_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2023.4.28.1\build\native\directxmesh_desktop_2019.targets'))" />
-    <Error Condition="!Exists('..\packages\directxtex_desktop_2019.2023.6.14.1\build\native\directxtex_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2023.6.14.1\build\native\directxtex_desktop_2019.targets'))" />
+    <Error Condition="!Exists('..\packages\directxmesh_desktop_2019.2023.10.31.2\build\native\directxmesh_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2023.10.31.2\build\native\directxmesh_desktop_2019.targets'))" />
+    <Error Condition="!Exists('..\packages\directxtex_desktop_2019.2023.10.31.1\build\native\directxtex_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2023.10.31.1\build\native\directxtex_desktop_2019.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/UVAtlasTool/UVAtlasTool_2019.vcxproj.filters b/UVAtlasTool/UVAtlasTool_2019.vcxproj.filters
index b48c9f8..daba530 100644
--- a/UVAtlasTool/UVAtlasTool_2019.vcxproj.filters
+++ b/UVAtlasTool/UVAtlasTool_2019.vcxproj.filters
@@ -25,12 +25,12 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <Manifest Include="settings.manifest">
       <Filter>Resource Files</Filter>
     </Manifest>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/UVAtlasTool/UVAtlasTool_2022.vcxproj b/UVAtlasTool/UVAtlasTool_2022.vcxproj
index 43b4bd1..75a6745 100644
--- a/UVAtlasTool/UVAtlasTool_2022.vcxproj
+++ b/UVAtlasTool/UVAtlasTool_2022.vcxproj
@@ -307,21 +307,21 @@
     <ResourceCompile Include="UVAtlas.rc" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
+    <Manifest Include="settings.manifest" />
   </ItemGroup>
   <ItemGroup>
-    <Manifest Include="settings.manifest" />
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\directxmesh_desktop_2019.2023.4.28.1\build\native\directxmesh_desktop_2019.targets" Condition="Exists('..\packages\directxmesh_desktop_2019.2023.4.28.1\build\native\directxmesh_desktop_2019.targets')" />
-    <Import Project="..\packages\directxtex_desktop_2019.2023.6.14.1\build\native\directxtex_desktop_2019.targets" Condition="Exists('..\packages\directxtex_desktop_2019.2023.6.14.1\build\native\directxtex_desktop_2019.targets')" />
+    <Import Project="..\packages\directxmesh_desktop_2019.2023.10.31.2\build\native\directxmesh_desktop_2019.targets" Condition="Exists('..\packages\directxmesh_desktop_2019.2023.10.31.2\build\native\directxmesh_desktop_2019.targets')" />
+    <Import Project="..\packages\directxtex_desktop_2019.2023.10.31.1\build\native\directxtex_desktop_2019.targets" Condition="Exists('..\packages\directxtex_desktop_2019.2023.10.31.1\build\native\directxtex_desktop_2019.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_2019.2023.4.28.1\build\native\directxmesh_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2023.4.28.1\build\native\directxmesh_desktop_2019.targets'))" />
-    <Error Condition="!Exists('..\packages\directxtex_desktop_2019.2023.6.14.1\build\native\directxtex_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2023.6.14.1\build\native\directxtex_desktop_2019.targets'))" />
+    <Error Condition="!Exists('..\packages\directxmesh_desktop_2019.2023.10.31.2\build\native\directxmesh_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2023.10.31.2\build\native\directxmesh_desktop_2019.targets'))" />
+    <Error Condition="!Exists('..\packages\directxtex_desktop_2019.2023.10.31.1\build\native\directxtex_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2023.10.31.1\build\native\directxtex_desktop_2019.targets'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/UVAtlasTool/UVAtlasTool_2022.vcxproj.filters b/UVAtlasTool/UVAtlasTool_2022.vcxproj.filters
index b48c9f8..daba530 100644
--- a/UVAtlasTool/UVAtlasTool_2022.vcxproj.filters
+++ b/UVAtlasTool/UVAtlasTool_2022.vcxproj.filters
@@ -25,12 +25,12 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <Manifest Include="settings.manifest">
       <Filter>Resource Files</Filter>
     </Manifest>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/UVAtlasTool/packages.config b/UVAtlasTool/packages.config
index eef7e76..5b569e5 100644
--- a/UVAtlasTool/packages.config
+++ b/UVAtlasTool/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="directxmesh_desktop_2019" version="2023.4.28.1" targetFramework="native" />
-  <package id="directxtex_desktop_2019" version="2023.6.14.1" targetFramework="native" />
+  <package id="directxmesh_desktop_2019" version="2023.10.31.2" targetFramework="native" />
+  <package id="directxtex_desktop_2019" version="2023.10.31.1" targetFramework="native" />
 </packages>
\ No newline at end of file