Fix MAUI android runtime's Emgu.CV dependency version.

iorileslie · Apr 8, 2023 · 754f024 · 754f024
1 parent 1f7a853
commit 754f024
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Emgu.CV.Platform/Maui/Android/Emgu.CV.Platform.Maui.Android.csproj b/Emgu.CV.Platform/Maui/Android/Emgu.CV.Platform.Maui.Android.csproj
@@ -73,8 +73,6 @@
  <EmguCVBuildAndroidx8664 Condition="$(AndroidSupportedAbis.Contains('x86_64%3')) OR $(AndroidSupportedAbis.Contains('x86_64,')) OR $(AndroidSupportedAbis.Contains('x86_64;')) OR $(AndroidSupportedAbis.EndsWith('x86_64')) OR ('$(AndroidSupportedAbis)'=='' AND '$(Platform)'=='AnyCPU') OR ('$(Platform)'=='x86_64')">True</EmguCVBuildAndroidx8664>
  <EmguCVMauiAndroidErrorMessage Condition="'$(EmguCVBuildAndroidx8664)'=='True' AND !Exists('$(EmguCVNativex8664)')">This package do not contain necessary binary for $(EmguCVLinkTarget). Emgu CV for Android Commercial License is required. x86_64 is targeted, but file $(EmguCVNativex8664) is missing.</EmguCVMauiAndroidErrorMessage>
  <EmguCVMauiAndroidDeployMessage Condition="'$(EmguCVBuildAndroidx8664)'=='True' AND Exists('$(EmguCVNativex8664)')">$(EmguCVMauiAndroidDeployMessage)x86_64 </EmguCVMauiAndroidDeployMessage>
- <PackageTags>a;b;c</PackageTags>
- <PackageProjectUrl>proj_url</PackageProjectUrl>
  </PropertyGroup>
  <!-- armeabi-v7a -->
  <ItemGroup Condition="'$(EmguCVBuildAndroidArmeabiv7a)'=='True' AND Exists('$(EmguCVNativeArmeabiv7a)')">

diff --git a/cmake/Emgu.CV.Platform.NetStandard.Directory.Build.props.in b/cmake/Emgu.CV.Platform.NetStandard.Directory.Build.props.in
@@ -1,4 +1,7 @@
 <?xml version="1.0"?>
 <Project>
+ <PropertyGroup>
+ <version>${CPACK_PACKAGE_VERSION}</version>
+ </PropertyGroup>
  ${EMGUCV_POST_PROCESS_BINARY}
 </Project>
diff --git a/cmake/Emgu.CV.Platform.NetStandard.IOS.Directory.Build.props.in b/cmake/Emgu.CV.Platform.NetStandard.IOS.Directory.Build.props.in
@@ -1,4 +1,7 @@
 <?xml version="1.0"?>
 <Project>
+ <PropertyGroup>
+ <version>${CPACK_PACKAGE_VERSION}</version>
+ </PropertyGroup>
  ${EMGUCV_IOS_POST_PROCESS_BINARY}
 </Project>