Skip to content

Commit 5e270e1

Browse files
shimatshimat
committed
remove x86
1 parent 1f50deb commit 5e270e1

5 files changed

Lines changed: 20 additions & 32 deletions

File tree

‎nuget/OpenCvSharp4.Windows.Slim.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>net48;netstandard2.0;netstandard2.1;net8.0;</TargetFrameworks>
44
<NoBuild>true</NoBuild>
55
<IncludeBuildOutput>false</IncludeBuildOutput>
66

77
<PackageId>OpenCvSharp4.Windows.Slim</PackageId>
8-
<Title>OpenCvSharp NuGet package for x64/x86 Windows (Slim)</Title>
8+
<Title>OpenCvSharp NuGet package for x64 Windows (Slim)</Title>
99
<Authors>shimat</Authors>
1010
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
1111
<PackageProjectUrl>https://github.com/shimat/opencvsharp</PackageProjectUrl>

‎nuget/OpenCvSharp4.Windows.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFrameworks>net48;netstandard2.0;netstandard2.1;net8.0;</TargetFrameworks>
44
<NoBuild>true</NoBuild>
55
<IncludeBuildOutput>false</IncludeBuildOutput>
66

77
<!-- NuGet Package Metadata -->
88
<PackageId>OpenCvSharp4.Windows</PackageId>
9-
<Title>OpenCvSharp NuGet package for x64/x86 Windows (same as OpenCvSharp3-AnyCPU)</Title>
9+
<Title>OpenCvSharp NuGet package for x64 Windows (same as OpenCvSharp3-AnyCPU)</Title>
1010
<Authors>shimat</Authors>
1111
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
1212
<PackageProjectUrl>https://github.com/shimat/opencvsharp</PackageProjectUrl>

‎nuget/OpenCvSharp4.runtime.win.props‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,6 @@
33
<OpenCvSharp4ExternalNativeDlls>$(MSBuildThisFileDirectory)..\..\runtimes</OpenCvSharp4ExternalNativeDlls>
44
</PropertyGroup>
55
<ItemGroup Condition="$(TargetFrameworkVersion.StartsWith('v4')) Or $(TargetFramework.StartsWith('net4'))">
6-
<Content Include="$(OpenCvSharp4ExternalNativeDlls)\win-x86\native\OpenCvSharpExtern.dll">
7-
<Link>dll\x86\OpenCvSharpExtern.dll</Link>
8-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9-
</Content>
10-
<Content Include="$(OpenCvSharp4ExternalNativeDlls)\win-x86\native\opencv_videoio_ffmpeg4130.dll">
11-
<Link>dll\x86\opencv_videoio_ffmpeg4130.dll</Link>
12-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
13-
</Content>
146
<Content Include="$(OpenCvSharp4ExternalNativeDlls)\win-x64\native\OpenCvSharpExtern.dll">
157
<Link>dll\x64\OpenCvSharpExtern.dll</Link>
168
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

‎nuget/OpenCvSharp4.runtime.win.slim.props‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
1-
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
33
<OpenCvSharp4ExternalNativeDlls>$(MSBuildThisFileDirectory)..\..\runtimes</OpenCvSharp4ExternalNativeDlls>
44
</PropertyGroup>
55
<ItemGroup Condition="$(TargetFrameworkVersion.StartsWith('v4')) Or $(TargetFramework.StartsWith('net4'))">
6-
<Content Include="$(OpenCvSharp4ExternalNativeDlls)\win-x86\native\OpenCvSharpExtern.dll">
7-
<Link>dll\x86\OpenCvSharpExtern.dll</Link>
8-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9-
</Content>
106
<Content Include="$(OpenCvSharp4ExternalNativeDlls)\win-x64\native\OpenCvSharpExtern.dll">
117
<Link>dll\x64\OpenCvSharpExtern.dll</Link>
128
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

‎tool/OpenCvSharp.ReleaseMaker/Packer.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,43 +10,43 @@ public static class Packer
1010
{
1111
private static readonly IReadOnlyDictionary<string, string[]> dllFiles = new Dictionary<string, string[]>
1212
{
13-
["netstandard2.0"] = new[]
14-
{
13+
["netstandard2.0"] =
14+
[
1515
@"OpenCvSharp\bin\Release\netstandard2.0\OpenCvSharp.dll",
1616
@"OpenCvSharp\bin\Release\netstandard2.0\OpenCvSharp.dll.config",
1717
@"OpenCvSharp\bin\Release\netstandard2.0\OpenCvSharp.pdb",
1818
@"OpenCvSharp.Extensions\bin\Release\netstandard2.0\OpenCvSharp.Extensions.dll",
1919
@"OpenCvSharp.Extensions\bin\Release\netstandard2.0\OpenCvSharp.Extensions.pdb",
20-
},
21-
["netstandard2.1"] = new[]
22-
{
20+
],
21+
["netstandard2.1"] =
22+
[
2323
@"OpenCvSharp\bin\Release\netstandard2.1\OpenCvSharp.dll",
2424
@"OpenCvSharp\bin\Release\netstandard2.1\OpenCvSharp.dll.config",
2525
@"OpenCvSharp\bin\Release\netstandard2.1\OpenCvSharp.pdb",
2626
@"OpenCvSharp.Extensions\bin\Release\netstandard2.1\OpenCvSharp.Extensions.dll",
2727
@"OpenCvSharp.Extensions\bin\Release\netstandard2.1\OpenCvSharp.Extensions.pdb",
28-
},
29-
["net8.0"] = new[]
30-
{
28+
],
29+
["net8.0"] =
30+
[
3131
@"OpenCvSharp\bin\Release\net8.0\OpenCvSharp.dll",
3232
@"OpenCvSharp\bin\Release\net8.0\OpenCvSharp.dll.config",
3333
@"OpenCvSharp\bin\Release\net8.0\OpenCvSharp.pdb",
3434
@"OpenCvSharp.Extensions\bin\Release\net8.0\OpenCvSharp.Extensions.dll",
3535
@"OpenCvSharp.Extensions\bin\Release\net8.0\OpenCvSharp.Extensions.pdb",
3636
@"OpenCvSharp.WpfExtensions\bin\Release\net8.0-windows\OpenCvSharp.WpfExtensions.dll",
3737
@"OpenCvSharp.WpfExtensions\bin\Release\net8.0-windows\OpenCvSharp.WpfExtensions.pdb",
38-
},
38+
],
3939
};
4040

4141
private const string DebuggerVisualizerPath = @"OpenCvSharp.DebuggerVisualizers\bin\Release\OpenCvSharp.DebuggerVisualizers.dll";
4242

43-
private static readonly string[] xmlFiles = {
43+
private static readonly string[] xmlFiles = [
4444
@"OpenCvSharp.WpfExtensions\OpenCvSharp.WpfExtensions.xml",
45-
};
45+
];
4646

4747
private static readonly IReadOnlyDictionary<string, string[]> architectures = new Dictionary<string, string[]>
4848
{
49-
["win"] = new[] { "x86", "x64" },
49+
["win"] = ["x64"],
5050
//["uwp"] = new[] { "x86", "x64", "ARM" },
5151
};
5252

@@ -80,11 +80,11 @@ private static IReadOnlyDictionary<string, string> UwpNativeDllDirectories(strin
8080
private static IReadOnlyList<string> UwpNativeDlls(string version)
8181
{
8282
version = version.Replace(".", "");
83-
return new[]
84-
{
83+
return
84+
[
8585
$"opencv_world{version}.dll",
8686
$"opencv_img_hash{version}.dll"
87-
};
87+
];
8888
}
8989

9090
/// <summary>

0 commit comments

Comments
 (0)