Move Interop.WIA.x64.dll to x64/Interop.WIA.dll

FieldWorks can't find it with the different name. needed for https://jira.sil.org/browse/LT-21444
sillsdev · Jun 28, 2023 · bad8c37 · bad8c37
1 parent 8af5875
commit bad8c37
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/SIL.Windows.Forms/SIL.Windows.Forms.csproj b/SIL.Windows.Forms/SIL.Windows.Forms.csproj
@@ -45,10 +45,10 @@
       <Pack>true</Pack>
       <PackagePath>build</PackagePath>
     </None>
-    <None Include="../lib/Interop.WIA.x64.dll">
+    <None Include="../lib/x64/Interop.WIA.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <Pack>true</Pack>
-      <PackagePath>build</PackagePath>
+      <PackagePath>build/x64</PackagePath>
     </None>
     <Content Include="SIL.Windows.Forms.targets">
       <Pack>true</Pack>

diff --git a/SIL.Windows.Forms/SIL.Windows.Forms.targets b/SIL.Windows.Forms/SIL.Windows.Forms.targets
@@ -1,6 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)**\*.dll">
+    <None Include="$(MSBuildThisFileDirectory)**\*.dll"
+          Exclude="$(MSBuildThisFileDirectory)x64\**\*.dll">
       <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

diff --git a/lib/Interop.WIA.x64.dll → lib/x64/Interop.WIA.dll b/lib/Interop.WIA.x64.dll → lib/x64/Interop.WIA.dll