Browse Source

Rename WPF.NetCore to HelloWorld.WPF

pull/768/merge
Canming Huang 7 months ago
parent
commit
9709ae92ec
  1. 3
      CMakeLists.txt
  2. 0
      Emgu.CV.Example/HelloWorld.WPF/App.xaml
  3. 0
      Emgu.CV.Example/HelloWorld.WPF/App.xaml.cs
  4. 0
      Emgu.CV.Example/HelloWorld.WPF/AssemblyInfo.cs
  5. 2
      Emgu.CV.Example/HelloWorld.WPF/HelloWorld.WPF.csproj
  6. 0
      Emgu.CV.Example/HelloWorld.WPF/Window1.xaml
  7. 0
      Emgu.CV.Example/HelloWorld.WPF/Window1.xaml.cs
  8. 2
      Solution/CrossPlatform/Emgu.CV.CrossPlatform.sln
  9. 2
      Solution/Windows.Desktop/Emgu.CV.Example.sln
  10. 6
      cmake/Emgu.CV.HelloWorld.WPF.Directory.Build.props.in

3
CMakeLists.txt

@ -1987,7 +1987,8 @@ ENDIF()
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Emgu.CV.BuildInfo.Console.Directory.Build.props.in ${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV.Example/BuildInfo.Console/Directory.Build.props)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Emgu.CV.Test.Net.Directory.Build.props.in ${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV.Test/Emgu.CV.Test.Net/Directory.Build.props)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Emgu.CV.DynamicImage.Asp.Net.Directory.Build.props.in ${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV.Example/DynamicImage.Asp.Net/Directory.Build.props)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Emgu.CV.HelloWorld.Console.Directory.Build.props.in ${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV.Example/HelloWorld/Directory.Build.props)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Emgu.CV.HelloWorld.Console.Directory.Build.props.in ${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV.Example/HelloWorld.Console/Directory.Build.props)
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/cmake/Emgu.CV.HelloWorld.WPF.Directory.Build.props.in ${CMAKE_CURRENT_SOURCE_DIR}/Emgu.CV.Example/HelloWorld.WPF/Directory.Build.props)
IF(HAVE_WINSTORE_10)
SET(EMGUCV_UWP_NUGET_TITLE "Emgu CV for UWP Native Runtime")

0
Emgu.CV.Example/WPF.NetCore/App.xaml → Emgu.CV.Example/HelloWorld.WPF/App.xaml

0
Emgu.CV.Example/WPF.NetCore/App.xaml.cs → Emgu.CV.Example/HelloWorld.WPF/App.xaml.cs

0
Emgu.CV.Example/WPF.NetCore/AssemblyInfo.cs → Emgu.CV.Example/HelloWorld.WPF/AssemblyInfo.cs

2
Emgu.CV.Example/WPF.NetCore/WPF.NetCore.csproj → Emgu.CV.Example/HelloWorld.WPF/HelloWorld.WPF.csproj

@ -2,7 +2,7 @@
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net7.0-windows</TargetFramework>
<!-- <TargetFramework>net7.0-windows</TargetFramework> -->
<UseWPF>true</UseWPF>
<Platforms>AnyCPU;x64;x86</Platforms>
</PropertyGroup>

0
Emgu.CV.Example/WPF.NetCore/Window1.xaml → Emgu.CV.Example/HelloWorld.WPF/Window1.xaml

0
Emgu.CV.Example/WPF.NetCore/Window1.xaml.cs → Emgu.CV.Example/HelloWorld.WPF/Window1.xaml.cs

2
Solution/CrossPlatform/Emgu.CV.CrossPlatform.sln

@ -41,7 +41,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emgu.CV.WindowsUI", "..\..\
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Emgu.CV.Wpf", "..\..\Emgu.CV.Wpf\Emgu.CV.Wpf.csproj", "{86CFFFE8-665D-491D-87AC-08E5EB525509}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WPF.NetCore", "..\..\Emgu.CV.Example\WPF.NetCore\WPF.NetCore.csproj", "{0830246D-3F72-4B90-A933-3A9EE44F9684}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorld.WPF", "..\..\Emgu.CV.Example\HelloWorld.WPF\HelloWorld.WPF.csproj", "{0830246D-3F72-4B90-A933-3A9EE44F9684}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuildInfo.Console", "..\..\Emgu.CV.Example\BuildInfo.Console\BuildInfo.Console.csproj", "{20FA82FC-DEE0-45F4-BE16-0533752F4CEF}"
EndProject

2
Solution/Windows.Desktop/Emgu.CV.Example.sln

@ -35,7 +35,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TF.Interop.NetCore", "..\..
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Emgu.CV.Runtime.Ubuntu", "..\..\Emgu.CV.Runtime\Ubuntu\Emgu.CV.Runtime.Ubuntu.shproj", "{86A21342-2DA9-4841-B1BD-B323AC5B81FD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WPF.NetCore", "..\..\Emgu.CV.Example\WPF.NetCore\WPF.NetCore.csproj", "{5F062E7D-B078-4F68-BF4A-F431DFC51002}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelloWorld.WPF", "..\..\Emgu.CV.Example\HelloWorld.WPF\HelloWorld.WPF.csproj", "{5F062E7D-B078-4F68-BF4A-F431DFC51002}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DepthAI", "..\..\Emgu.CV.Example\DepthAI\DepthAI.csproj", "{A5216561-256F-4D28-A354-6125A05E99ED}"
EndProject

6
cmake/Emgu.CV.HelloWorld.WPF.Directory.Build.props.in

@ -0,0 +1,6 @@
<?xml version="1.0"?>
<Project>
<PropertyGroup>
<TargetFramework>net${DOTNET_VERSION_MAJOR}.0-windows</TargetFramework>
</PropertyGroup>
</Project>
Loading…
Cancel
Save