Skip to content

Commit

Permalink
bundles new nuget for samples
Browse files Browse the repository at this point in the history
  • Loading branch information
shimat committed Jan 16, 2016
1 parent e8745e3 commit 169df39
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
10 changes: 5 additions & 5 deletions nuget/OpenCvSharp3-AnyCPU.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>OpenCvSharp3-AnyCPU</id>
<version>3.1.0.20160116</version>
<version>3.1.0.20160114</version>
<title>OpenCvSharp3</title>
<authors>shimat</authors>
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
Expand Down Expand Up @@ -61,13 +61,13 @@
<file src="..\lib\vc++\x64\msvcp120.dll" target="NativeDlls\x64\msvcp120.dll" />
<file src="..\lib\vc++\x64\msvcr120.dll" target="NativeDlls\x64\msvcr120.dll" />
<file src="..\src\Release\x64\OpenCvSharpExtern.dll" target="NativeDlls\x64\OpenCvSharpExtern.dll" />
<file src="..\lib\opencv\x64\vc12\bin\opencv_ffmpeg310_64.dll" target="NativeDlls\x64\opencv_ffmpeg300_64.dll" />
<file src="..\lib\opencv\x64\vc12\bin\opencv_world310.dll" target="NativeDlls\x64\opencv_world300.dll" />
<file src="..\lib\opencv\x64\vc12\bin\opencv_ffmpeg310_64.dll" target="NativeDlls\x64\opencv_ffmpeg310_64.dll" />
<file src="..\lib\opencv\x64\vc12\bin\opencv_world310.dll" target="NativeDlls\x64\opencv_world310.dll" />
<file src="..\lib\vc++\x86\msvcp120.dll" target="NativeDlls\x86\msvcp120.dll" />
<file src="..\lib\vc++\x86\msvcr120.dll" target="NativeDlls\x86\msvcr120.dll" />
<file src="..\src\Release\Win32\OpenCvSharpExtern.dll" target="NativeDlls\x86\OpenCvSharpExtern.dll" />
<file src="..\lib\opencv\x86\vc12\bin\opencv_ffmpeg310.dll" target="NativeDlls\x86\opencv_ffmpeg300.dll" />
<file src="..\lib\opencv\x86\vc12\bin\opencv_world310.dll" target="NativeDlls\x86\opencv_world300.dll" />
<file src="..\lib\opencv\x86\vc12\bin\opencv_ffmpeg310.dll" target="NativeDlls\x86\opencv_ffmpeg310.dll" />
<file src="..\lib\opencv\x86\vc12\bin\opencv_world310.dll" target="NativeDlls\x86\opencv_world310.dll" />
<file src="tools\init.ps1" target="tools\init.ps1" />
<file src="tools\uninstall.ps1" target="tools\uninstall.ps1" />
</files>
Expand Down
16 changes: 8 additions & 8 deletions nuget/OpenCvSharp3-AnyCPU.props
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
<Link>dll\x86\msvcr120.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(NativeDlls)\x86\opencv_world300.dll">
<Link>dll\x86\opencv_world300.dll</Link>
<None Include="$(NativeDlls)\x86\opencv_world310.dll">
<Link>dll\x86\opencv_world310.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(NativeDlls)\x86\opencv_ffmpeg300.dll">
<Link>dll\x86\opencv_ffmpeg300.dll</Link>
<None Include="$(NativeDlls)\x86\opencv_ffmpeg310.dll">
<Link>dll\x86\opencv_ffmpeg310.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
Expand All @@ -37,12 +37,12 @@
<Link>dll\x64\msvcr120.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(NativeDlls)\x64\opencv_world300.dll">
<Link>dll\x64\opencv_world300.dll</Link>
<None Include="$(NativeDlls)\x64\opencv_world310.dll">
<Link>dll\x64\opencv_world310.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="$(NativeDlls)\x64\opencv_ffmpeg300_64.dll">
<Link>dll\x64\opencv_ffmpeg300_64.dll</Link>
<None Include="$(NativeDlls)\x64\opencv_ffmpeg310_64.dll">
<Link>dll\x64\opencv_ffmpeg310_64.dll</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
Expand Down

0 comments on commit 169df39

Please sign in to comment.