Skip to content

Commit

Permalink
Merge pull request #596 from shimat/nuget_fix
Browse files Browse the repository at this point in the history
update nuspec (runtime.*.OpenCvSharp -> OpenCvSharp.runtime.*)
  • Loading branch information
shimat authored Dec 25, 2018
2 parents 78469e4 + 98d7d4a commit d1198da
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,9 @@ after_build:
if ($isWindows) {
nuget pack nuget/OpenCvSharp4.nuspec -OutputDirectory artifacts
nuget pack nuget/OpenCvSharp4.Windows.nuspec -OutputDirectory artifacts
nuget pack nuget/runtime.win.OpenCvSharp4.nuspec -OutputDirectory artifacts
nuget pack nuget/OpenCvSharp4.runtime.win.nuspec -OutputDirectory artifacts
} else {
nuget pack $env:APPVEYOR_BUILD_FOLDER/nuget/runtime.ubuntu.18.04-x64.OpenCvSharp4.nuspec -OutputDirectory $env:APPVEYOR_BUILD_FOLDER/artifacts_ubuntu
nuget pack $env:APPVEYOR_BUILD_FOLDER/nuget/OpenCvSharp4.runtime.ubuntu.18.04-x64.nuspec -OutputDirectory $env:APPVEYOR_BUILD_FOLDER/artifacts_ubuntu
}
test_script:
Expand Down
18 changes: 9 additions & 9 deletions nuget/OpenCvSharp4.Windows.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>OpenCvSharp4.Windows</id>
<version>4.0.0.20181223</version>
<version>4.0.0.20181225</version>
<title>OpenCvSharp NuGet package for x64/x86 Windows (same as OpenCvSharp3-AnyCPU)</title>
<authors>shimat</authors>
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
Expand All @@ -16,20 +16,20 @@
<tags>Image Processing OpenCV Wrapper FFI opencvsharp</tags>
<dependencies>
<group targetFramework="net20">
<dependency id="OpenCvSharp4" version="4.0.0.20181223" />
<dependency id="runtime.win.OpenCvSharp4" version="4.0.0.20181223" />
<dependency id="OpenCvSharp4" version="4.0.0.20181225" />
<dependency id="OpenCvSharp4.runtime.win" version="4.0.0.20181225" />
</group>
<group targetFramework="net40">
<dependency id="OpenCvSharp4" version="4.0.0.20181223" />
<dependency id="runtime.win.OpenCvSharp4" version="4.0.0.20181223" />
<dependency id="OpenCvSharp4" version="4.0.0.20181225" />
<dependency id="OpenCvSharp4.runtime.win" version="4.0.0.20181225" />
</group>
<group targetFramework="net461">
<dependency id="OpenCvSharp4" version="4.0.0.20181223" />
<dependency id="runtime.win.OpenCvSharp4" version="4.0.0.20181223" />
<dependency id="OpenCvSharp4" version="4.0.0.20181225" />
<dependency id="OpenCvSharp4.runtime.win" version="4.0.0.20181225" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="OpenCvSharp4" version="4.0.0.20181223" />
<dependency id="runtime.win.OpenCvSharp4" version="4.0.0.20181223" />
<dependency id="OpenCvSharp4" version="4.0.0.20181225" />
<dependency id="OpenCvSharp4.runtime.win" version="4.0.0.20181225" />
</group>
</dependencies>
<frameworkAssemblies>
Expand Down
6 changes: 3 additions & 3 deletions nuget/OpenCvSharp4.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>OpenCvSharp4</id>
<version>4.0.0.20181223</version>
<version>4.0.0.20181225</version>
<title>OpenCvSharp core library. A package of separate native bindings for your OS is required.</title>
<authors>shimat</authors>
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
<projectUrl>https://github.com/shimat/opencvsharp</projectUrl>
<iconUrl>https://raw.githubusercontent.com/shimat/opencvsharp/master/nuget/icon/opencvsharp.png</iconUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>OpenCV wrapper for .NET. Since this package includes only core managed libraries, another package of native bindings for your OS is required (runtime.*.OpenCvSharp4).</description>
<summary>OpenCV wrapper for .NET. Since this package includes only core managed libraries, another package of native bindings for your OS is required (runtime.*.OpenCvSharp4).</summary>
<description>OpenCV wrapper for .NET. Since this package includes only core managed libraries, another package of native bindings for your OS is required (OpenCvSharp4.runtime.*).</description>
<summary>OpenCV wrapper for .NET. Since this package includes only core managed libraries, another package of native bindings for your OS is required (OpenCvSharp4.runtime.*).</summary>
<releaseNotes></releaseNotes>
<copyright>Copyright 2008-2017</copyright>
<tags>Image Processing OpenCV Wrapper FFI opencvsharp</tags>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>runtime.ubuntu.18.04-x64.OpenCvSharp4</id>
<version>4.0.0.20181223</version>
<title>runtime.ubuntu.18.04-x64.OpenCvSharp</title>
<id>OpenCvSharp4.runtime.ubuntu.18.04-x64</id>
<version>4.0.0.20181225</version>
<title>OpenCvSharp native bindings for ubuntu.18.04-x64</title>
<authors>shimat</authors>
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
<projectUrl>https://github.com/shimat/opencvsharp</projectUrl>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>runtime.win.OpenCvSharp4</id>
<version>4.0.0.20181223</version>
<title>runtime.win.OpenCvSharp4</title>
<id>OpenCvSharp4.runtime.win</id>
<version>4.0.0.20181225</version>
<title>OpenCvSharp4 native bindings for Windows x64/x86</title>
<authors>shimat</authors>
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
<projectUrl>https://github.com/shimat/opencvsharp</projectUrl>
Expand All @@ -28,6 +28,6 @@
<file src="..\src\Release\Win32\OpenCvSharpExtern.dll" target="runtimes\win-x86\native" />
<file src="..\opencv_files_400\lib\x64\vc15\bin\opencv_ffmpeg400_64.dll" target="runtimes\win-x64\native" />
<file src="..\opencv_files_400\lib\x86\vc15\bin\opencv_ffmpeg400.dll" target="runtimes\win-x86\native" />
<file src="runtime.win.OpenCvSharp4.props" target="build\net\runtime.win.OpenCvSharp4.props" />
<file src="OpenCvSharp4.runtime.win.props" target="build\net\OpenCvSharp4.runtime.win.props" />
</files>
</package>
File renamed without changes.

0 comments on commit d1198da

Please sign in to comment.