Update DXUT port and add Effects11 (FX) port (#16101)

* Update dxut port, added effects11 port

* DXUT does not support UWP

* Fixed FX11 CMake to support UWP

* DXUT supports arm64 desktop

* Update baseline

* Now that these build with CMake, no need to exclude staticcrt

* rev'd port version

* Fix versions

* Update versions/d-/dxut.json

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Update versions/e-/effects11.json

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Update ports/dxut/vcpkg.json

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

* Update versions/baseline.json

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

* Update versions/d-/dxut.json

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

* Update versions/e-/effects11.json

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

* Update versions/baseline.json

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

* Update ports/effects11/vcpkg.json

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

* Updated version hash

* Fixed format complaint

* Fixed baseline

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

7 files changed, 68 insertions, 40 deletions

diff --git a/ports/dxut/portfile.cmake b/ports/dxut/portfile.cmake
index 78626d1c9..ab1dd0ad2 100644
--- a/ports/dxut/portfile.cmake
+++ b/ports/dxut/portfile.cmake
@@ -1,43 +1,23 @@
-vcpkg_check_linkage(ONLY_STATIC_LIBRARY ONLY_DYNAMIC_CRT)
-vcpkg_fail_port_install(ON_ARCH arm)
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
-vcpkg_from_github(
-	OUT_SOURCE_PATH SOURCE_PATH
-	REPO microsoft/DXUT
-	REF d6e8ef60b35b8d3b97684bd6b3cee88f8ba81a3f
-	SHA512 2ac1ac4416dbf7ae0e8a9e1e95fbd8bede126ac6dc4e919f4bd1131d10f3a01e007aff2f770ace9cbf48093ff76d8b89c4b78b734658028be62e1412f44078ae
-)
-
-IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
-	SET(BUILD_ARCH "Win32")
-ELSE()
-	SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
-ENDIF()
+vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "UWP" "ANDROID")
 
-vcpkg_build_msbuild(
-	PROJECT_PATH "${SOURCE_PATH}/DXUT_2015.sln"
-	PLATFORM "${BUILD_ARCH}"
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO microsoft/DXUT
+    REF feb2021
+    SHA512 576692b79e67a9fd0b39b6e20c519fe61ad18525db663071f446f3c2e0ae3f009f67f00be45baf52749810af1ddc995ad0e5e4608d7f42d08116ff6e91bccb22
+    HEAD_REF master
 )
 
-file(INSTALL
-	"${SOURCE_PATH}/Core/"
-	"${SOURCE_PATH}/Optional/"
-	DESTINATION "${CURRENT_PACKAGES_DIR}/include"
-	FILES_MATCHING PATTERN "*.h"
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
 )
-file(REMOVE_RECURSE
-	"${CURRENT_PACKAGES_DIR}/include/Bin")
-
-file(INSTALL
-	"${SOURCE_PATH}/Core/Bin/Desktop_2015/${BUILD_ARCH}/Release/DXUT.lib"
-	"${SOURCE_PATH}/Optional/Bin/Desktop_2015/${BUILD_ARCH}/Release/DXUTOpt.lib"
-	DESTINATION "${CURRENT_PACKAGES_DIR}/lib")
 
-file(INSTALL
-	"${SOURCE_PATH}/Core/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DXUT.lib"
-	"${SOURCE_PATH}/Optional/Bin/Desktop_2015/${BUILD_ARCH}/Debug/DXUTOpt.lib"
-	DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib")
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
 
-vcpkg_copy_pdbs()
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/MIT.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/dxut/vcpkg.json b/ports/dxut/vcpkg.json
index 49517b1de..3cbd3990c 100644
--- a/ports/dxut/vcpkg.json
+++ b/ports/dxut/vcpkg.json
@@ -1,8 +1,7 @@
 {
   "name": "dxut",
-  "version-string": "11.14",
-  "port-version": 4,
+  "version-string": "11.25",
   "description": "A \"GLUT\"-like framework for Direct3D 11.x Win32 desktop applications",
   "homepage": "https://github.com/Microsoft/DXUT",
-  "supports": "!staticcrt & windows & !arm"
+  "supports": "windows & !uwp"
 }
diff --git a/ports/effects11/portfile.cmake b/ports/effects11/portfile.cmake
new file mode 100644
index 000000000..e5ebf84ab
--- /dev/null
+++ b/ports/effects11/portfile.cmake
@@ -0,0 +1,24 @@
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "ANDROID")
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO microsoft/FX11
+    REF feb2021
+    SHA512 bdf35347582646e782c20a96180c8286786da46583527b76b2d348cd76a75285a31ebb88297962cd279c09bbd416c15c0d25ae91881ffebbf9e8ce2f21912f16
+    HEAD_REF master
+    FILE_DISAMBIGUATOR 1
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/effects11/vcpkg.json b/ports/effects11/vcpkg.json
new file mode 100644
index 000000000..7cdf47eb1
--- /dev/null
+++ b/ports/effects11/vcpkg.json
@@ -0,0 +1,7 @@
+{
+  "name": "effects11",
+  "version-string": "11.26",
+  "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",
+  "supports": "windows"
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index fb2aac356..522fb51f8 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1721,8 +1721,8 @@
       "port-version": 0
     },
     "dxut": {
-      "baseline": "11.14",
-      "port-version": 4
+      "baseline": "11.25",
+      "port-version": 0
     },
     "eabase": {
       "baseline": "2.09.12-1",
@@ -1768,6 +1768,10 @@
       "baseline": "1.2.6",
       "port-version": 0
     },
+    "effects11": {
+      "baseline": "11.26",
+      "port-version": 0
+    },
     "effolkronium-random": {
       "baseline": "1.3.1",
       "port-version": 0
diff --git a/versions/d-/dxut.json b/versions/d-/dxut.json
index 87ba2f783..7dcbb464c 100644
--- a/versions/d-/dxut.json
+++ b/versions/d-/dxut.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "b037faaa0c10a455e68dc219788dcbf2f83aace2",
+      "version-string": "11.25",
+      "port-version": 0
+    },
+    {
       "git-tree": "6171a1c44bd4c11d7db922b56ef55c9366fe60af",
       "version-string": "11.14",
       "port-version": 4
diff --git a/versions/e-/effects11.json b/versions/e-/effects11.json
new file mode 100644
index 000000000..f1a390ba1
--- /dev/null
+++ b/versions/e-/effects11.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "428f5c35c75c0886d83e163b5158c941cb15fb22",
+      "version-string": "11.26",
+      "port-version": 0
+    }
+  ]
+}