Update for DirectXTex, DirectXMesh, and UVAtlas December 2023 releases

walbourn · Jan 1, 2024 · f0301f6 · f0301f6
1 parent 62a5944
commit f0301f6
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 19 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -6,6 +6,9 @@ Release available for download on [GitHub](https://github.com/walbourn/contentex
 
 ## Release History
 
+### December 31, 2023
+* Updated for DirectXTex, DirectXMesh, and UVAtlas December 2023 releases
+
 ### March 31, 2023
 * Updated for DirectXTex, DirectXMesh, and UVAtlas March 2023 releases
 

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ https://aka.ms/dxsdkcontentexporter
 
 Copyright (c) Microsoft Corporation.
 
-**March 31, 2023**
+**December 31, 2023**
 
 The **Samples Content Exporter** was shipped as a sample in the legacy DirectX SDK. It makes use of the [Autodesk FBX SDK](http://autodesk.com/fbx) to import an FBX file and then export the data as an ``.SDKMESH``. The ``.SDKMESH`` format is a runtime geometry format supported by the _DirectX Tool Kit_ for [DX11](http://go.microsoft.com/fwlink/?LinkId=248929) / [DX12](http://go.microsoft.com/fwlink/?LinkID=615561) and [DXUT](http://go.microsoft.com/fwlink/?LinkId=320437), and is used in the Windows sample [Marble Maze](https://docs.microsoft.com/samples/microsoft/windows-appsample-marble-maze/directx-marble-maze-game-sample/).
 

diff --git a/exportobjects/ExportObjects2019.vcxproj b/exportobjects/ExportObjects2019.vcxproj
@@ -155,16 +155,16 @@
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\packages\uvatlas_desktop_2019.2023.4.29.1\build\native\uvatlas_desktop_2019.targets" Condition="Exists('..\packages\uvatlas_desktop_2019.2023.4.29.1\build\native\uvatlas_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')" />
+    <Import Project="..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets" Condition="Exists('..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets')" />
+    <Import Project="..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets" Condition="Exists('..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets')" />
+    <Import Project="..\packages\uvatlas_desktop_2019.2023.11.1.1\build\native\uvatlas_desktop_2019.targets" Condition="Exists('..\packages\uvatlas_desktop_2019.2023.11.1.1\build\native\uvatlas_desktop_2019.targets')" />
   </ImportGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable 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\uvatlas_desktop_2019.2023.4.29.1\build\native\uvatlas_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\uvatlas_desktop_2019.2023.4.29.1\build\native\uvatlas_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'))" />
+    <Error Condition="!Exists('..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets'))" />
+    <Error Condition="!Exists('..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets'))" />
+    <Error Condition="!Exists('..\packages\uvatlas_desktop_2019.2023.11.1.1\build\native\uvatlas_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\uvatlas_desktop_2019.2023.11.1.1\build\native\uvatlas_desktop_2019.targets'))" />
   </Target>
 </Project>
diff --git a/exportobjects/packages.config b/exportobjects/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="directxmesh_desktop_2019" version="2023.10.31.2" targetFramework="native" />
-  <package id="directxtex_desktop_2019" version="2023.10.31.1" targetFramework="native" />
-  <package id="uvatlas_desktop_2019" version="2023.4.29.1" targetFramework="native" />
+  <package id="directxmesh_desktop_2019" version="2024.1.1.1" targetFramework="native" />
+  <package id="directxtex_desktop_2019" version="2024.1.1.1" targetFramework="native" />
+  <package id="uvatlas_desktop_2019" version="2023.11.1.1" targetFramework="native" />
 </packages>
diff --git a/importfbx/ImportFBX2019.vcxproj b/importfbx/ImportFBX2019.vcxproj
@@ -177,18 +177,18 @@
   <ImportGroup Label="ExtensionTargets">
     <Import Project="..\packages\openexr-msvc-x64.2.3.0.8788\build\native\OpenEXR-msvc-x64.targets" Condition="Exists('..\packages\openexr-msvc-x64.2.3.0.8788\build\native\OpenEXR-msvc-x64.targets')" />
     <Import Project="..\packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets" Condition="Exists('..\packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets')" />
-    <Import Project="..\packages\uvatlas_desktop_2019.2023.4.29.1\build\native\uvatlas_desktop_2019.targets" Condition="Exists('..\packages\uvatlas_desktop_2019.2023.4.29.1\build\native\uvatlas_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')" />
+    <Import Project="..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets" Condition="Exists('..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets')" />
+    <Import Project="..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets" Condition="Exists('..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets')" />
+    <Import Project="..\packages\uvatlas_desktop_2019.2023.11.1.1\build\native\uvatlas_desktop_2019.targets" Condition="Exists('..\packages\uvatlas_desktop_2019.2023.11.1.1\build\native\uvatlas_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\openexr-msvc-x64.2.3.0.8788\build\native\OpenEXR-msvc-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\openexr-msvc-x64.2.3.0.8788\build\native\OpenEXR-msvc-x64.targets'))" />
     <Error Condition="!Exists('..\packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\zlib-msvc-x64.1.2.11.8900\build\native\zlib-msvc-x64.targets'))" />
-    <Error Condition="!Exists('..\packages\uvatlas_desktop_2019.2023.4.29.1\build\native\uvatlas_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\uvatlas_desktop_2019.2023.4.29.1\build\native\uvatlas_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'))" />
+    <Error Condition="!Exists('..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxmesh_desktop_2019.2024.1.1.1\build\native\directxmesh_desktop_2019.targets'))" />
+    <Error Condition="!Exists('..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtex_desktop_2019.2024.1.1.1\build\native\directxtex_desktop_2019.targets'))" />
+    <Error Condition="!Exists('..\packages\uvatlas_desktop_2019.2023.11.1.1\build\native\uvatlas_desktop_2019.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\uvatlas_desktop_2019.2023.11.1.1\build\native\uvatlas_desktop_2019.targets'))" />
   </Target>
 </Project>
diff --git a/importfbx/packages.config b/importfbx/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="directxmesh_desktop_2019" version="2023.10.31.2" targetFramework="native" />
-  <package id="directxtex_desktop_2019" version="2023.10.31.1" targetFramework="native" />
+  <package id="directxmesh_desktop_2019" version="2024.1.1.1" targetFramework="native" />
+  <package id="directxtex_desktop_2019" version="2024.1.1.1" targetFramework="native" />
   <package id="openexr-msvc-x64" version="2.3.0.8788" targetFramework="native" />
-  <package id="uvatlas_desktop_2019" version="2023.4.29.1" targetFramework="native" />
+  <package id="uvatlas_desktop_2019" version="2023.11.1.1" targetFramework="native" />
   <package id="zlib-msvc-x64" version="1.2.11.8900" targetFramework="native" />
 </packages>