Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set WebConverter target framework to .NET 8 #57

Merged
merged 2 commits into from
Jan 3, 2024
Merged

Set WebConverter target framework to .NET 8 #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16ea23a
Set WebConverter target framework to .NET 8
sungaila Jan 3, 2024
f3e453e
Update paths for githubpages workloads
sungaila Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/dotnet.yml
View file
Open in desktop
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 Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions .github/workflows/githubpages.yml
View file
Open in desktop
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 All @@ -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)
Expand Down Expand Up @@ -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
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/githubpages_staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
- '**'

concurrency:
group: "pages-staging"
group: "pages"
cancel-in-progress: false

jobs:
Expand All @@ -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 All @@ -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)
Expand Down Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions src/PDFtoImage/PDFtoImage.csproj
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion src/WebConverter/Properties/PublishProfiles/PublishSite.pubxml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Binary file not shown.