From b5e2378be7525734f8caa227eef9c11a3fe7f4d0 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sun, 4 Nov 2018 13:27:12 +0000 Subject: [PATCH] WinGui: Update installer for 1.2 --- win/CS/HandBrakeWPF/Installer/Installer64.nsi | 6 +++--- win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi index 9cd407fcd..4a5f05a84 100644 --- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi +++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi @@ -120,18 +120,18 @@ Section "HandBrake" SEC01 Call CheckFramework StrCmp $0 "1" +3 StrCpy $InstallDotNET "Yes" - MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the Microsoft .NET Framework 4.6.2 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK + MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the Microsoft .NET Framework 4.7.1 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK Pop $0 ; Get .NET if required ${If} $InstallDotNET == "Yes" SetDetailsView hide - inetc::get /caption "Downloading Microsoft .NET Framework 4.6.2" /canceltext "Cancel" "https://www.microsoft.com/en-us/download/confirmation.aspx?id=56116" "$INSTDIR\dotnetfx.exe" /end + inetc::get /caption "Downloading Microsoft .NET Framework 4.7.1" /canceltext "Cancel" "https://www.microsoft.com/en-us/download/confirmation.aspx?id=56116" "$INSTDIR\dotnetfx.exe" /end Pop $1 ${If} $1 != "OK" Delete "$INSTDIR\dotnetfx.exe" - Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.6.2 Framework" + Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.7.1 Framework" ${EndIf} ExecWait "$INSTDIR\dotnetfx.exe" diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi index 30123ead3..696f00c42 100644 --- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi +++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi @@ -119,18 +119,18 @@ Section "HandBrake" SEC01 Call CheckFramework StrCmp $0 "1" +3 StrCpy $InstallDotNET "Yes" - MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the Microsoft .NET Framework 4.6.2 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK + MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the Microsoft .NET Framework 4.7.1 is installed. The latest .NET Framework will be downloaded and installed automatically during installation of ${PRODUCT_NAME}." /SD IDOK Pop $0 ; Get .NET if required ${If} $InstallDotNET == "Yes" SetDetailsView hide - inetc::get /caption "Downloading Microsoft .NET Framework 4.6.2" /canceltext "Cancel" "https://www.microsoft.com/en-us/download/confirmation.aspx?id=56116" "$INSTDIR\dotnetfx.exe" /end + inetc::get /caption "Downloading Microsoft .NET Framework 4.7.1" /canceltext "Cancel" "https://www.microsoft.com/en-us/download/confirmation.aspx?id=56116" "$INSTDIR\dotnetfx.exe" /end Pop $1 ${If} $1 != "OK" Delete "$INSTDIR\dotnetfx.exe" - Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.6.2 Framework" + Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.7.1 Framework" ${EndIf} ExecWait "$INSTDIR\dotnetfx.exe" -- 2.40.0