Skip to content

Commit 169df39

Browse files
committed
bundles new nuget for samples
1 parent e8745e3 commit 169df39

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

nuget/OpenCvSharp3-AnyCPU.nuspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>OpenCvSharp3-AnyCPU</id>
5-
<version>3.1.0.20160116</version>
5+
<version>3.1.0.20160114</version>
66
<title>OpenCvSharp3</title>
77
<authors>shimat</authors>
88
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
@@ -61,13 +61,13 @@
6161
<file src="..\lib\vc++\x64\msvcp120.dll" target="NativeDlls\x64\msvcp120.dll" />
6262
<file src="..\lib\vc++\x64\msvcr120.dll" target="NativeDlls\x64\msvcr120.dll" />
6363
<file src="..\src\Release\x64\OpenCvSharpExtern.dll" target="NativeDlls\x64\OpenCvSharpExtern.dll" />
64-
<file src="..\lib\opencv\x64\vc12\bin\opencv_ffmpeg310_64.dll" target="NativeDlls\x64\opencv_ffmpeg300_64.dll" />
65-
<file src="..\lib\opencv\x64\vc12\bin\opencv_world310.dll" target="NativeDlls\x64\opencv_world300.dll" />
64+
<file src="..\lib\opencv\x64\vc12\bin\opencv_ffmpeg310_64.dll" target="NativeDlls\x64\opencv_ffmpeg310_64.dll" />
65+
<file src="..\lib\opencv\x64\vc12\bin\opencv_world310.dll" target="NativeDlls\x64\opencv_world310.dll" />
6666
<file src="..\lib\vc++\x86\msvcp120.dll" target="NativeDlls\x86\msvcp120.dll" />
6767
<file src="..\lib\vc++\x86\msvcr120.dll" target="NativeDlls\x86\msvcr120.dll" />
6868
<file src="..\src\Release\Win32\OpenCvSharpExtern.dll" target="NativeDlls\x86\OpenCvSharpExtern.dll" />
69-
<file src="..\lib\opencv\x86\vc12\bin\opencv_ffmpeg310.dll" target="NativeDlls\x86\opencv_ffmpeg300.dll" />
70-
<file src="..\lib\opencv\x86\vc12\bin\opencv_world310.dll" target="NativeDlls\x86\opencv_world300.dll" />
69+
<file src="..\lib\opencv\x86\vc12\bin\opencv_ffmpeg310.dll" target="NativeDlls\x86\opencv_ffmpeg310.dll" />
70+
<file src="..\lib\opencv\x86\vc12\bin\opencv_world310.dll" target="NativeDlls\x86\opencv_world310.dll" />
7171
<file src="tools\init.ps1" target="tools\init.ps1" />
7272
<file src="tools\uninstall.ps1" target="tools\uninstall.ps1" />
7373
</files>

nuget/OpenCvSharp3-AnyCPU.props

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
<Link>dll\x86\msvcr120.dll</Link>
1616
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1717
</None>
18-
<None Include="$(NativeDlls)\x86\opencv_world300.dll">
19-
<Link>dll\x86\opencv_world300.dll</Link>
18+
<None Include="$(NativeDlls)\x86\opencv_world310.dll">
19+
<Link>dll\x86\opencv_world310.dll</Link>
2020
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2121
</None>
22-
<None Include="$(NativeDlls)\x86\opencv_ffmpeg300.dll">
23-
<Link>dll\x86\opencv_ffmpeg300.dll</Link>
22+
<None Include="$(NativeDlls)\x86\opencv_ffmpeg310.dll">
23+
<Link>dll\x86\opencv_ffmpeg310.dll</Link>
2424
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2525
</None>
2626
</ItemGroup>
@@ -37,12 +37,12 @@
3737
<Link>dll\x64\msvcr120.dll</Link>
3838
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
3939
</None>
40-
<None Include="$(NativeDlls)\x64\opencv_world300.dll">
41-
<Link>dll\x64\opencv_world300.dll</Link>
40+
<None Include="$(NativeDlls)\x64\opencv_world310.dll">
41+
<Link>dll\x64\opencv_world310.dll</Link>
4242
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4343
</None>
44-
<None Include="$(NativeDlls)\x64\opencv_ffmpeg300_64.dll">
45-
<Link>dll\x64\opencv_ffmpeg300_64.dll</Link>
44+
<None Include="$(NativeDlls)\x64\opencv_ffmpeg310_64.dll">
45+
<Link>dll\x64\opencv_ffmpeg310_64.dll</Link>
4646
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4747
</None>
4848
</ItemGroup>

0 commit comments

Comments
 (0)