Skip to content

Commit

Permalink
Another attempt to fix issue that the Linux version of EvoPDF was use…
Browse files Browse the repository at this point in the history
…d on Windows applications.
  • Loading branch information
GilianJuice committed Jan 27, 2025
1 parent ace6abf commit 08b58af
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 26 deletions.
37 changes: 28 additions & 9 deletions GeeksCoreLibrary/GeeksCoreLibrary.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<OutputType>Library</OutputType>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>5.0.2501.4</Version>
<Version>5.0.2501.5</Version>
<Company>Happy Horizon B.V.</Company>
<Description>Our base/core library that we use for most of our other projects.</Description>
<AssemblyVersion>5.0.2501.4</AssemblyVersion>
<FileVersion>5.0.2501.4</FileVersion>
<AssemblyVersion>5.0.2501.5</AssemblyVersion>
<FileVersion>5.0.2501.5</FileVersion>
<PackageDescription>Geeks Core Library</PackageDescription>
<RepositoryUrl>https://github.com/happy-geeks/geeks-core-library.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
Expand All @@ -23,6 +23,26 @@
<IncludeBuildOutput>true</IncludeBuildOutput>
</PropertyGroup>

<!-- Default PackageReference when no RuntimeIdentifier is specified -->
<ItemGroup Condition="'$(RuntimeIdentifier)' == '' AND $([MSBuild]::IsOsPlatform('Windows'))">
<PackageReference Include="EvoPdf.Chromium.Windows" Version="11.4.1" />
</ItemGroup>

<ItemGroup Condition="'$(RuntimeIdentifier)' == '' AND $([MSBuild]::IsOsPlatform('Linux'))">
<PackageReference Include="EvoPdf.Chromium.Linux" Version="11.4.1" />
</ItemGroup>

<!-- Windows-specific dependency -->
<ItemGroup Condition="'$(RuntimeIdentifier)' == 'win-x64'">
<PackageReference Include="EvoPdf.Chromium.Windows" Version="11.4.1" />
</ItemGroup>

<!-- Linux-specific dependency -->
<ItemGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64'">
<PackageReference Include="EvoPdf.Chromium.Linux" Version="11.4.1" />
</ItemGroup>


<ItemGroup>
<PackageReference Include="AspNetCore.HealthChecks.MySql" Version="9.0.0"/>
<PackageReference Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0"/>
Expand Down Expand Up @@ -65,18 +85,17 @@
<PackageReference Include="ZXing.Net.Bindings.Magick" Version="0.16.16" />
</ItemGroup>

<ItemGroup Condition="$([MSBuild]::IsOsPlatform('Windows'))">
<!-- Windows-specific settings -->
<ItemGroup Condition="'$(RuntimeIdentifier)' == 'win-x64'">
<PackageReference Include="EvoPdf.Chromium.Windows" Version="11.4.1" />
</ItemGroup>

<ItemGroup Condition="$([MSBuild]::IsOsPlatform('Linux'))">
<!-- Linux-specific settings -->
<ItemGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64'">
<PackageReference Include="EvoPdf.Chromium.Linux" Version="11.4.1" />
</ItemGroup>

<ItemGroup>
<None Include="GeeksCoreLibrary.targets" Pack="true" PackagePath="buildMultiTargeting/" />
</ItemGroup>

<!-- Copy the LICENSE and README.md files to the package -->
<ItemGroup>
<None Include="..\LICENSE">
<Pack>True</Pack>
Expand Down
17 changes: 0 additions & 17 deletions GeeksCoreLibrary/GeeksCoreLibrary.targets

This file was deleted.

0 comments on commit 08b58af

Please sign in to comment.