mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +00:00
Merge pull request #35679 from twangboy/change.vcredist.version.2016.3
Revert to vcredist 12 (2013)
This commit is contained in:
commit
e45aa55d79
@ -64,10 +64,7 @@ Function Get-Settings {
|
||||
"SSLeay" = "ssleay32.dll"
|
||||
"OpenSSLLic" = "OpenSSL_License.txt"
|
||||
"libsodium" = "libsodium.dll"
|
||||
"concrt" = "concrt140.dll"
|
||||
"msvcp" = "msvcp140.dll"
|
||||
"vccorlib" = "vccorlib140.dll"
|
||||
"vcruntime" = "vcruntime140.dll"
|
||||
"msvcr" = "msvcr120.dll"
|
||||
}
|
||||
$ini.Add("64bitDLLs", $64bitDLLs)
|
||||
|
||||
@ -77,10 +74,7 @@ Function Get-Settings {
|
||||
"SSLeay" = "ssleay32.dll"
|
||||
"OpenSSLLic" = "OpenSSL_License.txt"
|
||||
"libsodium" = "libsodium.dll"
|
||||
"concrt" = "concrt140.dll"
|
||||
"msvcp" = "msvcp140.dll"
|
||||
"vccorlib" = "vccorlib140.dll"
|
||||
"vcruntime" = "vcruntime140.dll"
|
||||
"msvcr" = "msvcr120.dll"
|
||||
}
|
||||
$ini.Add("32bitDLLs", $32bitDLLs)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user