diff options
| author | sr55 <[email protected]> | 2015-07-22 18:53:24 +0000 |
|---|---|---|
| committer | sr55 <[email protected]> | 2015-07-22 18:53:24 +0000 |
| commit | b1e3d11e361b73a36a11f3f3462c75526fe100f2 (patch) | |
| tree | a5250a8e4f690291b5c7cfde189aa59ed5ff7e04 /win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl | |
| parent | 06d3f871ff06643a673c0a6a2872bfa242623613 (diff) | |
WinGui: Migrate to the newly release .NET Framework 4.6. The installer will automatically offer to install this for most users. Visual Studio 2012 or later is now a requirement for developers. VS 2015 Community edition works fine.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@7367 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl')
| -rw-r--r-- | win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl index 188c795d1..105946e70 100644 --- a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl +++ b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi.tmpl @@ -16,7 +16,7 @@ ;Required .NET framework
!define MIN_FRA_MAJOR "4"
-!define MIN_FRA_MINOR "0"
+!define MIN_FRA_MINOR "6"
!define MIN_FRA_BUILD "*"
SetCompressor lzma
@@ -110,18 +110,18 @@ Section "HandBrake" SEC01 Call CheckFramework
StrCmp $0 "1" +3
StrCpy $InstallDotNET "Yes"
- MessageBox MB_OK|MB_ICONINFORMATION "${PRODUCT_NAME} requires that the .NET Framework 4.0 Client Profile 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.6 Client Profile 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 .NET Framework 4.0" /canceltext "Cancel" "http://www.microsoft.com/downloads/info.aspx?na=41&srcfamilyid=e5ad0459-cbcc-4b4f-97b6-fb17111cf544&srcdisplaylang=en&u=http%3a%2f%2fdownload.microsoft.com%2fdownload%2f5%2f6%2f2%2f562A10F9-C9F4-4313-A044-9C94E0A8FAC8%2fdotNetFx40_Client_x86_x64.exe" "$INSTDIR\dotnetfx.exe" /end
+ inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "http://go.microsoft.com/fwlink/?LinkId=528222" "$INSTDIR\dotnetfx.exe" /end
Pop $1
${If} $1 != "OK"
Delete "$INSTDIR\dotnetfx.exe"
- Abort "Installation cancelled, ${PRODUCT_NAME} requires the .NET 4.0 Framework"
+ Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.6 Framework"
${EndIf}
ExecWait "$INSTDIR\dotnetfx.exe"
|