Merge pull request #17347 from iterate-ch/bugfix/GH-17344

Include VC140 dependency

Author: dkocher

cli/src/main/csharp/duck.csproj

@@ -24,6 +24,10 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Link>$(Filename)$(Extension)</Link>
     </Content>
+    <Content Include="$(TargetBuildDir)lib\vcruntime140*.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>$(Filename)$(Extension)</Link>
+    </Content>
 
     <Content Include="$(CyberduckDir)bookmarks/*.duck">
       <Link>bookmarks/%(Filename)%(Extension)</Link>

cli/src/main/wix/Bundle/Cyberduck CLI-WiX.wxs

@@ -92,6 +92,12 @@
       <Component Id="jnidispatch" Guid="B6621775-1A9A-461E-83B8-BB1EE34B5965">
         <File Source="$(var.CLI.TargetDir)/jnidispatch.dll" KeyPath="yes" Checksum="yes"/>
       </Component>
+      <Component Id="vcruntime140">
+        <File Source="$(var.CLI.TargetDir)/vcruntime140.dll" KeyPath="yes" Checksum="yes"/>
+      </Component>
+      <Component Id="vcruntime140_1">
+        <File Source="$(var.CLI.TargetDir)/vcruntime140_1.dll" KeyPath="yes" Checksum="yes"/>
+      </Component>
 
       <Component Id="System.Buffers">
         <File Source="$(var.CLI.TargetDir)/System.Buffers.dll" KeyPath="yes" Checksum="yes" />

core/dll/pom.xml

@@ -102,6 +102,22 @@
                     <version>${jna-version}</version>
                     <scope>runtime</scope>
                 </dependency>
+                <dependency>
+                    <groupId>com.microsoft</groupId>
+                    <artifactId>vcruntime140</artifactId>
+                    <classifier>x64</classifier>
+                    <type>dll</type>
+                    <version>14.44.35211</version>
+                    <scope>runtime</scope>
+                </dependency>
+                <dependency>
+                    <groupId>com.microsoft</groupId>
+                    <artifactId>vcruntime140_1</artifactId>
+                    <classifier>x64</classifier>
+                    <type>dll</type>
+                    <version>14.44.35211</version>
+                    <scope>runtime</scope>
+                </dependency>
             </dependencies>
         </profile>
     </profiles>

windows/src/main/csharp/Cyberduck.csproj

@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="$(TargetBuildDir)lib\jnidispatch.dll;$(TargetBuildDir)lib\winsparkle.dll">
+    <Content Include="$(TargetBuildDir)lib\jnidispatch.dll;$(TargetBuildDir)lib\winsparkle.dll;$(TargetBuildDir)lib\vcruntime140*.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <Link>$(Filename)$(Extension)</Link>
     </Content>

windows/src/main/wix/Bundle/Cyberduck.wxs

@@ -131,6 +131,12 @@
       <Component Id="jnidispatch">
         <File Source="$(var.cyberduck.TargetDir)/jnidispatch.dll" KeyPath="yes" Checksum="yes" />
       </Component>
+      <Component Id="vcruntime140">
+        <File Source="$(var.cyberduck.TargetDir)/vcruntime140.dll" KeyPath="yes" Checksum="yes" />
+      </Component>
+      <Component Id="vcruntime140_1">
+        <File Source="$(var.cyberduck.TargetDir)/vcruntime140_1.dll" KeyPath="yes" Checksum="yes" />
+      </Component>
 
       <!-- IKVM -->
       <Component Id="IKVM.ByteCode.dll">