Răsfoiți Sursa

Change how the VC++ redist is bundled

Antony Male 4 ani în urmă
părinte
comite
e8e196562a

+ 5 - 0
Rakefile

@@ -199,6 +199,11 @@ namespace :portable do
             cp_to_portable(portable_dir, file)
             cp_to_portable(portable_dir, file)
           end
           end
         end
         end
+        Dir.chdir(File.join(arch_config.installer_dir, 'vc++')) do
+          FileList['*.dll'].each do |file|
+            cp_to_portable(portable_dir, file)
+          end
+        end
         Dir.chdir(arch_config.installer_dir) do
         Dir.chdir(arch_config.installer_dir) do
           cp_to_portable(portable_dir, arch_config.syncthing_binaries[PORTABLE_SYNCTHING_VERSION], 'syncthing.exe')
           cp_to_portable(portable_dir, arch_config.syncthing_binaries[PORTABLE_SYNCTHING_VERSION], 'syncthing.exe')
         end
         end

+ 1 - 0
installer/common.iss

@@ -71,6 +71,7 @@ Source: "{#AppBin}\SyncTrayzor.exe.Installer.config"; DestDir: "{app}"; DestName
 Source: "{#AppSrc}\Icons\default.ico"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#AppSrc}\Icons\default.ico"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#AppRoot}\*.md"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#AppRoot}\*.md"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#AppRoot}\*.txt"; DestDir: "{app}"; Flags: ignoreversion
 Source: "{#AppRoot}\*.txt"; DestDir: "{app}"; Flags: ignoreversion
+Source: "vc++\*.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "ucrt\*.dll"; DestDir: "{app}"; Flags: ignoreversion; OnlyBelowVersion: 10.0
 Source: "ucrt\*.dll"; DestDir: "{app}"; Flags: ignoreversion; OnlyBelowVersion: 10.0
 Source: "syncthing.exe"; DestDir: "{app}"; DestName: "syncthing.exe"; Flags: ignoreversion
 Source: "syncthing.exe"; DestDir: "{app}"; DestName: "syncthing.exe"; Flags: ignoreversion
 
 

BIN
installer/x64/vc++/concrt140.dll


BIN
installer/x64/vc++/msvcp140.dll


BIN
installer/x64/vc++/vccorlib140.dll


BIN
installer/x64/vc++/vcruntime140.dll


BIN
installer/x86/vc++/concrt140.dll


BIN
installer/x86/vc++/msvcp140.dll


BIN
installer/x86/vc++/vccorlib140.dll


BIN
installer/x86/vc++/vcruntime140.dll


+ 0 - 3
src/SyncTrayzor/SyncTrayzor.csproj

@@ -620,9 +620,6 @@
     <PackageReference Include="System.Text.Json">
     <PackageReference Include="System.Text.Json">
       <Version>5.0.0</Version>
       <Version>5.0.0</Version>
     </PackageReference>
     </PackageReference>
-    <PackageReference Include="VCRuntime.CefSharp.140">
-      <Version>1.0.4</Version>
-    </PackageReference>
     <PackageReference Include="WindowsAPICodePack-Core">
     <PackageReference Include="WindowsAPICodePack-Core">
       <Version>1.1.2</Version>
       <Version>1.1.2</Version>
     </PackageReference>
     </PackageReference>