Переглянути джерело

Update files ignored in installer/portable

Antony Male 4 роки тому
батько
коміт
8a8b0ea4b7
3 змінених файлів з 3 додано та 2 видалено
  1. 1 1
      Rakefile
  2. 1 1
      installer/common.iss
  3. 1 0
      src/SyncTrayzor/Pages/ViewerViewModel.cs

+ 1 - 1
Rakefile

@@ -177,7 +177,7 @@ namespace :portable do
           files = FileList['**/*'].exclude(
             '*.xml', '*.vshost.*', '*.log', '*.Installer.config', '*/FluentValidation.resources.dll',
             '*/System.Windows.Interactivity.resources.dll', 'syncthing.exe', 'data/*', 'logs',
-            'ffmpegsumo.dll', 'd3dcompiler_43.dll', 'd3dcompiler_47.dll', 'libEGL.dll', 'libGLESv2.dll', 'pdf.dll')
+            'd3dcompiler_47.dll', 'libEGL.dll', 'libGLESv2.dll', 'swiftshader/libEGL.dll', 'swiftshader/libGLESv2.dll',)
 
           files.each do |file|
             cp_to_portable(portable_dir, file)

+ 1 - 1
installer/common.iss

@@ -67,7 +67,7 @@ Name: "{userappdata}\{#AppDataFolder}"
 ; Near the beginning, as it's extracted first and this makes it cheaper
 Source: "..\{#DotNetInstallerExe}"; DestDir: {tmp}; Flags: dontcopy nocompression noencryption
 
-Source: "{#AppBin}\*"; DestDir: "{app}"; Excludes: "*.xml,*.vshost.*,*.config,*.log,FluentValidation.resources.dll,System.Windows.Interactivity.resources.dll,syncthing.exe,data,logs,ffmpegsumo.dll,d3dcompiler_43.dll,d3dcompiler_47.dll,libEGL.dll,libGLESv2.dll,pdf.dll"; Flags: ignoreversion recursesubdirs
+Source: "{#AppBin}\*"; DestDir: "{app}"; Excludes: "*.xml,*.vshost.*,*.config,*.log,FluentValidation.resources.dll,System.Windows.Interactivity.resources.dll,syncthing.exe,data,logs,cef_extensions.pak,d3dcompiler_47.dll,libEGL.dll,libGLESv2.dll,swiftshader/libEGL.dll,swiftshader/libGLESv2.dll"; Flags: ignoreversion recursesubdirs
 Source: "{#AppBin}\SyncTrayzor.exe.Installer.config"; DestDir: "{app}"; DestName: "SyncTrayzor.exe.config"; Flags: ignoreversion
 Source: "{#AppSrc}\Icons\default.ico"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#AppRoot}\*.md"; DestDir: "{app}"; Flags: ignoreversion

+ 1 - 0
src/SyncTrayzor/Pages/ViewerViewModel.cs

@@ -109,6 +109,7 @@ namespace SyncTrayzor.Pages
                 // System proxy settings (which also specify a proxy for localhost) shouldn't affect us
                 settings.CefCommandLineArgs.Add("no-proxy-server", "1");
                 settings.CefCommandLineArgs.Add("disable-cache", "1");
+                settings.CefCommandLineArgs.Add("disable-extensions", "1");
 
                 if (configuration.DisableHardwareRendering)
                 {