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 a141598903b42ff0e5987f96c81cdfd15a994331..909b4079820248166a3971ca68abf3d3e72c2f58 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
+++ b/win/CS/HandBrake.ApplicationServices/HandBrake.ApplicationServices.csproj
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
     <RootNamespace>HandBrake.ApplicationServices</RootNamespace>\r
     <AssemblyName>HandBrake.ApplicationServices</AssemblyName>\r
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>\r
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>\r
     <FileAlignment>512</FileAlignment>\r
     <FileUpgradeFlags>\r
     </FileUpgradeFlags>\r

diff --git a/win/CS/HandBrake.ApplicationServices/app.config b/win/CS/HandBrake.ApplicationServices/app.config
index f17b7db35b785447dbcfefc3687f81eeea26c138..2a3544d0e5b18355b0843e8fee626e5b26e721f5 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/app.config
+++ b/win/CS/HandBrake.ApplicationServices/app.config
@@ -3,6 +3,6 @@
   <configSections>\r
   </configSections>\r
   <startup>\r
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>\r
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>\r
   </startup>\r
 </configuration>\r

diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
index 393bba2a483b2af88412a0d573541a1746225ac6..42c3882a6bc35f22c55a05a7a2219ac350ba1173 100644 (file)
--- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
+++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
     <RootNamespace>HandBrakeWPF</RootNamespace>\r
     <AssemblyName>HandBrake</AssemblyName>\r
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>\r
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>\r
     <TargetFrameworkProfile>\r
     </TargetFrameworkProfile>\r
     <FileAlignment>512</FileAlignment>\r

diff --git a/win/CS/HandBrakeWPF/Installer/Installer.nsi b/win/CS/HandBrakeWPF/Installer/Installer.nsi
index 5752309edcf6a7a0f10a51d96c5bbd3927f39a05..15f1b10e86ef5d875d396a42fa6de53f0bb1b5b2 100644 (file)
--- 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\r
   ${If} $InstallDotNET == "Yes"\r
      SetDetailsView hide\r
-     inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "http://go.microsoft.com/fwlink/?LinkId=528222" "$INSTDIR\dotnetfx.exe" /end\r
+     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\r
      Pop $1\r
 \r
      ${If} $1 != "OK"\r

diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
index a12b393f37a0ff8c5911d0643f3c13850b476991..f1a41a07a421ae36caf9a634c65cfaa4b23ee42a 100644 (file)
--- 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\r
   ${If} $InstallDotNET == "Yes"\r
      SetDetailsView hide\r
-     inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "http://go.microsoft.com/fwlink/?LinkId=528222" "$INSTDIR\dotnetfx.exe" /end\r
+     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\r
      Pop $1\r
 \r
      ${If} $1 != "OK"\r

diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi
index 178bbbcc626ba8f815ba08df5f9639cd46629b76..0d9f152351bca7d8980fe6b9c75413b3f0e3ccd8 100644 (file)
--- 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\r
   ${If} $InstallDotNET == "Yes"\r
      SetDetailsView hide\r
-     inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "http://go.microsoft.com/fwlink/?LinkId=528222" "$INSTDIR\dotnetfx.exe" /end\r
+     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\r
      Pop $1\r
 \r
      ${If} $1 != "OK"\r

diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi
index 07bda3722b030cd3b3e07592e4bbc898cbd2fe04..dc6d134eeb86d677bbf41ecc8614f1d30135864e 100644 (file)
--- 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\r
   ${If} $InstallDotNET == "Yes"\r
      SetDetailsView hide\r
-     inetc::get /caption "Downloading Microsoft .NET Framework 4.6" /canceltext "Cancel" "http://go.microsoft.com/fwlink/?LinkId=528222" "$INSTDIR\dotnetfx.exe" /end\r
+     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\r
      Pop $1\r
 \r
      ${If} $1 != "OK"\r

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
index bb11a9a12a53410bb6b1b35f32330e4190dc38cd..9da007c106baaca571683dca8078627a34ecb4fe 100644 (file)
--- a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs
@@ -270,7 +270,7 @@ namespace HandBrakeWPF.Properties {
         ///\r
         ///Unsharp is a general purpose unsharp masking filter. It sharpens by blurring, then calculating the difference between the blurred picture and the original.\r
         ///\r
-        ///Lapsharp sharpens using convolution kernels approximating Laplacian edge filters, sometimes producing higher quality results than [rest of string was truncated]";.\r
+        ///Lapsharp sharpens using convolution kernels approximating Laplacian edge filters, sometimes producing higher quality results than unshar [rest of string was truncated]";.\r
         /// </summary>\r
         public static string FilterView_Sharpen {\r
             get {\r
@@ -294,7 +294,7 @@ namespace HandBrakeWPF.Properties {
         ///\r
         ///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.\r
         ///\r
-        ///Lapsharp&apos;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]&quot;;.\r
+        ///Lapsharp&apos;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]&quot;;.\r
         /// </summary>\r
         public static string FilterView_SharpenTune {\r
             get {\r

diff --git a/win/CS/HandBrakeWPF/app.config b/win/CS/HandBrakeWPF/app.config
index 4fee91d0a8a1f809d20971c47e8261ba19076d43..8627281cfaac0ca8207405403fc631932e9f8abf 100644 (file)
--- a/win/CS/HandBrakeWPF/app.config
+++ b/win/CS/HandBrakeWPF/app.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <configuration>\r
   <startup>\r
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>\r
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>\r
   </startup>\r
   <runtime>\r
     <!-- Required for "Per monitor DPI scaling" on .NET < 4.6.2 -->\r