Skip to content

Commit 1c34215

Browse files
shimatshimat
committed
3.4.3 -> 3.4.4
1 parent 1866016 commit 1c34215

File tree

12 files changed

+63
-51
lines changed

12 files changed

+63
-51
lines changed

‎.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[submodule "samples"]
22
path = samples
33
url = https://github.com/shimat/opencvsharp_samples.git
4-
[submodule "opencv_files_343"]
5-
path = opencv_files_343
6-
url = https://github.com/shimat/opencv_files_343
4+
[submodule "opencv_files_344"]
5+
path = opencv_files_344
6+
url = https://github.com/shimat/opencv_files_344

‎nuget/OpenCvSharp3-AnyCPU.nuspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>OpenCvSharp3-AnyCPU</id>
5-
<version>3.4.3.20181114-beta</version>
5+
<version>3.4.4.20181118-beta</version>
66
<title>OpenCvSharp3</title>
77
<authors>shimat</authors>
88
<licenseUrl>http://opensource.org/licenses/BSD-3-Clause</licenseUrl>
@@ -81,8 +81,8 @@
8181

8282
<file src="..\src\Release\x64\OpenCvSharpExtern.dll" target="runtimes\win10-x64\native" />
8383
<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" />
84+
<file src="..\opencv_files_344\lib\x64\vc15\bin\opencv_ffmpeg344_64.dll" target="runtimes\win10-x64\native" />
85+
<file src="..\opencv_files_344\lib\x86\vc15\bin\opencv_ffmpeg344.dll" target="runtimes\win10-x86\native" />
8686
<file src="OpenCvSharp3-AnyCPU.props" target="build\OpenCvSharp3-AnyCPU.props" />
8787

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

‎nuget/OpenCvSharp3-AnyCPU.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<Link>dll\x86\OpenCvSharpExtern.dll</Link>
88
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
99
</None>
10-
<None Include="$(NativeDlls)\win10-x86\native\opencv_ffmpeg343.dll">
11-
<Link>dll\x86\opencv_ffmpeg343.dll</Link>
10+
<None Include="$(NativeDlls)\win10-x86\native\opencv_ffmpeg344.dll">
11+
<Link>dll\x86\opencv_ffmpeg344.dll</Link>
1212
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1313
</None>
1414
</ItemGroup>
@@ -17,8 +17,8 @@
1717
<Link>dll\x64\OpenCvSharpExtern.dll</Link>
1818
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
1919
</None>
20-
<None Include="$(NativeDlls)\win10-x64\native\opencv_ffmpeg343_64.dll">
21-
<Link>dll\x64\opencv_ffmpeg343_64.dll</Link>
20+
<None Include="$(NativeDlls)\win10-x64\native\opencv_ffmpeg344_64.dll">
21+
<Link>dll\x64\opencv_ffmpeg344_64.dll</Link>
2222
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
2323
</None>
2424
</ItemGroup>

‎opencv_files_343

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎opencv_files_344

Submodule opencv_files_344 added at d0d7afd

‎src/OpenCvSharp.ReleaseMaker/MainForm.Designer.cs

Lines changed: 36 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/OpenCvSharp.ReleaseMaker/OpenCvSharp.ReleaseMaker.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>OpenCvSharp.ReleaseMaker</RootNamespace>
1212
<AssemblyName>OpenCvSharp.ReleaseMaker</AssemblyName>
13-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<FileUpgradeFlags>
1616
</FileUpgradeFlags>

‎src/OpenCvSharp.ReleaseMaker/Properties/Resources.Designer.cs

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/OpenCvSharp.ReleaseMaker/Properties/Settings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/OpenCvSharp.ReleaseMaker/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>

‎src/OpenCvSharp/OpenCvSharp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1414
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
1515
<Configurations>Debug;Release;Release-JP</Configurations>
16-
<LangVersion>7.2</LangVersion>
16+
<LangVersion>7.3</LangVersion>
1717
</PropertyGroup>
1818

1919
<ItemGroup>

0 commit comments

Comments
 (0)