[dxut, fx11, directxmath] ports updated (#18431)

* [dxut] port updated for latest servicing

* update baseline

* Update to use latest DirectXMath

* Fix baseline

* fx11 metadata update

* Updated baseline

* Converted directxmath CONTROL to vcpkg.json

* Update baseline

* Apply suggestions from code review

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Code review feedback

* Update baseline

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

9 files changed, 41 insertions, 13 deletions

diff --git a/ports/directxmath/CONTROL b/ports/directxmath/CONTROL
deleted file mode 100644
index bbd86fa2e..000000000
--- a/ports/directxmath/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: directxmath
-Version: jan2021
-Homepage: https://walbourn.github.io/introducing-directxmath/
-Description: DirectXMath SIMD C++ math library
diff --git a/ports/directxmath/vcpkg.json b/ports/directxmath/vcpkg.json
new file mode 100644
index 000000000..e0ffe0e44
--- /dev/null
+++ b/ports/directxmath/vcpkg.json
@@ -0,0 +1,9 @@
+{
+  "name": "directxmath",
+  "version-string": "jan2021",
+  "port-version": 1,
+  "description": "DirectXMath SIMD C++ math library",
+  "homepage": "https://github.com/Microsoft/DirectXMath",
+  "documentation": "https://docs.microsoft.com/en-us/windows/win32/dxmath/directxmath-portal",
+  "license": "MIT"
+}
diff --git a/ports/dxut/portfile.cmake b/ports/dxut/portfile.cmake
index ab1dd0ad2..118bedd7b 100644
--- a/ports/dxut/portfile.cmake
+++ b/ports/dxut/portfile.cmake
@@ -5,8 +5,8 @@ vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "UWP" "ANDROID")
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO microsoft/DXUT
-    REF feb2021
-    SHA512 576692b79e67a9fd0b39b6e20c519fe61ad18525db663071f446f3c2e0ae3f009f67f00be45baf52749810af1ddc995ad0e5e4608d7f42d08116ff6e91bccb22
+    REF jun2021
+    SHA512 4c95cefcf685e95b26677d0aba3d118df7860e3bf1b99b567013d326f890a3f67657be2c60677d3d996cccacce30f70d0c2fc60a692372053cce50318fa79a70
     HEAD_REF master
 )
 
diff --git a/ports/dxut/vcpkg.json b/ports/dxut/vcpkg.json
index 3cbd3990c..ede994b81 100644
--- a/ports/dxut/vcpkg.json
+++ b/ports/dxut/vcpkg.json
@@ -1,7 +1,12 @@
 {
   "name": "dxut",
-  "version-string": "11.25",
+  "version": "11.26",
   "description": "A \"GLUT\"-like framework for Direct3D 11.x Win32 desktop applications",
   "homepage": "https://github.com/Microsoft/DXUT",
-  "supports": "windows & !uwp"
+  "documentation": "https://github.com/microsoft/DXUT/wiki",
+  "license": "MIT",
+  "supports": "windows & !uwp",
+  "dependencies": [
+    "directxmath"
+  ]
 }
diff --git a/ports/effects11/vcpkg.json b/ports/effects11/vcpkg.json
index 7cdf47eb1..4edddcd8d 100644
--- a/ports/effects11/vcpkg.json
+++ b/ports/effects11/vcpkg.json
@@ -1,7 +1,10 @@
 {
   "name": "effects11",
-  "version-string": "11.26",
+  "version": "11.26",
+  "port-version": 1,
   "description": "Effects for Direct3D 11 (FX11) is a management runtime for authoring HLSL shaders, render state, and runtime variables together.",
-  "homepage": "https://github.com/microsoft/FX11",
+  "homepage": "https://github.com/Microsoft/FX11",
+  "documentation": "https://github.com/microsoft/FX11/wiki",
+  "license": "MIT",
   "supports": "windows"
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index 62aad444c..1f20bf2df 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1666,7 +1666,7 @@
     },
     "directxmath": {
       "baseline": "jan2021",
-      "port-version": 0
+      "port-version": 1
     },
     "directxmesh": {
       "baseline": "jun2021",
@@ -1777,7 +1777,7 @@
       "port-version": 0
     },
     "dxut": {
-      "baseline": "11.25",
+      "baseline": "11.26",
       "port-version": 0
     },
     "eabase": {
@@ -1826,7 +1826,7 @@
     },
     "effects11": {
       "baseline": "11.26",
-      "port-version": 0
+      "port-version": 1
     },
     "effolkronium-random": {
       "baseline": "1.3.1",
diff --git a/versions/d-/directxmath.json b/versions/d-/directxmath.json
index 5f0c61ee6..44477eae7 100644
--- a/versions/d-/directxmath.json
+++ b/versions/d-/directxmath.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "d02145b6ed0cbe882bfb75291f832a11ab0582ce",
+      "version-string": "jan2021",
+      "port-version": 1
+    },
+    {
       "git-tree": "381e0fc938992c45b9c2000e25bb4265f408ee27",
       "version-string": "jan2021",
       "port-version": 0
diff --git a/versions/d-/dxut.json b/versions/d-/dxut.json
index 7dcbb464c..ef3b7c69c 100644
--- a/versions/d-/dxut.json
+++ b/versions/d-/dxut.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "098b30a228f1d71cfa5b0e21a4c9bf9ade3774e6",
+      "version": "11.26",
+      "port-version": 0
+    },
+    {
       "git-tree": "b037faaa0c10a455e68dc219788dcbf2f83aace2",
       "version-string": "11.25",
       "port-version": 0
diff --git a/versions/e-/effects11.json b/versions/e-/effects11.json
index f1a390ba1..4850d41d5 100644
--- a/versions/e-/effects11.json
+++ b/versions/e-/effects11.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "ed264ec7ce47f6c0ad48933d3ced950b4841726f",
+      "version": "11.26",
+      "port-version": 1
+    },
+    {
       "git-tree": "428f5c35c75c0886d83e163b5158c941cb15fb22",
       "version-string": "11.26",
       "port-version": 0