From 1bd13ba48bffa1652ad4bcf58d3a88c24bae25f8 Mon Sep 17 00:00:00 2001 From: sr55 Date: Mon, 18 Jun 2018 15:07:09 +0100 Subject: [PATCH] WinGui: Bump version to 1.1.1 --- .../Properties/AssemblyInfo.cs | 2 +- win/CS/HandBrake.sln.DotSettings | 10 + win/CS/HandBrakeWPF/Installer/Installer.nsi | 214 ------------------ win/CS/HandBrakeWPF/Installer/MakeNightly.nsi | 214 ------------------ .../HandBrakeWPF/Properties/AssemblyInfo.cs | 2 +- 5 files changed, 12 insertions(+), 430 deletions(-) delete mode 100644 win/CS/HandBrakeWPF/Installer/Installer.nsi delete mode 100644 win/CS/HandBrakeWPF/Installer/MakeNightly.nsi diff --git a/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs b/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs index 2e140a74f..eb6f16315 100644 --- a/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs +++ b/win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs @@ -43,5 +43,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.0.0")] +[assembly: AssemblyVersion("1.1.1.0")] [assembly: NeutralResourcesLanguage("")] diff --git a/win/CS/HandBrake.sln.DotSettings b/win/CS/HandBrake.sln.DotSettings index 07d41daf2..848f6abd3 100644 --- a/win/CS/HandBrake.sln.DotSettings +++ b/win/CS/HandBrake.sln.DotSettings @@ -39,11 +39,16 @@ False 1 1 + False + False False public protected internal private static new abstract virtual override sealed readonly extern unsafe volatile async + NEVER False False + NEVER False + ALWAYS False True ALWAYS_USE @@ -495,8 +500,13 @@ True True True + True True + True + True + True True + True True True True diff --git a/win/CS/HandBrakeWPF/Installer/Installer.nsi b/win/CS/HandBrakeWPF/Installer/Installer.nsi deleted file mode 100644 index fdc8ea9a1..000000000 --- a/win/CS/HandBrakeWPF/Installer/Installer.nsi +++ /dev/null @@ -1,214 +0,0 @@ -/* Resources.Designer.cs $ - - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ - -; Script generated by the HM NIS Edit Script Wizard. - -; HM NIS Edit Wizard helper defines -!define PRODUCT_NAME "HandBrake" -!define PRODUCT_VERSION "1.1.0" -!define PRODUCT_VERSION_NUMBER "1.1.0" -!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}" -!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" -!define PRODUCT_UNINST_ROOT_KEY "HKLM" - -;Required .NET framework -!define MIN_FRA_MAJOR "4" -!define MIN_FRA_MINOR "6" -!define MIN_FRA_BUILD "*" - -SetCompressor lzma - -; MUI 1.67 compatible ------ -!include "MUI.nsh" -!include WinVer.nsh - -; MUI Settings -!define MUI_ABORTWARNING -!define MUI_ICON "HandBrakepineapple.ico" -!define MUI_UNICON "HandBrakepineapple.ico" - -; Welcome page -!insertmacro MUI_PAGE_WELCOME -; License page -!insertmacro MUI_PAGE_LICENSE "doc\COPYING" -; Directory page -!insertmacro MUI_PAGE_DIRECTORY -; Instfiles page -!insertmacro MUI_PAGE_INSTFILES -; Finish page -;!define MUI_FINISHPAGE_RUN "$INSTDIR\HandBrake.exe" -!insertmacro MUI_PAGE_FINISH - -; Uninstaller pages -!insertmacro MUI_UNPAGE_INSTFILES - -; Language files -!insertmacro MUI_LANGUAGE "English" - -; MUI end ------ - -Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" -OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}-Win_GUI.exe" - -!include WordFunc.nsh -!insertmacro VersionCompare -!include LogicLib.nsh - -InstallDir "$PROGRAMFILES\HandBrake" -InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" -ShowInstDetails show -ShowUnInstDetails show - -Var InstallDotNET - -Function .onInit - - ; For Silent Installs, Assume All Users - IfSilent 0 +2 - SetShellVarContext all - - ; Begin Only allow one version - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e' - Pop $R0 - - StrCmp $R0 0 +3 - MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK - Abort - - ; Detect if the intsaller is running on Windows XP/Vista and abort if it is. - ${IfNot} ${AtLeastWin7} - MessageBox MB_OK "Windows 7 with Service Pack 1 or later is required in order to run HandBrake." - Quit - ${EndIf} - - ;Remove previous version - ReadRegStr $R0 HKLM \ - "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \ - "UninstallString" - StrCmp $R0 "" done - - MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \ - "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \ - previous version or `Cancel` to continue." /SD IDOK \ - IDOK uninst - goto done - - ;Run the uninstaller - uninst: - IfSilent +3 - ExecWait $INSTDIR\uninst.exe - goto done - ExecWait '"$INSTDIR\uninst.exe" /S' - done: -FunctionEnd - -Section "HandBrake" SEC01 - SetOutPath "$INSTDIR" - SetOverwrite ifnewer - - ; Begin Check .NET version - StrCpy $InstallDotNET "No" - Call CheckFramework - StrCmp $0 "1" +3 - StrCpy $InstallDotNET "Yes" - 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 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" - Delete "$INSTDIR\dotnetfx.exe" - Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.6 Framework" - ${EndIf} - - ExecWait "$INSTDIR\dotnetfx.exe" - Delete "$INSTDIR\dotnetfx.exe" - - SetDetailsView show - ${EndIf} - - ; Install Files - File "*.exe" - CreateDirectory "$SMPROGRAMS\HandBrake" - CreateShortCut "$SMPROGRAMS\HandBrake\HandBrake.lnk" "$INSTDIR\HandBrake.exe" - CreateShortCut "$DESKTOP\HandBrake.lnk" "$INSTDIR\HandBrake.exe" - File "*.dll" - File "*.template" - File "*.config" - File "*.pdb" - - ; Copy the standard doc set into the doc folder - SetOutPath "$INSTDIR\doc" - SetOverwrite ifnewer - File "doc\*.*" -SectionEnd - -Section -AdditionalIcons - CreateShortCut "$SMPROGRAMS\HandBrake\Uninstall.lnk" "$INSTDIR\uninst.exe" -SectionEnd - -Section -Post - WriteUninstaller "$INSTDIR\uninst.exe" - WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\HandBrake.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\HandBrake.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" -SectionEnd - - -Function un.onUninstSuccess - HideWindow - MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK -FunctionEnd - -Function un.onInit - - ; For Silent Installs, Assume All Users - IfSilent 0 +2 - SetShellVarContext all - - MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" /SD IDYES IDYES +2 - Abort -FunctionEnd - -Section Uninstall - Delete "$INSTDIR\uninst.exe" - - Delete "$INSTDIR\*.*" - Delete "$INSTDIR\doc\*.*" - RMDir "$INSTDIR\doc" - Delete "$SMPROGRAMS\HandBrake\Uninstall.lnk" - Delete "$DESKTOP\HandBrake.lnk" - Delete "$SMPROGRAMS\HandBrake\HandBrake.lnk" - RMDir "$SMPROGRAMS\HandBrake" - RMDir "$INSTDIR" - - DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" - DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" - SetAutoClose true -SectionEnd - -;Check for .NET framework -Function CheckFrameWork - ; Magic numbers from http://msdn.microsoft.com/en-us/library/ee942965.aspx - ClearErrors - ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "Release" - - IfErrors NotDetected - - ${If} $0 >= 393295 - StrCpy $0 "1" - ${Else} - NotDetected: - StrCpy $0 "2" - ${EndIf} - -FunctionEnd \ No newline at end of file diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi deleted file mode 100644 index 4d19fff81..000000000 --- a/win/CS/HandBrakeWPF/Installer/MakeNightly.nsi +++ /dev/null @@ -1,214 +0,0 @@ -/* Resources.Designer.cs $ - - This file is part of the HandBrake source code. - Homepage: . - It may be used under the terms of the GNU General Public License. */ - -; Script generated by the HM NIS Edit Script Wizard. - -; HM NIS Edit Wizard helper defines -!define PRODUCT_NAME "HandBrake Nightly" -!define PRODUCT_VERSION "Nightly" -!define PRODUCT_VERSION_NUMBER "Nightly" -!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}" -!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" -!define PRODUCT_UNINST_ROOT_KEY "HKLM" - -;Required .NET framework -!define MIN_FRA_MAJOR "4" -!define MIN_FRA_MINOR "6" -!define MIN_FRA_BUILD "*" - -SetCompressor lzma - -; MUI 1.67 compatible ------ -!include "MUI.nsh" -!include WinVer.nsh - -; MUI Settings -!define MUI_ABORTWARNING -!define MUI_ICON "HandBrakepineapple.ico" -!define MUI_UNICON "HandBrakepineapple.ico" - -; Welcome page -!insertmacro MUI_PAGE_WELCOME -; License page -!insertmacro MUI_PAGE_LICENSE "doc\COPYING" -; Directory page -!insertmacro MUI_PAGE_DIRECTORY -; Instfiles page -!insertmacro MUI_PAGE_INSTFILES -; Finish page -;!define MUI_FINISHPAGE_RUN "$INSTDIR\HandBrake.exe" -!insertmacro MUI_PAGE_FINISH - -; Uninstaller pages -!insertmacro MUI_UNPAGE_INSTFILES - -; Language files -!insertmacro MUI_LANGUAGE "English" - -; MUI end ------ - -Name "${PRODUCT_NAME}" -OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}_i686-Win_GUI.exe" - -!include WordFunc.nsh -!insertmacro VersionCompare -!include LogicLib.nsh - -InstallDir "$PROGRAMFILES\HandBrake Nightly" -InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" "" -ShowInstDetails show -ShowUnInstDetails show - -Var InstallDotNET - -Function .onInit - - ; For Silent Installs, Assume All Users - IfSilent 0 +2 - SetShellVarContext all - - ; Begin Only allow one version - System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e' - Pop $R0 - - StrCmp $R0 0 +3 - MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK - Abort - - ; Detect if the intsaller is running on Windows XP/Vista and abort if it is. - ${IfNot} ${AtLeastWin7} - MessageBox MB_OK "Windows 7 with Service Pack 1 or later is required in order to run HandBrake." - Quit - ${EndIf} - - ;Remove previous version - ReadRegStr $R0 HKLM \ - "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \ - "UninstallString" - StrCmp $R0 "" done - - MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \ - "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \ - previous version or `Cancel` to continue." /SD IDOK \ - IDOK uninst - goto done - - ;Run the uninstaller - uninst: - IfSilent +3 - ExecWait $INSTDIR\uninst.exe - goto done - ExecWait '"$INSTDIR\uninst.exe" /S' - done: -FunctionEnd - -Section "HandBrake" SEC01 - SetOutPath "$INSTDIR" - SetOverwrite ifnewer - - ; Begin Check .NET version - StrCpy $InstallDotNET "No" - Call CheckFramework - StrCmp $0 "1" +3 - StrCpy $InstallDotNET "Yes" - 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 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" - Delete "$INSTDIR\dotnetfx.exe" - Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.6 Framework" - ${EndIf} - - ExecWait "$INSTDIR\dotnetfx.exe" - Delete "$INSTDIR\dotnetfx.exe" - - SetDetailsView show - ${EndIf} - - ; Install Files - File "*.exe" - CreateDirectory "$SMPROGRAMS\HandBrake Nightly" - CreateShortCut "$SMPROGRAMS\HandBrake Nightly\HandBrake Nightly.lnk" "$INSTDIR\HandBrake.exe" - CreateShortCut "$DESKTOP\HandBrake Nightly.lnk" "$INSTDIR\HandBrake.exe" - File "*.dll" - File "*.template" - File "*.config" - File "*.pdb" - - ; Copy the standard doc set into the doc folder - SetOutPath "$INSTDIR\doc" - SetOverwrite ifnewer - File "doc\*.*" -SectionEnd - -Section -AdditionalIcons - CreateShortCut "$SMPROGRAMS\HandBrake Nightly\Uninstall.lnk" "$INSTDIR\uninst.exe" -SectionEnd - -Section -Post - WriteUninstaller "$INSTDIR\uninst.exe" - WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\HandBrake.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\HandBrake.exe" - WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" -SectionEnd - - -Function un.onUninstSuccess - HideWindow - MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK -FunctionEnd - -Function un.onInit - - ; For Silent Installs, Assume All Users - IfSilent 0 +2 - SetShellVarContext all - - MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" /SD IDYES IDYES +2 - Abort -FunctionEnd - -Section Uninstall - Delete "$INSTDIR\uninst.exe" - - Delete "$INSTDIR\*.*" - Delete "$INSTDIR\doc\*.*" - RMDir "$INSTDIR\doc" - Delete "$SMPROGRAMS\HandBrake Nightly\Uninstall.lnk" - Delete "$DESKTOP\HandBrake Nightly.lnk" - Delete "$SMPROGRAMS\HandBrake Nightly\HandBrake Nightly.lnk" - RMDir "$SMPROGRAMS\HandBrake Nightly" - RMDir "$INSTDIR" - - DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" - DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" - SetAutoClose true -SectionEnd - -;Check for .NET framework -Function CheckFrameWork - ; Magic numbers from http://msdn.microsoft.com/en-us/library/ee942965.aspx - ClearErrors - ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "Release" - - IfErrors NotDetected - - ${If} $0 >= 393295 - StrCpy $0 "1" - ${Else} - NotDetected: - StrCpy $0 "2" - ${EndIf} - -FunctionEnd \ No newline at end of file diff --git a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs index 13c81ced7..b20b8ddb3 100644 --- a/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs +++ b/win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs @@ -61,5 +61,5 @@ using System.Windows; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.1.0.0")] +[assembly: AssemblyVersion("1.1.1.0")] [assembly: NeutralResourcesLanguage("")] \ No newline at end of file -- 2.40.0