Skip to content

Commit

Permalink
Added dotnet core support. Folder re-organization. Moved files to Emg…
Browse files Browse the repository at this point in the history 
…u.CV.Platform and delete folder that are no longer used.
  • Loading branch information
@emgucv
emgucv committed Mar 19, 2020
1 parent 866a5ee commit 270606d
Show file tree
Hide file tree
Showing 195 changed files with 1,206 additions and 7,777 deletions.
106 changes: 73 additions & 33 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -880,8 +880,6 @@ ENDIF()
IF(HAVE_WINDESKTOP_X86 OR HAVE_WINDESKTOP_X64)
SET(EMGUCV_WINDOWS_NUGET_FILE_LIST "${EMGUCV_WINDOWS_NUGET_FILE_LIST}
<file src=\"Emgu.CV.runtime.windows.targets\" target=\"build\\${EMGUCV_WINDOWS_NUGET_ID}.targets\" />
<file src=\"..\\..\\..\\libs\\Emgu.CV.UI.dll\" target=\"lib\\net461\" />
<file src=\"..\\..\\..\\libs\\Emgu.CV.UI.xml\" target=\"lib\\net461\" />
<file src=\"..\\..\\..\\miscellaneous\\nuget_icon.png\" target=\"icon.png\" />
<file src=\"..\\..\\..\\${EMGUCV_LICENSE_FILE}\" target=\"\" />")
ENDIF()
Expand Down Expand Up @@ -954,11 +952,56 @@ IF(HAVE_LINUX_X64 OR HAVE_LINUX_X86)
ENDIF()

SET(EMGUCV_NUGET_FILE_LIST "")
SET(EMGUCV_NUGET_DEPENDENCY "")
SET(EMGUCV_NUGET_FRAMEWORK_REFERENCES "")
SET(EMGUCV_NUGET_FILE_LIST "${EMGUCV_NUGET_FILE_LIST}
<file src=\"..\\..\\..\\libs\\Emgu.CV.World.NetStandard.dll\" target=\"lib\\netstandard2.0\" />
<file src=\"..\\..\\..\\libs\\Emgu.CV.World.NetStandard.xml\" target=\"lib\\netstandard2.0\" />
<file src=\"..\\..\\..\\libs\\Emgu.CV.Platform.NetStandard.dll\" target=\"lib\\netstandard2.0\" />
<file src=\"..\\..\\..\\libs\\Emgu.CV.Platform.NetStandard.xml\" target=\"lib\\netstandard2.0\" />
<file src=\"..\\..\\..\\miscellaneous\\nuget_icon.png\" target=\"icon.png\" />
<file src=\"..\\..\\..\\${EMGUCV_LICENSE_FILE}\" target=\"\" />")
SET(EMGUCV_NUGET_DEPENDENCY "${EMGUCV_NUGET_DEPENDENCY}
<group targetFramework=\".NETStandard2.0\">
<dependency id=\"System.Drawing.Primitives\" version=\"4.3.0\" exclude=\"Build,Analyzers\" />
<dependency id=\"System.Runtime\" version=\"4.3.1\" exclude=\"Build,Analyzers\" />
<dependency id=\"System.Runtime.InteropServices.RuntimeInformation\" version=\"4.3.0\" exclude=\"Build,Analyzers\" />
</group>")
IF (HAVE_WINDESKTOP_X64 OR HAVE_WINDESKTOP_X86)
SET(EMGUCV_NUGET_FILE_LIST "${EMGUCV_NUGET_FILE_LIST}
<file src=\"..\\..\\..\\libs\\Emgu.CV.Platform.NetStandard.dll\" target=\"lib\\net461\" />
<file src=\"..\\..\\..\\libs\\Emgu.CV.Platform.NetStandard.xml\" target=\"lib\\net461\" />
<file src=\"..\\..\\..\\libs\\Emgu.CV.Platform.NetFramework.dll\" target=\"lib\\net461\" />
<file src=\"..\\..\\..\\libs\\Emgu.CV.Platform.NetFramework.xml\" target=\"lib\\net461\" />")
SET(EMGUCV_NUGET_DEPENDENCY "${EMGUCV_NUGET_DEPENDENCY}
<group targetFramework=\"net461\">
</group>")
ENDIF()
IF (HAVE_WINDESKTOP_X64 OR HAVE_WINDESKTOP_X86 OR APPLE)
SET(EMGUCV_NUGET_FILE_LIST "${EMGUCV_NUGET_FILE_LIST}
<file src=\"..\\..\\..\\libs\\Emgu.CV.Platform.NetStandard.dll\" target=\"lib\\netcoreapp3.1\" />
<file src=\"..\\..\\..\\libs\\Emgu.CV.Platform.NetStandard.xml\" target=\"lib\\netcoreapp3.1\" />
<file src=\"..\\..\\..\\libs\\Emgu.CV.Platform.NetCore.dll\" target=\"lib\\netcoreapp3.1\" />
<file src=\"..\\..\\..\\libs\\Emgu.CV.Platform.NetCore.xml\" target=\"lib\\netcoreapp3.1\" />")
SET(EMGUCV_NUGET_DEPENDENCY "${EMGUCV_NUGET_DEPENDENCY}
<group targetFramework=\".NETCoreApp3.1\">
<dependency id=\"System.Drawing.Primitives\" version=\"4.3.0\" exclude=\"Build,Analyzers\" />
<dependency id=\"System.Runtime\" version=\"4.3.1\" exclude=\"Build,Analyzers\" />
<dependency id=\"System.Runtime.InteropServices.RuntimeInformation\" version=\"4.3.0\" exclude=\"Build,Analyzers\" />
<dependency id=\"System.Drawing.Common\" version=\"4.7.0\" exclude=\"Build,Analyzers\" />
</group>")
SET(EMGUCV_NUGET_FRAMEWORK_REFERENCES "${EMGUCV_NUGET_FRAMEWORK_REFERENCES}
<group targetFramework=\".NETCoreApp3.1\">
<frameworkReference name=\"Microsoft.WindowsDesktop.App.WindowsForms\" />
</group>")
ENDIF()
SET(EMGUCV_NUGET_DEPENDENCY "
<dependencies>
${EMGUCV_NUGET_DEPENDENCY}
</dependencies>")

SET(EMGUCV_NUGET_FRAMEWORK_REFERENCES "
<frameworkReferences>
${EMGUCV_NUGET_FRAMEWORK_REFERENCES}
</frameworkReferences>")

SET(EMGUCV_NUGET_TITLE_ARCH "")
IF(HAVE_WINDESKTOP_X86)
Expand All @@ -974,6 +1017,8 @@ SET(EMGUCV_WINDOWS_NUGET_TITLE "EMGU CV ${EMGUCV_NUGET_TITLE_ARCH}")
#SET(EMGUCV_WINDOWS_NUGET_TITLE "EMGU CV ${EMGUCV_NUGET_TITLE_ARCH}")
STRING(STRIP "${EMGUCV_WINDOWS_NUGET_TITLE}" EMGUCV_WINDOWS_NUGET_TITLE)



#SET(EMGUCV_WINDOWS_NET461_NUGET_DEPENDENCY "")
SET(EMGUCV_WINDOWS_NETSTANDARD_NUGET_DEPENDENCY "<dependency id=\"${EMGUCV_NUGET_ID}\" version=\"[${CPACK_PACKAGE_VERSION}]\" />")
#SET(EMGUCV_WINDOWS_NUGET_DEPENDENCY "")
Expand Down Expand Up @@ -1066,24 +1111,26 @@ SET(EMGUCV_WINDOWS_NUGET_DEPENDENCY " <dependencies>
IF(HAVE_ANDROID_ALL_ARCH AND WIN32)
SET(EMGUCV_ANDROID_NUGET_TITLE "Emgu CV for Android Native Runtime")
SET(EMGUCV_ANDROID_NUGET_FILE_LIST "
<file src=\"..\\..\\..\\libs\\Emgu.CV.Runtime.Android.dll\" target=\"lib\\MonoAndroid50\" />
<file src=\"..\\..\\..\\libs\\Emgu.CV.Runtime.Android.xml\" target=\"lib\\MonoAndroid50\" />")
<file src=\"..\\..\\..\\libs\\Emgu.CV.Platform.Android.dll\" target=\"lib\\MonoAndroid50\" />
<file src=\"..\\..\\..\\libs\\Emgu.CV.Platform.Android.xml\" target=\"lib\\MonoAndroid50\" />")
SET(EMGUCV_ANDROID_NUGET_FILE_LIST "${EMGUCV_ANDROID_NUGET_FILE_LIST}
<file src=\"Emgu.CV.runtime.android.targets\" target=\"build\\${EMGUCV_ANDROID_NUGET_ID}.targets\" />
<file src=\"..\\..\\..\\miscellaneous\\nuget_icon.png\" target=\"icon.png\" />
<file src=\"..\\..\\..\\${LICENSE_FILE_NAME}\" target=\"\" />")
SET(EMGUCV_ANDROID_NUGET_DEPENDENCY "
<dependencies>
<dependency id=\"${EMGUCV_NUGET_ID}\" version=\"[${CPACK_PACKAGE_VERSION}]\" />
<group targetFramework=\"MonoAndroid5.0\">
<dependency id=\"${EMGUCV_NUGET_ID}\" version=\"[${CPACK_PACKAGE_VERSION}]\" />
</group>
</dependencies>")
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Emgu.CV.runtime.android.Package.nuspec.in ${CMAKE_CURRENT_SOURCE_DIR}/platforms/nuget/Emgu.CV.runtime.android/Package.nuspec)
ENDIF()

IF(HAVE_IOS AND WIN32)
SET(EMGUCV_IOS_NUGET_TITLE "Emgu CV for iOS")
SET(EMGUCV_IOS_NUGET_FILE_LIST "
<file src=\"..\\..\\..\\libs\\Emgu.CV.World.IOS.dll\" target=\"lib\\Xamarin.iOS10\" />
<file src=\"..\\..\\..\\libs\\Emgu.CV.World.IOS.XML\" target=\"lib\\Xamarin.iOS10\" />")
<file src=\"..\\..\\..\\libs\\Emgu.CV.Platform.IOS.dll\" target=\"lib\\Xamarin.iOS10\" />
<file src=\"..\\..\\..\\libs\\Emgu.CV.Platform.IOS.XML\" target=\"lib\\Xamarin.iOS10\" />")
SET(EMGUCV_IOS_NUGET_FILE_LIST "${EMGUCV_IOS_NUGET_FILE_LIST}
<file src=\"Emgu.CV.runtime.ios.targets\" target=\"build\\${EMGUCV_IOS_NUGET_ID}.targets\" />
<file src=\"..\\..\\..\\miscellaneous\\nuget_icon.png\" target=\"icon.png\" />
Expand Down Expand Up @@ -1280,28 +1327,21 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/CvInvokeEntryPoints.cs.in ${CMA
# ----------------------------------------------------------------------------
# Build the managed dlls of Emgu CV
# ----------------------------------------------------------------------------
#IF(NOT IOS)
ADD_SUBDIRECTORY(Emgu.Util)
ADD_SUBDIRECTORY(Emgu.CV)
ADD_SUBDIRECTORY(Emgu.CV.UI)
ADD_SUBDIRECTORY(Emgu.CV.Example)
#ADD_SUBDIRECTORY(Emgu.UI)
ADD_SUBDIRECTORY(Emgu.CV.Test)
ADD_SUBDIRECTORY(Emgu.CV.Cuda)
IF (EMGU_CV_WITH_TESSERACT)
ADD_SUBDIRECTORY(Emgu.CV.OCR)
ENDIF()

ADD_SUBDIRECTORY(Emgu.CV.Contrib)
# IF(NOT (NETFX_CORE OR ANDROID))
# ADD_SUBDIRECTORY(Emgu.CV.UI.GL)
# ENDIF()
ADD_SUBDIRECTORY(Emgu.CV.World)
#ENDIF()
ADD_SUBDIRECTORY(Emgu.Util)
ADD_SUBDIRECTORY(Emgu.CV)
ADD_SUBDIRECTORY(Emgu.CV.Platform)
ADD_SUBDIRECTORY(Emgu.CV.Example)
ADD_SUBDIRECTORY(Emgu.CV.Test)
ADD_SUBDIRECTORY(Emgu.CV.Cuda)
IF (EMGU_CV_WITH_TESSERACT)
ADD_SUBDIRECTORY(Emgu.CV.OCR)
ENDIF()

ADD_SUBDIRECTORY(Emgu.CV.Contrib)

ADD_SUBDIRECTORY(Emgu.CV.Runtime)
#IF(WIN32)
ADD_SUBDIRECTORY(platforms/nuget)
#ENDIF()
ADD_SUBDIRECTORY(platforms/nuget)


IF(HAVE_ANDROID)
INSTALL(
Expand Down Expand Up @@ -1439,8 +1479,8 @@ ELSEIF (WIN32)
#ENDFOREACH()
IF (HAS_WINDESKTOP_X86_NATIVE_BINARY)
SET(DEBUGER_VISUALIZER_FILES
"Emgu.CV.World.Netstandard"
"Emgu.CV.UI")
"Emgu.CV.Platform.NetStandard"
"Emgu.CV.Platform.NetFramework")
#"Emgu.CV.DebuggerVisualizers")
#SET(DEBUGGER_VISUALIZER_UNMANAGED_FILES
# "Emgu.CV.DebuggerVisualizers"
Expand Down Expand Up @@ -2017,7 +2057,7 @@ ELSEIF (APPLE)
ELSE() #LINUX
SET(MONO_GACUTIL_EXEC "gacutil")
SET(LINUX_CONTROL_FILE_FOLDER "${CMAKE_CURRENT_SOURCE_DIR}/cmake/linux")
SET(EMGUCV_MANAGED_DLLS "Emgu.CV.World" "Emgu.CV.UI")
SET(EMGUCV_MANAGED_DLLS "Emgu.CV.Platform.NetStandard" "Emgu.CV.Platform.NetCore")

SET(CLIFILELIST_CONTENT "")
FOREACH(MANAGED_DLL ${EMGUCV_MANAGED_DLLS})
Expand Down
47 changes: 1 addition & 46 deletions Emgu.CV.DebuggerVisualizers/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,55 +4,10 @@

IF((EMGU_CV_BUILD OR EMGU_CV_EXAMPLE_BUILD) AND WIN32)

#MACRO(COMPILE_DEBUGGER_VISUALIZER DEBUGGER_VISUALIZER_NAME DEBUGGER_VISUALIZER_CODENAME)
#
# FIND_FILE(DEBUGGER_VISUALIZER_REF_${DEBUGGER_VISUALIZER_CODENAME}
# NAME Microsoft.VisualStudio.DebuggerVisualizers.dll
# #HINTS
# #"$ENV{ProgramFiles} (x86)/Microsoft Visual Studio ${DEBUGGER_VISUALIZER_CODENAME}/Common7/IDE/PublicAssemblies"
# #"$ENV{ProgramFiles}/Microsoft Visual Studio ${DEBUGGER_VISUALIZER_CODENAME}/Common7/IDE/PublicAssemblies"
# PATHS
# "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio ${DEBUGGER_VISUALIZER_CODENAME}/Common7/IDE/PublicAssemblies"
# "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio ${DEBUGGER_VISUALIZER_CODENAME}/Common7/IDE/ReferenceAssemblies/v2.0"
# "$ENV{ProgramFiles}/Microsoft Visual Studio ${DEBUGGER_VISUALIZER_CODENAME}/Common7/IDE/PublicAssemblies"
# "$ENV{ProgramFiles}/Microsoft Visual Studio ${DEBUGGER_VISUALIZER_CODENAME}/Common7/IDE/ReferenceAssemblies/v2.0"
# "$ENV{ProgramFiles} (x86)/Microsoft Visual Studio/${DEBUGGER_VISUALIZER_CODENAME}/Community/Common7/IDE/ReferenceAssemblies/v2.0"
# )
# #MESSAGE(STATUS "DEBUGGER_VISUALIZER_REF_${DEBUGGER_VISUALIZER_CODENAME}: ${DEBUGGER_VISUALIZER_REF_${DEBUGGER_VISUALIZER_CODENAME}}")
# IF(DEBUGGER_VISUALIZER_REF_${DEBUGGER_VISUALIZER_CODENAME})
# PROJECT(${DEBUGGER_VISUALIZER_NAME})
# FILE(GLOB_RECURSE SRC_CV_DEBUGGER_VISUALIZER ${CMAKE_CURRENT_SOURCE_DIR} "*.cs")
# SET(SRC_CV_DEBUGGER_VISUALIZER ${SRC_CV_DEBUGGER_VISUALIZER} ${CMAKE_CURRENT_SOURCE_DIR}/../CommonAssemblyInfo.cs)
# SIGN_ASSEMBLY(${CMAKE_CURRENT_SOURCE_DIR}/../Emgu.CV.snk)
# ADD_CS_REFERENCES("System.Drawing.dll;${LIBRARY_OUTPUT_PATH}/Emgu.CV.World.Netstandard.dll;${LIBRARY_OUTPUT_PATH}/Emgu.CV.UI.dll;${DEBUGGER_VISUALIZER_REF_${DEBUGGER_VISUALIZER_CODENAME}}")
# MESSAGE(STATUS "Configuring ${DEBUGGER_VISUALIZER_NAME} (${DEBUGGER_VISUALIZER_CODENAME}) with ${DEBUGGER_VISUALIZER_REF_${DEBUGGER_VISUALIZER_CODENAME}}")
# COMPILE_CS(${DEBUGGER_VISUALIZER_NAME} "library" "${SRC_CV_DEBUGGER_VISUALIZER}" ALL)
#
# if(ENABLE_SOLUTION_FOLDERS)
# set_target_properties(${DEBUGGER_VISUALIZER_NAME} PROPERTIES FOLDER "emgu")
# endif()
#
# ADD_DEPENDENCIES(${DEBUGGER_VISUALIZER_NAME} Emgu.CV.UI)
#
# INSTALL(
# FILES
# ${LIBRARY_OUTPUT_PATH}/${DEBUGGER_VISUALIZER_NAME}.dll
# DESTINATION ${CPACK_PACKAGE_CLI_FOLDER}
# COMPONENT emgucv_binary)
# ENDIF()
#ENDMACRO()

#COMPILE_DEBUGGER_VISUALIZER(Emgu.CV.DebuggerVisualizers.VS2008 9.0)
#COMPILE_DEBUGGER_VISUALIZER(Emgu.CV.DebuggerVisualizers.VS2010 10.0)
#COMPILE_DEBUGGER_VISUALIZER(Emgu.CV.DebuggerVisualizers.VS2012 11.0)
#COMPILE_DEBUGGER_VISUALIZER(Emgu.CV.DebuggerVisualizers.VS2013 12.0)
#COMPILE_DEBUGGER_VISUALIZER(Emgu.CV.DebuggerVisualizers.VS2015 14.0)
#COMPILE_DEBUGGER_VISUALIZER(Emgu.CV.DebuggerVisualizers.VS2017 2017)
#COMPILE_DEBUGGER_VISUALIZER(Emgu.CV.DebuggerVisualizers.VS2019 2019)
PROJECT(Emgu.CV.DebuggerVisualizers)

BUILD_CSPROJ_IN_SOLUTION(${PROJECT_NAME} "${CMAKE_CURRENT_SOURCE_DIR}/../Solution/Windows.Desktop/Emgu.CV.DebuggerVisualizers.sln" "Emgu.CV.DebuggerVisualizers" "${EXTRA_BUILD_FLAGS}" ALL)
ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.CV.UI)
ADD_DEPENDENCIES(${PROJECT_NAME} Emgu.CV.Platform.NetFramework)

INSTALL(
FILES
Expand Down
21 changes: 8 additions & 13 deletions Emgu.CV.DebuggerVisualizers/Emgu.CV.DebuggerVisualizers.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,23 +93,18 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="..\CommonAssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Emgu.CV.UI\Emgu.CV.UI.csproj">
<Project>{90E78BBF-C7FE-4D8E-ADE1-75448E866FDB}</Project>
<Name>Emgu.CV.UI</Name>
</ProjectReference>
<ProjectReference Include="..\Emgu.CV.World\NetStandard\Emgu.CV.World.NetStandard.csproj">
<Project>{7b084957-6092-46b6-809e-7355555ac0cf}</Project>
<Name>Emgu.CV.World.NetStandard</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Service Include="{B4F97281-0DBD-4835-9ED8-7DFB966E87FF}" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="ZedGraph">
<Version>5.1.7</Version>
</PackageReference>
<ProjectReference Include="..\Emgu.CV.Platform\DotNet\Framework\Emgu.CV.Platform.NetFramework.csproj">
<Project>{90e78bbf-c7fe-4d8e-ade1-75448e866fdb}</Project>
<Name>Emgu.CV.Platform.NetFramework</Name>
</ProjectReference>
<ProjectReference Include="..\Emgu.CV.Platform\NetStandard\Emgu.CV.Platform.NetStandard.csproj">
<Project>{5db57d3a-1db6-4930-ae6a-e1587140b0c6}</Project>
<Name>Emgu.CV.Platform.NetStandard</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Target Name="DeployBinary" AfterTargets="AfterBuild">
Expand Down
10 changes: 5 additions & 5 deletions Emgu.CV.Example/Aruco/Aruco.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Emgu.CV.UI\Emgu.CV.UI.csproj">
<ProjectReference Include="..\..\Emgu.CV.Platform\DotNet\Framework\Emgu.CV.Platform.NetFramework.csproj">
<Project>{90e78bbf-c7fe-4d8e-ade1-75448e866fdb}</Project>
<Name>Emgu.CV.UI</Name>
<Name>Emgu.CV.Platform.NetFramework</Name>
</ProjectReference>
<ProjectReference Include="..\..\Emgu.CV.World\NetStandard\Emgu.CV.World.NetStandard.csproj">
<Project>{896fd1e3-99f5-4a83-8be6-cacf4a2c82a4}</Project>
<Name>Emgu.CV.World.NetStandard</Name>
<ProjectReference Include="..\..\Emgu.CV.Platform\NetStandard\Emgu.CV.Platform.Netstandard.csproj">
<Project>{f8ccdef7-e79a-4fd5-8c0e-9290059c7dd6}</Project>
<Name>Emgu.CV.Platform.Netstandard</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\..\Emgu.CV.Runtime\Windows\Emgu.CV.Runtime.Windows.projitems" Label="Shared" />
Expand Down
20 changes: 8 additions & 12 deletions Emgu.CV.Example/CameraCapture/CameraCapture.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,6 @@
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="ZedGraph, Version=5.1.5.28844, Culture=neutral, PublicKeyToken=02a83cbd123fcd60, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\3rdParty\ZedGraph.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="CameraCapture.cs">
Expand Down Expand Up @@ -146,18 +142,18 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Emgu.CV.UI\Emgu.CV.UI.csproj">
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Emgu.CV.Platform\DotNet\Framework\Emgu.CV.Platform.NetFramework.csproj">
<Project>{90e78bbf-c7fe-4d8e-ade1-75448e866fdb}</Project>
<Name>Emgu.CV.UI</Name>
<Name>Emgu.CV.Platform.NetFramework</Name>
</ProjectReference>
<ProjectReference Include="..\..\Emgu.CV.World\NetStandard\Emgu.CV.World.NetStandard.csproj">
<Project>{896fd1e3-99f5-4a83-8be6-cacf4a2c82a4}</Project>
<Name>Emgu.CV.World.NetStandard</Name>
<ProjectReference Include="..\..\Emgu.CV.Platform\NetStandard\Emgu.CV.Platform.Netstandard.csproj">
<Project>{f8ccdef7-e79a-4fd5-8c0e-9290059c7dd6}</Project>
<Name>Emgu.CV.Platform.Netstandard</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
</ItemGroup>
<Import Project="..\..\Emgu.CV.Runtime\Windows\Emgu.CV.Runtime.Windows.projitems" Label="Shared" />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
10 changes: 5 additions & 5 deletions Emgu.CV.Example/FaceDetectionVB/FaceDetectionVB.vbproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,13 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Emgu.CV.UI\Emgu.CV.UI.csproj">
<ProjectReference Include="..\..\Emgu.CV.Platform\DotNet\Framework\Emgu.CV.Platform.NetFramework.csproj">
<Project>{90e78bbf-c7fe-4d8e-ade1-75448e866fdb}</Project>
<Name>Emgu.CV.UI</Name>
<Name>Emgu.CV.Platform.NetFramework</Name>
</ProjectReference>
<ProjectReference Include="..\..\Emgu.CV.World\NetStandard\Emgu.CV.World.NetStandard.csproj">
<Project>{896fd1e3-99f5-4a83-8be6-cacf4a2c82a4}</Project>
<Name>Emgu.CV.World.NetStandard</Name>
<ProjectReference Include="..\..\Emgu.CV.Platform\NetStandard\Emgu.CV.Platform.Netstandard.csproj">
<Project>{f8ccdef7-e79a-4fd5-8c0e-9290059c7dd6}</Project>
<Name>Emgu.CV.Platform.Netstandard</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\..\Emgu.CV.Runtime\Windows\Emgu.CV.Runtime.Windows.projitems" Label="Shared" />
Expand Down
8 changes: 4 additions & 4 deletions Emgu.CV.Example/HelloWorld/HelloWorld.csproj → ...mple/HelloWorld/HelloWorld.NetCore.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\Emgu.CV.World\Netstandard\Emgu.CV.World.Netstandard.csproj" />
</ItemGroup>

<Import Project="..\..\Emgu.CV.Runtime\Windows\Emgu.CV.Runtime.Windows.projitems" Label="Shared" />

<Import Project="..\..\Emgu.CV.Runtime\Mac\Emgu.CV.Runtime.Mac.projitems" Label="Shared" />

<Import Project="..\..\Emgu.CV.Runtime\Raspbian\Emgu.CV.Runtime.Raspbian.projitems" Label="Shared" />

<ItemGroup>
<ProjectReference Include="..\..\Emgu.CV.Platform\NetStandard\Emgu.CV.Platform.Netstandard.csproj" />
</ItemGroup>

</Project>
Binary file removed Emgu.CV.Example/ImageDatabase/Antlr3.Runtime.dll
View file
Binary file not shown.
Binary file removed Emgu.CV.Example/ImageDatabase/Iesi.Collections.dll
View file
Binary file not shown.
Loading

0 comments on commit 270606d

Please sign in to comment.