Multiple changes

.github/workflows/dotnet.yml

@@ -0,0 +1,36 @@
+name: .NET
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Fetch history
+      run: git fetch --prune --unshallow
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: |
+           9.0.x
+    - name: Restore dependencies
+      run: |
+        dotnet restore src/S7CommPlusDriver
+        dotnet restore src/DriverTest
+        dotnet restore src/S7CommPlusGUIBrowser
+
+    - name: Build
+      run: |
+        dotnet build src/S7CommPlusDriver
+        dotnet build src/DriverTest
+        dotnet build src/S7CommPlusGUIBrowser
+    - uses: actions/upload-artifact@v4
+      with:
+        path: src/S7CommPlusDriver/bin/Debug/*.nupkg

.github/workflows/dotnetpull.yml

@@ -0,0 +1,30 @@
+name: .NET Pull Request
+
+on:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: |
+           6.0.x
+           8.0.x
+           9.0.x
+    - name: Restore dependencies
+      run: |
+        dotnet restore src/S7CommPlusDriver
+        dotnet restore src/DriverTest
+        dotnet restore src/S7CommPlusGUIBrowser
+    - name: Build
+      run: |
+        dotnet build src/S7CommPlusDriver
+        dotnet build src/DriverTest
+        dotnet build src/S7CommPlusGUIBrowser

.github/workflows/release.yml

@@ -0,0 +1,45 @@
+name: .NET
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Fetch history
+      run: git fetch --prune --unshallow
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: |
+           6.0.x
+           8.0.x
+           9.0.x
+    - name: Restore dependencies
+      run: |
+        dotnet restore src/S7CommPlusDriver
+        dotnet restore src/DriverTest
+        dotnet restore src/S7CommPlusGUIBrowser
+
+    - name: Update project version
+      uses: roryprimrose/set-vs-sdk-project-version@v1
+      with:
+        version: ${{ github.event.release.tag_name }}
+        assemblyVersion: ${{ github.event.release.tag_name }}
+        fileVersion: ${{ github.event.release.tag_name }}
+        informationalVersion: ${{ github.event.release.tag_name }}-${{ github.sha }}
+
+    - name: Build
+      run: |
+        dotnet build --configuration Release src/S7CommPlusDriver
+        dotnet build --configuration Release src/DriverTest
+        dotnet build --configuration Release src/S7CommPlusGUIBrowser
+    - name: Publish
+      run: |
+        dotnet nuget push --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json src/S7CommPlusDriver/bin/Release/*.nupkg
+

docs/online-multiplexing-todo.md

@@ -0,0 +1,40 @@
+# S7CommPlus online multiplexing notes
+
+Status: implemented in the driver refactor. One `S7CommPlusClient` owns exactly one PLC connection. The library must not silently open additional PLC connections. If an application wants more physical PLC connections, it creates more clients explicitly.
+
+Observed TIA behavior in `C:\Data\temp\Online CPU FA01.pcapng`:
+
+- TIA opened two ES connections to the PLC, not one connection per watched block.
+- Online block view traffic used one long-lived watch connection.
+- Additional opened or expanded blocks created additional TIS jobs/subscriptions on that same watch connection.
+- Responses and notifications were interleaved; notifications are routed by subscription object id.
+
+Implemented driver changes:
+
+- Added a receive dispatcher per protocol session, but arbitrary PLC requests are not run in parallel.
+  - Thomas' 2025 note is correct for fragmented response bodies: once a large S7CommPlus response is fragmented, the individual fragments do not carry the request sequence number. Sending multiple fragment-producing requests concurrently can make fragment ownership ambiguous.
+  - One foreground request stays in flight per physical S7CommPlus connection.
+  - Responses are matched by function code and sequence number.
+  - Notifications are routed by `Notification.SubscriptionObjectId`.
+  - Alarm part-2 notifications are also routed by `Notification.P2SubscriptionObjectId` when present.
+  - Consumed notifications are not left in the dispatcher queue for a second delivery.
+- Public API rule:
+  - One `S7CommPlusClient` means one PLC connection.
+  - Multiple physical connections are created only when the application creates multiple clients.
+- Replaced singleton subscription state with per-subscription handles.
+  - Tags: subscription object id, reference-id-to-tag map, next credit limit.
+  - Alarms: subscription object id, next credit limit.
+  - TIS watch: job object id, subscription object id, subscription-ref object id, result model, poll counter.
+- Multiple subscriptions can coexist on one client.
+  - Create/delete/read/metadata operations stay serialized as normal session requests.
+  - Notification loops wait for their own subscription object id.
+  - Reads/metadata may run while subscriptions are active, but not in parallel with another foreground request on the same physical connection.
+  - If an application needs true parallel large metadata/block transfers, it should create a second `S7CommPlusClient` explicitly.
+- Explicit helper APIs stay explicit.
+  - Snapshot helpers may accept another `S7CommPlusClient`, but should not create one implicitly.
+- For online engineering features prefer `S7CommPlusDefaults.RemoteTsapEs`.
+
+Live-test rule:
+
+- Do not test against `10.0.10.100` or the production/FA01 CPU.
+- If live PLC testing is needed, use only `10.0.98.206`.

src/.gitignore

@@ -11,5 +11,4 @@
 [Rr]elease/
 [Bb]in/
 [Oo]bj/
-x64/
 build/

src/DriverTest/DriverTest.csproj

@@ -1,92 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{94755B6A-7E0D-40F9-A2ED-48FF0C0FEA2B}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>DriverTest</RootNamespace>
-    <AssemblyName>DriverTest</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <LangVersion>7.3</LangVersion>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TestPlcTag.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\S7CommPlusDriver\S7CommPlusDriver.csproj">
-      <Project>{781951d8-80de-4e2f-92ca-a5fef0059415}</Project>
-      <Name>S7CommPlusDriver</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>xcopy /y /d  "$(SolutionDir)S7CommPlusDriver\OpenSSL-dll-$(PlatformName)\*.dll" "$(ProjectDir)$(OutDir)"</PostBuildEvent>
-  </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <OutputType>Exe</OutputType>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\S7CommPlusDriver\S7CommPlusDriver.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <PropertyGroup>
+    <AssemblyTitle>DriverTest</AssemblyTitle>
+    <Description>S7CommPlusDriver Test</Description>
+    <Product>DriverTest</Product>
+    <Copyright>Copyright ©  2023, Thomas Wiens</Copyright>
+    <AssemblyVersion>0.1.0.0</AssemblyVersion>
+    <FileVersion>0.1.0.0</FileVersion>
+    <PlatformTarget>x86</PlatformTarget>
+  </PropertyGroup>
 </Project>