Skip to content

Commit 0edfe1e

Browse files
Merge pull request #355 from SixLabors/js/v2-update-refs
Updates Six Labors References to Latest Versions
2 parents 435aae4 + cfbdb66 commit 0edfe1e

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

.github/workflows/build-and-test.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ on:
44
push:
55
branches:
66
- main
7+
- release/*
78
tags:
89
- "v*"
910
pull_request:
1011
branches:
1112
- main
13+
- release/*
1214
types: [ labeled, opened, synchronize, reopened ]
1315
jobs:
1416
Build:
@@ -65,8 +67,10 @@ jobs:
6567

6668
steps:
6769
- name: Install libgdi+, which is required for tests running on ubuntu
68-
if: ${{ matrix.options.os == 'buildjet-4vcpu-ubuntu-2204-arm' }}
69-
run: sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
70+
if: ${{ contains(matrix.options.os, 'ubuntu') }}
71+
run: |
72+
sudo apt-get update
73+
sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
7074
7175
- name: Git Config
7276
shell: bash

src/ImageSharp.Drawing/ImageSharp.Drawing.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
<None Include="..\..\shared-infrastructure\branding\icons\imagesharp.drawing\sixlabors.imagesharp.drawing.128.png" Pack="true" PackagePath="" />
4646
</ItemGroup>
4747
<ItemGroup>
48-
<PackageReference Include="SixLabors.Fonts" Version="2.0.8" />
49-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
48+
<PackageReference Include="SixLabors.Fonts" Version="2.1.3" />
49+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.8" />
5050
</ItemGroup>
5151
<Import Project="..\..\shared-infrastructure\src\SharedInfrastructure\SharedInfrastructure.projitems" Label="Shared" />
5252
</Project>

tests/ImageSharp.Drawing.Tests/Drawing/Text/DrawTextOnImageTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ public void FontShapesAreRenderedCorrectly_LargeText<TPixel>(
269269
string str = Repeat(" ", 78) + "THISISTESTWORDSTHISISTESTWORDSTHISISTESTWORDSTHISISTESTWORDSTHISISTESTWORDS";
270270
sb.Append(str);
271271

272-
string newLines = Repeat("\r\n", 31);
272+
string newLines = Repeat("\r\n", 61);
273273
sb.Append(newLines);
274274

275275
for (int i = 0; i < 10; i++)
Lines changed: 2 additions & 2 deletions
Loading
Lines changed: 2 additions & 2 deletions
Loading

0 commit comments

Comments
 (0)