Skip to content

Commit 4add9e8

Browse files
shimatshimat
authored
Merge pull request #1802 from shimat/update_nuget
update nuget
2 parents 70b2ba2 + ddf3f2c commit 4add9e8

39 files changed

Lines changed: 63 additions & 138 deletions

‎src/OpenCvSharp.Extensions/CvExtensions.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -271,16 +271,17 @@ public static LineSegmentPoint[] HoughLinesProbabilisticEx(this Mat img, double
271271
}
272272
}
273273

274-
private static void Shuffle<T>(IList<T> list)
274+
private static void Shuffle<T>(T[] list)
275275
{
276276
var rand = new Random();
277-
for (int i = list.Count; i > 1; i--)
277+
for (int i = list.Length; i > 1; i--)
278278
{
279279
int j = rand.Next(i);
280280
Swap(list, j, i - 1);
281281
}
282282
}
283-
private static void Swap<T>(IList<T> list, int i1, int i2)
283+
284+
private static void Swap<T>(T[] list, int i1, int i2)
284285
{
285286
T temp = list[i1];
286287
list[i1] = list[i2];

‎src/OpenCvSharp.Extensions/OpenCvSharp.Extensions.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@
4343

4444
<ItemGroup>
4545
<PackageReference Include="System.Drawing.Common">
46-
<Version>8.0.11</Version>
46+
<Version>10.0.3</Version>
4747
</PackageReference>
4848
</ItemGroup>
4949

5050
<ItemGroup>
51-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
51+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.103" PrivateAssets="All" />
5252
</ItemGroup>
5353

5454
<PropertyGroup>

‎src/OpenCvSharp.WpfExtensions/OpenCvSharp.WpfExtensions.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<UseWPF>true</UseWPF>
2020
</PropertyGroup>
2121
<ItemGroup>
22-
<PackageReference Include="System.Drawing.Common" Version="8.0.11" />
22+
<PackageReference Include="System.Drawing.Common" Version="10.0.3" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎src/OpenCvSharp/Internal/Vectors/VectorOfVec6f.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace OpenCvSharp.Internal.Vectors;
66
/// <summary>
77
/// </summary>
88
// ReSharper disable once InconsistentNaming
9-
internal class VectorOfVec6f : DisposableCvObject, IStdVector<Vec6f>
9+
internal sealed class VectorOfVec6f : DisposableCvObject, IStdVector<Vec6f>
1010
{
1111
/// <summary>
1212
/// Constructor

‎src/OpenCvSharp/Modules/flann/IndexParams/KMeansIndexParams.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ protected KMeansIndexParams(OpenCvSharp.Ptr ptrObj)
3434
{
3535
}
3636

37-
internal new class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr)
37+
internal sealed new class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr)
3838
{
3939
public override IntPtr Get()
4040
{

‎src/OpenCvSharp/Modules/ximgproc/Segmentation/SelectiveSearchSegmentationStrategy.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public static SelectiveSearchSegmentationStrategyTexture Create()
210210
return new SelectiveSearchSegmentationStrategyTexture(p);
211211
}
212212

213-
internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr)
213+
internal sealed class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr)
214214
{
215215
public override IntPtr Get()
216216
{

‎src/OpenCvSharp/OpenCvSharp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</ItemGroup>
3535

3636
<ItemGroup>
37-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
37+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.103" PrivateAssets="All" />
3838
</ItemGroup>
3939

4040
<ItemGroup>

‎test/OpenCvSharp.Tests.Windows/BitmapConverterTest.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.Runtime.InteropServices;
44
using OpenCvSharp.Extensions;
55
using Xunit;
6-
using Xunit.Abstractions;
76

87
namespace OpenCvSharp.Tests.Extensions;
98

‎test/OpenCvSharp.Tests.Windows/OpenCvSharp.Tests.Windows.csproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net8.0-windows;net48</TargetFrameworks>
5+
<OutputType>Exe</OutputType>
56
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
67
<UseWPF>true</UseWPF>
78
<LangVersion>12</LangVersion>
@@ -32,18 +33,18 @@
3233
</ItemGroup>
3334

3435
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0-windows' ">
35-
<PackageReference Include="System.Drawing.Common" Version="8.0.11" />
36+
<PackageReference Include="System.Drawing.Common" Version="10.0.3" />
3637
</ItemGroup>
3738

3839
<ItemGroup>
39-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
40+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
4041
<PackageReference Include="System.Memory" Version="4.6.3" />
41-
<PackageReference Include="xunit" Version="2.9.2" />
42-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
42+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
4343
<PrivateAssets>all</PrivateAssets>
4444
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4545
</PackageReference>
46-
<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
46+
<PackageReference Include="Xunit.StaFact" Version="3.0.13" />
47+
<PackageReference Include="xunit.v3" Version="3.2.2" />
4748
</ItemGroup>
4849

4950
<ItemGroup>

‎test/OpenCvSharp.Tests/OpenCvSharp.Tests.csproj‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net8.0;net48</TargetFrameworks>
55
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
66
<AssemblyName>OpenCvSharp.Tests</AssemblyName>
7-
<OutputType>Library</OutputType>
7+
<OutputType>Exe</OutputType>
88
<PackageId>OpenCvSharp.Tests</PackageId>
99
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
1010
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -34,19 +34,20 @@
3434

3535
<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
3636
<Reference Include="System.Net.Http" />
37+
<Reference Include="System.Windows.Forms" />
3738
</ItemGroup>
3839

3940
<ItemGroup>
40-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
41+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
4142
<PackageReference Include="SharpZipLib" Version="1.4.2" />
42-
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta15" />
43+
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0" />
4344
<PackageReference Include="System.Memory" Version="4.6.3" />
44-
<PackageReference Include="xunit" Version="2.9.2" />
45-
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
45+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
4646
<PrivateAssets>all</PrivateAssets>
4747
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
4848
</PackageReference>
49-
<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
49+
<PackageReference Include="Xunit.StaFact" Version="3.0.13" />
50+
<PackageReference Include="xunit.v3" Version="3.2.2" />
5051
</ItemGroup>
5152

5253
<ItemGroup>

0 commit comments

Comments
 (0)