Merge branch 'v2.7.0' of https://github.com/codeproject/CodeProject.AI-Server into v2.7.0

matthewDDennis · matthewDDennis · commit 537035ee67c7 · 2024-05-03T16:14:48.000-04:00
diff --git a/devops/install/clean.bat b/devops/install/clean.bat
diff --git a/devops/install/clean.sh b/devops/install/clean.sh
diff --git a/modules/ObjectDetectionYOLOv5-6.2/requirements.jetson.txt b/modules/ObjectDetectionYOLOv5-6.2/requirements.jetson.txt
@@ -28,7 +28,6 @@ TorchVision                     # Installing TorchVision, for Computer Vision ba
 # We need this, but we don't need this.
 Seaborn                         # Installing Seaborn, a data visualization library based on matplotlib
 
-# setuptools                    # Installing setuptools for managing Python packages
 CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
 
 # last line empty.
diff --git a/modules/ObjectDetectionYOLOv5-6.2/requirements.linux.arm64.txt b/modules/ObjectDetectionYOLOv5-6.2/requirements.linux.arm64.txt
@@ -21,7 +21,6 @@ yolov5==6.2.3                   # Installing Ultralytics YoloV5 package for obje
 # We need this, but we don't need this.
 Seaborn                         # Installing Seaborn, a data visualization library based on matplotlib
 
-# setuptools                    # Installing setuptools for managing Python packages
 CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
 
 # last line empty.
diff --git a/modules/ObjectDetectionYOLOv5-6.2/requirements.linux.cuda.txt b/modules/ObjectDetectionYOLOv5-6.2/requirements.linux.cuda.txt
@@ -20,7 +20,6 @@ yolov5==6.2.3                   # Installing Ultralytics YoloV5 package for obje
 # We need this, but we don't need this.
 Seaborn                         # Installing Seaborn, a data visualization library based on matplotlib
 
-# setuptools                    # Installing setuptools for managing Python packages
 CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
 
 # last line empty..
diff --git a/modules/ObjectDetectionYOLOv5-6.2/requirements.linux.cuda11.txt b/modules/ObjectDetectionYOLOv5-6.2/requirements.linux.cuda11.txt
@@ -20,7 +20,6 @@ yolov5==6.2.3                   # Installing Ultralytics YoloV5 package for obje
 # We need this, but we don't need this.
 Seaborn                         # Installing Seaborn, a data visualization library based on matplotlib
 
-# setuptools                    # Installing setuptools for managing Python packages
 CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
 
 # last line empty..
diff --git a/modules/ObjectDetectionYOLOv5-6.2/requirements.linux.cuda11_5.txt b/modules/ObjectDetectionYOLOv5-6.2/requirements.linux.cuda11_5.txt
@@ -20,7 +20,6 @@ yolov5==6.2.3                   # Installing Ultralytics YoloV5 package for obje
 # We need this, but we don't need this.
 Seaborn                         # Installing Seaborn, a data visualization library based on matplotlib
 
-# setuptools                    # Installing setuptools for managing Python packages
 CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
 
 # last line empty..
diff --git a/modules/ObjectDetectionYOLOv5-6.2/requirements.linux.cuda12.txt b/modules/ObjectDetectionYOLOv5-6.2/requirements.linux.cuda12.txt
@@ -28,7 +28,6 @@ yolov5==6.2.3                   # Installing Ultralytics YoloV5 package for obje
 # We need this, but we don't need this.
 Seaborn                         # Installing Seaborn, a data visualization library based on matplotlib
 
-# setuptools                    # Installing setuptools for managing Python packages
 CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
 
 # last line empty..
diff --git a/modules/ObjectDetectionYOLOv5-6.2/requirements.linux.rocm.txt b/modules/ObjectDetectionYOLOv5-6.2/requirements.linux.rocm.txt
@@ -17,7 +17,6 @@ yolov5==6.2.3                   # Installing Ultralytics YoloV5 package for obje
 # We need this, but we don't need this.
 Seaborn                         # Installing Seaborn, a data visualization library based on matplotlib
 
-# setuptools                    # Installing setuptools for managing Python packages
 CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
 
 # last line empty..
diff --git a/modules/ObjectDetectionYOLOv5-6.2/requirements.linux.txt b/modules/ObjectDetectionYOLOv5-6.2/requirements.linux.txt
@@ -26,7 +26,6 @@ yolov5==6.2.3                   # Installing Ultralytics YoloV5 package for obje
 # We need this, but we don't need this.
 Seaborn                         # Installing Seaborn, a data visualization library based on matplotlib
 
-# setuptools                    # Installing setuptools for managing Python packages
 CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
 
 # last line empty.
diff --git a/modules/ObjectDetectionYOLOv5-6.2/requirements.macos.arm64.txt b/modules/ObjectDetectionYOLOv5-6.2/requirements.macos.arm64.txt
@@ -18,7 +18,6 @@ yolov5==6.2.3                   # Installing Ultralytics YoloV5 package for obje
 Seaborn                         # Installing Seaborn, a data visualization library based on matplotlib
 # matplotlib                    # Installing matplotlib, the python plotting package
 
-# setuptools                    # Installing setuptools for managing Python packages
 CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
 
 # last line empty.
diff --git a/modules/ObjectDetectionYOLOv5-6.2/requirements.macos.txt b/modules/ObjectDetectionYOLOv5-6.2/requirements.macos.txt
@@ -18,7 +18,6 @@ yolov5==6.2.3                   # Installing Ultralytics YoloV5 package for obje
 # We need this, but we don't need this.
 Seaborn                         # Installing Seaborn, a data visualization library based on matplotlib
 
-# setuptools                    # Installing setuptools for managing Python packages
 CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
 
 # last line empty.
diff --git a/modules/ObjectDetectionYOLOv5-6.2/requirements.orangepi.txt b/modules/ObjectDetectionYOLOv5-6.2/requirements.orangepi.txt
@@ -24,7 +24,6 @@ yolov5==6.2.3                   # Installing Ultralytics YoloV5 package for obje
 # We need this, but we don't need this.
 Seaborn                         # Installing Seaborn, a data visualization library based on matplotlib
 
-# setuptools                    # Installing setuptools for managing Python packages
 CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
 
 # last line empty.
diff --git a/modules/ObjectDetectionYOLOv5-6.2/requirements.radxarock.txt b/modules/ObjectDetectionYOLOv5-6.2/requirements.radxarock.txt
@@ -24,7 +24,6 @@ yolov5==6.2.3                   # Installing Ultralytics YoloV5 package for obje
 # We need this, but we don't need this.
 Seaborn                         # Installing Seaborn, a data visualization library based on matplotlib
 
-# setuptools                    # Installing setuptools for managing Python packages
 CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
 
 # last line empty.
diff --git a/modules/ObjectDetectionYOLOv5-6.2/requirements.raspberrypi.txt b/modules/ObjectDetectionYOLOv5-6.2/requirements.raspberrypi.txt
@@ -24,7 +24,6 @@ yolov5==6.2.3                   # Installing Ultralytics YoloV5 package for obje
 # We need this, but we don't need this.
 Seaborn                         # Installing Seaborn, a data visualization library based on matplotlib
 
-# setuptools                    # Installing setuptools for managing Python packages
 CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
 
 # last line empty.
diff --git a/modules/ObjectDetectionYOLOv5-6.2/requirements.txt b/modules/ObjectDetectionYOLOv5-6.2/requirements.txt
@@ -31,7 +31,6 @@ yolov5==6.2.3	                # Installing Ultralytics YoloV5 package for object
 # We need this, but we don't need this.
 Seaborn                         # Installing Seaborn, a data visualization library based on matplotlib
 
-# setuptools                    # Installing setuptools for managing Python packages
 CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
 
 # last line empty.
diff --git a/modules/ObjectDetectionYOLOv5-6.2/requirements.windows.cuda.txt b/modules/ObjectDetectionYOLOv5-6.2/requirements.windows.cuda.txt
@@ -25,7 +25,6 @@ yolov5==6.2.3                   # Installing Ultralytics YoloV5 package for obje
 # We need this, but we don't need this.
 Seaborn                         # Installing Seaborn, a data visualization library based on matplotlib
 
-# setuptools                    # Installing setuptools for managing Python packages
 CodeProject-AI-SDK              # Installing the CodeProject.AI SDK
 
 # last line empty.
diff --git a/src/SDK/install.bat b/src/SDK/install.bat
@@ -44,7 +44,7 @@ if /i "!useJq!" == "false" (
     dotnet build "!sdkPath!\Utilities\ParseJSON" /property:GenerateFullPaths=true /consoleloggerparameters:NoSummary -c Release >NUL
     if exist "!sdkPath!\Utilities\ParseJSON\bin\Release\net7.0\" (
         pushd "!sdkPath!\Utilities\ParseJSON\bin\Release\net7.0\"
-        move * ..\..\..\ > /dev/null
+        move * ..\..\..\ >NUL
         popd
     )
 )
