Use NAPS2.Pdfium.Binaries package

This commit is contained in:
Ben Olden-Cooligan 2023-02-28 12:37:57 -08:00
parent 8551d7f638
commit f57c228bb8
14 changed files with 6 additions and 56 deletions

View File

@ -18,10 +18,10 @@
</PropertyGroup>
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
<Import Project="..\NAPS2.Setup\targets\NativeLibs.Linux.targets" />
<Import Project="..\NAPS2.Setup\targets\SdkUsers.targets" />
<ItemGroup>
<PackageReference Include="NAPS2.Pdfium.Binaries" Version="1.0.0" />
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.0.3" />
<ProjectReference Include="..\NAPS2.Lib.Gtk\NAPS2.Lib.Gtk.csproj" />

View File

@ -14,10 +14,10 @@
</PropertyGroup>
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
<Import Project="..\NAPS2.Setup\targets\NativeLibs.Mac.targets" />
<Import Project="..\NAPS2.Setup\targets\SdkUsers.targets" />
<ItemGroup>
<PackageReference Include="NAPS2.Pdfium.Binaries" Version="1.0.0" />
<PackageReference Include="NAPS2.Sane.Binaries" Version="1.1.0" />
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.0.3" />

View File

@ -13,6 +13,7 @@
<Import Project="..\NAPS2.Setup\targets\LibUsers.targets" />
<ItemGroup>
<PackageReference Include="NAPS2.Pdfium.Binaries" Version="1.0.0" />
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.0.3" />
<PackageReference Include="NAPS2.Wia" Version="1.0.1" />

View File

@ -30,6 +30,7 @@
<Import Project="..\NAPS2.Setup\targets\SdkUsers.targets" />
<ItemGroup>
<PackageReference Include="NAPS2.Pdfium.Binaries" Version="1.0.0" />
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.0.3" />
<PackageReference Include="NAPS2.Wia" Version="1.0.1" />

View File

@ -8,7 +8,6 @@
</PropertyGroup>
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
<Import Project="..\NAPS2.Setup\targets\NativeLibs.targets" />
<Import Project="..\NAPS2.Setup\targets\LibUsers.targets" />
<ItemGroup>
@ -19,6 +18,7 @@
<ProjectReference Include="..\NAPS2.Lib\NAPS2.Lib.csproj" />
<ProjectReference Include="..\NAPS2.Sdk.Tests\NAPS2.Sdk.Tests.csproj" />
<PackageReference Include="NAPS2.Pdfium.Binaries" Version="1.0.0" />
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="Moq" Version="4.18.1" />

View File

@ -12,7 +12,6 @@
</PropertyGroup>
<Import Project="..\NAPS2.Setup\targets\CommonTargets.targets" />
<Import Project="..\NAPS2.Setup\targets\NativeLibs.targets" />
<Import Project="..\NAPS2.Setup\targets\SdkUsers.targets" />
<ItemGroup>
@ -25,6 +24,7 @@
<ProjectReference Include="..\NAPS2.Images.Mac\NAPS2.Images.Mac.csproj" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
<ProjectReference Include="..\NAPS2.Images.Gtk\NAPS2.Images.Gtk.csproj" Condition="$([MSBuild]::IsOSPlatform('Linux'))" />
<PackageReference Include="NAPS2.Pdfium.Binaries" Version="1.0.0" />
<PackageReference Include="NAPS2.Tesseract.Binaries" Version="1.0.3" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
<PackageReference Include="Moq" Version="4.18.1" />

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,10 +0,0 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ContentWithTargetPath Include="..\NAPS2.Setup\lib\linux\libpdfium.so"
Condition="'$(RuntimeIdentifier)' == 'linux-x64'">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>lib\linux\libpdfium.so</Link>
<TargetPath>_linux\libpdfium.so</TargetPath>
</ContentWithTargetPath>
</ItemGroup>
</Project>

View File

@ -1,16 +0,0 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ContentWithTargetPath Include="..\NAPS2.Setup\lib\mac\libpdfium.dylib"
Condition="'$(RuntimeIdentifier)' == 'osx-x64'">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>lib\mac\libpdfium.dylib</Link>
<TargetPath>libpdfium.dylib</TargetPath>
</ContentWithTargetPath>
<ContentWithTargetPath Include="..\NAPS2.Setup\lib\macarm\libpdfium.dylib"
Condition="'$(RuntimeIdentifier)' == 'osx-arm64'">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>lib\macarm\libpdfium.dylib</Link>
<TargetPath>libpdfium.dylib</TargetPath>
</ContentWithTargetPath>
</ItemGroup>
</Project>

View File

@ -1,31 +1,5 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ContentWithTargetPath Include="..\NAPS2.Setup\lib\win64\pdfium.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>lib\win64\pdfium.dll</Link>
<TargetPath>_win64\pdfium.dll</TargetPath>
</ContentWithTargetPath>
<ContentWithTargetPath Include="..\NAPS2.Setup\lib\win32\pdfium.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>lib\win32\pdfium.dll</Link>
<TargetPath>_win32\pdfium.dll</TargetPath>
</ContentWithTargetPath>
<ContentWithTargetPath Include="..\NAPS2.Setup\lib\linux\libpdfium.so">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>lib\linux\libpdfium.so</Link>
<TargetPath>_linux\libpdfium.so</TargetPath>
</ContentWithTargetPath>
<ContentWithTargetPath Include="..\NAPS2.Setup\lib\mac\libpdfium.dylib">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>lib\mac\libpdfium.dylib</Link>
<TargetPath>_mac\libpdfium.dylib</TargetPath>
</ContentWithTargetPath>
<ContentWithTargetPath Include="..\NAPS2.Setup\lib\macarm\libpdfium.dylib">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>lib\macarm\libpdfium.dylib</Link>
<TargetPath>_macarm\libpdfium.dylib</TargetPath>
</ContentWithTargetPath>
<ContentWithTargetPath Include="..\NAPS2.Setup\lib\win64\twaindsm.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<Link>lib\win64\twaindsm.dll</Link>