Skip to content

Bump SkiaSharp from 3.119.4 to 4.148.0 #111

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

Merged
stesee merged 6 commits into from
Jul 3, 2026
Merged

Bump SkiaSharp from 3.119.4 to 4.148.0 #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c95837
Bump actions/checkout from 6 to 7
dependabot[bot] Jun 22, 2026
14997d5
Bump SkiaSharp.NativeAssets.Linux.NoDependencies from 3.119.4 to 4.148.0
dependabot[bot] Jun 24, 2026
5972777
Merge pull request #108 from Codeuctivity/dependabot/github_actions/a…
stesee Jun 28, 2026
ab75db8
Aktualisiere .NET Build-Workflow und aktualisiere Paketversionen in P…
stesee Jun 28, 2026
c7f06c2
Merge pull request #110 from Codeuctivity/dependabot/nuget/SkiaSharpC…
stesee Jul 3, 2026
f08e55f
Migrate solution to .slnx and trim test targets
stesee Jul 3, 2026
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
34 changes: 34 additions & 0 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/dotnet
{
"name": "C# (.NET)",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"image": "mcr.microsoft.com/devcontainers/dotnet:2-10.0-noble",
"customizations": {
"vscode": {
"extensions": [
"ms-dotnettools.csdevkit"
]
}
}

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [5000, 5001],
// "portsAttributes": {
// "5001": {
// "protocol": "https"
// }
// }

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "dotnet restore",

// Configure tool-specific properties.
// "customizations": {},

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
26 changes: 6 additions & 20 deletions .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: .NET build and test
env:
CURRENT_VERSION: 3.2.${{ github.run_number }}
CURRENT_VERSION: 4.0.${{ github.run_number }}
LAST_COMMIT_MESSAGE: ${{ github.event.head_commit.message }}

on:
Expand All @@ -18,13 +18,11 @@ jobs:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- name: Setup .NET
uses: actions/setup-dotnet@v5
with:
dotnet-version: |
8.0.x
9.0.x
10.0.x
- name: Check formatting
run: dotnet format --verify-no-changes
Expand Down Expand Up @@ -64,13 +62,11 @@ jobs:
runs-on: ubuntu-latest
needs: build
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- name: Setup .NET
uses: actions/setup-dotnet@v5
with:
dotnet-version: |
8.0.x
9.0.x
10.0.x
- name: Restore dependencies
run: dotnet restore
Expand All @@ -97,17 +93,15 @@ jobs:
gh release create ${{env.CURRENT_VERSION}} ./SkiaSharpCompare/bin/Release/*.*nupkg cli-artifacts.zip --generate-notes

deployTest:
if: ${{ !startsWith(github.ref, 'refs/heads/release') }}
if: ${{ github.ref == 'refs/heads/main') }}
runs-on: ubuntu-latest
Comment on lines 95 to 97
needs: build
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v7
- name: Setup .NET
uses: actions/setup-dotnet@v5
with:
dotnet-version: |
8.0.x
9.0.x
10.0.x
- name: Restore dependencies
run: dotnet restore
Expand All @@ -123,12 +117,4 @@ jobs:
if: env.NUGET_TOKEN_EXISTS != ''
run: |
ls ./SkiaSharpCompare/bin/Release
dotnet nuget push ./SkiaSharpCompare/bin/Release/*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_TEST_TOKEN}} --source https://apiint.nugettest.org/v3/index.json
- name: Github prerelease
shell: bash
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
if: env.GITHUB_TOKEN != ''
run: |
zip -r cli-artifacts.zip ./artifacts_download
gh release create ${{env.CURRENT_VERSION}} ./SkiaSharpCompare/bin/Release/*.*nupkg cli-artifacts.zip --prerelease --generate-notes
dotnet nuget push ./SkiaSharpCompare/bin/Release/*.nupkg --skip-duplicate --api-key ${{secrets.NUGET_TEST_TOKEN}} --source https://apiint.nugettest.org/v3/index.json
6 changes: 3 additions & 3 deletions SkiaSharpCompare.Cli.Tests/SkiaSharpCompare.Cli.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NUnit" Version="4.4.0" />
<PackageReference Include="NUnit3TestAdapter" Version="5.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageReference Include="NUnit" Version="4.6.1" />
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
</ItemGroup>

<ItemGroup>
Expand Down
53 changes: 0 additions & 53 deletions SkiaSharpCompare.sln
View file
Open in desktop

This file was deleted.

14 changes: 14 additions & 0 deletions SkiaSharpCompare.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Solution>
<Folder Name="/Solution Items/">
<File Path=".editorconfig" />
<File Path=".github/dependabot.yml" />
<File Path=".github/workflows/cla.yml" />
<File Path=".github/workflows/dotnet.yml" />
<File Path=".github/workflows/stale.yml" />
<File Path="README.md" />
</Folder>
<Project Path="SkiaSharpCompare.Cli.Tests/SkiaSharpCompare.Cli.Tests.csproj" />
<Project Path="SkiaSharpCompare.Cli/SkiaSharpCompare.Cli.csproj" />
<Project Path="SkiaSharpCompare/SkiaSharpCompare.csproj" />
<Project Path="SkiaSharpCompareTestNunit/SkiaSharpCompareTestNunit.csproj" />
</Solution>
8 changes: 4 additions & 4 deletions SkiaSharpCompare/SkiaSharpCompare.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
Comment on lines 2 to 4
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<RepositoryUrl>https://github.com/Codeuctivity/SkiaSharp.Compare</RepositoryUrl>
Expand Down Expand Up @@ -45,9 +45,9 @@

<ItemGroup>
<PackageReference Include="MetadataExtractor" Version="2.9.3" />
<PackageReference Include="SkiaSharp" Version="3.119.4" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="3.119.4" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.16.0.128591">
<PackageReference Include="SkiaSharp" Version="4.148.0" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="4.148.0" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.27.0.140913">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
6 changes: 3 additions & 3 deletions SkiaSharpCompareTestNunit/SkiaSharpCompareTestNunit.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">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
<TargetFrameworks>net10.0</TargetFrameworks>
<IsPackable>false</IsPackable>
<Nullable>enable</Nullable>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
Expand All @@ -13,15 +13,15 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="nunit" Version="4.6.1" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.16.0.128591">
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.27.0.140913">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Comment on lines 15 to 17
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NUnit3TestAdapter" Version="6.2.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading