From b8c5ede662c774a5e2a10418933075a9f84ccd0c Mon Sep 17 00:00:00 2001
From: Voskrese <10104740+Voskrese@users.noreply.github.com>
Date: Fri, 1 May 2020 01:11:20 +0800
Subject: [PATCH] [msbuild] Hotfix /p:UseEnv=True to be a port-local setting
 (#11058)

* Update vcpkg_build_msbuild.cmake

* Update vcpkg_install_msbuild.cmake

* Update CONTROL

* Update CONTROL

* Update portfile.cmake

* Update portfile.cmake

* Update ci.baseline.txt
---
 ports/libvpx/CONTROL                      | 2 +-
 ports/libvpx/portfile.cmake               | 1 +
 ports/mpg123/CONTROL                      | 2 +-
 ports/mpg123/portfile.cmake               | 1 +
 scripts/cmake/vcpkg_build_msbuild.cmake   | 1 -
 scripts/cmake/vcpkg_install_msbuild.cmake | 1 -
 6 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ports/libvpx/CONTROL b/ports/libvpx/CONTROL
index 2472e88a31e..b18dfe6c00d 100644
--- a/ports/libvpx/CONTROL
+++ b/ports/libvpx/CONTROL
@@ -1,5 +1,5 @@
 Source: libvpx
-Version: 1.8.1-2
+Version: 1.8.1-3
 Homepage: https://github.com/webmproject/libvpx
 Description: The reference software implementation for the video coding formats VP8 and VP9.
 Supports: !(uwp|arm|arm64|linux|osx)
diff --git a/ports/libvpx/portfile.cmake b/ports/libvpx/portfile.cmake
index b513a96232e..3eded00d94f 100644
--- a/ports/libvpx/portfile.cmake
+++ b/ports/libvpx/portfile.cmake
@@ -71,6 +71,7 @@ vcpkg_execute_required_process(
 
 vcpkg_build_msbuild(
     PROJECT_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/vpx.vcxproj"
+    OPTIONS /p:UseEnv=True
 )
 
 if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
diff --git a/ports/mpg123/CONTROL b/ports/mpg123/CONTROL
index d1edfde9d50..a42cb9ed380 100644
--- a/ports/mpg123/CONTROL
+++ b/ports/mpg123/CONTROL
@@ -1,5 +1,5 @@
 Source: mpg123
-Version: 1.25.8-7
+Version: 1.25.8-8
 Homepage: https://sourceforge.net/projects/mpg123/
 Description: mpg123 is a real time MPEG 1.0/2.0/2.5 audio player/decoder for layers 1, 2 and 3 (MPEG 1.0 layer 3 also known as MP3).
 Supports: !(uwp|arm)
diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake
index 4b019274211..73e7bb3fa29 100644
--- a/ports/mpg123/portfile.cmake
+++ b/ports/mpg123/portfile.cmake
@@ -47,6 +47,7 @@ set(ENV{PATH} "$ENV{PATH};${YASM_EXE_PATH}")
 if(VCPKG_TARGET_IS_WINDOWS)
     vcpkg_build_msbuild(
         PROJECT_PATH ${SOURCE_PATH}/ports/MSVC++/2015/win32/libmpg123/libmpg123.vcxproj
+        OPTIONS /p:UseEnv=True
         RELEASE_CONFIGURATION Release${MPG123_CONFIGURATION}${MPG123_CONFIGURATION_SUFFIX}
         DEBUG_CONFIGURATION Debug${MPG123_CONFIGURATION}${MPG123_CONFIGURATION_SUFFIX}
     )
diff --git a/scripts/cmake/vcpkg_build_msbuild.cmake b/scripts/cmake/vcpkg_build_msbuild.cmake
index 04e8eb0ed55..cfd429da2f2 100644
--- a/scripts/cmake/vcpkg_build_msbuild.cmake
+++ b/scripts/cmake/vcpkg_build_msbuild.cmake
@@ -91,7 +91,6 @@ 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 2bfbb76900f..db2874a9ffd 100644
--- a/scripts/cmake/vcpkg_install_msbuild.cmake
+++ b/scripts/cmake/vcpkg_install_msbuild.cmake
@@ -131,7 +131,6 @@ 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