wip

Signed-off-by: Andrey Parfenov <[email protected]>
brainflow-dev · Nov 7, 2023 · b2e080e · b2e080e
1 parent 7d7be17
commit b2e080e
Show file tree

Hide file tree

Showing 20 changed files with 138 additions and 134 deletions.
diff --git a/.github/workflows/run_unix.yml b/.github/workflows/run_unix.yml
@@ -24,7 +24,7 @@ jobs:
     - name: Install dotnet
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '3.1.x'
+        dotnet-version: '7.0.x'
     - name: Install Python 3.7
       uses: actions/setup-python@v3
       with:
@@ -155,14 +155,14 @@ jobs:
       run: $GITHUB_WORKSPACE/build/tests/brainflow_tests
     - name: Synthetic C# Test
       run: |
-        cd $GITHUB_WORKSPACE/csharp_package/brainflow/examples/brainflow_get_data/bin/Release/netcoreapp3.1
+        cd $GITHUB_WORKSPACE/csharp_package/brainflow/examples/brainflow_get_data/bin/Release/net7.0
         ./brainflow_get_data --board-id -1
       env:
         DYLD_PRINT_LIBRARIES: 1
         LD_LIBRARY_PATH: ${{ github.workspace }}/installed/lib
     - name: EEG Metrics C# Test
       run: |
-        cd $GITHUB_WORKSPACE/csharp_package/brainflow/examples/eeg_metrics/bin/Release/netcoreapp3.1
+        cd $GITHUB_WORKSPACE/csharp_package/brainflow/examples/eeg_metrics/bin/Release/net7.0
         ./eeg_metrics --board-id -1
       env:
         DYLD_PRINT_LIBRARIES: 1

diff --git a/.github/workflows/run_windows.yml b/.github/workflows/run_windows.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Install dotnet
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: '3.1.x'
+        dotnet-version: '7.0.x'
     - name: Set Version
       id: version
       run: if ("tag" -eq $Env:GITHUB_REF_TYPE) { echo "::set-output name=version::$Env:GITHUB_REF_NAME" } else { echo "::set-output name=version::$Env:GITHUB_SHA" }
@@ -139,7 +139,7 @@ jobs:
       run: python %GITHUB_WORKSPACE%\emulator\brainflow_emulator\cyton_windows.py %GITHUB_WORKSPACE%\cpp_package\examples\get_data\build\Release\brainflow_get_data.exe --board-id 0 --serial-port
       shell: cmd
     - name: Cyton Windows C# Test
-      run: python %GITHUB_WORKSPACE%\emulator\brainflow_emulator\cyton_windows.py %GITHUB_WORKSPACE%\csharp_package\brainflow\examples\brainflow_get_data\bin\Release\netcoreapp3.1\brainflow_get_data.exe --board-id 0 --serial-port
+      run: python %GITHUB_WORKSPACE%\emulator\brainflow_emulator\cyton_windows.py %GITHUB_WORKSPACE%\csharp_package\brainflow\examples\brainflow_get_data\bin\Release\net7.0\brainflow_get_data.exe --board-id 0 --serial-port
       shell: cmd
     - name: Synthetic Windows Python Test
       run: python %GITHUB_WORKSPACE%\python_package\examples\tests\brainflow_get_data.py --board-id -1
@@ -159,7 +159,7 @@ jobs:
       shell: cmd
     - name: Synthetic Windows C# Test
       run: |
-        cd %GITHUB_WORKSPACE%\csharp_package\brainflow\examples\brainflow_get_data\bin\Release\netcoreapp3.1\
+        cd %GITHUB_WORKSPACE%\csharp_package\brainflow\examples\brainflow_get_data\bin\Release\net7.0\
         brainflow_get_data.exe --board-id -1
       shell: cmd
     - name: Cyton Daisy Windows Python Test
@@ -172,13 +172,13 @@ jobs:
       run: python %GITHUB_WORKSPACE%\emulator\brainflow_emulator\cyton_windows.py %GITHUB_WORKSPACE%\cpp_package\examples\get_data\build\Release\brainflow_get_data.exe --board-id 2 --serial-port
       shell: cmd
     - name: Cyton Daisy Windows C# Test
-      run: python %GITHUB_WORKSPACE%\emulator\brainflow_emulator\cyton_windows.py %GITHUB_WORKSPACE%\csharp_package\brainflow\examples\brainflow_get_data\bin\Release\netcoreapp3.1\brainflow_get_data.exe --board-id 2 --serial-port
+      run: python %GITHUB_WORKSPACE%\emulator\brainflow_emulator\cyton_windows.py %GITHUB_WORKSPACE%\csharp_package\brainflow\examples\brainflow_get_data\bin\Release\net7.0\brainflow_get_data.exe --board-id 2 --serial-port
       shell: cmd
     - name: Galea Windows Cpp Test
       run: python %GITHUB_WORKSPACE%\emulator\brainflow_emulator\galea_udp.py %GITHUB_WORKSPACE%\cpp_package\examples\get_data\build\Release\brainflow_get_data.exe --board-id 3 --ip-address 127.0.0.1
       shell: cmd
     - name: Galea Windows C# Test
-      run: python %GITHUB_WORKSPACE%\emulator\brainflow_emulator\galea_udp.py %GITHUB_WORKSPACE%\csharp_package\brainflow\examples\brainflow_get_data\bin\Release\netcoreapp3.1\brainflow_get_data.exe --board-id 3 --ip-address 127.0.0.1
+      run: python %GITHUB_WORKSPACE%\emulator\brainflow_emulator\galea_udp.py %GITHUB_WORKSPACE%\csharp_package\brainflow\examples\brainflow_get_data\bin\Release\net7.0\brainflow_get_data.exe --board-id 3 --ip-address 127.0.0.1
       shell: cmd
     - name: FreeEEG32 Python Test
       run: python %GITHUB_WORKSPACE%\emulator\brainflow_emulator\freeeeg32_windows.py python %GITHUB_WORKSPACE%\python_package\examples\tests\brainflow_get_data.py --board-id 17 --serial-port
@@ -255,7 +255,7 @@ jobs:
       run: .\cpp_package\examples\signal_processing\build\Release\serialization.exe
       shell: cmd
     - name: ICA C# Test
-      run: .\csharp_package\brainflow\examples\ica\bin\Release\netcoreapp3.1\ica.exe
+      run: .\csharp_package\brainflow\examples\ica\bin\Release\net7.0\ica.exe
       shell: cmd
     # Tests for MLModule
     - name: EEG Metrics Python Test
@@ -271,10 +271,10 @@ jobs:
       run: .\cpp_package\examples\ml\build32\Release\eeg_metrics_ci.exe --board-id -1 --metric 2 --classifier 2 --model-file %GITHUB_WORKSPACE%\src\ml\train\logreg_mindfulness.onnx
       shell: cmd
     - name: EEG Metrics C# Test
-      run: .\csharp_package\brainflow\examples\eeg_metrics\bin\Release\netcoreapp3.1\eeg_metrics.exe
+      run: .\csharp_package\brainflow\examples\eeg_metrics\bin\Release\net7.0\eeg_metrics.exe
       shell: cmd
     - name: EEG Metrics CI C# Test
-      run: .\csharp_package\brainflow\examples\eeg_metrics_ci\bin\Release\netcoreapp3.1\eeg_metrics_ci.exe --board-id -1 --metric 2 --classifier 2 --model-file %GITHUB_WORKSPACE%\src\ml\train\logreg_mindfulness.onnx
+      run: .\csharp_package\brainflow\examples\eeg_metrics_ci\bin\Release\net7.0\eeg_metrics_ci.exe --board-id -1 --metric 2 --classifier 2 --model-file %GITHUB_WORKSPACE%\src\ml\train\logreg_mindfulness.onnx
       shell: cmd
     - name: EEG Metrics CI Rust Test
       run: |

diff --git a/csharp_package/brainflow/brainflow.sln b/csharp_package/brainflow/brainflow.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31515.178
+# Visual Studio Version 17
+VisualStudioVersion = 17.7.34221.43
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{FF155433-168F-4A55-BA98-DFD197A98185}"
 EndProject