2 files changed, 24 insertions, 1 deletions
diff --git a/win/CS/HandBrakeWPF/Installer/Installer64.nsi b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
index ec6914ec9..8b06214fb 100644
--- a/win/CS/HandBrakeWPF/Installer/Installer64.nsi
+++ b/win/CS/HandBrakeWPF/Installer/Installer64.nsi
@@ -123,6 +123,12 @@ Section "HandBrake" SectionApp
   File "*.config"
   File "*.pdb"
   File "*.config"
+  File "*.deps.json"
+  File "*.runtimeconfig.json"
+
+  SetOutPath "$INSTDIR\runtimes\win\lib\netcoreapp2.0"
+  SetOverwrite ifnewer
+  File "runtimes\win\lib\netcoreapp2.0\*.*"
 
  ; Copy the languages
   SetOutPath "$INSTDIR\de"
@@ -236,6 +242,12 @@ Section Uninstall
   RMDir  "$INSTDIR\co"
   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"
 
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"