mirror of
https://github.com/cyanfish/naps2.git
synced 2024-09-11 15:26:55 +03:00
Use NAPS2.PdfSharp package
This commit is contained in:
parent
a3090e1a07
commit
3669c2df56
@ -11,10 +11,6 @@
|
|||||||
<Import Project="..\NAPS2.Setup\targets\LibUsers.targets" />
|
<Import Project="..\NAPS2.Setup\targets\LibUsers.targets" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="PdfSharpCore">
|
|
||||||
<HintPath>..\NAPS2.Setup\lib\PdfSharpCore.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
|
|
||||||
<ProjectReference Include="..\NAPS2.Lib\NAPS2.Lib.csproj" />
|
<ProjectReference Include="..\NAPS2.Lib\NAPS2.Lib.csproj" />
|
||||||
<ProjectReference Include="..\NAPS2.Sdk.Tests\NAPS2.Sdk.Tests.csproj" />
|
<ProjectReference Include="..\NAPS2.Sdk.Tests\NAPS2.Sdk.Tests.csproj" />
|
||||||
|
|
||||||
|
@ -15,9 +15,6 @@
|
|||||||
<Import Project="..\NAPS2.Setup\targets\SdkUsers.targets" />
|
<Import Project="..\NAPS2.Setup\targets\SdkUsers.targets" />
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="PdfSharpCore">
|
|
||||||
<HintPath>..\NAPS2.Setup\lib\PdfSharpCore.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<Reference Include="NTwain">
|
<Reference Include="NTwain">
|
||||||
<HintPath>..\NAPS2.Setup\lib\NTwain.dll</HintPath>
|
<HintPath>..\NAPS2.Setup\lib\NTwain.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
|
@ -31,11 +31,9 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
|
||||||
|
<PackageReference Include="NAPS2.PdfSharp" Version="1.0.1" />
|
||||||
<PackageReference Include="SharpZipLib" Version="1.4.2" />
|
<PackageReference Include="SharpZipLib" Version="1.4.2" />
|
||||||
<PackageReference Include="SixLabors.Fonts" Version="1.0.1" />
|
<PackageReference Include="SixLabors.Fonts" Version="1.0.1" />
|
||||||
<Reference Include="PdfSharpCore">
|
|
||||||
<HintPath>..\NAPS2.Setup\lib\PdfSharpCore.dll</HintPath>
|
|
||||||
</Reference>
|
|
||||||
<!-- TODO: Switch back to the official nuget if https://github.com/soukoku/ntwain/pull/35 gets merged -->
|
<!-- TODO: Switch back to the official nuget if https://github.com/soukoku/ntwain/pull/35 gets merged -->
|
||||||
<Reference Include="NTwain" Condition="'$(TargetFramework)' != 'net8-macos10.15'">
|
<Reference Include="NTwain" Condition="'$(TargetFramework)' != 'net8-macos10.15'">
|
||||||
<HintPath>..\NAPS2.Setup\lib\NTwain.dll</HintPath>
|
<HintPath>..\NAPS2.Setup\lib\NTwain.dll</HintPath>
|
||||||
@ -97,26 +95,14 @@
|
|||||||
|
|
||||||
<ItemGroup Condition="'$(TargetFramework)' != 'net8-macos10.15'">
|
<ItemGroup Condition="'$(TargetFramework)' != 'net8-macos10.15'">
|
||||||
<!-- TODO: Ideally we'd only have package dependencies, not direct dlls -->
|
<!-- TODO: Ideally we'd only have package dependencies, not direct dlls -->
|
||||||
<Content Include="..\NAPS2.Setup\lib\PdfSharpCore.dll">
|
<Content Include="..\NAPS2.Setup\lib\NTwain.dll">
|
||||||
<Pack>true</Pack>
|
<Pack>true</Pack>
|
||||||
<PackagePath>lib\net6.0</PackagePath>
|
<PackagePath>lib\net6.0</PackagePath>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\NAPS2.Setup\lib\NTwain.dll">
|
<Content Include="..\NAPS2.Setup\lib\NTwain.dll">
|
||||||
<Pack>true</Pack>
|
|
||||||
<PackagePath>lib\net6.0</PackagePath>
|
|
||||||
</Content>
|
|
||||||
<Content Include="..\NAPS2.Setup\lib\PdfSharpCore.dll">
|
|
||||||
<Pack>true</Pack>
|
<Pack>true</Pack>
|
||||||
<PackagePath>lib\net462</PackagePath>
|
<PackagePath>lib\net462</PackagePath>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="..\NAPS2.Setup\lib\NTwain.dll">
|
|
||||||
<Pack>true</Pack>
|
|
||||||
<PackagePath>lib\net462</PackagePath>
|
|
||||||
</Content>
|
|
||||||
<Content Include="..\NAPS2.Setup\lib\PdfSharpCore.dll">
|
|
||||||
<Pack>true</Pack>
|
|
||||||
<PackagePath>lib\net8.0-macos10.15</PackagePath>
|
|
||||||
</Content>
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user