Browse Source

Set csproj version based on dotnet version found.

pull/768/merge
Canming Huang 8 months ago
parent
commit
4f69f5eff9
  1. 2
      DebuggerVisualizer/DebuggerVisualizer.csproj
  2. 1
      Emgu.CV.Example/BuildInfo.Console/BuildInfo.Console.csproj
  3. 2
      Emgu.CV.Runtime/Maui/Android/Emgu.CV.runtime.maui.android.csproj
  4. 2
      Emgu.CV.Runtime/Maui/Mac/Emgu.CV.runtime.maui.macos.csproj
  5. 2
      Emgu.CV.Runtime/Maui/iOS/Emgu.CV.runtime.maui.ios.csproj
  6. 2
      Emgu.CV.Test/Emgu.CV.Test.Net/Emgu.CV.Test.Net.csproj
  7. 1
      cmake/Emgu.CV.DebuggerVisualizer.Directory.Build.props.in
  8. 5
      cmake/Emgu.CV.runtime.maui.Directory.Build.props.in
  9. 1
      cmake/Emgu.CV.runtime.maui.android.Directory.Build.props.in
  10. 2
      cmake/Emgu.CV.runtime.maui.ios.Directory.Build.props.in
  11. 2
      cmake/Emgu.CV.runtime.maui.macos.Directory.Build.props.in

2
DebuggerVisualizer/DebuggerVisualizer.csproj

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<RootNamespace>Emgu.CV.DebuggerVisualizer</RootNamespace>

1
Emgu.CV.Example/BuildInfo.Console/BuildInfo.Console.csproj

@ -2,7 +2,6 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<Platforms>AnyCPU;x86;x64</Platforms>
</PropertyGroup>

2
Emgu.CV.Runtime/Maui/Android/Emgu.CV.runtime.maui.android.csproj

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-android</TargetFramework>
<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>

2
Emgu.CV.Runtime/Maui/Mac/Emgu.CV.runtime.maui.macos.csproj

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0-maccatalyst</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>
<IsBindingProject>true</IsBindingProject>

2
Emgu.CV.Runtime/Maui/iOS/Emgu.CV.runtime.maui.ios.csproj

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net9.0-ios</TargetFrameworks>
<!-- <RuntimeIdentifiers>ios-arm64;iossimulator-x64</RuntimeIdentifiers> -->
<Nullable>enable</Nullable>
<ImplicitUsings>true</ImplicitUsings>

2
Emgu.CV.Test/Emgu.CV.Test.Net/Emgu.CV.Test.Net.csproj

@ -1,8 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

1
cmake/Emgu.CV.DebuggerVisualizer.Directory.Build.props.in

@ -4,6 +4,7 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
<TargetFramework>net${DOTNET_VERSION_MAJOR}.0-windows</TargetFramework>
<version>${CPACK_PACKAGE_VERSION}</version>
<authors>${CPACK_PACKAGE_VENDOR}</authors>
<owners>${CPACK_PACKAGE_VENDOR}</owners>

5
cmake/Emgu.CV.runtime.maui.Directory.Build.props.in

@ -4,6 +4,11 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
<TargetFrameworks>net${DOTNET_VERSION_MAJOR}.0-android;net${DOTNET_VERSION_MAJOR}.0-ios;net${DOTNET_VERSION_MAJOR}.0-maccatalyst</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net${DOTNET_VERSION_MAJOR}.0-windows10.0.19041.0</TargetFrameworks>
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
<!-- <TargetFrameworks>$(TargetFrameworks);net8.0-tizen</TargetFrameworks> -->
<EmguCVProjectRoot>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\))</EmguCVProjectRoot>
<PackageId>${EMGUCV_MAUI_NUGET_ID}</PackageId>

1
cmake/Emgu.CV.runtime.maui.android.Directory.Build.props.in

@ -4,6 +4,7 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
<TargetFramework>net${DOTNET_VERSION_MAJOR}-android</TargetFramework>
<EmguCVProjectRoot>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\))</EmguCVProjectRoot>
<PackageId>${EMGUCV_MAUI_ANDROID_NUGET_ID}</PackageId>

2
cmake/Emgu.CV.runtime.maui.ios.Directory.Build.props.in

@ -4,6 +4,8 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
<TargetFrameworks>net${DOTNET_VERSION_MAJOR}.0-ios</TargetFrameworks>
<EmguCVProjectRoot>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\))</EmguCVProjectRoot>
<PackageId>${EMGUCV_MAUI_IOS_NUGET_ID}</PackageId>

2
cmake/Emgu.CV.runtime.maui.macos.Directory.Build.props.in

@ -4,7 +4,7 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
<PropertyGroup>
<TargetFramework>net${DOTNET_VERSION_MAJOR}.0-maccatalyst</TargetFramework>
<EmguCVProjectRoot>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\..\..\))</EmguCVProjectRoot>
<PackageId>${EMGUCV_MAUI_MACOS_NUGET_ID}</PackageId>

Loading…
Cancel
Save