aboutsummaryrefslogtreecommitdiff
path: root/scripts/buildsystems
diff options
context:
space:
mode:
authorGriffin Downs <35574547+grdowns@users.noreply.github.com>2019-07-01 13:14:53 -0700
committerGitHub <noreply@github.com>2019-07-01 13:14:53 -0700
commit0b9cf040bafa0a8ed064e47459779d72fcf9b9c4 (patch)
tree53036c9f0b7f051abe737376f7ddeeeccd9948d0 /scripts/buildsystems
parent34d19da9ffd0571bf16190ec4a16a04bef265900 (diff)
parent77cfd20b83e71a0c513658e7c4d049d4039905af (diff)
downloadvcpkg-0b9cf040bafa0a8ed064e47459779d72fcf9b9c4.tar.gz
vcpkg-0b9cf040bafa0a8ed064e47459779d72fcf9b9c4.zip
Merge branch 'master' into openssl-unix-dynamic
Diffstat (limited to 'scripts/buildsystems')
-rw-r--r--scripts/buildsystems/msbuild/applocal.ps14
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1
index cf363f12e..2fdd9fdb4 100644
--- a/scripts/buildsystems/msbuild/applocal.ps1
+++ b/scripts/buildsystems/msbuild/applocal.ps1
@@ -9,7 +9,7 @@ $g_is_debug = $g_install_root -match '(.*\\)?debug(\\)?$'
# Ensure we create the copied files log, even if we don't end up copying any files
if ($copiedFilesLog)
{
- Set-Content -Path $copiedFilesLog -Value "" -Encoding Ascii
+ Set-Content -Path $copiedFilesLog -Value "" -Encoding UTF8
}
# Note: this function signature is depended upon by the qtdeploy.ps1 script introduced in 5.7.1-7
@@ -28,7 +28,7 @@ function deployBinary([string]$targetBinaryDir, [string]$SourceDir, [string]$tar
Write-Verbose " ${targetBinaryName}: Copying $SourceDir\$targetBinaryName"
Copy-Item "$SourceDir\$targetBinaryName" $targetBinaryDir
}
- if ($copiedFilesLog) { Add-Content $copiedFilesLog "$targetBinaryDir\$targetBinaryName" }
+ if ($copiedFilesLog) { Add-Content $copiedFilesLog "$targetBinaryDir\$targetBinaryName" -Encoding UTF8 }
if ($tlogFile) { Add-Content $tlogFile "$targetBinaryDir\$targetBinaryName" }
}