Skip to content

Commit 197dc44

Browse files
stefannikoleistefannikolei
authored
Merge branch 'main' into sn/nullable_icc
2 parents 30a2dfa + 672d788 commit 197dc44

28 files changed

+213
-254
lines changed

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,32 +64,32 @@ jobs:
6464
matrix:
6565
options:
6666
- os: ubuntu-latest
67-
framework: net9.0
68-
sdk: 9.0.x
67+
framework: net10.0
68+
sdk: 10.0.x
6969
sdk-preview: true
7070
runtime: -x64
7171
codecov: false
7272
- os: macos-13 # macos-latest runs on arm64 runners where libgdiplus is unavailable
73-
framework: net9.0
74-
sdk: 9.0.x
73+
framework: net10.0
74+
sdk: 10.0.x
7575
sdk-preview: true
7676
runtime: -x64
7777
codecov: false
7878
- os: macos-26
79-
framework: net9.0
80-
sdk: 9.0.x
79+
framework: net10.0
80+
sdk: 10.0.x
8181
sdk-preview: true
8282
runtime: -x64
8383
codecov: false
8484
- os: windows-latest
85-
framework: net9.0
86-
sdk: 9.0.x
85+
framework: net10.0
86+
sdk: 10.0.x
8787
sdk-preview: true
8888
runtime: -x64
8989
codecov: false
9090
- os: ubuntu-22.04-arm
91-
framework: net9.0
92-
sdk: 9.0.x
91+
framework: net10.0
92+
sdk: 10.0.x
9393
sdk-preview: true
9494
runtime: -x64
9595
codecov: false
@@ -187,7 +187,7 @@ jobs:
187187
uses: actions/setup-dotnet@v4
188188
with:
189189
dotnet-version: |
190-
9.0.x
190+
10.0.x
191191
192192
- name: DotNet Build
193193
if: ${{ matrix.options.sdk-preview != true }}

‎Directory.Build.props‎

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

24-
<PropertyGroup>
24+
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' OR '$(TargetFramework)' == 'net9.0'">
2525
<LangVersion>12.0</LangVersion>
2626
</PropertyGroup>
2727

28+
<PropertyGroup Condition="'$(TargetFramework)' == 'net10.0'">
29+
<LangVersion>14.0</LangVersion>
30+
</PropertyGroup>
31+
2832
<!--
2933
Ensure all custom build configurations based upon "Release" are optimized.
3034
This is easier than setting each project individually.

‎src/ImageSharp/ImageSharp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<Choose>
3131
<When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
3232
<PropertyGroup>
33-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
33+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
3434
</PropertyGroup>
3535
</When>
3636
<Otherwise>

‎tests/Directory.Build.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
See https://github.com/ImageMagick/ImageMagick/commit/27a0a9c37f18af9c8d823a3ea076f600843b553c
2626
-->
2727
<PackageReference Update="Magick.NET-Q16-AnyCPU" Version="13.10.0" />
28-
<PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.23580.1" />
28+
<PackageReference Update="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.25563.105" />
2929
<PackageReference Update="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.23580.1" />
3030
<PackageReference Update="Moq" Version="4.20.72" />
3131
<PackageReference Update="NetVips" Version="3.0.0" />

‎tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
BenchmarkDotNet requires a certain structure to the code,
2020
as such, some of these rules cannot be implemented.
2121
-->
22-
22+
2323
<!--Mark members as static-->
2424
<!--Validate platform compatibility-->
2525
<!--Types that own disposable fields should be disposable-->
@@ -39,7 +39,7 @@
3939
<Choose>
4040
<When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
4141
<PropertyGroup>
42-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
42+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
4343
</PropertyGroup>
4444
</When>
4545
<Otherwise>

‎tests/ImageSharp.Tests.ProfilingSandbox/ImageSharp.Tests.ProfilingSandbox.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<Choose>
2020
<When Condition="$(SIXLABORS_TESTING_PREVIEW) == true">
2121
<PropertyGroup>
22-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
22+
<TargetFrameworks>net8.0;net10.0</TargetFrameworks>
2323
</PropertyGroup>
2424
</When>
2525
<Otherwise>

‎tests/ImageSharp.Tests/Common/SimdUtilsTests.Shuffle.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ static void RunTest(string serialized)
292292
FeatureTestRunner.RunWithHwIntrinsicsFeature(
293293
RunTest,
294294
count,
295-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE);
295+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
296296
}
297297

298298
[Theory]
@@ -352,7 +352,7 @@ static void RunTest(string serialized)
352352
FeatureTestRunner.RunWithHwIntrinsicsFeature(
353353
RunTest,
354354
count,
355-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE);
355+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
356356
}
357357

358358
[Theory]
@@ -394,7 +394,7 @@ static void RunTest(string serialized)
394394
FeatureTestRunner.RunWithHwIntrinsicsFeature(
395395
RunTest,
396396
count,
397-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE);
397+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
398398
}
399399

400400
[Theory]
@@ -436,7 +436,7 @@ static void RunTest(string serialized)
436436
FeatureTestRunner.RunWithHwIntrinsicsFeature(
437437
RunTest,
438438
count,
439-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE);
439+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableHWIntrinsic);
440440
}
441441

442442
[Theory]
@@ -478,7 +478,7 @@ static void RunTest(string serialized)
478478
FeatureTestRunner.RunWithHwIntrinsicsFeature(
479479
RunTest,
480480
count,
481-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE);
481+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
482482
}
483483

484484
private static void TestShuffleFloat4Channel(

‎tests/ImageSharp.Tests/Common/SimdUtilsTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ static void RunTest(string serialized) => TestImpl_BulkConvertByteToNormalizedFl
133133
FeatureTestRunner.RunWithHwIntrinsicsFeature(
134134
RunTest,
135135
count,
136-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512F | HwIntrinsics.DisableAVX2 | HwIntrinsics.DisableSSE41);
136+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2);
137137
}
138138

139139
[Theory]
@@ -171,7 +171,7 @@ static void RunTest(string serialized) => TestImpl_BulkConvertNormalizedFloatToB
171171
FeatureTestRunner.RunWithHwIntrinsicsFeature(
172172
RunTest,
173173
count,
174-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512BW | HwIntrinsics.DisableAVX2);
174+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX512 | HwIntrinsics.DisableAVX2);
175175
}
176176

177177
[Theory]

‎tests/ImageSharp.Tests/Formats/Jpg/Block8x8FTests.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ static void RunTest(string srcSeedSerialized, string qtSeedSerialized)
267267
RunTest,
268268
srcSeed,
269269
qtSeed,
270-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE);
270+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
271271
}
272272

273273
[Fact]
@@ -462,7 +462,7 @@ static void RunTest()
462462
// 3. DisableAvx2 - call fallback code of float implementation
463463
FeatureTestRunner.RunWithHwIntrinsicsFeature(
464464
RunTest,
465-
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableSSE);
465+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
466466
}
467467

468468
[Theory]

‎tests/ImageSharp.Tests/Formats/Jpg/DCTTests.cs‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ static void RunTest(string serialized)
152152
FeatureTestRunner.RunWithHwIntrinsicsFeature(
153153
RunTest,
154154
seed,
155-
HwIntrinsics.AllowAll | HwIntrinsics.DisableFMA | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
155+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
156156
}
157157

158158
[Theory]
@@ -352,15 +352,14 @@ static void RunTest(string serialized)
352352
Assert.Equal(expectedDest, actualDest, new ApproximateFloatComparer(1f));
353353
}
354354

355-
// 4 paths:
356-
// 1. AllowAll - call avx/fma implementation
357-
// 2. DisableFMA - call avx without fma implementation
358-
// 3. DisableAvx - call Vector4 implementation
359-
// 4. DisableHWIntrinsic - call scalar fallback implementation
355+
// 3 paths:
356+
// 1. AllowAll - call avx implementation
357+
// 2. DisableAvx - call Vector4 implementation
358+
// 3. DisableHWIntrinsic - call scalar fallback implementation
360359
FeatureTestRunner.RunWithHwIntrinsicsFeature(
361360
RunTest,
362361
seed,
363-
HwIntrinsics.AllowAll | HwIntrinsics.DisableFMA | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
362+
HwIntrinsics.AllowAll | HwIntrinsics.DisableAVX | HwIntrinsics.DisableHWIntrinsic);
364363
}
365364
}
366365
}

0 commit comments

Comments
 (0)