Add OnnxRuntime and OpenCVSharp to essentials

OneWare.slnx

@@ -44,6 +44,10 @@
     <File Path="build/props/Svg.Controls.Skia.Avalonia.props" />
     <File Path="build/props/Xaml.Behaviors.Avalonia.props" />
     <File Path="build/props/XUnit.props" />
+    <File Path="build\props\Microsoft.ML.OnnxRuntime.Managed.props" />
+    <File Path="build\props\Microsoft.ML.OnnxRuntime.props" />
+    <File Path="build\props\OpenCvSharp4.props" />
+    <File Path="build\props\OpenCvSharp4.runtime.props" />
     <File Path="build\props\LiveChartsCore.SkiaSharpView.Avalonia.props" />
   </Folder>
   <Folder Name="/Coremodules/">
@@ -58,6 +62,7 @@
     <Project Path="src/OneWare.Settings/OneWare.Settings.csproj" />
     <Project Path="src/OneWare.SourceControl/OneWare.SourceControl.csproj" />
     <Project Path="src/OneWare.Updater/OneWare.Updater.csproj" />
+    <Project Path="src\OneWare.Native\OneWare.Native.csproj" />
   </Folder>
   <Folder Name="/Coremodules/Terminal/">
     <Project Path="src/OneWare.Terminal/OneWare.Terminal.csproj" />

build/props/Base.props

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <StudioVersion>0.21.21.0</StudioVersion>
-        <CoreVersion>0.31.15.0</CoreVersion>
-        <UniversalFpgaProjectSystemVersion>0.41.15.0</UniversalFpgaProjectSystemVersion>
-        <EssentialsVersion>0.11.15.0</EssentialsVersion>
+        <StudioVersion>0.21.22.0</StudioVersion>
+        <CoreVersion>0.31.16.0</CoreVersion>
+        <UniversalFpgaProjectSystemVersion>0.41.16.0</UniversalFpgaProjectSystemVersion>
+        <EssentialsVersion>0.11.16.0</EssentialsVersion>
         <Version>$(CoreVersion)</Version>
         <Authors>Hendrik Mennen</Authors>
         <Description>Next Generation IDE for Electronics Development</Description>

build/props/Microsoft.ML.OnnxRuntime.Managed.props

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ItemGroup>
+        <PackageReference Include="Microsoft.ML.OnnxRuntime.Managed" Version="1.23.2"/>
+    </ItemGroup>
+</Project>

build/props/Microsoft.ML.OnnxRuntime.props

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ItemGroup>
+        <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.23.2"/>
+    </ItemGroup>
+</Project>

build/props/OpenCvSharp4.props

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <ItemGroup>
+        <PackageReference Include="OpenCvSharp4" Version="4.11.0.20250507" />
+    </ItemGroup>
+</Project>

build/props/OpenCvSharp4.runtime.props

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+    <!-- Windows x64 -->
+    <ItemGroup Condition="
+    '$(RuntimeIdentifier)' == 'win-x64'
+    OR
+    (
+      $([MSBuild]::IsOSPlatform('Windows'))
+      AND
+      $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture) == 'X64'
+    )">
+        <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.11.0.20250507" />
+    </ItemGroup>
+
+    <!-- Windows arm64 -->
+    <ItemGroup Condition="
+    '$(RuntimeIdentifier)' == 'win-arm64'
+    OR
+    (
+      $([MSBuild]::IsOSPlatform('Windows'))
+      AND
+      $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture) == 'Arm64'
+    )">
+        <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.11.0.20250507" />
+    </ItemGroup>
+
+    <!-- Linux x64 -->
+    <ItemGroup Condition="
+    '$(RuntimeIdentifier)' == 'linux-x64'
+    OR
+    (
+      $([MSBuild]::IsOSPlatform('Linux'))
+      AND
+      $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture) == 'X64'
+    )">
+        <PackageReference Include="m-ringler.OpenCvSharp4.ubuntu24.runtime.linux-x64" Version="4.10.0.20250917" />
+    </ItemGroup>
+
+    <!-- Linux arm64 -->
+    <ItemGroup Condition="
+    '$(RuntimeIdentifier)' == 'linux-arm64'
+    OR
+    (
+      $([MSBuild]::IsOSPlatform('Linux'))
+      AND
+      $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture) == 'Arm64'
+    )">
+        <!-- TODO: Build an arm compatible library -->
+        <PackageReference Include="m-ringler.OpenCvSharp4.ubuntu24.runtime.linux-x64" Version="4.10.0.20250917" />
+    </ItemGroup>
+
+    <!-- macOS x64 -->
+    <ItemGroup Condition="
+    '$(RuntimeIdentifier)' == 'osx-x64'
+    OR
+    (
+      $([MSBuild]::IsOSPlatform('MacOS'))
+      AND
+      $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture) == 'X64'
+    )">
+        <PackageReference Include="OpenCvSharp4.runtime.osx.10.15-x64" Version="4.6.0.20230105" />
+    </ItemGroup>
+
+    <!-- macOS arm64 -->
+    <ItemGroup Condition="
+    '$(RuntimeIdentifier)' == 'osx-arm64'
+    OR
+    (
+      $([MSBuild]::IsOSPlatform('MacOS'))
+      AND
+      $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture) == 'Arm64'
+    )">
+        <PackageReference Include="OpenCvSharp4.runtime.osx_arm64" Version="4.8.1-rc" />
+    </ItemGroup>
+</Project>

src/OneWare.Core/OneWare.Core.csproj

@@ -6,7 +6,9 @@
     <Import Project="..\..\build\props\RestSharp.props"/>
     <Import Project="..\..\build\props\SharpCompress.props"/>
     <Import Project="..\..\build\props\Markdown.Avalonia.props"/>
-
+    <Import Project="..\..\build\props\Microsoft.ML.OnnxRuntime.props"/>
+    <Import Project="..\..\build\props\OpenCvSharp4.runtime.props"/>
+
     <ItemGroup>
         <AvaloniaResource Include="Assets\**\*.*"/>
     </ItemGroup>

src/OneWare.Core/Services/PluginService.cs

@@ -70,7 +70,8 @@ public IPlugin AddPlugin(string path)
                 ContainerLocator.Container.Resolve<ILogger>()
                     .Log($"Module {module.ModuleName} loaded", ConsoleColor.Cyan, true);
             }
-
+
+            //We should not use that anymore, since it can break compatibility with code signed apps
             SetupNativeImports(realPath);
         }
         catch (Exception e)
@@ -94,6 +95,7 @@ public void RemovePlugin(IPlugin plugin)
         }
     }
 
+    [Obsolete]
     private void SetupNativeImports(string pluginPath)
     {
         var newAssemblies = AppDomain.CurrentDomain.GetAssemblies().Where(x => !_initAssemblies.Contains(x));

src/OneWare.Essentials/OneWare.Essentials.csproj

@@ -19,6 +19,9 @@
     <Import Project="..\..\build\props\Asmichi.ChildProcess.props"/>
     <Import Project="..\..\build\props\Svg.Controls.Skia.Avalonia.props"/>
     <Import Project="..\..\build\props\Xaml.Behaviors.Avalonia.props"/>
+    <Import Project="..\..\build\props\OpenCvSharp4.props"/>
+    <Import Project="..\..\build\props\Microsoft.ML.OnnxRuntime.Managed.props"/>
+
     <Import Project="..\..\build\props\LiveChartsCore.SkiaSharpView.Avalonia.props"/>
 
     <PropertyGroup>

src/OneWare.Native/OneWare.Native.csproj

@@ -0,0 +1,86 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="..\..\build\props\Base.props"/>
+    <Import Project="..\..\build\props\OneWare.Module.props"/>
+
+    <PropertyGroup>
+        <Version>0.9</Version>
+        <RootNamespace>OneWare.NativeRuntimes</RootNamespace>
+    </PropertyGroup>
+
+    <!-- Windows x64 -->
+    <ItemGroup Condition="
+    '$(RuntimeIdentifier)' == 'win-x64'
+    OR
+    (
+      $([MSBuild]::IsOSPlatform('Windows'))
+      AND
+      $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture) == 'X64'
+    )">
+        <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.11.0.20250507" />
+        <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.23.2" Private="true" />
+    </ItemGroup>
+
+    <!-- Windows arm64 -->
+    <ItemGroup Condition="
+    '$(RuntimeIdentifier)' == 'win-arm64'
+    OR
+    (
+      $([MSBuild]::IsOSPlatform('Windows'))
+      AND
+      $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture) == 'Arm64'
+    )">
+        <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.11.0.20250507" />
+        <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.23.2" Private="true" />
+    </ItemGroup>
+
+    <!-- Linux x64 -->
+    <ItemGroup Condition="
+    '$(RuntimeIdentifier)' == 'linux-x64'
+    OR
+    (
+      $([MSBuild]::IsOSPlatform('Linux'))
+      AND
+      $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture) == 'X64'
+    )">
+        <PackageReference Include="m-ringler.OpenCvSharp4.ubuntu24.runtime.linux-x64" Version="4.10.0.20250917" />
+        <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.23.2" Private="true" />
+    </ItemGroup>
+
+    <!-- Linux arm64 -->
+    <ItemGroup Condition="
+    '$(RuntimeIdentifier)' == 'linux-arm64'
+    OR
+    (
+      $([MSBuild]::IsOSPlatform('Linux'))
+      AND
+      $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture) == 'Arm64'
+    )">
+        <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.23.2" Private="true" />
+    </ItemGroup>
+
+    <!-- macOS x64 -->
+    <ItemGroup Condition="
+    '$(RuntimeIdentifier)' == 'osx-x64'
+    OR
+    (
+      $([MSBuild]::IsOSPlatform('MacOS'))
+      AND
+      $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture) == 'X64'
+    )">
+        <PackageReference Include="OpenCvSharp4.runtime.osx.10.15-universal" Version="4.7.0.20230224" />
+        <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.23.2" Private="true" />
+    </ItemGroup>
+
+    <!-- macOS arm64 -->
+    <ItemGroup Condition="
+    '$(RuntimeIdentifier)' == 'osx-arm64'
+    OR
+    (
+      $([MSBuild]::IsOSPlatform('MacOS'))
+      AND
+      $([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture) == 'Arm64'
+    )">
+        <PackageReference Include="OpenCvSharp4.runtime.osx.10.15-universal" Version="4.7.0.20230224" />
+        <PackageReference Include="Microsoft.ML.OnnxRuntime" Version="1.23.2" Private="true" />
+    </ItemGroup>
+</Project>

studio/OneWare.Studio.Desktop/OneWare.Studio.Desktop.csproj

@@ -30,6 +30,7 @@
         <ProjectReference Include="..\..\src\OneWare.OssCadSuiteIntegration\OneWare.OssCadSuiteIntegration.csproj"/>
         <ProjectReference Include="..\..\src\OneWare.Verilog\OneWare.Verilog.csproj"/>
         <ProjectReference Include="..\..\src\OneWare.Vhdl\OneWare.Vhdl.csproj"/>
+        <ProjectReference Include="..\..\src\OneWare.Native\OneWare.Native.csproj" />
         <ProjectReference Include="..\OneWare.Studio\OneWare.Studio.csproj"/>
     </ItemGroup>
 
@@ -46,11 +47,5 @@
     <ItemGroup Condition="'$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))'">
         <PublishReadyToRunExclude Include="OneWare.Terminal.dll" />
     </ItemGroup>
-    <ItemGroup>
-      <Compile Update="Views\AIReleaseWindow.axaml.cs">
-        <DependentUpon>AIReleaseWindow.axaml</DependentUpon>
-        <SubType>Code</SubType>
-      </Compile>
-    </ItemGroup>
 
 </Project>