Skip to content

Commit 1866016

Browse files
shimatshimat
committed
change nuspec (NativeDlls/ -> runtimes/)
1 parent 030ad26 commit 1866016

15 files changed

+16
-518
lines changed

‎nuget/OpenCvSharp3-AnyCPU.nuspec

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>OpenCvSharp3-AnyCPU</id>
55
<version>3.4.3.20181114-beta</version>
@@ -13,7 +13,8 @@
1313
<summary>OpenCV 3.x wrapper</summary>
1414
<releaseNotes></releaseNotes>
1515
<copyright>Copyright 2008-2018</copyright>
16-
<tags>Image Processing OpenCV Wrapper FFI</tags>
16+
<tags>Image Processing OpenCV Wrapper FFI opencvsharp</tags>
17+
<!--<minClientVersion>3.3</minClientVersion>-->
1718
<dependencies>
1819
<group targetFramework="net20" />
1920
<group targetFramework="net40" />
@@ -35,8 +36,6 @@
3536
</frameworkAssemblies>
3637
</metadata>
3738
<files>
38-
<file src="OpenCvSharp3-AnyCPU.props" target="build\OpenCvSharp3-AnyCPU.props" />
39-
4039
<file src="..\src\OpenCvSharp\bin\Release\net20\OpenCvSharp.dll" target="lib\net20" />
4140
<file src="..\src\OpenCvSharp\bin\Release\net20\OpenCvSharp.pdb" target="lib\net20" />
4241
<file src="..\src\OpenCvSharp\bin\Release\net20\OpenCvSharp.xml" target="lib\net20" />
@@ -80,10 +79,11 @@
8079
<file src="..\src\OpenCvSharp.Extensions\bin\Release\netstandard2.0\OpenCvSharp.Extensions.pdb" target="lib\netstandard2.0" />
8180
<file src="..\src\OpenCvSharp.Extensions\bin\Release\netstandard2.0\OpenCvSharp.Extensions.xml" target="lib\netstandard2.0" />
8281

83-
<file src="..\src\Release\x64\OpenCvSharpExtern.dll" target="NativeDlls\x64\OpenCvSharpExtern.dll" />
84-
<file src="..\opencv_files_343\lib\x64\vc15\bin\opencv_ffmpeg343_64.dll" target="NativeDlls\x64\opencv_ffmpeg343_64.dll" />
85-
<file src="..\src\Release\Win32\OpenCvSharpExtern.dll" target="NativeDlls\x86\OpenCvSharpExtern.dll" />
86-
<file src="..\opencv_files_343\lib\x86\vc15\bin\opencv_ffmpeg343.dll" target="NativeDlls\x86\opencv_ffmpeg343.dll" />
82+
<file src="..\src\Release\x64\OpenCvSharpExtern.dll" target="runtimes\win10-x64\native" />
83+
<file src="..\src\Release\Win32\OpenCvSharpExtern.dll" target="runtimes\win10-x86\native" />
84+
<file src="..\opencv_files_343\lib\x64\vc15\bin\opencv_ffmpeg343_64.dll" target="runtimes\win10-x64\native" />
85+
<file src="..\opencv_files_343\lib\x86\vc15\bin\opencv_ffmpeg343.dll" target="runtimes\win10-x86\native" />
86+
<file src="OpenCvSharp3-AnyCPU.props" target="build\OpenCvSharp3-AnyCPU.props" />
8787

8888
<!--<file src="tools\init.ps1" target="tools\init.ps1" />
8989
<file src="tools\uninstall.ps1" target="tools\uninstall.ps1" />-->

‎nuget/OpenCvSharp3-AnyCPU.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22
<PropertyGroup>
3-
<NativeDlls>$(MSBuildThisFileDirectory)\..\NativeDlls</NativeDlls>
3+
<NativeDlls>$(MSBuildThisFileDirectory)..\runtimes</NativeDlls>
44
</PropertyGroup>
55
<ItemGroup>
6-
<None Include="$(NativeDlls)\x86\OpenCvSharpExtern.dll">
6+
<None Include="$(NativeDlls)\win10-x86\native\OpenCvSharpExtern.dll">
77
<Link>dll\x86\OpenCvSharpExtern.dll</Link>
88
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
99
</None>
10-
<None Include="$(NativeDlls)\x86\opencv_ffmpeg341.dll">
11-
<Link>dll\x86\opencv_ffmpeg341.dll</Link>
10+
<None Include="$(NativeDlls)\win10-x86\native\opencv_ffmpeg343.dll">
11+
<Link>dll\x86\opencv_ffmpeg343.dll</Link>
1212
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1313
</None>
1414
</ItemGroup>
1515
<ItemGroup>
16-
<None Include="$(NativeDlls)\x64\OpenCvSharpExtern.dll">
16+
<None Include="$(NativeDlls)\win10-x64\native\OpenCvSharpExtern.dll">
1717
<Link>dll\x64\OpenCvSharpExtern.dll</Link>
1818
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1919
</None>
20-
<None Include="$(NativeDlls)\x64\opencv_ffmpeg341_64.dll">
21-
<Link>dll\x64\opencv_ffmpeg341_64.dll</Link>
20+
<None Include="$(NativeDlls)\win10-x64\native\opencv_ffmpeg343_64.dll">
21+
<Link>dll\x64\opencv_ffmpeg343_64.dll</Link>
2222
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2323
</None>
2424
</ItemGroup>

‎nuget/OpenCvSharp3-WithoutDll.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<summary>OpenCV 3.x wrapper</summary>
1414
<releaseNotes></releaseNotes>
1515
<copyright>Copyright 2008-2017</copyright>
16-
<tags>Image Processing OpenCV Wrapper FFI</tags>
16+
<tags>Image Processing OpenCV Wrapper FFI opencvsharp</tags>
1717
<dependencies>
1818
<group targetFramework="net20" />
1919
<group targetFramework="net40" />

‎nuget/nuget.exe

5.24 MB
Binary file not shown.

‎nuget/nuget/NuGet.Config

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎nuget/nuget/NuGet.exe

-3.77 MB
Binary file not shown.

‎nuget/nuget/NuGet.targets

Lines changed: 0 additions & 144 deletions
This file was deleted.

‎nuget/old/OpenCvSharp-x64.nuspec

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)