From edd291d61a3aad8f41f86af909a4e9979ac5d37d Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 14 Nov 2020 15:44:33 +0000 Subject: WinGui: Various fixes and improvements to the installers post .NET 5 --- win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi') diff --git a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi index 19323a403..0d2f18b54 100644 --- a/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi +++ b/win/CS/HandBrakeWPF/Installer/MakeNightly64.nsi @@ -119,9 +119,14 @@ Section "HandBrake" SectionApp File "*.dll" File "*.template" File "*.config" - File "*.json" + File "*.deps.json" + File "*.runtimeconfig.json" File "HandBrake*.pdb" + SetOutPath "$INSTDIR\runtimes\win\lib\netcoreapp2.0" + SetOverwrite ifnewer + File "runtimes\win\lib\netcoreapp2.0\*.*" + ; Copy the languages SetOutPath "$INSTDIR\de" SetOverwrite ifnewer @@ -233,6 +238,12 @@ Section Uninstall Delete "$INSTDIR\uk\*.*" RMDir "$INSTDIR\uk" + Delete "$INSTDIR\runtimes\win\lib\netcoreapp2.0\*.*" + RMDir "$INSTDIR\runtimes\win\lib\netcoreapp2.0" + RMDir "$INSTDIR\runtimes\win\lib" + RMDir "$INSTDIR\runtimes\win" + RMDir "$INSTDIR\runtimes" + RMDir "$INSTDIR" Delete "$SMPROGRAMS\HandBrake Nightly\Uninstall.lnk" -- cgit v1.2.3