Skip to content

Commit

Permalink
Set WebConverter target framework to .NET 8
Browse files Browse the repository at this point in the history
  • Loading branch information
sungaila committed Jan 3, 2024
1 parent e1cc513 commit 16ea23a
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 15 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ jobs:
run: dotnet workload install maui-windows
- name: Setup .NET workload wasm-tools
run: dotnet workload install wasm-tools
- name: Setup .NET workload wasm-tools-net7
run: dotnet workload install wasm-tools-net7
- name: Setup JDK 17
uses: actions/setup-java@main
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/githubpages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ jobs:
run: dotnet workload install android
- name: Setup .NET workload wasm-tools
run: dotnet workload install wasm-tools
- name: Setup .NET workload wasm-tools-net7
run: dotnet workload install wasm-tools-net7
- name: Update relative paths
working-directory: src/WebConverter/wwwroot
run: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/githubpages_staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ jobs:
run: dotnet workload install android
- name: Setup .NET workload wasm-tools
run: dotnet workload install wasm-tools
- name: Setup .NET workload wasm-tools-net7
run: dotnet workload install wasm-tools-net7
- name: Update relative paths
working-directory: src/WebConverter/wwwroot
run: |
Expand Down
10 changes: 5 additions & 5 deletions src/PDFtoImage/PDFtoImage.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,15 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net462' or '$(TargetFramework)'=='net481'">
<PackageReference Include="bblanchon.PDFium.Win32" Version="122.0.6205" PrivateAssets="analyzers" />
<PackageReference Include="bblanchon.PDFium.Win32" Version="122.0.6219" PrivateAssets="analyzers" />
<PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="2.88.6" PrivateAssets="analyzers" />
</ItemGroup>

<!-- .NET packages -->
<ItemGroup Condition="'$(TargetFramework)'=='net6.0' or '$(TargetFramework)'=='net7.0' or '$(TargetFramework)'=='net8.0'">
<PackageReference Include="bblanchon.PDFium.Linux" Version="122.0.6205" PrivateAssets="analyzers" />
<PackageReference Include="bblanchon.PDFium.macOS" Version="122.0.6205" PrivateAssets="analyzers" />
<PackageReference Include="bblanchon.PDFium.Win32" Version="122.0.6205" PrivateAssets="analyzers" />
<PackageReference Include="bblanchon.PDFium.Linux" Version="122.0.6219" PrivateAssets="analyzers" />
<PackageReference Include="bblanchon.PDFium.macOS" Version="122.0.6219" PrivateAssets="analyzers" />
<PackageReference Include="bblanchon.PDFium.Win32" Version="122.0.6219" PrivateAssets="analyzers" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.6" PrivateAssets="analyzers" />
<PackageReference Include="SkiaSharp.NativeAssets.macOS" Version="2.88.6" PrivateAssets="analyzers" />
<PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="2.88.6" PrivateAssets="analyzers" />
Expand All @@ -97,7 +97,7 @@

<!-- Android packages -->
<ItemGroup Condition="'$(TargetFramework)'=='net7.0-android' or '$(TargetFramework)'=='net8.0-android' or '$(TargetFramework)'=='monoandroid10.0'">
<PackageReference Include="bblanchon.PDFium.Android" Version="122.0.6205" PrivateAssets="analyzers" />
<PackageReference Include="bblanchon.PDFium.Android" Version="122.0.6219" PrivateAssets="analyzers" />
<PackageReference Include="SkiaSharp.NativeAssets.Android" Version="2.88.6" PrivateAssets="analyzers" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
<WebPublishMethod>FileSystem</WebPublishMethod>
<_TargetId>Folder</_TargetId>
<SiteUrlToLaunchAfterPublish />
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
<RunAOTCompilation>true</RunAOTCompilation>
<ProjectGuid>eda29f04-48e7-4823-8141-22a82cb80037</ProjectGuid>
Expand Down
8 changes: 5 additions & 3 deletions src/WebConverter/WebConverter.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
<!-- Assembly -->
<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
<ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
<AssemblyName>PDFtoImage.WebConverter</AssemblyName>
Expand All @@ -11,6 +11,8 @@
<VersionSuffix></VersionSuffix>
<RunAOTCompilation>true</RunAOTCompilation>
<WasmNativeStrip>true</WasmNativeStrip>
<WasmEnableSIMD>true</WasmEnableSIMD>
<WasmEnableExceptionHandling>false</WasmEnableExceptionHandling>
<PublishTrimmed>true</PublishTrimmed>
<TrimMode>partial</TrimMode>
</PropertyGroup>
Expand Down Expand Up @@ -40,7 +42,7 @@
<ItemGroup>
<PackageReference Include="ByteSize" Version="2.1.1" />
<PackageReference Include="Markdig.Signed" Version="0.34.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.14" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
<PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.6" />
<PackageReference Include="Thinktecture.Blazor.FileHandling" Version="2.0.0" />
Expand All @@ -60,7 +62,7 @@
<Content Update="wwwroot\404.html" CopyToOutputDirectory="Always" />
<EmbeddedResource Include="..\..\README.md" Link="README.md" />
<NativeFileReference Include="pdfium.a" />
<NativeFileReference Include="$(SkiaSharpStaticLibraryPath)\3.1.12\st\*.a" />
<NativeFileReference Include="$(SkiaSharpStaticLibraryPath)\3.1.12\simd\libSkiaSharp.a" />
</ItemGroup>

</Project>
Binary file modified src/WebConverter/pdfium.a
Binary file not shown.

0 comments on commit 16ea23a

Please sign in to comment.