3 files changed, 2 insertions, 9 deletions
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index 66292e4df..274af8198 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -957,15 +957,10 @@ libuuid:x86-windows=fail
 libuv:arm64-windows=fail
 libuv:arm-uwp=fail
 libuv:x64-uwp=fail
-# libvpx is failing because the port's attempt to make yasm available is not succeeding
 libvpx:arm-uwp=fail
 libvpx:arm64-windows=fail
 libvpx:x64-linux=fail
 libvpx:x64-osx=fail
-libvpx:x64-uwp=fail
-libvpx:x64-windows-static=fail
-libvpx:x64-windows=fail
-libvpx:x86-windows=fail
 libwandio:x86-windows=fail
 libwandio:x64-windows=fail
 libwandio:x64-windows-static=fail
@@ -1124,12 +1119,8 @@ mozjpeg:x64-uwp            = skip
 mozjpeg:x64-windows        = skip
 mozjpeg:x64-windows-static = skip
 mozjpeg:x86-windows        = skip
-# mpg123 is failing because the port's attempt to make yasm available is not succeeding
 mpg123:arm-uwp=fail
 mpg123:x64-uwp=fail
-mpg123:x64-windows-static=fail
-mpg123:x64-windows=fail
-mpg123:x86-windows=fail
 mpir:arm64-windows=fail
 mpir:arm-uwp=fail
 mpir:x64-uwp=fail
diff --git a/scripts/cmake/vcpkg_build_msbuild.cmake b/scripts/cmake/vcpkg_build_msbuild.cmake
index cfd429da2..04e8eb0ed 100644
--- a/scripts/cmake/vcpkg_build_msbuild.cmake
+++ b/scripts/cmake/vcpkg_build_msbuild.cmake
@@ -91,6 +91,7 @@ function(vcpkg_build_msbuild)
 
     list(APPEND _csc_OPTIONS
         /t:${_csc_TARGET}
+        /p:UseEnv=True
         /p:Platform=${_csc_PLATFORM}
         /p:PlatformToolset=${_csc_PLATFORM_TOOLSET}
         /p:VCPkgLocalAppDataDisabled=true
diff --git a/scripts/cmake/vcpkg_install_msbuild.cmake b/scripts/cmake/vcpkg_install_msbuild.cmake
index db2874a9f..2bfbb7690 100644
--- a/scripts/cmake/vcpkg_install_msbuild.cmake
+++ b/scripts/cmake/vcpkg_install_msbuild.cmake
@@ -131,6 +131,7 @@ function(vcpkg_install_msbuild)
 
     list(APPEND _csc_OPTIONS
         /t:${_csc_TARGET}
+        /p:UseEnv=True
         /p:Platform=${_csc_PLATFORM}
         /p:PlatformToolset=${_csc_PLATFORM_TOOLSET}
         /p:VCPkgLocalAppDataDisabled=true