Updates for GitHub actions and some initial Spyder-S support

.github/workflows/codeql-analysis.yml

@@ -1,15 +1,9 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
 name: "CodeQL"
 
 on:
   push:
     branches: [master]
   pull_request:
-    # The branches below must be a subset of the branches above
     branches: [master]
   schedule:
     - cron: '0 8 * * 2'
@@ -18,54 +12,31 @@ jobs:
   analyze:
     name: Analyze
     runs-on: ubuntu-latest
+    permissions:
+      security-events: write
 
     strategy:
       fail-fast: false
       matrix:
-        # Override automatic language detection by changing the below list
-        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
         language: ['csharp']
-        # Learn more...
-        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
-      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
-        fetch-depth: 2
-
-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
-    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
+      uses: actions/checkout@v4
 
-    # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file. 
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
 
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 10.0.x
 
-    #- run: |
-    #   make bootstrap
-    #   make release
+    - name: Build
+      run: dotnet build --configuration Release
+      working-directory: ./src/
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3

.github/workflows/dotnet-build.yml

@@ -0,0 +1,40 @@
+name: CI
+
+on:
+  pull_request:
+    branches: [ master ]
+  push:
+    branches: [ master ]
+
+jobs:
+  build-and-test:
+    runs-on: windows-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 10.0.x
+
+    - name: Restore dependencies
+      run: dotnet restore
+      working-directory: ./src/
+
+    - name: Build
+      run: dotnet build --configuration Release --no-restore
+      working-directory: ./src/
+
+    - name: Run tests
+      run: dotnet test --configuration Release --no-build --verbosity normal --logger trx --results-directory "TestResults"
+      working-directory: ./src/
+
+    - name: Upload test results
+      uses: actions/upload-artifact@v4
+      if: always()
+      with:
+        name: test-results
+        path: src/TestResults
+        retention-days: 5

.github/workflows/publish-nuget.yml

@@ -0,0 +1,56 @@
+name: Publish Nuget
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+
+    - name: Verify tag is on master branch
+      run: |
+        if ! git branch -r --contains ${{ github.ref }} | grep -q 'origin/master'; then
+          echo "Error: Tag must be on the master branch"
+          exit 1
+        fi
+
+    - name: Get version from tag
+      id: get_version
+      run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 10.0.x
+
+    - name: Restore dependencies
+      run: dotnet restore
+      working-directory: ./src/
+
+    - name: Build
+      run: dotnet build --configuration Release --no-restore
+      working-directory: ./src/
+
+    - name: Pack
+      run: dotnet pack --configuration Release --no-build --output ./nupkg -p:PackageVersion=${{ steps.get_version.outputs.VERSION }}
+      working-directory: ./src/SpyderClientLibrary/
+
+    - name: Publish to NuGet
+      run: dotnet nuget push ./nupkg/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json --skip-duplicate
+      working-directory: ./src/SpyderClientLibrary/
+
+    - name: Create GitHub Release
+      uses: softprops/action-gh-release@v2
+      with:
+        name: Release v${{ steps.get_version.outputs.VERSION }}
+        files: ./src/SpyderClientLibrary/nupkg/*.nupkg
+        generate_release_notes: true
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -1,25 +1,25 @@
 # SpyderClientLibrary
 
-![Build Status](https://ci.appveyor.com/api/projects/status/5xhce5xxfpphcsv8/branch/master?svg=true)
-
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=dsmithson_SpyderClientLibrary&metric=alert_status)](https://sonarcloud.io/dashboard?id=dsmithson_SpyderClientLibrary)
+[![CI](https://github.com/dsmithson/SpyderClientLibrary/actions/workflows/dotnet-build.yml/badge.svg)](https://github.com/dsmithson/SpyderClientLibrary/actions/workflows/dotnet-build.yml)
+[![NuGet](https://img.shields.io/nuget/v/SpyderClientLibrary.svg)](https://www.nuget.org/packages/SpyderClientLibrary)
 
 Provides a modern, fully async compatible .Net Standard 2.0 library for creating applications and utilities targeting the 
 [Spyder video processor](http://www.vistasystems.net/video-processors-and-matrix-switchers/video-processors/pages/default.aspx) 
-from Desktop (.Net 4.6.2 or later) or Windows UWP applications (Windows 10).
+from Desktop (.Net 4.6.2 or later) or Windows Store applications (Windows 10/11).
 
 Key Features
 -------------
 * Full implementation of the published Spyder UDP control protocol
 * System Config File parsing - provides full Spyder data object model to clients
 * Drawing Data (live view) data stream deserialization (Supports 2.10.8 - 5.X+)
+* Partial support for Spyder-S (6.x) as of the current release
 * Spyder quick file transfer procotol (QFT) implementation. List, get, and set files
 * Thumbnail Manager - provides background downloading, multi-resolution scaling, and memory lifetime management of system thumbnail images
 
 Usage
 -----
 
-This library was built using Visual Studio 2019, and can either be downloaded and compiled from source or downloaded as a
+This library was built using Visual Studio 2026, and can either be downloaded and compiled from source or downloaded as a
 [Nuget Package](https://www.nuget.org/packages/SpyderClientLibrary/) if you prefer - search for SpyderClientLibrary from 
 the Nuget package manager to get started.
 
@@ -32,3 +32,7 @@ If you run into issues
 I've taken great effort to make this library as solid as possible, but if you run into any problems or want to see something added, 
 please feel free to log them in the issue tracker or fix them up and send me a pull request.  
 
+
+## License
+----------------------
+This project is licensed under the Apache 2.0 License - see the [LICENSE](LICENSE) file for details.

src/DrawingDataRawCaptureUtility/DrawingDataRawCaptureUtility.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Platforms>AnyCPU;x86</Platforms>
   </PropertyGroup>