Skip to content

Commit d831f72

Browse files
lilithlilith
committed
Support and test under .NET 10.0
1 parent 1383511 commit d831f72

File tree

7 files changed

+148
-348
lines changed

7 files changed

+148
-348
lines changed

‎.github/workflows/dotnet-core.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,12 @@ jobs:
5858
- name: Setup .NET 6,8,9
5959
uses: actions/setup-dotnet@v4
6060
with:
61+
dotnet-quality: 'preview'
6162
dotnet-version: |
6263
6
6364
8
6465
9
66+
10
6567
6668
- uses: nowsprinting/[email protected]
6769
id: version

‎src/Imageflow.AllPlatforms/Imageflow.AllPlatforms.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<AssemblyName>Imageflow.AllPlatforms</AssemblyName>
55
<Description>Imageflow processes and optimizes images at incredible speeds. Works well with with .NET 8,7,6.. anything with .NET Standard 2.0. NOTE: For .NET 4.x projects, use the Imageflow.Net and Imageflow.NativeRuntime.[your platform] packages separately.</Description>
66

7-
<TargetFrameworks>net8.0;netstandard2.0</TargetFrameworks>
7+
<TargetFrameworks>net10.0;net8.0;netstandard2.0</TargetFrameworks>
88
<IsTrimmable Condition="'$(TargetFramework)' == 'net8.0'">true</IsTrimmable>
99
<EnableTrimAnalyzer Condition="'$(TargetFramework)' == 'net8.0'">true</EnableTrimAnalyzer>
1010
<IsAotCompatible Condition="'$(TargetFramework)' == 'net8.0'">true</IsAotCompatible>

‎src/Imageflow.AllPlatforms/packages.lock.json‎

Lines changed: 101 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,106 @@
186186
"contentHash": "5654kWI9CipWWH3pEFPIuZm0FZtZgXsSMaBG70LZ8f0aLCVNVnvfSXcBTVEpzM9ctIysSoqxabXRFtlmpFufFA=="
187187
}
188188
},
189+
"net10.0": {
190+
"Imageflow.NativeRuntime.All": {
191+
"type": "Direct",
192+
"requested": "[2.1.2-rc02, )",
193+
"resolved": "2.1.2-rc02",
194+
"contentHash": "fScgsBhjE0q6uT/nRbC/JpEFaMYK06l98x/iLX1fD1ylAaaKJvyqpCVqGsSKp+54TaVthobeM/g2GAk6gebrzQ==",
195+
"dependencies": {
196+
"Imageflow.NativeRuntime.linux-arm64": "2.1.2-rc02",
197+
"Imageflow.NativeRuntime.linux-x64": "2.1.2-rc02",
198+
"Imageflow.NativeRuntime.osx-arm64": "2.1.2-rc02",
199+
"Imageflow.NativeRuntime.osx-x86_64": "2.1.2-rc02",
200+
"Imageflow.NativeRuntime.win-arm64": "2.1.2-rc02",
201+
"Imageflow.NativeRuntime.win-x86": "2.1.2-rc02",
202+
"Imageflow.NativeRuntime.win-x86_64": "2.1.2-rc02"
203+
}
204+
},
205+
"Imageflow.NativeRuntime.linux-arm64": {
206+
"type": "Transitive",
207+
"resolved": "2.1.2-rc02",
208+
"contentHash": "rUVnvqR0vUbgLFNEuowV4ztG9triVspjPBZLl5TlV6+/5kQnOlInJPC+AgGkUiSk0b+sZJsKnyeu/zybihGpeg=="
209+
},
210+
"Imageflow.NativeRuntime.linux-x64": {
211+
"type": "Transitive",
212+
"resolved": "2.1.2-rc02",
213+
"contentHash": "zbBSdsNUnZS3X9PIKllHXd3AzmGR3dk1jlUnYbv+KZM/ONv8OJi809bUhcmCzi8w/Swtwbdzv+lS4CgqBmrbPw=="
214+
},
215+
"Imageflow.NativeRuntime.osx-arm64": {
216+
"type": "Transitive",
217+
"resolved": "2.1.2-rc02",
218+
"contentHash": "Sm2pcwdQ4bi/Ymx6Wd+8D481xe0wEsZxSkRjLvAciQGa85mLGaMI3SId2JFc8C2rOeUYeSVAQKEOCGLQRRxSlg=="
219+
},
220+
"Imageflow.NativeRuntime.osx-x86_64": {
221+
"type": "Transitive",
222+
"resolved": "2.1.2-rc02",
223+
"contentHash": "SumLKeBZQ9JpZadEul6olSnp+2xpVkoGQpHzT3vIl0Furigtze5Rixr9NHwRkGzYbsTE2hkj8yfZ+GuMZLrtYg=="
224+
},
225+
"Imageflow.NativeRuntime.win-arm64": {
226+
"type": "Transitive",
227+
"resolved": "2.1.2-rc02",
228+
"contentHash": "fqt7EYYvQRCfs9+wYuD8XMyCgiJFId3UxmbUTw1A2ZrT+5LZnHRx4Ns5IcsPpXt2S3gUIw9rEFXW0UOnYIwV8w=="
229+
},
230+
"Imageflow.NativeRuntime.win-x86": {
231+
"type": "Transitive",
232+
"resolved": "2.1.2-rc02",
233+
"contentHash": "+EOhzvdKn/28//APsTo1sBgZAcr2/ju65WeHsjmKpRMhPTH7qg9a9OOThTP4QGyqlhufqdCOTzMG9shUQh/cyQ=="
234+
},
235+
"Imageflow.NativeRuntime.win-x86_64": {
236+
"type": "Transitive",
237+
"resolved": "2.1.2-rc02",
238+
"contentHash": "5654kWI9CipWWH3pEFPIuZm0FZtZgXsSMaBG70LZ8f0aLCVNVnvfSXcBTVEpzM9ctIysSoqxabXRFtlmpFufFA=="
239+
},
240+
"Microsoft.IO.RecyclableMemoryStream": {
241+
"type": "Transitive",
242+
"resolved": "3.0.1",
243+
"contentHash": "s/s20YTVY9r9TPfTrN5g8zPF1YhwxyqO6PxUkrYTGI2B+OGPe9AdajWZrLhFqXIvqIW23fnUE4+ztrUWNU1+9g=="
244+
},
245+
"imageflow.net": {
246+
"type": "Project",
247+
"dependencies": {
248+
"Microsoft.IO.RecyclableMemoryStream": "[3.*, 4.0.0)"
249+
}
250+
}
251+
},
252+
"net10.0/win-x86": {
253+
"Imageflow.NativeRuntime.linux-arm64": {
254+
"type": "Transitive",
255+
"resolved": "2.1.2-rc02",
256+
"contentHash": "rUVnvqR0vUbgLFNEuowV4ztG9triVspjPBZLl5TlV6+/5kQnOlInJPC+AgGkUiSk0b+sZJsKnyeu/zybihGpeg=="
257+
},
258+
"Imageflow.NativeRuntime.linux-x64": {
259+
"type": "Transitive",
260+
"resolved": "2.1.2-rc02",
261+
"contentHash": "zbBSdsNUnZS3X9PIKllHXd3AzmGR3dk1jlUnYbv+KZM/ONv8OJi809bUhcmCzi8w/Swtwbdzv+lS4CgqBmrbPw=="
262+
},
263+
"Imageflow.NativeRuntime.osx-arm64": {
264+
"type": "Transitive",
265+
"resolved": "2.1.2-rc02",
266+
"contentHash": "Sm2pcwdQ4bi/Ymx6Wd+8D481xe0wEsZxSkRjLvAciQGa85mLGaMI3SId2JFc8C2rOeUYeSVAQKEOCGLQRRxSlg=="
267+
},
268+
"Imageflow.NativeRuntime.osx-x86_64": {
269+
"type": "Transitive",
270+
"resolved": "2.1.2-rc02",
271+
"contentHash": "SumLKeBZQ9JpZadEul6olSnp+2xpVkoGQpHzT3vIl0Furigtze5Rixr9NHwRkGzYbsTE2hkj8yfZ+GuMZLrtYg=="
272+
},
273+
"Imageflow.NativeRuntime.win-arm64": {
274+
"type": "Transitive",
275+
"resolved": "2.1.2-rc02",
276+
"contentHash": "fqt7EYYvQRCfs9+wYuD8XMyCgiJFId3UxmbUTw1A2ZrT+5LZnHRx4Ns5IcsPpXt2S3gUIw9rEFXW0UOnYIwV8w=="
277+
},
278+
"Imageflow.NativeRuntime.win-x86": {
279+
"type": "Transitive",
280+
"resolved": "2.1.2-rc02",
281+
"contentHash": "+EOhzvdKn/28//APsTo1sBgZAcr2/ju65WeHsjmKpRMhPTH7qg9a9OOThTP4QGyqlhufqdCOTzMG9shUQh/cyQ=="
282+
},
283+
"Imageflow.NativeRuntime.win-x86_64": {
284+
"type": "Transitive",
285+
"resolved": "2.1.2-rc02",
286+
"contentHash": "5654kWI9CipWWH3pEFPIuZm0FZtZgXsSMaBG70LZ8f0aLCVNVnvfSXcBTVEpzM9ctIysSoqxabXRFtlmpFufFA=="
287+
}
288+
},
189289
"net8.0": {
190290
"Imageflow.NativeRuntime.All": {
191291
"type": "Direct",
@@ -248,16 +348,10 @@
248348
"resolved": "3.0.1",
249349
"contentHash": "s/s20YTVY9r9TPfTrN5g8zPF1YhwxyqO6PxUkrYTGI2B+OGPe9AdajWZrLhFqXIvqIW23fnUE4+ztrUWNU1+9g=="
250350
},
251-
"System.Text.Json": {
252-
"type": "Transitive",
253-
"resolved": "6.0.11",
254-
"contentHash": "xqC1HIbJMBFhrpYs76oYP+NAskNVjc6v73HqLal7ECRDPIp4oRU5pPavkD//vNactCn9DA2aaald/I5N+uZ5/g=="
255-
},
256351
"imageflow.net": {
257352
"type": "Project",
258353
"dependencies": {
259-
"Microsoft.IO.RecyclableMemoryStream": "[3.*, 4.0.0)",
260-
"System.Text.Json": "[6.0.11, )"
354+
"Microsoft.IO.RecyclableMemoryStream": "[3.*, 4.0.0)"
261355
}
262356
}
263357
},

‎src/Imageflow/Imageflow.Net.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<AssemblyName>Imageflow.Net</AssemblyName>
44
<Description>Bindings for the Imageflow image processing library. Also remember to install Imageflow.NativeRuntime.[your platform] or use Imageflow.AllPlatforms instead.</Description>
55

6-
<TargetFrameworks>net8.0;netstandard2.0;netstandard2.1</TargetFrameworks>
6+
<TargetFrameworks>net10.0;net8.0;netstandard2.0;netstandard2.1</TargetFrameworks>
77
<IsTrimmable Condition="'$(TargetFramework)' == 'net8.0'">true</IsTrimmable>
88
<IsPackable>true</IsPackable>
99
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎src/Imageflow/packages.lock.json‎

Lines changed: 40 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,8 @@
157157
"contentHash": "xqC1HIbJMBFhrpYs76oYP+NAskNVjc6v73HqLal7ECRDPIp4oRU5pPavkD//vNactCn9DA2aaald/I5N+uZ5/g==",
158158
"dependencies": {
159159
"Microsoft.Bcl.AsyncInterfaces": "6.0.0",
160-
"System.Buffers": "4.5.1",
161-
"System.Memory": "4.5.4",
162-
"System.Numerics.Vectors": "4.5.0",
163160
"System.Runtime.CompilerServices.Unsafe": "6.0.0",
164-
"System.Text.Encodings.Web": "6.0.1",
165-
"System.Threading.Tasks.Extensions": "4.5.4"
161+
"System.Text.Encodings.Web": "6.0.1"
166162
}
167163
},
168164
"Microsoft.Bcl.AsyncInterfaces": {
@@ -180,16 +176,6 @@
180176
"resolved": "8.0.0",
181177
"contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
182178
},
183-
"System.Buffers": {
184-
"type": "Transitive",
185-
"resolved": "4.5.1",
186-
"contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
187-
},
188-
"System.Numerics.Vectors": {
189-
"type": "Transitive",
190-
"resolved": "4.5.0",
191-
"contentHash": "QQTlPTl06J/iiDbJCiepZ4H//BVraReU4O4EoRw1U02H5TLUIT7xn3GnDp9AXPSlJUDyFs4uWjWafNX6WrAojQ=="
192-
},
193179
"System.Runtime.CompilerServices.Unsafe": {
194180
"type": "Transitive",
195181
"resolved": "6.0.0",
@@ -200,21 +186,52 @@
200186
"resolved": "6.0.1",
201187
"contentHash": "E5M5AE2OUTlCrf4omZvzzziUJO9CofBl+lXHaN5IKePPJvHqYFYYpaDPgCpR4VwaFbEebfnjOxxEBtPtsqAxpQ==",
202188
"dependencies": {
203-
"System.Buffers": "4.5.1",
204-
"System.Memory": "4.5.4",
205189
"System.Runtime.CompilerServices.Unsafe": "6.0.0"
206190
}
191+
}
192+
},
193+
".NETStandard,Version=v2.1/win-x86": {},
194+
"net10.0": {
195+
"Microsoft.IO.RecyclableMemoryStream": {
196+
"type": "Direct",
197+
"requested": "[3.*, 4.0.0)",
198+
"resolved": "3.0.1",
199+
"contentHash": "s/s20YTVY9r9TPfTrN5g8zPF1YhwxyqO6PxUkrYTGI2B+OGPe9AdajWZrLhFqXIvqIW23fnUE4+ztrUWNU1+9g=="
207200
},
208-
"System.Threading.Tasks.Extensions": {
209-
"type": "Transitive",
210-
"resolved": "4.5.4",
211-
"contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg==",
201+
"Microsoft.SourceLink.GitHub": {
202+
"type": "Direct",
203+
"requested": "[8.*, )",
204+
"resolved": "8.0.0",
205+
"contentHash": "G5q7OqtwIyGTkeIOAc3u2ZuV/kicQaec5EaRnc0pIeSnh9LUjj+PYQrJYBURvDt7twGl2PKA7nSN0kz1Zw5bnQ==",
212206
"dependencies": {
213-
"System.Runtime.CompilerServices.Unsafe": "4.5.3"
207+
"Microsoft.Build.Tasks.Git": "8.0.0",
208+
"Microsoft.SourceLink.Common": "8.0.0"
214209
}
210+
},
211+
"PolySharp": {
212+
"type": "Direct",
213+
"requested": "[1.15.0, )",
214+
"resolved": "1.15.0",
215+
"contentHash": "FbU0El+EEjdpuIX4iDbeS7ki1uzpJPx8vbqOzEtqnl1GZeAGJfq+jCbxeJL2y0EPnUNk8dRnnqR2xnYXg9Tf+g=="
216+
},
217+
"System.Text.Json": {
218+
"type": "Direct",
219+
"requested": "[6.0.11, )",
220+
"resolved": "6.0.11",
221+
"contentHash": "xqC1HIbJMBFhrpYs76oYP+NAskNVjc6v73HqLal7ECRDPIp4oRU5pPavkD//vNactCn9DA2aaald/I5N+uZ5/g=="
222+
},
223+
"Microsoft.Build.Tasks.Git": {
224+
"type": "Transitive",
225+
"resolved": "8.0.0",
226+
"contentHash": "bZKfSIKJRXLTuSzLudMFte/8CempWjVamNUR5eHJizsy+iuOuO/k2gnh7W0dHJmYY0tBf+gUErfluCv5mySAOQ=="
227+
},
228+
"Microsoft.SourceLink.Common": {
229+
"type": "Transitive",
230+
"resolved": "8.0.0",
231+
"contentHash": "dk9JPxTCIevS75HyEQ0E4OVAFhB2N+V9ShCXf8Q6FkUQZDkgLI12y679Nym1YqsiSysuQskT7Z+6nUf3yab6Vw=="
215232
}
216233
},
217-
".NETStandard,Version=v2.1/win-x86": {},
234+
"net10.0/win-x86": {},
218235
"net8.0": {
219236
"Microsoft.IO.RecyclableMemoryStream": {
220237
"type": "Direct",

‎tests/Imageflow.Test/Imageflow.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<IsPackable>false</IsPackable>
44
<Platforms>AnyCPU;x64;x86</Platforms>
5-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
5+
<TargetFrameworks>net10.0;net8.0;net9.0</TargetFrameworks>
66
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net8.0;net9.0;net481</TargetFrameworks>
77

88
</PropertyGroup>

0 commit comments

Comments
 (0)