[directxtk, directxtk12, directxmesh, directxtex, uvatlas] ports updated for June 2021 releases (#18366)

* [directxtk, directxtk12, directxmesh, directxtex, uvatlas] ports updated for June 2021 release

* added versions

21 files changed, 182 insertions, 98 deletions

diff --git a/ports/directxmesh/CONTROL b/ports/directxmesh/CONTROL
deleted file mode 100644
index 20b2829ae..000000000
--- a/ports/directxmesh/CONTROL
+++ /dev/null
@@ -1,9 +0,0 @@
-Source: directxmesh
-Version: apr2021
-Homepage: https://github.com/microsoft/DirectXMesh
-Description: DirectXMesh geometry processing library
-Build-Depends: directxmath, directx-headers
-Supports: windows|linux
-
-Feature: dx12
-Description: Build with DirectX12 support for Windows 10
diff --git a/ports/directxmesh/portfile.cmake b/ports/directxmesh/portfile.cmake
index 3c5c8e99d..baf22e54b 100644
--- a/ports/directxmesh/portfile.cmake
+++ b/ports/directxmesh/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX")
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO Microsoft/DirectXMesh

-    REF apr2021

-    SHA512 9e125c1b00c03cb0ff2f5297567e3d5c885acf5c3309208b7f846543eb4114129733676fe6f77b9c33adeb2ad50504927fff9fe48b7fe3f2c042432d0737564c

+    REF jun2021

+    SHA512 ed61e14bb217bdff803ad95bfffe31aac7ff0a3f78b963aac183c61233374def4c0b052d1bf9b0d03900fc5be052e1d8fe8de00e81f01349eff1a564d55be610

     HEAD_REF master

 )

 

@@ -38,9 +38,9 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
 if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))

   vcpkg_download_distfile(

     MESHCONVERT_EXE

-    URLS "https://github.com/Microsoft/DirectXMesh/releases/download/apr2021/meshconvert.exe"

-    FILENAME "meshconvert-apr2021.exe"

-    SHA512 0b2dd64f89d884734ad0c58690f50b84acbcd3ab61db79a5b2edf8effb9a756e38862cf599da9969cd30adc9a8f8fe6c8a3c0a3a4b4beef9be87dee8ad496871

+    URLS "https://github.com/Microsoft/DirectXMesh/releases/download/jun2021/meshconvert.exe"

+    FILENAME "meshconvert-jun2021.exe"

+    SHA512 2a5e1eb69f24fd321d372dcd790970a15957757eacd0a861001299409ff56372bc890c2d8baba32368c81eeb63cdd7aef514c57bca1e7e4e3f7bdf494c3453a0

   )

 

   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxmesh/")

@@ -49,7 +49,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
     ${MESHCONVERT_EXE}

     DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxmesh/)

 

-  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-apr2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe)

+  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxmesh/meshconvert.exe)

 

 elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP))

 

diff --git a/ports/directxmesh/vcpkg.json b/ports/directxmesh/vcpkg.json
new file mode 100644
index 000000000..4eb6c26be
--- /dev/null
+++ b/ports/directxmesh/vcpkg.json
@@ -0,0 +1,18 @@
+{
+  "name": "directxmesh",
+  "version-string": "jun2021",
+  "description": "DirectXMesh geometry processing library",
+  "homepage": "http://go.microsoft.com/fwlink/?LinkID=324981",
+  "documentation": "https://github.com/microsoft/DirectXMesh/wiki",
+  "license": "MIT",
+  "supports": "windows | linux",
+  "dependencies": [
+    "directx-headers",
+    "directxmath"
+  ],
+  "features": {
+    "dx12": {
+      "description": "Build with DirectX12 support for Windows 10"
+    }
+  }
+}
diff --git a/ports/directxtex/CONTROL b/ports/directxtex/CONTROL
deleted file mode 100644
index 13adec892..000000000
--- a/ports/directxtex/CONTROL
+++ /dev/null
@@ -1,13 +0,0 @@
-Source: directxtex
-Version: apr2021
-Homepage: https://github.com/microsoft/DirectXTex
-Description: DirectXTex texture processing library
-Build-Depends: directxmath, directx-headers
-Supports: windows|linux
-
-Feature: dx12
-Description: Build with DirectX12 support for Windows 10
-
-Feature: openexr
-Description: Enable OpenEXR support
-Build-Depends: openexr
diff --git a/ports/directxtex/portfile.cmake b/ports/directxtex/portfile.cmake
index 6f2ccaaab..eb991da0b 100644
--- a/ports/directxtex/portfile.cmake
+++ b/ports/directxtex/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXTex
-    REF apr2021
-    SHA512 0f2624d7ca6f30e75e5a394c3f4730b068dac256f3571df024d5421f2ce777ee1bf3d90984e93d4ed881d2364dc7bd0dc6b2b48c0abe50a5bc5c2071ce2ba711
+    REF jun2021
+    SHA512 aa67e814248b3e6163eb8670a8740831bc449b0cc1d83ba0e83d022cc3a8b78c92bc79dee15a089ef1d20566e22c4236ae871906b467bab688c223b32900ec60
     HEAD_REF master
 )
 
@@ -65,23 +65,23 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
 if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT ("openexr" IN_LIST FEATURES)))
   vcpkg_download_distfile(
     TEXASSEMBLE_EXE
-    URLS "https://github.com/Microsoft/DirectXTex/releases/download/apr2021/texassemble.exe"
-    FILENAME "texassemble-apr2021.exe"
-    SHA512 1ab77d057d859600cd74632cd236b4ba619ec3538fae2871488bfbe3434bf1acb3ea594b034d5bc7e631954f83e5170b2edb9bc9f228e9216771762ed971a4a2
+    URLS "https://github.com/Microsoft/DirectXTex/releases/download/jun2021/texassemble.exe"
+    FILENAME "texassemble-jun2021.exe"
+    SHA512 98fbd891b36c1f0c400670e4ad7943929a278995d1c1d99fe6c4d490abfabe001885eeafad3f913962c560a0ddd960126c979c60d89edcdf0dd002be919048d8
   )
 
   vcpkg_download_distfile(
     TEXCONV_EXE
-    URLS "https://github.com/Microsoft/DirectXTex/releases/download/apr2021/texconv.exe"
-    FILENAME "texconv-apr2021.exe"
-    SHA512 6e4f0b775097cd45b54b9b024b6e2f7783d7b3af8cf0e120fb01d69318b30857506260be35b571e873300403acec3c325be6357d05a1fa5971c14ce3065343bc
+    URLS "https://github.com/Microsoft/DirectXTex/releases/download/jun2021/texconv.exe"
+    FILENAME "texconv-jun2021.exe"
+    SHA512 47719cca9a2eaf7b28da6b68f87c54ed89507e864d93a35ce7dc417dd0f40cbef23e54039c27c4addfbda79f2f94b1224172e6c8cf2b9ed1e784e60661900102
   )
 
   vcpkg_download_distfile(
     TEXDIAG_EXE
-    URLS "https://github.com/Microsoft/DirectXTex/releases/download/apr2021/texdiag.exe"
-    FILENAME "texdiag-apr2021.exe"
-    SHA512 f35b2719d47ed36159a7572b632da26179db8d6b2a0164cd6cf917e5220ff04e6179987ca605d8d534cbc76fc8c5204c87748ed5be3dfb393413d5e1e7a58895
+    URLS "https://github.com/Microsoft/DirectXTex/releases/download/jun2021/texdiag.exe"
+    FILENAME "texdiag-jun2021.exe"
+    SHA512 484f582c01a001ad97dedecf9ac4be6602a82f52a4e22750dd8ee2c4fa09a776d74aa77b3e50339248dd547f832d293d6d789fabeafe9593271100085e838a86
   )
 
   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtex/")
@@ -92,9 +92,9 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64) AND (NOT
     ${TEXDIAG_EXE}
     DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtex/)
 
-  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-apr2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-apr2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-apr2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texassemble.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texconv.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtex/texdiag-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtex/texadiag.exe)
 
 elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP))
 
diff --git a/ports/directxtex/vcpkg.json b/ports/directxtex/vcpkg.json
new file mode 100644
index 000000000..b9195d591
--- /dev/null
+++ b/ports/directxtex/vcpkg.json
@@ -0,0 +1,24 @@
+{
+  "name": "directxtex",
+  "version-string": "jun2021",
+  "description": "DirectXTex texture processing library",
+  "homepage": "http://go.microsoft.com/fwlink/?LinkId=248926",
+  "documentation": "https://github.com/microsoft/DirectXTex/wiki",
+  "license": "MIT",
+  "supports": "windows | linux",
+  "dependencies": [
+    "directx-headers",
+    "directxmath"
+  ],
+  "features": {
+    "dx12": {
+      "description": "Build with DirectX12 support for Windows 10"
+    },
+    "openexr": {
+      "description": "Enable OpenEXR support",
+      "dependencies": [
+        "openexr"
+      ]
+    }
+  }
+}
diff --git a/ports/directxtk/CONTROL b/ports/directxtk/CONTROL
deleted file mode 100644
index 8ef3b1f3d..000000000
--- a/ports/directxtk/CONTROL
+++ /dev/null
@@ -1,12 +0,0 @@
-Source: directxtk
-Version: apr2021
-Homepage: https://github.com/microsoft/DirectXTK
-Description: A collection of helper classes for writing DirectX 11.x code in C++.
-Build-Depends: directxmath
-Supports: windows
-
-Feature: xaudio2-9
-Description: Build with XAudio 2.9 support for Windows 10
-
-Feature: xaudio2-8
-Description: Build with XAudio 2.8 support for Windows 8.x or later
diff --git a/ports/directxtk/portfile.cmake b/ports/directxtk/portfile.cmake
index 56d88087a..466a4d37e 100644
--- a/ports/directxtk/portfile.cmake
+++ b/ports/directxtk/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXTK
-    REF apr2021
-    SHA512 d64b5a6c39e9ecc4609a1db4c3121880b4e40431ec2e785aefff8e11615444485b0ffa68169cff6a5dda52f38bb2ce22161644e5fa4b757b9a84e682a458f846
+    REF jun2021
+    SHA512 df15d20c3ab586e4f08b92a30d82f277e966aaa2555fa6161a6fb2308e65d79fdb3c65518f150fb08c31902d929aa01369dc8a852d2be31d30ecdf9253898fe0
     HEAD_REF master
 )
 
@@ -15,6 +15,7 @@ vcpkg_check_features(
     FEATURES
         xaudio2-9 BUILD_XAUDIO_WIN10
         xaudio2-8 BUILD_XAUDIO_WIN8
+        xaudio2redist BUILD_XAUDIO_WIN7
 )
 
 if(VCPKG_TARGET_IS_UWP)
@@ -35,16 +36,16 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
 if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
   vcpkg_download_distfile(
     MAKESPRITEFONT_EXE
-    URLS "https://github.com/Microsoft/DirectXTK/releases/download/apr2021/MakeSpriteFont.exe"
-    FILENAME "makespritefont-apr2021.exe"
-    SHA512 f958dc0a88ff931182914ebb4b935d4ed71297d59a61fb70dbf7769d22350abc712acfdbbfbba658781600c83ac7e390eac0663ade747f749194addd209c5bfa
+    URLS "https://github.com/Microsoft/DirectXTK/releases/download/jun2021/MakeSpriteFont.exe"
+    FILENAME "makespritefont-jun2021.exe"
+    SHA512 4618090f65332c64cb5601a7095c60c87a3a41e9c030d7422d36f14b04dcd80c7aa26438733b892f91daf19fadd44591a814b77c3ca04590ad6c61ecbe909a65
   )
 
   vcpkg_download_distfile(
     XWBTOOL_EXE
-    URLS "https://github.com/Microsoft/DirectXTK/releases/download/apr2021/XWBTool.exe"
-    FILENAME "xwbtool-apr2021.exe"
-    SHA512 8918fe7f5c996a54c6a5032115c9b82c6fe9b61688da3cde11c0282061c17a829639b219b8ff5ac623986507338c927eb926f2c42ba3c98563dfe7e162e22305
+    URLS "https://github.com/Microsoft/DirectXTK/releases/download/jun2021/XWBTool.exe"
+    FILENAME "xwbtool-jun2021.exe"
+    SHA512 dc74081b9569a9ca736984d8da1a5b2dc852f85d07a629d6e0ef7f2b4313987ec82d2ff1e0cfa19a89c7387182644869ac2a8f842d30609d88ccae7c01ce3f80
   )
 
   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk/")
@@ -54,8 +55,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
     ${XWBTOOL_EXE}
     DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtk/)
 
-  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-apr2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-apr2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/makespritefont.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk/xwbtool.exe)
 
 elseif(NOT VCPKG_TARGET_IS_UWP)
 
diff --git a/ports/directxtk/vcpkg.json b/ports/directxtk/vcpkg.json
new file mode 100644
index 000000000..2a484ac3f
--- /dev/null
+++ b/ports/directxtk/vcpkg.json
@@ -0,0 +1,29 @@
+{
+  "name": "directxtk",
+  "version-string": "jun2021",
+  "description": "A collection of helper classes for writing DirectX 11.x code in C++.",
+  "homepage": "http://go.microsoft.com/fwlink/?LinkId=248929",
+  "documentation": "https://github.com/microsoft/DirectXTK/wiki",
+  "license": "MIT",
+  "supports": "windows",
+  "dependencies": [
+    "directxmath"
+  ],
+  "features": {
+    "xaudio2-8": {
+      "description": "Build with XAudio 2.8 support for Windows 8.x or later"
+    },
+    "xaudio2-9": {
+      "description": "Build with XAudio 2.9 support for Windows 10"
+    },
+    "xaudio2redist": {
+      "description": "Build with XAudio2Redist support for Windows 7 SP1 or later",
+      "dependencies": [
+        {
+          "name": "xaudio2redist",
+          "platform": "!uwp & !arm"
+        }
+      ]
+    }
+  }
+}
diff --git a/ports/directxtk12/CONTROL b/ports/directxtk12/CONTROL
deleted file mode 100644
index a73866306..000000000
--- a/ports/directxtk12/CONTROL
+++ /dev/null
@@ -1,7 +0,0 @@
-Source: directxtk12
-Version: apr2021
-Homepage: https://github.com/microsoft/DirectXTK12
-Description: A collection of helper classes for writing DirectX 12 code in C++.
-Build-Depends: directxmath
-Supports: windows
-
diff --git a/ports/directxtk12/portfile.cmake b/ports/directxtk12/portfile.cmake
index 24e1419e9..f1a1edff0 100644
--- a/ports/directxtk12/portfile.cmake
+++ b/ports/directxtk12/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX" "Linux")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/DirectXTK12
-    REF apr2021
-    SHA512 5bca666815567f681420c4b4e8b1b801a3bdfaf8f00f0910c9d697c90d6c75d74d0ecf9f8c820cca5f94756c5e3796bc3fd936a8b695953af20ffd0c0c0b1b96
+    REF jun2021
+    SHA512 8d33232a5422283a0a69850a7913b88ccbf9720e5172fe82171d38a0f42b487ba5cca4f356eeaee975bcbb931a5e7ddbce1c335c3c93f01e79f85d65613e5387
     HEAD_REF master
 )
 
@@ -22,16 +22,16 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
 if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
   vcpkg_download_distfile(
     MAKESPRITEFONT_EXE
-    URLS "https://github.com/Microsoft/DirectXTK12/releases/download/apr2021/MakeSpriteFont.exe"
-    FILENAME "makespritefont-apr2021.exe"
-    SHA512 f958dc0a88ff931182914ebb4b935d4ed71297d59a61fb70dbf7769d22350abc712acfdbbfbba658781600c83ac7e390eac0663ade747f749194addd209c5bfa
+    URLS "https://github.com/Microsoft/DirectXTK12/releases/download/jun2021/MakeSpriteFont.exe"
+    FILENAME "makespritefont-jun2021.exe"
+    SHA512 4618090f65332c64cb5601a7095c60c87a3a41e9c030d7422d36f14b04dcd80c7aa26438733b892f91daf19fadd44591a814b77c3ca04590ad6c61ecbe909a65
   )
 
   vcpkg_download_distfile(
     XWBTOOL_EXE
-    URLS "https://github.com/Microsoft/DirectXTK12/releases/download/apr2021/XWBTool.exe"
-    FILENAME "xwbtool-apr2021.exe"
-    SHA512 8918fe7f5c996a54c6a5032115c9b82c6fe9b61688da3cde11c0282061c17a829639b219b8ff5ac623986507338c927eb926f2c42ba3c98563dfe7e162e22305
+    URLS "https://github.com/Microsoft/DirectXTK12/releases/download/jun2021/XWBTool.exe"
+    FILENAME "xwbtool-jun2021.exe"
+    SHA512 dc74081b9569a9ca736984d8da1a5b2dc852f85d07a629d6e0ef7f2b4313987ec82d2ff1e0cfa19a89c7387182644869ac2a8f842d30609d88ccae7c01ce3f80
   )
 
   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/directxtk12/")
@@ -41,8 +41,8 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
     ${XWBTOOL_EXE}
     DESTINATION ${CURRENT_PACKAGES_DIR}/tools/directxtk12/)
 
-  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-apr2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe)
-  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-apr2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/makespritefont.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/directxtk12/xwbtool.exe)
 endif()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
diff --git a/ports/directxtk12/vcpkg.json b/ports/directxtk12/vcpkg.json
new file mode 100644
index 000000000..b3d46b054
--- /dev/null
+++ b/ports/directxtk12/vcpkg.json
@@ -0,0 +1,13 @@
+{
+  "name": "directxtk12",
+  "version-string": "jun2021",
+  "description": "A collection of helper classes for writing DirectX 12 code in C++.",
+  "homepage": "http://go.microsoft.com/fwlink/?LinkID=615561",
+  "documentation": "https://github.com/microsoft/DirectXTK12/wiki",
+  "license": "MIT",
+  "supports": "windows",
+  "dependencies": [
+    "directx-headers",
+    "directxmath"
+  ]
+}
diff --git a/ports/uvatlas/CONTROL b/ports/uvatlas/CONTROL
deleted file mode 100644
index 53e754440..000000000
--- a/ports/uvatlas/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: uvatlas

-Version: apr2021

-Homepage: https://github.com/Microsoft/UVAtlas

-Description: UVAtlas isochart texture atlas

-Build-Depends: directxmesh(!(uwp|linux)), directxtex(!(uwp|linux)), directxmath, directx-headers

-Supports: windows|linux

diff --git a/ports/uvatlas/portfile.cmake b/ports/uvatlas/portfile.cmake
index ac63fc5a9..d35e59779 100644
--- a/ports/uvatlas/portfile.cmake
+++ b/ports/uvatlas/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "OSX")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/UVAtlas
-    REF apr2021
-    SHA512 cbbcb5ca38d5ad27b1f355dba7d71cd605ab6a7588c1886d47f6426e932cdc62376f8fc85033010c2e742336aba632fd4f70b726340ab4ff4eb0343ddecac7db
+    REF jun2021
+    SHA512 f0ecba24c63214876f69eec2de7e5dd15e63aee20641e0989211f7dcab7182c7f6cb73960dbbc1504cd0fab18af8b024c8ee3bde087694d4acd3d1254b90f608
     HEAD_REF master
 )
 
@@ -32,9 +32,9 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
 if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
   vcpkg_download_distfile(
     UVATLASTOOL_EXE
-    URLS "https://github.com/Microsoft/UVAtlas/releases/download/apr2021/uvatlastool.exe"
-    FILENAME "uvatlastool-apr2021.exe"
-    SHA512 a54d8de9a94dbfb29e3e200b60ce177a56c3c3b2907f7903564168af9da9969efc2abdc7c8107f323cc808fc04648751a51cd4c6cafaeb72174967fdd300e489
+    URLS "https://github.com/Microsoft/UVAtlas/releases/download/jun2021/uvatlastool.exe"
+    FILENAME "uvatlastool-jun2021.exe"
+    SHA512 af2e57a2d6aa41b53784c78ea8b5e181bb6ea6f66b23bfb3710ae3d7aebf3184c1739d02822a1eab438ebaac5fccb053bfac29b77d5ce81ae1f9c8e0bd396b49
   )
 
   file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/uvatlas/")
@@ -43,7 +43,7 @@ if((VCPKG_HOST_IS_WINDOWS) AND (VCPKG_TARGET_ARCHITECTURE MATCHES x64))
     ${UVATLASTOOL_EXE}
     DESTINATION ${CURRENT_PACKAGES_DIR}/tools/uvatlas/)
 
-  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-apr2021.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe)
+  file(RENAME ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool-jun2021.exe ${CURRENT_PACKAGES_DIR}/tools/uvatlas/uvatlastool.exe)
 
 elseif((VCPKG_TARGET_IS_WINDOWS) AND (NOT VCPKG_TARGET_IS_UWP))
 
diff --git a/ports/uvatlas/vcpkg.json b/ports/uvatlas/vcpkg.json
new file mode 100644
index 000000000..2394f43e6
--- /dev/null
+++ b/ports/uvatlas/vcpkg.json
@@ -0,0 +1,21 @@
+{
+  "name": "uvatlas",
+  "version-string": "jun2021",
+  "description": "UVAtlas isochart texture atlas",
+  "homepage": "http://go.microsoft.com/fwlink/?LinkID=512686",
+  "documentation": "https://github.com/Microsoft/UVAtlas/wiki",
+  "license": "MIT",
+  "supports": "windows | linux",
+  "dependencies": [
+    "directx-headers",
+    "directxmath",
+    {
+      "name": "directxmesh",
+      "platform": "!(uwp | linux)"
+    },
+    {
+      "name": "directxtex",
+      "platform": "!(uwp | linux)"
+    }
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 54f4afe56..8c59d3e7d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1669,7 +1669,7 @@
       "port-version": 0
     },
     "directxmesh": {
-      "baseline": "apr2021",
+      "baseline": "jun2021",
       "port-version": 0
     },
     "directxsdk": {
@@ -1677,15 +1677,15 @@
       "port-version": 2
     },
     "directxtex": {
-      "baseline": "apr2021",
+      "baseline": "jun2021",
       "port-version": 0
     },
     "directxtk": {
-      "baseline": "apr2021",
+      "baseline": "jun2021",
       "port-version": 0
     },
     "directxtk12": {
-      "baseline": "apr2021",
+      "baseline": "jun2021",
       "port-version": 0
     },
     "dirent": {
@@ -6449,7 +6449,7 @@
       "port-version": 0
     },
     "uvatlas": {
-      "baseline": "apr2021",
+      "baseline": "jun2021",
       "port-version": 0
     },
     "uvw": {
diff --git a/versions/d-/directxmesh.json b/versions/d-/directxmesh.json
index eb7561601..cfb012c23 100644
--- a/versions/d-/directxmesh.json
+++ b/versions/d-/directxmesh.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "57ebdc7d52aef816917feb6d24ad2e6e67fa92ec",
+      "version-string": "jun2021",
+      "port-version": 0
+    },
+    {
       "git-tree": "ec7046a3aaada7fed843b0769bcb50ec78a47555",
       "version-string": "apr2021",
       "port-version": 0
diff --git a/versions/d-/directxtex.json b/versions/d-/directxtex.json
index 9f97ae5d3..6e7bac2e2 100644
--- a/versions/d-/directxtex.json
+++ b/versions/d-/directxtex.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "a98fe1cd0beed414488e36e18d5e2f5a54f2d6b6",
+      "version-string": "jun2021",
+      "port-version": 0
+    },
+    {
       "git-tree": "af7a4042d884e4cf4f85fbfc49fe928949f53aeb",
       "version-string": "apr2021",
       "port-version": 0
diff --git a/versions/d-/directxtk.json b/versions/d-/directxtk.json
index 20244a382..0872ba43f 100644
--- a/versions/d-/directxtk.json
+++ b/versions/d-/directxtk.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "d7cafe13a0edb883e2d15c917d5a042d4b599c1c",
+      "version-string": "jun2021",
+      "port-version": 0
+    },
+    {
       "git-tree": "9502cb93d3227fa8a77cd99a9f321447eb420300",
       "version-string": "apr2021",
       "port-version": 0
diff --git a/versions/d-/directxtk12.json b/versions/d-/directxtk12.json
index bd3909ad9..d53b7318e 100644
--- a/versions/d-/directxtk12.json
+++ b/versions/d-/directxtk12.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "eba43932b7f93d4dedbd866542362f12933e3a74",
+      "version-string": "jun2021",
+      "port-version": 0
+    },
+    {
       "git-tree": "49e5974a7aee2ea6a1d4639e7bf885947db11ea0",
       "version-string": "apr2021",
       "port-version": 0
diff --git a/versions/u-/uvatlas.json b/versions/u-/uvatlas.json
index 89aaa0f2e..21d07dec2 100644
--- a/versions/u-/uvatlas.json
+++ b/versions/u-/uvatlas.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "24f38b36247b90b011cb96c5b06728fa6b2f1011",
+      "version-string": "jun2021",
+      "port-version": 0
+    },
+    {
       "git-tree": "39b1594645ffd005dc96b8201297e02cae54ed93",
       "version-string": "apr2021",
       "port-version": 0