Skip to content

Commit 938595b

Browse files
Merge branch 'main' into subsub-ifd
2 parents 1fbd202 + bfa664d commit 938595b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+477
-418
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ jobs:
7474
steps:
7575
- name: Install libgdi+, which is required for tests running on ubuntu
7676
if: ${{ contains(matrix.options.os, 'ubuntu') }}
77-
run: sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
77+
run: |
78+
sudo apt-get update
79+
sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
7880
7981
- name: Git Config
8082
shell: bash

.github/workflows/code-coverage.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ jobs:
2020

2121
- name: Install libgdi+, which is required for tests running on ubuntu
2222
if: ${{ contains(matrix.options.os, 'ubuntu') }}
23-
run: sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
23+
run: |
24+
sudo apt-get update
25+
sudo apt-get -y install libgdiplus libgif-dev libglib2.0-dev libcairo2-dev libtiff-dev libexif-dev
2426
2527
- name: Git Config
2628
shell: bash

Directory.Build.props

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@
2121
<!-- Import the shared global .props file -->
2222
<Import Project="$(MSBuildThisFileDirectory)shared-infrastructure\msbuild\props\SixLabors.Global.props" />
2323

24-
<PropertyGroup Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
25-
<!-- Workaround various issues bound to implicit language features. -->
26-
<LangVersion>preview</LangVersion>
24+
<PropertyGroup>
25+
<LangVersion>12.0</LangVersion>
2726
</PropertyGroup>
2827

2928
<!--

0 commit comments

Comments
 (0)