From: sr55 Date: Wed, 14 Jun 2017 20:08:49 +0000 (+0100) Subject: WinGui: Set Framework version to 4.6.1 X-Git-Tag: 1.1.0~520 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b65b3005312401d0f9aad7acb00aa412cea7376;p=handbrake WinGui: Set Framework version to 4.6.1 --- diff --git a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj index a14159890..909b40798 100644 --- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj +++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj @@ -8,7 +8,7 @@ Properties HandBrake.ApplicationServices HandBrake.ApplicationServices - v4.6 + v4.6.1 512 diff --git a/win/CS/HandBrake.ApplicationServices/app.config b/win/CS/HandBrake.ApplicationServices/app.config index f17b7db35..2a3544d0e 100644 --- a/win/CS/HandBrake.ApplicationServices/app.config +++ b/win/CS/HandBrake.ApplicationServices/app.config @@ -3,6 +3,6 @@ - + diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj index 393bba2a4..42c3882a6 100644 --- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj +++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj @@ -8,7 +8,7 @@ Properties HandBrakeWPF HandBrake - v4.6 + v4.6.1 512 diff --git a/win/CS/HandBrakeWPF/Installer/Installer.nsi b/win/CS/HandBrakeWPF/Installer/Installer.nsi index 5752309ed..15f1b10e8 100644 --- a/win/CS/HandBrakeWPF/Installer/Installer.nsi +++ b/win/CS/HandBrakeWPF/Installer/Installer.nsi @@ -120,7 +120,7 @@ Section "HandBrake" SEC01 ; Get .NET if required ${If} $InstallDotNET == "Yes" SetDetailsView hide - inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "http://go.microsoft.com/fwlink/?LinkId=528222" "$INSTDIR\dotnetfx.exe" /end + inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "https://www.microsoft.com/en-us/download/confirmation.aspx?id=49982" "$INSTDIR\dotnetfx.exe" /end Pop $1 ${If} $1 != "OK" diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi index a12b393f3..f1a41a07a 100644 --- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi +++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi @@ -120,7 +120,7 @@ Section "HandBrake" SEC01 ; Get .NET if required ${If} $InstallDotNET == "Yes" SetDetailsView hide - inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "http://go.microsoft.com/fwlink/?LinkId=528222" "$INSTDIR\dotnetfx.exe" /end + inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "https://www.microsoft.com/en-us/download/confirmation.aspx?id=49982" "$INSTDIR\dotnetfx.exe" /end Pop $1 ${If} $1 != "OK" diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi index 178bbbcc6..0d9f15235 100644 --- a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi +++ b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi @@ -120,7 +120,7 @@ Section "HandBrake" SEC01 ; Get .NET if required ${If} $InstallDotNET == "Yes" SetDetailsView hide - inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "http://go.microsoft.com/fwlink/?LinkId=528222" "$INSTDIR\dotnetfx.exe" /end + inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "https://www.microsoft.com/en-us/download/confirmation.aspx?id=49982" "$INSTDIR\dotnetfx.exe" /end Pop $1 ${If} $1 != "OK" diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi index 07bda3722..dc6d134ee 100644 --- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi +++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi @@ -119,7 +119,7 @@ Section "HandBrake" SEC01 ; Get .NET if required ${If} $InstallDotNET == "Yes" SetDetailsView hide - inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "http://go.microsoft.com/fwlink/?LinkId=528222" "$INSTDIR\dotnetfx.exe" /end + inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "https://www.microsoft.com/en-us/download/confirmation.aspx?id=49982" "$INSTDIR\dotnetfx.exe" /end Pop $1 ${If} $1 != "OK" diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs index bb11a9a12..9da007c10 100644 --- a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs @@ -270,7 +270,7 @@ namespace HandBrakeWPF.Properties { /// ///Unsharp is a general purpose unsharp masking filter. It sharpens by blurring, then calculating the difference between the blurred picture and the original. /// - ///Lapsharp sharpens using convolution kernels approximating Laplacian edge filters, sometimes producing higher quality results than [rest of string was truncated]";. + ///Lapsharp sharpens using convolution kernels approximating Laplacian edge filters, sometimes producing higher quality results than unshar [rest of string was truncated]";. /// public static string FilterView_Sharpen { get { @@ -294,7 +294,7 @@ namespace HandBrakeWPF.Properties { /// ///Unsharp can be tuned for Ultrafine, Fine, Medium, Coarse, or Very Coarse sharpening. Select one based on the output picture resolution and fineness of detail to enhance. /// - ///Lapsharp's Film tune refines settings for use with most live action content. Film uses an isotropic Laplacian kernel to sharpen all edges similarly, and luminance (brightness) information is sharp [rest of string was truncated]";. + ///Lapsharp's Film tune refines settings for use with most live action content. Film uses an isotropic Laplacian kernel to sharpen all edges similarly, and luminance (brightness) information is sharpened [rest of string was truncated]";. /// public static string FilterView_SharpenTune { get { diff --git a/win/CS/HandBrakeWPF/app.config b/win/CS/HandBrakeWPF/app.config index 4fee91d0a..8627281cf 100644 --- a/win/CS/HandBrakeWPF/app.config +++ b/win/CS/HandBrakeWPF/app.config @@ -1,7 +1,7 @@ - +