Updated to 2.1

Author: ChrisMaunder

.vscode/launch.json

@@ -85,7 +85,7 @@
             "command": "dotnet",
             "args": [
                 "build",
-                "${workspaceFolder}/src/AnalysisLayer/ObjectDetectionNet",
+                "${workspaceFolder}/src/modules/ObjectDetectionNet",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],

.vscode/tasks.json

@@ -14,9 +14,9 @@ transfer, and is easy to use.
 
 <div style="width:75%;min-width:700px;margin:30px auto">
 
-| <img src="https://www.codeproject.com/ai/docs/img/windows.svg" title="Windows" style="width:64px">  | <img src="https://www.codeproject.com/ai/docs/img/macos.svg" title="macOS" style="width:72px">  | <img src="https://www.codeproject.com/ai/docs/img/apple-silicon.svg" title="Apple Silicon" style="width:64px"> | <img src="https://www.codeproject.com/ai/docs/img/Ubuntu.svg" title="Ubuntu" style="width:64px">  |   <img src="https://www.codeproject.com/ai/docs/img/docker.svg" title="Docker" style="width:64px">  |  <img src="https://www.codeproject.com/ai/docs/img/VisualStudio.svg" title="Visual Studio" style="width:64px">         |         <img src="https://www.codeproject.com/ai/docs/img/VisualStudioCode.svg" title="Visual Studio Code" style="width:64px">        |
-| :------: |  :---: | :---------: | :-----: | :----: | :--------------------: | :-------------------: |
-| Windows  | macOS  | macOS-arm64 |  Ubuntu | Docker | Visual Studio<br>2019+ | Visual Studio<br>Code |
+| <img src="https://www.codeproject.com/ai/docs/img/windows.svg" title="Windows" style="width:64px">  | <img src="https://www.codeproject.com/ai/docs/img/macos.svg" title="macOS" style="width:72px">  | <img src="https://www.codeproject.com/ai/docs/img/apple-silicon.svg" title="Apple Silicon" style="width:64px"> | <img src="https://www.codeproject.com/ai/docs/img/Ubuntu.svg" title="Ubuntu" style="width:64px">  | <img src="https://www.codeproject.com/ai/docs/img/RaspberryPi64.svg" title="Raspberry Pi arm64" style="width:64px"> | <img src="https://www.codeproject.com/ai/docs/img/docker.svg" title="Docker" style="width:64px">  |  <img src="https://www.codeproject.com/ai/docs/img/VisualStudio.svg" title="Visual Studio" style="width:64px">         |         <img src="https://www.codeproject.com/ai/docs/img/VisualStudioCode.svg" title="Visual Studio Code" style="width:64px">        |
+| :------: |  :---: | :---------: | :-----: | :----: | :----: | :--------------------: | :-------------------: |
+| Windows  | macOS  | macOS arm64 |  Ubuntu | Raspberry&nbsp;Pi arm64 |  Docker | Visual Studio<br>2019+ | Visual Studio<br>Code |
 
 </div>
 

CodeProject.AI.sln

@@ -33,7 +33,7 @@
   </ItemGroup>
 
 	<ItemGroup>
-	  <Interpreter Include="$(ProjectDir)\..\..\..\..\src\AnalysisLayer\bin\windows\python39\venv\">
+	  <Interpreter Include="$(ProjectDir)\..\..\..\..\src\runtimes\bin\windows\python39\venv\">
 	  <Id>env</Id>
       <Version>3.9</Version>
       <Description>env (Python 3.9 (64-bit))</Description>

README.md

@@ -32,7 +32,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Interpreter Include="$(ProjectDir)\..\..\..\..\src\AnalysisLayer\bin\windows\python39\venv\">
+    <Interpreter Include="$(ProjectDir)\..\..\..\..\src\runtimes\bin\windows\python39\venv\">
       <Id>env</Id>
       <Version>3.9</Version>
       <Description>env (Python 3.9 (64-bit))</Description>

demos/Python/Face/Face.pyproj

@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-	<!-- Platform, architecture, runtime target defines -->
+	<!-- Set defines: Windows, Linux, macOS and/or Arm64. This is needed in some files! -->
 	<Import Project="../../../src/SDK/NET/Common.targets" />
 
 	<PropertyGroup>
 		<RootNamespace>CodeProject.AI.Explorer</RootNamespace>
 		<AssemblyName>CodeProject.AI.Explorer</AssemblyName>
 		<OutputType>WinExe</OutputType>
-		<TargetFramework>net7.0-windows</TargetFramework>
 		<Nullable>enable</Nullable>
 		<UseWindowsForms>true</UseWindowsForms>
 		<ApplicationIcon>favicon.ico</ApplicationIcon>
 		<SelfContained>false</SelfContained>
 		<PublishSingleFile>false</PublishSingleFile>
 		<Platform>AnyCPU</Platform>
+		<TargetFramework>net7.0-windows</TargetFramework>
 	</PropertyGroup>
 
 	<!-- Common Release properties -->

demos/Python/ObjectDetect/ObjectDetect.pyproj

@@ -2,13 +2,16 @@
 ::
 ::                           CodeProject.AI Demos
 ::
-:: This script is only called from ../src/setup.bat
+:: This script is only called from ..\src\setup.bat
 
 @if "%1" NEQ "install" (
-	echo This script is only called from ../src/setup.bat
+	echo This script is only called from ..\src\setup.bat
 	@pause
 	@goto:eof
 )
 
-call "%sdkScriptsPath%\utils.bat" SetupPython 3.9
-call "%sdkScriptsPath%\utils.bat" InstallPythonPackages 3.9 "%modulePath%\Python"
+call "%sdkScriptsPath%\utils.bat" SetupPython 3.9 "Shared"
+if errorlevel 1 exit /b 1
+
+call "%sdkScriptsPath%\utils.bat" InstallPythonPackages 3.9 "%modulePath%\Python" "Shared"
+if errorlevel 1 exit /b 1

demos/TestData/Faces/scarlett-johanson-1.webp

@@ -16,5 +16,8 @@ fi
 
 
 # Install python and the required dependencies. If we find imutils then asssume it's all there
-setupPython 3.8
-installPythonPackages 3.8 "${modulePath}/Python"
+setupPython 3.8 "Shared"
+if [ $? -ne 0 ]; then quit 1; fi
+
+installPythonPackages 3.8 "${modulePath}/Python" "Shared"
+if [ $? -ne 0 ]; then quit 1; fi