From 297d4abbeca9a580ba3701bc34b016ec3d57c44e Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 15 Jun 2019 19:42:57 +0100 Subject: [PATCH] WinGui: Move the UI to .NET Framework 4.8 to see if this helps with any of the user reports that the UI isn't launching. --- win/CS/HandBrake.Interop/HandBrake.Interop.csproj | 2 +- win/CS/HandBrake.Interop/app.config | 2 +- win/CS/HandBrake.Worker/App.config | 6 +++--- win/CS/HandBrake.Worker/HandBrake.Worker.csproj | 3 ++- win/CS/HandBrakeTools/App.config | 6 +++--- win/CS/HandBrakeTools/HandBrakeTools.csproj | 3 ++- win/CS/HandBrakeWPF/HandBrakeWPF.csproj | 2 +- win/CS/HandBrakeWPF/Installer/Installer64.nsi | 6 +++--- win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi | 6 +++--- .../HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs | 2 +- win/CS/HandBrakeWPF/app.config | 2 +- 11 files changed, 21 insertions(+), 19 deletions(-) diff --git a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj index 733c81248..651ebf634 100644 --- a/win/CS/HandBrake.Interop/HandBrake.Interop.csproj +++ b/win/CS/HandBrake.Interop/HandBrake.Interop.csproj @@ -8,7 +8,7 @@ Properties HandBrake.Interop HandBrake.Interop - v4.7.1 + v4.8 512 diff --git a/win/CS/HandBrake.Interop/app.config b/win/CS/HandBrake.Interop/app.config index 4a29a96b3..462e7462f 100644 --- a/win/CS/HandBrake.Interop/app.config +++ b/win/CS/HandBrake.Interop/app.config @@ -3,6 +3,6 @@ - + diff --git a/win/CS/HandBrake.Worker/App.config b/win/CS/HandBrake.Worker/App.config index 787dcbecc..4bfa00561 100644 --- a/win/CS/HandBrake.Worker/App.config +++ b/win/CS/HandBrake.Worker/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/win/CS/HandBrake.Worker/HandBrake.Worker.csproj b/win/CS/HandBrake.Worker/HandBrake.Worker.csproj index 506e37245..38d794a5a 100644 --- a/win/CS/HandBrake.Worker/HandBrake.Worker.csproj +++ b/win/CS/HandBrake.Worker/HandBrake.Worker.csproj @@ -8,9 +8,10 @@ Exe HandBrake.Worker HandBrake.Worker - v4.7.1 + v4.8 512 true + true diff --git a/win/CS/HandBrakeTools/App.config b/win/CS/HandBrakeTools/App.config index 731f6de6c..4bfa00561 100644 --- a/win/CS/HandBrakeTools/App.config +++ b/win/CS/HandBrakeTools/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/win/CS/HandBrakeTools/HandBrakeTools.csproj b/win/CS/HandBrakeTools/HandBrakeTools.csproj index f8eac8fd9..34eb016b5 100644 --- a/win/CS/HandBrakeTools/HandBrakeTools.csproj +++ b/win/CS/HandBrakeTools/HandBrakeTools.csproj @@ -9,7 +9,7 @@ Properties HandBrakeTools HandBrakeTools - v4.6.1 + v4.8 512 true publish\ @@ -27,6 +27,7 @@ false false true + AnyCPU diff --git a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj index aa1725a10..1c1fbc871 100644 --- a/win/CS/HandBrakeWPF/HandBrakeWPF.csproj +++ b/win/CS/HandBrakeWPF/HandBrakeWPF.csproj @@ -8,7 +8,7 @@ Properties HandBrakeWPF HandBrake - v4.7.1 + v4.8 512 diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi index 386244d4f..e17eccac7 100644 --- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi +++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi @@ -127,18 +127,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.7.1 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.8 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.7.1" /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.8" /canceltext "Cancel" "https://go.microsoft.com/fwlink/?linkid=2088631" "$INSTDIR\dotnetfx.exe" /end Pop $1 ${If} $1 != "OK" Delete "$INSTDIR\dotnetfx.exe" - Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.7.1 Framework" + Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.8 Framework" ${EndIf} ExecWait "$INSTDIR\dotnetfx.exe" diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi index a76dc0000..f471ee0a3 100644 --- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi +++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi @@ -126,18 +126,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.7.1 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.8 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.7.1" /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.8" /canceltext "Cancel" "https://go.microsoft.com/fwlink/?linkid=2088631" "$INSTDIR\dotnetfx.exe" /end Pop $1 ${If} $1 != "OK" Delete "$INSTDIR\dotnetfx.exe" - Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.7.1 Framework" + Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.8 Framework" ${EndIf} ExecWait "$INSTDIR\dotnetfx.exe" diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs index 438ccc251..cf331974e 100644 --- a/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/ResourcesTooltips.Designer.cs @@ -19,7 +19,7 @@ namespace HandBrakeWPF.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class ResourcesTooltips { diff --git a/win/CS/HandBrakeWPF/app.config b/win/CS/HandBrakeWPF/app.config index e23d0c02d..a2962a879 100644 --- a/win/CS/HandBrakeWPF/app.config +++ b/win/CS/HandBrakeWPF/app.config @@ -1,7 +1,7 @@ - + -- 2.40.0