From: sr55 Date: Wed, 22 Jul 2015 18:53:24 +0000 (+0000) Subject: WinGui: Migrate to the newly release .NET Framework 4.6. The installer will automatic... X-Git-Tag: 1.0.0~1021 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1e3d11e361b73a36a11f3f3462c75526fe100f2;p=handbrake 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 --- diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj index 1a080047f..7027bacbe 100644 --- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj +++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -10,18 +10,20 @@ Properties HandBrake.ApplicationServices HandBrake.ApplicationServices - v4.0 + v4.6 512 3.5 - Client + + AnyCPU bin\Debug\ DEBUG;TRACE + false AnyCPU @@ -30,12 +32,14 @@ DEBUG;TRACE pdbonly true + false AnyCPU bin\Debug\ TRACE;DEBUG true + false AnyCPU @@ -44,6 +48,7 @@ true pdbonly true + false diff --git a/win/CS/HandBrake.ApplicationServices/Properties/Resources.Designer.cs b/win/CS/HandBrake.ApplicationServices/Properties/Resources.Designer.cs index 228d3e59a..cc2213858 100644 --- a/win/CS/HandBrake.ApplicationServices/Properties/Resources.Designer.cs +++ b/win/CS/HandBrake.ApplicationServices/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.269 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/win/CS/HandBrake.ApplicationServices/app.config b/win/CS/HandBrake.ApplicationServices/app.config index 084adc9e4..f17b7db35 100644 --- a/win/CS/HandBrake.ApplicationServices/app.config +++ b/win/CS/HandBrake.ApplicationServices/app.config @@ -1,8 +1,8 @@ - + - + diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj index d31a3faba..829c61f5d 100644 --- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj +++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj @@ -1,5 +1,5 @@  - + Debug x86 @@ -10,8 +10,9 @@ Properties HandBrakeWPF HandBrake - v4.0 - Client + v4.6 + + 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} 4 @@ -40,6 +41,7 @@ DEBUG;TRACE prompt 4 + false x86 @@ -49,6 +51,7 @@ TRACE prompt 4 + false handbrakepineapple.ico @@ -63,6 +66,7 @@ true true true + false bin\x64\Release\ @@ -71,6 +75,7 @@ pdbonly x64 prompt + false diff --git a/win/CS/HandBrakeWPF/Installer/Installer.nsi b/win/CS/HandBrakeWPF/Installer/Installer.nsi index 124994498..fb803ba77 100644 --- a/win/CS/HandBrakeWPF/Installer/Installer.nsi +++ b/win/CS/HandBrakeWPF/Installer/Installer.nsi @@ -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" diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi index 46f129da5..b060a6550 100644 --- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi +++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi @@ -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" 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" diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl index 7dc5f536b..ee5cb21b4 100644 --- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl +++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi.tmpl @@ -16,8 +16,8 @@ ;Required .NET framework !define MIN_FRA_MAJOR "4" -!define MIN_FRA_MINOR "5" -!define MIN_FRA_BUILD "2" +!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 Microsoft .NET Framework 4.5.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.6 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.5.2" /canceltext "Cancel" "http://go.microsoft.com/fwlink/?LinkId=397707" "$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 Microsoft.NET 4.5.2 Framework" + Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.6 Framework" ${EndIf} ExecWait "$INSTDIR\dotnetfx.exe" diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs index b0c768edf..23cceef50 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs index 156c2cc3e..449eb17fa 100644 --- a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs index 3bc2d064d..9a9e5c218 100644 --- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. diff --git a/win/CS/HandBrakeWPF/app.config b/win/CS/HandBrakeWPF/app.config index fc4f3393f..5ea845f32 100644 --- a/win/CS/HandBrakeWPF/app.config +++ b/win/CS/HandBrakeWPF/app.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file +