]> granicus.if.org Git - handbrake/commitdiff
WinGui: Bump version to 1.1.1 1.1.1
authorsr55 <sr55.hb@outlook.com>
Mon, 18 Jun 2018 14:07:09 +0000 (15:07 +0100)
committersr55 <sr55.hb@outlook.com>
Mon, 18 Jun 2018 14:07:09 +0000 (15:07 +0100)
win/CS/HandBrake.ApplicationServices/Properties/AssemblyInfo.cs
win/CS/HandBrake.sln.DotSettings
win/CS/HandBrakeWPF/Installer/Installer.nsi [deleted file]
win/CS/HandBrakeWPF/Installer/MakeNightly.nsi [deleted file]
win/CS/HandBrakeWPF/Properties/AssemblyInfo.cs

index 2e140a74f0ab8ca312a87bca3b072ad11374e3e5..eb6f16315b13e50a906c838dbc3c393db9ed8a0d 100644 (file)
@@ -43,5 +43,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers \r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.1.0.0")]\r
+[assembly: AssemblyVersion("1.1.1.0")]\r
 [assembly: NeutralResourcesLanguage("")]\r
index 07d41daf210df2496ddb88d47e85034774b230d4..848f6abd341b39ce1415b12fec633425fe5ccb17 100644 (file)
        <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INDENT_EMBRACED_INITIALIZER_BLOCK/@EntryValue">False</s:Boolean>
        <s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
        <s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_BLANK_LINES_IN_DECLARATIONS/@EntryValue">1</s:Int64>
+       <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_EXPR_MEMBER_ARRANGEMENT/@EntryValue">False</s:Boolean>
+       <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_EXISTING_INITIALIZER_ARRANGEMENT/@EntryValue">False</s:Boolean>
        <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/KEEP_USER_LINEBREAKS/@EntryValue">False</s:Boolean>
        <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/MODIFIERS_ORDER/@EntryValue">public protected internal private static new abstract virtual override sealed readonly extern unsafe volatile async</s:String>
+       <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_ACCESSORHOLDER_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
        <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_CONSTRUCTOR_INITIALIZER_ON_SAME_LINE/@EntryValue">False</s:Boolean>
        <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE/@EntryValue">False</s:Boolean>
+       <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_FIELD_ATTRIBUTE_ON_SAME_LINE_EX/@EntryValue">NEVER</s:String>
        <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ACCESSOR_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
+       <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_EMBEDDED_STATEMENT_ON_SAME_LINE/@EntryValue">ALWAYS</s:String>
        <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_TYPE_CONSTRAINTS_ON_SAME_LINE/@EntryValue">False</s:Boolean>
        <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_WHILE_ON_NEW_LINE/@EntryValue">True</s:Boolean>
        <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/REDUNDANT_THIS_QUALIFIER_STYLE/@EntryValue">ALWAYS_USE</s:String>
        <s:Boolean x:Key="/Default/Environment/MemoryUsageIndicator/IsVisible/@EntryValue">True</s:Boolean>
        <s:Boolean x:Key="/Default/Environment/OpenDocument/OpenDocumentAfterModification/@EntryValue">True</s:Boolean>
        <s:Boolean x:Key="/Default/Environment/SearchAndNavigation/MergeOccurences/@EntryValue">True</s:Boolean>
+       <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
        <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpFileLayoutPatternsUpgrade/@EntryIndexedValue">True</s:Boolean>
+       <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+       <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+       <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpRenamePlacementToArrangementMigration/@EntryIndexedValue">True</s:Boolean>
        <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
+       <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
        <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
        <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
        <s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsCodeFormatterSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
diff --git a/win/CS/HandBrakeWPF/Installer/Installer.nsi b/win/CS/HandBrakeWPF/Installer/Installer.nsi
deleted file mode 100644 (file)
index fdc8ea9..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-/*  Resources.Designer.cs $\r
-\r
-          This file is part of the HandBrake source code.\r
-          Homepage: <http://HandBrake.fr/>.\r
-          It may be used under the terms of the GNU General Public License. */\r
-\r
-; Script generated by the HM NIS Edit Script Wizard.\r
-\r
-; HM NIS Edit Wizard helper defines\r
-!define PRODUCT_NAME "HandBrake"\r
-!define PRODUCT_VERSION "1.1.0"\r
-!define PRODUCT_VERSION_NUMBER "1.1.0"\r
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}"\r
-!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
-!define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
-\r
-;Required .NET framework\r
-!define MIN_FRA_MAJOR "4"\r
-!define MIN_FRA_MINOR "6"\r
-!define MIN_FRA_BUILD "*"\r
-\r
-SetCompressor lzma\r
-\r
-; MUI 1.67 compatible ------\r
-!include "MUI.nsh"\r
-!include WinVer.nsh\r
-\r
-; MUI Settings\r
-!define MUI_ABORTWARNING\r
-!define MUI_ICON "HandBrakepineapple.ico"\r
-!define MUI_UNICON "HandBrakepineapple.ico"\r
-\r
-; Welcome page\r
-!insertmacro MUI_PAGE_WELCOME\r
-; License page\r
-!insertmacro MUI_PAGE_LICENSE "doc\COPYING"\r
-; Directory page\r
-!insertmacro MUI_PAGE_DIRECTORY\r
-; Instfiles page\r
-!insertmacro MUI_PAGE_INSTFILES\r
-; Finish page\r
-;!define MUI_FINISHPAGE_RUN "$INSTDIR\HandBrake.exe"\r
-!insertmacro MUI_PAGE_FINISH\r
-\r
-; Uninstaller pages\r
-!insertmacro MUI_UNPAGE_INSTFILES\r
-\r
-; Language files\r
-!insertmacro MUI_LANGUAGE "English"\r
-\r
-; MUI end ------\r
-\r
-Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"\r
-OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}-Win_GUI.exe"\r
-\r
-!include WordFunc.nsh\r
-!insertmacro VersionCompare\r
-!include LogicLib.nsh\r
-\r
-InstallDir "$PROGRAMFILES\HandBrake"\r
-InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""\r
-ShowInstDetails show\r
-ShowUnInstDetails show\r
-\r
-Var InstallDotNET\r
-\r
-Function .onInit\r
-\r
-  ; For Silent Installs, Assume All Users\r
-  IfSilent 0 +2\r
-    SetShellVarContext all  \r
-\r
-  ; Begin Only allow one version\r
-  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e'\r
-  Pop $R0\r
-\r
-  StrCmp $R0 0 +3\r
-  MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK\r
-  Abort\r
-  \r
-  ; Detect if the intsaller is running on Windows XP/Vista and abort if it is.\r
-  ${IfNot} ${AtLeastWin7}\r
-    MessageBox MB_OK "Windows 7 with Service Pack 1 or later is required in order to run HandBrake."\r
-    Quit\r
-  ${EndIf}\r
-\r
-  ;Remove previous version\r
-  ReadRegStr $R0 HKLM \\r
-  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \\r
-  "UninstallString"\r
-  StrCmp $R0 "" done\r
-\r
-  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \\r
-  "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \\r
-  previous version or `Cancel` to continue." /SD IDOK \\r
-  IDOK uninst\r
-  goto done\r
-\r
- ;Run the uninstaller\r
-  uninst:\r
-   IfSilent +3\r
-   ExecWait $INSTDIR\uninst.exe\r
-   goto done\r
-   ExecWait '"$INSTDIR\uninst.exe" /S'\r
-  done:\r
-FunctionEnd\r
-\r
-Section "HandBrake" SEC01\r
-  SetOutPath "$INSTDIR"\r
-  SetOverwrite ifnewer\r
-\r
-  ; Begin Check .NET version\r
-  StrCpy $InstallDotNET "No"\r
-  Call CheckFramework\r
-     StrCmp $0 "1" +3\r
-        StrCpy $InstallDotNET "Yes"\r
-      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\r
-     Pop $0\r
-\r
-  ; Get .NET if required\r
-  ${If} $InstallDotNET == "Yes"\r
-     SetDetailsView hide\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
-           Delete "$INSTDIR\dotnetfx.exe"\r
-           Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.6 Framework"\r
-     ${EndIf}\r
-\r
-     ExecWait "$INSTDIR\dotnetfx.exe"\r
-     Delete "$INSTDIR\dotnetfx.exe"\r
-\r
-     SetDetailsView show\r
-  ${EndIf}\r
-  \r
-  ; Install Files\r
-  File "*.exe"\r
-  CreateDirectory "$SMPROGRAMS\HandBrake"\r
-  CreateShortCut "$SMPROGRAMS\HandBrake\HandBrake.lnk" "$INSTDIR\HandBrake.exe"\r
-  CreateShortCut "$DESKTOP\HandBrake.lnk" "$INSTDIR\HandBrake.exe"\r
-  File "*.dll"\r
-  File "*.template"\r
-  File "*.config"\r
-  File "*.pdb"\r
-\r
-  ; Copy the standard doc set into the doc folder\r
-  SetOutPath "$INSTDIR\doc"\r
-  SetOverwrite ifnewer\r
-  File "doc\*.*"\r
-SectionEnd\r
-\r
-Section -AdditionalIcons\r
-  CreateShortCut "$SMPROGRAMS\HandBrake\Uninstall.lnk" "$INSTDIR\uninst.exe"\r
-SectionEnd\r
-\r
-Section -Post\r
-  WriteUninstaller "$INSTDIR\uninst.exe"\r
-  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\HandBrake.exe"\r
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"\r
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"\r
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\HandBrake.exe"\r
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"\r
-SectionEnd\r
-\r
-\r
-Function un.onUninstSuccess\r
-  HideWindow\r
-  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK\r
-FunctionEnd\r
-\r
-Function un.onInit\r
-\r
-  ; For Silent Installs, Assume All Users\r
-  IfSilent 0 +2\r
-    SetShellVarContext all  \r
-\r
-  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\r
-  Abort\r
-FunctionEnd\r
-\r
-Section Uninstall\r
-  Delete "$INSTDIR\uninst.exe"\r
-  \r
-  Delete "$INSTDIR\*.*"\r
-  Delete "$INSTDIR\doc\*.*"\r
-  RMDir  "$INSTDIR\doc"\r
-  Delete "$SMPROGRAMS\HandBrake\Uninstall.lnk"\r
-  Delete "$DESKTOP\HandBrake.lnk"\r
-  Delete "$SMPROGRAMS\HandBrake\HandBrake.lnk"\r
-  RMDir  "$SMPROGRAMS\HandBrake"\r
-  RMDir  "$INSTDIR"\r
-\r
-  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"\r
-  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"\r
-  SetAutoClose true\r
-SectionEnd\r
-\r
-;Check for .NET framework\r
-Function CheckFrameWork\r
-  ; Magic numbers from http://msdn.microsoft.com/en-us/library/ee942965.aspx\r
-    ClearErrors\r
-    ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "Release"\r
-\r
-    IfErrors NotDetected\r
-\r
-    ${If} $0 >= 393295\r
-        StrCpy $0 "1"\r
-    ${Else}\r
-               NotDetected:\r
-                 StrCpy $0 "2"\r
-    ${EndIf}\r
-\r
-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 (file)
index 4d19fff..0000000
+++ /dev/null
@@ -1,214 +0,0 @@
-/*  Resources.Designer.cs $\r
-\r
-          This file is part of the HandBrake source code.\r
-          Homepage: <http://HandBrake.fr/>.\r
-          It may be used under the terms of the GNU General Public License. */\r
-\r
-; Script generated by the HM NIS Edit Script Wizard.\r
-\r
-; HM NIS Edit Wizard helper defines\r
-!define PRODUCT_NAME "HandBrake Nightly"\r
-!define PRODUCT_VERSION "Nightly"\r
-!define PRODUCT_VERSION_NUMBER "Nightly"\r
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME}"\r
-!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"\r
-!define PRODUCT_UNINST_ROOT_KEY "HKLM"\r
-\r
-;Required .NET framework\r
-!define MIN_FRA_MAJOR "4"\r
-!define MIN_FRA_MINOR "6"\r
-!define MIN_FRA_BUILD "*"\r
-\r
-SetCompressor lzma\r
-\r
-; MUI 1.67 compatible ------\r
-!include "MUI.nsh"\r
-!include WinVer.nsh\r
-\r
-; MUI Settings\r
-!define MUI_ABORTWARNING\r
-!define MUI_ICON "HandBrakepineapple.ico"\r
-!define MUI_UNICON "HandBrakepineapple.ico"\r
-\r
-; Welcome page\r
-!insertmacro MUI_PAGE_WELCOME\r
-; License page\r
-!insertmacro MUI_PAGE_LICENSE "doc\COPYING"\r
-; Directory page\r
-!insertmacro MUI_PAGE_DIRECTORY\r
-; Instfiles page\r
-!insertmacro MUI_PAGE_INSTFILES\r
-; Finish page\r
-;!define MUI_FINISHPAGE_RUN "$INSTDIR\HandBrake.exe"\r
-!insertmacro MUI_PAGE_FINISH\r
-\r
-; Uninstaller pages\r
-!insertmacro MUI_UNPAGE_INSTFILES\r
-\r
-; Language files\r
-!insertmacro MUI_LANGUAGE "English"\r
-\r
-; MUI end ------\r
-\r
-Name "${PRODUCT_NAME}"\r
-OutFile "HandBrake-${PRODUCT_VERSION_NUMBER}_i686-Win_GUI.exe"\r
-\r
-!include WordFunc.nsh\r
-!insertmacro VersionCompare\r
-!include LogicLib.nsh\r
-\r
-InstallDir "$PROGRAMFILES\HandBrake Nightly"\r
-InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""\r
-ShowInstDetails show\r
-ShowUnInstDetails show\r
-\r
-Var InstallDotNET\r
-\r
-Function .onInit\r
\r
-  ; For Silent Installs, Assume All Users\r
-  IfSilent 0 +2\r
-    SetShellVarContext all  \r
-\r
-  ; Begin Only allow one version\r
-  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "myMutex") i .r1 ?e'\r
-  Pop $R0\r
-\r
-  StrCmp $R0 0 +3\r
-  MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK\r
-  Abort\r
-\r
-  ; Detect if the intsaller is running on Windows XP/Vista and abort if it is.\r
-  ${IfNot} ${AtLeastWin7}\r
-    MessageBox MB_OK "Windows 7 with Service Pack 1 or later is required in order to run HandBrake."\r
-    Quit\r
-  ${EndIf}\r
-\r
-  ;Remove previous version\r
-  ReadRegStr $R0 HKLM \\r
-  "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}\" \\r
-  "UninstallString"\r
-  StrCmp $R0 "" done\r
-\r
-  MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION \\r
-  "${PRODUCT_NAME} is already installed. $\n$\nClick `OK` to remove the \\r
-  previous version or `Cancel` to continue." /SD IDOK \\r
-  IDOK uninst\r
-  goto done\r
-\r
- ;Run the uninstaller\r
-  uninst:\r
-   IfSilent +3\r
-   ExecWait $INSTDIR\uninst.exe\r
-   goto done\r
-   ExecWait '"$INSTDIR\uninst.exe" /S'\r
-  done:\r
-FunctionEnd\r
-\r
-Section "HandBrake" SEC01\r
-  SetOutPath "$INSTDIR"\r
-  SetOverwrite ifnewer\r
-\r
-  ; Begin Check .NET version\r
-  StrCpy $InstallDotNET "No"\r
-  Call CheckFramework\r
-     StrCmp $0 "1" +3\r
-        StrCpy $InstallDotNET "Yes"\r
-      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\r
-     Pop $0\r
-\r
-  ; Get .NET if required\r
-  ${If} $InstallDotNET == "Yes"\r
-     SetDetailsView hide\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
-           Delete "$INSTDIR\dotnetfx.exe"\r
-           Abort "Installation cancelled, ${PRODUCT_NAME} requires the Microsoft .NET 4.6 Framework"\r
-     ${EndIf}\r
-\r
-     ExecWait "$INSTDIR\dotnetfx.exe"\r
-     Delete "$INSTDIR\dotnetfx.exe"\r
-\r
-     SetDetailsView show\r
-  ${EndIf}\r
-  \r
-  ; Install Files\r
-  File "*.exe"\r
-  CreateDirectory "$SMPROGRAMS\HandBrake Nightly"\r
-  CreateShortCut "$SMPROGRAMS\HandBrake Nightly\HandBrake Nightly.lnk" "$INSTDIR\HandBrake.exe"\r
-  CreateShortCut "$DESKTOP\HandBrake Nightly.lnk" "$INSTDIR\HandBrake.exe"\r
-  File "*.dll"\r
-  File "*.template"\r
-  File "*.config"\r
-  File "*.pdb"\r
-\r
-  ; Copy the standard doc set into the doc folder\r
-  SetOutPath "$INSTDIR\doc"\r
-  SetOverwrite ifnewer\r
-  File "doc\*.*"\r
-SectionEnd\r
-\r
-Section -AdditionalIcons\r
-  CreateShortCut "$SMPROGRAMS\HandBrake Nightly\Uninstall.lnk" "$INSTDIR\uninst.exe"\r
-SectionEnd\r
-\r
-Section -Post\r
-  WriteUninstaller "$INSTDIR\uninst.exe"\r
-  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\HandBrake.exe"\r
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"\r
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"\r
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\HandBrake.exe"\r
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"\r
-SectionEnd\r
-\r
-\r
-Function un.onUninstSuccess\r
-  HideWindow\r
-  MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) was successfully removed from your computer." /SD IDOK\r
-FunctionEnd\r
-\r
-Function un.onInit\r
-\r
-  ; For Silent Installs, Assume All Users\r
-  IfSilent 0 +2\r
-    SetShellVarContext all  \r
-\r
-  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\r
-  Abort\r
-FunctionEnd\r
-\r
-Section Uninstall\r
-  Delete "$INSTDIR\uninst.exe"\r
-  \r
-  Delete "$INSTDIR\*.*"\r
-  Delete "$INSTDIR\doc\*.*"\r
-  RMDir  "$INSTDIR\doc"\r
-  Delete "$SMPROGRAMS\HandBrake Nightly\Uninstall.lnk"\r
-  Delete "$DESKTOP\HandBrake Nightly.lnk"\r
-  Delete "$SMPROGRAMS\HandBrake Nightly\HandBrake Nightly.lnk"\r
-  RMDir  "$SMPROGRAMS\HandBrake Nightly"\r
-  RMDir  "$INSTDIR"\r
-\r
-  DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"\r
-  DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"\r
-  SetAutoClose true\r
-SectionEnd\r
-\r
-;Check for .NET framework\r
-Function CheckFrameWork\r
-  ; Magic numbers from http://msdn.microsoft.com/en-us/library/ee942965.aspx\r
-    ClearErrors\r
-    ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "Release"\r
-\r
-    IfErrors NotDetected\r
-\r
-    ${If} $0 >= 393295\r
-        StrCpy $0 "1"\r
-    ${Else}\r
-               NotDetected:\r
-                 StrCpy $0 "2"\r
-    ${EndIf}\r
-\r
-FunctionEnd
\ No newline at end of file
index 13c81ced7af2d7c094626094e0ed4e38343e3599..b20b8ddb3f704ffed0248dd12cc86f1be33becf1 100644 (file)
@@ -61,5 +61,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers \r
 // by using the '*' as shown below:\r
 // [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.1.0.0")]\r
+[assembly: AssemblyVersion("1.1.1.0")]\r
 [assembly: NeutralResourcesLanguage("")]
\ No newline at end of file