Always run MSVC runtime installer
This commit is contained in:
5
.github/workflows/build.yml
vendored
5
.github/workflows/build.yml
vendored
@@ -1452,6 +1452,11 @@ jobs:
|
||||
exit 1
|
||||
fi
|
||||
|
||||
- name: Download MSVC runtime
|
||||
shell: bash
|
||||
working-directory: build
|
||||
run: curl -f -O -L https://aka.ms/vs/17/release/vc_redist.$(test "${{matrix.arch}}" = "x86_64" && echo "x64" || echo "${{matrix.arch}}").exe
|
||||
|
||||
- name: Create nsis installer
|
||||
shell: cmd
|
||||
working-directory: build
|
||||
|
||||
10
dist/windows/strawberry.nsi.in
vendored
10
dist/windows/strawberry.nsi.in
vendored
@@ -208,14 +208,16 @@ FunctionEnd
|
||||
!ifdef msvc
|
||||
!define vc_redist_file "vc_redist.${arch}.exe"
|
||||
Function InstallMSVCRuntime
|
||||
${registry::Read} "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\${arch}" "Version" $R0 $R1
|
||||
${If} $R0 == ""
|
||||
SetOutPath "$TEMP"
|
||||
File "${vc_redist_file}"
|
||||
; ${registry::Read} "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\${arch}" "Version" $R0 $R1
|
||||
; ${If} $R0 == ""
|
||||
SetDetailsView hide
|
||||
inetc::get /caption "Downloading..." "https://aka.ms/vs/17/release/${vc_redist_file}" "$TEMP\${vc_redist_file}" /end
|
||||
; inetc::get /caption "Downloading..." "https://aka.ms/vs/17/release/${vc_redist_file}" "$TEMP\${vc_redist_file}" /end
|
||||
ExecWait '"$TEMP\${vc_redist_file}" /install /passive'
|
||||
Delete "$TEMP\${vc_redist_file}"
|
||||
SetDetailsView show
|
||||
${EndIf}
|
||||
; ${EndIf}
|
||||
FunctionEnd
|
||||
!endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user