Set WebConverter target framework to .NET 8 (#57)

sungaila · Jan 3, 2024 · f2c8577 · f2c8577
1 parent e1cc513
commit f2c8577
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 22 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -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:
@@ -189,6 +187,9 @@ jobs:
     permissions:
       checks: write
       pull-requests: write
+    concurrency:
+      group: "publish-test-results"
+      cancel-in-progress: false
     if: (success() || failure()) && (github.event_name != 'workflow_dispatch' && true || inputs.publish_testresults) == true
     steps:
       - name: Download Artifacts

diff --git a/.github/workflows/githubpages.yml b/.github/workflows/githubpages.yml
@@ -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: |
@@ -44,9 +42,9 @@ jobs:
       - name: Publish
         run: dotnet publish src/WebConverter/WebConverter.csproj -c Release -p:PublishProfile=src/WebConverter/Properties/PublishProfiles/PublishSite.pubxml -p:VersionSuffix=ci --no-restore
       - name: Create .nojekyll file
-        run: touch src/WebConverter/bin/Release/net7.0/publish/wwwroot/.nojekyll
+        run: touch src/WebConverter/bin/Release/net8.0/publish/wwwroot/.nojekyll
       - name: Update service-worker-assets.js hashes
-        working-directory: src/WebConverter/bin/Release/net7.0/publish/wwwroot
+        working-directory: src/WebConverter/bin/Release/net8.0/publish/wwwroot
         if: false
         run: |
           jsFile=$(<service-worker-assets.js)
@@ -78,7 +76,7 @@ jobs:
       - name: Upload pages artifact
         uses: actions/upload-pages-artifact@main
         with:
-          path: src/WebConverter/bin/Release/net7.0/publish/wwwroot
+          path: src/WebConverter/bin/Release/net8.0/publish/wwwroot
   deploy:
     name: Deploy
     needs: publish

diff --git a/.github/workflows/githubpages_staging.yml b/.github/workflows/githubpages_staging.yml
@@ -10,7 +10,7 @@ on:
       - '**'
 
 concurrency:
-  group: "pages-staging"
+  group: "pages"
   cancel-in-progress: false
 
 jobs:
@@ -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: |
@@ -45,9 +43,9 @@ jobs:
       - name: Publish
         run: dotnet publish src/WebConverter/WebConverter.csproj -c Release -p:PublishProfile=src/WebConverter/Properties/PublishProfiles/PublishSite.pubxml -p:VersionSuffix=ci --no-restore
       - name: Create .nojekyll file
-        run: touch src/WebConverter/bin/Release/net7.0/publish/wwwroot/.nojekyll
+        run: touch src/WebConverter/bin/Release/net8.0/publish/wwwroot/.nojekyll
       - name: Update service-worker-assets.js hashes
-        working-directory: src/WebConverter/bin/Release/net7.0/publish/wwwroot
+        working-directory: src/WebConverter/bin/Release/net8.0/publish/wwwroot
         if: false
         run: |
           jsFile=$(<service-worker-assets.js)
@@ -79,7 +77,7 @@ jobs:
       - name: Upload pages artifact
         uses: actions/upload-pages-artifact@main
         with:
-          path: src/WebConverter/bin/Release/net7.0/publish/wwwroot
+          path: src/WebConverter/bin/Release/net8.0/publish/wwwroot
   deploy:
     name: Deploy
     needs: publish

diff --git a/src/PDFtoImage/PDFtoImage.csproj b/src/PDFtoImage/PDFtoImage.csproj
@@ -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" />
@@ -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>
 

diff --git a/src/WebConverter/Properties/PublishProfiles/PublishSite.pubxml b/src/WebConverter/Properties/PublishProfiles/PublishSite.pubxml
@@ -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>

diff --git a/src/WebConverter/WebConverter.csproj b/src/WebConverter/WebConverter.csproj
@@ -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>
@@ -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>
@@ -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" />
@@ -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>
diff --git a/src/WebConverter/pdfium.a b/src/WebConverter/pdfium.a