Skip to content

Commit

Permalink
Fix nuget pack error of runtime.win (#1519)
Browse files Browse the repository at this point in the history
* 460 -> 470

* ErrorActionPreference

* update samples
  • Loading branch information
shimat committed Jan 15, 2023
1 parent 593f9f7 commit 83ea4cc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ jobs:
- name: Pack NuGet packages
shell: powershell
run: |
$ErrorActionPreference = "Stop"
$date = Get-Date -Format "yyyyMMdd"
$version = "${env:OPENCV_VERSION}.${date}-beta"
Write-Host "version = ${version}"
Expand Down
4 changes: 2 additions & 2 deletions nuget/OpenCvSharp4.runtime.win.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<files>
<file src="..\src\Release\x64\OpenCvSharpExtern.dll" target="runtimes\win-x64\native" />
<file src="..\src\Release\Win32\OpenCvSharpExtern.dll" target="runtimes\win-x86\native" />
<file src="..\opencv_files\opencv460_win_x64\x64\vc17\bin\opencv_videoio_ffmpeg470_64.dll" target="runtimes\win-x64\native" />
<file src="..\opencv_files\opencv460_win_x86\x86\vc17\bin\opencv_videoio_ffmpeg470.dll" target="runtimes\win-x86\native" />
<file src="..\opencv_files\opencv470_win_x64\x64\vc17\bin\opencv_videoio_ffmpeg470_64.dll" target="runtimes\win-x64\native" />
<file src="..\opencv_files\opencv470_win_x86\x86\vc17\bin\opencv_videoio_ffmpeg470.dll" target="runtimes\win-x86\native" />
<file src="OpenCvSharp4.runtime.win.props" target="build\net48\OpenCvSharp4.runtime.win.props" />
<file src="OpenCvSharp4.runtime.win.props" target="build\netstandard\OpenCvSharp4.runtime.win.props" />
<file src="OpenCvSharp4.runtime.win.props" target="build\netcoreapp\OpenCvSharp4.runtime.win.props" />
Expand Down
2 changes: 1 addition & 1 deletion samples
Submodule samples updated 87 files
+3 −3 CameraOpenCV/CameraOpenCV.csproj
+0 −1 CameraOpenCV/Properties/AssemblyInfo.cs
+1 −2 SampleBase/Interfaces/ITestManager.cs
+1 −5 SampleBase/MyProcess.cs
+1 −1 SampleBase/SampleBase.csproj
+1 −1 SamplesCore.Windows/FilePath.cs
+1 −6 SamplesCore.Windows/ISample.cs
+1 −1 SamplesCore.Windows/Program.cs
+1 −1 SamplesCore.Windows/Samples/MatToWriteableBitmap.cs
+1 −1 SamplesCore.Windows/Samples/WindowGUISample.cs
+3 −3 SamplesCore.Windows/SamplesCore.Windows.csproj
+1 −1 SamplesCore/Program.cs
+0 −1 SamplesCore/Properties/AssemblyInfo.cs
+2 −2 SamplesCore/Samples/ArucoSample.cs
+1 −1 SamplesCore/Samples/BRISKSample.cs
+1 −1 SamplesCore/Samples/BgSubtractorMOG.cs
+1 −1 SamplesCore/Samples/BinarizerSample.cs
+13 −7 SamplesCore/Samples/CaffeSample.cs
+2 −4 SamplesCore/Samples/CameraCaptureSample.cs
+1 −1 SamplesCore/Samples/ClaheSample.cs
+1 −1 SamplesCore/Samples/ConnectedComponentsSample.cs
+2 −3 SamplesCore/Samples/DFT.cs
+1 −1 SamplesCore/Samples/DnnSuperresSample.cs
+1 −1 SamplesCore/Samples/DrawBestMatch.cs
+1 −1 SamplesCore/Samples/FASTSample.cs
+1 −1 SamplesCore/Samples/FREAKSample.cs
+1 −1 SamplesCore/Samples/FaceDetection.cs
+8 −11 SamplesCore/Samples/FaceDetectionDNN.cs
+1 −1 SamplesCore/Samples/FlannSample.cs
+1 −1 SamplesCore/Samples/HOGSample.cs
+1 −1 SamplesCore/Samples/HandPose.cs
+2 −3 SamplesCore/Samples/HistSample.cs
+1 −1 SamplesCore/Samples/HoughLinesSample.cs
+1 −1 SamplesCore/Samples/InpaintSample.cs
+1 −1 SamplesCore/Samples/KAZESample.cs
+1 −1 SamplesCore/Samples/KAZESample2.cs
+1 −4 SamplesCore/Samples/MDS.cs
+1 −1 SamplesCore/Samples/MSERSample.cs
+1 −2 SamplesCore/Samples/MatOperations.cs
+1 −1 SamplesCore/Samples/MergeSplitSample.cs
+1 −2 SamplesCore/Samples/MorphologySample.cs
+1 −1 SamplesCore/Samples/NormalArrayOperations.cs
+2 −3 SamplesCore/Samples/OpenVinoFaceDetection.cs
+1 −1 SamplesCore/Samples/PerspectiveTransformSample.cs
+1 −1 SamplesCore/Samples/PhotoMethods.cs
+1 −1 SamplesCore/Samples/PixelAccess.cs
+1 −1 SamplesCore/Samples/Pose.cs
+1 −1 SamplesCore/Samples/SVMSample.cs
+1 −1 SamplesCore/Samples/SeamlessClone.cs
+1 −1 SamplesCore/Samples/SiftSurfSample.cs
+1 −1 SamplesCore/Samples/SimpleBlobDetectorSample.cs
+1 −2 SamplesCore/Samples/SolveEquation.cs
+1 −1 SamplesCore/Samples/StarDetectorSample.cs
+1 −1 SamplesCore/Samples/Stitching.cs
+1 −1 SamplesCore/Samples/Subdiv2DSample.cs
+1 −3 SamplesCore/Samples/SuperResolutionSample.cs
+1 −1 SamplesCore/Samples/VideoCaptureSample.cs
+1 −1 SamplesCore/Samples/VideoWriterSample.cs
+1 −5 SamplesCore/Samples/WatershedSample.cs
+2 −2 SamplesCore/SamplesCore.csproj
+0 −1 SamplesLegacy/Properties/AssemblyInfo.cs
+1 −1 SamplesLegacy/Samples/ArucoSample.cs
+0 −1 SamplesLegacy/Samples/CaffeSample.cs
+1 −3 SamplesLegacy/Samples/CameraCaptureSample.cs
+1 −2 SamplesLegacy/Samples/DFT.cs
+1 −2 SamplesLegacy/Samples/FaceDetectionDNN.cs
+1 −2 SamplesLegacy/Samples/HistSample.cs
+0 −3 SamplesLegacy/Samples/MDS.cs
+0 −1 SamplesLegacy/Samples/MatOperations.cs
+0 −1 SamplesLegacy/Samples/MorphologySample.cs
+1 −2 SamplesLegacy/Samples/OpenVinoFaceDetection.cs
+0 −1 SamplesLegacy/Samples/SolveEquation.cs
+0 −2 SamplesLegacy/Samples/SuperResolutionSample.cs
+0 −4 SamplesLegacy/Samples/WatershedSample.cs
+3 −3 SamplesLegacy/SamplesLegacy.csproj
+2 −2 SamplesLegacy/packages.config
+3 −3 SamplesVB/SamplesVB.vbproj
+2 −2 VideoCaptureForm/App.config
+0 −3 VideoCaptureForm/Program.cs
+0 −1 VideoCaptureForm/Properties/AssemblyInfo.cs
+21 −29 VideoCaptureForm/Properties/Resources.Designer.cs
+13 −17 VideoCaptureForm/Properties/Settings.Designer.cs
+0 −5 VideoCaptureForm/VideoCaptureForm.cs
+10 −5 VideoCaptureForm/VideoCaptureForm.csproj
+3 −3 VideoCaptureForm/packages.config
+1 −7 VideoCaptureWPF/App.xaml.cs
+3 −3 VideoCaptureWPF/VideoCaptureWPF.csproj

0 comments on commit 83ea4cc

Please sign in to comment.