Integrate Publisher and ArSubsv with sibling ARIEC61850 engine

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ permissions:
 
 jobs:
   public-content:
-    name: Validate licensing, provenance, and public wording
+    name: Validate licensing, provenance, wording, and engine ownership
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout
@@ -26,76 +26,151 @@ jobs:
         continue-on-error: true
         run: python3 scripts/validate-public-neutrality.py
 
-      - name: Upload terminology validation evidence
+      - name: Validate ARIEC61850 engine ownership boundary
+        id: ownership
+        continue-on-error: true
+        run: python3 scripts/validate-engine-ownership.py
+
+      - name: Upload public and ownership validation evidence
         if: always()
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
-          name: arsvin-public-neutrality-report
-          path: artifacts/public-neutrality-report.txt
+          name: arsvin-public-and-engine-ownership-reports
+          path: |
+            artifacts/public-neutrality-report.txt
+            artifacts/engine-ownership-report.txt
           if-no-files-found: error
           retention-days: 14
 
-      - name: Enforce terminology validation result
-        if: steps.neutrality.outcome == 'failure'
+      - name: Enforce public and ownership validation results
+        if: steps.neutrality.outcome == 'failure' || steps.ownership.outcome == 'failure'
         run: exit 1
 
   build-test:
-    name: Build, test, and validate site
+    name: Build, test, and validate pinned engine integration
     needs: public-content
     runs-on: windows-2025
+    defaults:
+      run:
+        working-directory: arsvin
+    env:
+      ARIEC61850_ROOT: ${{ github.workspace }}\ARIEC61850
     steps:
-      - name: Checkout
+      - name: Checkout ARSVIN into paired workspace
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+        with:
+          path: arsvin
+
+      - name: Resolve pinned ARIEC61850 revision
+        id: engine_pin
+        shell: pwsh
+        run: |
+          $pin = .\scripts\resolve-engine-pin.ps1 -AsObject
+          "repository=$($pin.Repository)" | Add-Content $env:GITHUB_OUTPUT
+          "ref=$($pin.Ref)" | Add-Content $env:GITHUB_OUTPUT
+          "commit=$($pin.Commit)" | Add-Content $env:GITHUB_OUTPUT
+
+      - name: Checkout pinned sibling ARIEC61850
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+        with:
+          repository: ${{ steps.engine_pin.outputs.repository }}
+          ref: ${{ steps.engine_pin.outputs.commit }}
+          path: ARIEC61850
+
+      - name: Record and verify paired engine revision
+        shell: pwsh
+        run: |
+          $engineSha = (git -C "$env:ARIEC61850_ROOT" rev-parse HEAD).Trim().ToLowerInvariant()
+          $expected = '${{ steps.engine_pin.outputs.commit }}'.ToLowerInvariant()
+          if ($engineSha -ne $expected) {
+            throw "Pinned engine mismatch. Expected $expected, found $engineSha."
+          }
+          "ARIEC61850_REF=${{ steps.engine_pin.outputs.ref }}" | Out-File artifacts-engine-revision.txt -Encoding utf8
+          "ARIEC61850_EXPECTED_SHA=$expected" | Add-Content artifacts-engine-revision.txt
+          "ARIEC61850_ACTUAL_SHA=$engineSha" | Add-Content artifacts-engine-revision.txt
+          Get-Content artifacts-engine-revision.txt
 
       - name: Setup .NET
         uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5
         with:
           dotnet-version: 8.0.4xx
           cache: true
           cache-dependency-path: |
-            Directory.Packages.props
-            src/**/packages.lock.json
-            tests/**/packages.lock.json
+            arsvin/Directory.Packages.props
+            arsvin/src/**/packages.lock.json
+            arsvin/tests/**/packages.lock.json
 
       - name: Verify current licensing and public wording
         run: python scripts/verify-current-license.py
 
+      - name: Validate engine ownership boundary
+        run: python scripts/validate-engine-ownership.py
+
       - name: Build public site and HTML documentation
         run: python scripts/build-public-site.py --output artifacts/public-site
 
       - name: Validate public site
         shell: pwsh
         run: .\scripts\validate-public-site.ps1 -SiteRoot artifacts/public-site
 
-      - name: Restore locked NuGet dependency graph
-        run: dotnet restore ARSVIN.sln --locked-mode
+      - name: Restore dependency graph
+        shell: pwsh
+        run: |
+          New-Item -ItemType Directory -Path artifacts/build-logs -Force | Out-Null
+          dotnet restore ARSVIN.sln 2>&1 |
+            Tee-Object -FilePath artifacts/build-logs/restore.log
+          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 
-      - name: Upload committed NuGet lock evidence
+      - name: Upload NuGet lock and paired engine revision evidence
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
-          name: arsvin-nuget-lockfiles
+          name: arsvin-dependency-evidence
           path: |
-            src/**/packages.lock.json
-            tests/**/packages.lock.json
+            arsvin/engines/ARIEC61850.lock.json
+            arsvin/src/**/packages.lock.json
+            arsvin/tests/**/packages.lock.json
+            arsvin/artifacts-engine-revision.txt
           if-no-files-found: error
           retention-days: 7
 
       - name: Build Publisher with warnings as errors
-        run: dotnet build src/ARSVIN/ARSVIN.csproj -c Release --no-restore -warnaserror
+        shell: pwsh
+        run: |
+          dotnet build src/ARSVIN/ARSVIN.csproj -c Release --no-restore -warnaserror 2>&1 |
+            Tee-Object -FilePath artifacts/build-logs/publisher-build.log
+          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 
       - name: Build Subscriber with warnings as errors
-        run: dotnet build src/ARSVIN.Subscriber/ARSVIN.Subscriber.csproj -c Release --no-restore -warnaserror
+        shell: pwsh
+        run: |
+          dotnet build src/ARSVIN.Subscriber/ARSVIN.Subscriber.csproj -c Release --no-restore -warnaserror 2>&1 |
+            Tee-Object -FilePath artifacts/build-logs/subscriber-build.log
+          if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
+
+      - name: Upload paired restore and build diagnostics
+        if: always()
+        uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
+        with:
+          name: arsvin-paired-build-logs
+          path: arsvin/artifacts/build-logs
+          if-no-files-found: warn
+          retention-days: 14
 
-      - name: Test with whole-engine and protocol-core coverage gates
+      - name: Test against pinned ARIEC61850 with integration coverage gates
         shell: pwsh
-        run: .\scripts\test-with-coverage.ps1 -MinimumWholeEngineLineCoverage 14.25 -MinimumLineCoverage 72.5 -NoRestore
+        run: |
+          .\scripts\test-with-coverage.ps1 `
+            -MinimumWholeEngineCoveredLines 3000 `
+            -MinimumProtocolCoreCoveredLines 2300 `
+            -MinimumLineCoverage 72.5 `
+            -NoRestore
 
       - name: Upload test and coverage evidence
         if: always()
         uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7
         with:
           name: arsvin-test-evidence
-          path: artifacts/test-results
+          path: arsvin/artifacts/test-results
           if-no-files-found: warn
           retention-days: 14
 

.github/workflows/codeql.yml

@@ -14,33 +14,64 @@ permissions:
 
 jobs:
   analyze:
-    name: Analyze C# solution
+    name: Analyze pinned paired C# solution
     runs-on: windows-2025
+    defaults:
+      run:
+        working-directory: arsvin
+    env:
+      ARIEC61850_ROOT: ${{ github.workspace }}\ARIEC61850
     steps:
-      - name: Checkout
+      - name: Checkout ARSVIN into paired workspace
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+        with:
+          path: arsvin
+
+      - name: Resolve pinned ARIEC61850 revision
+        id: engine_pin
+        shell: pwsh
+        run: |
+          $pin = .\scripts\resolve-engine-pin.ps1 -AsObject
+          "repository=$($pin.Repository)" | Add-Content $env:GITHUB_OUTPUT
+          "commit=$($pin.Commit)" | Add-Content $env:GITHUB_OUTPUT
+
+      - name: Checkout pinned sibling ARIEC61850
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7
+        with:
+          repository: ${{ steps.engine_pin.outputs.repository }}
+          ref: ${{ steps.engine_pin.outputs.commit }}
+          path: ARIEC61850
+
+      - name: Verify pinned engine commit
+        shell: pwsh
+        run: |
+          $actual = (git -C "$env:ARIEC61850_ROOT" rev-parse HEAD).Trim().ToLowerInvariant()
+          $expected = '${{ steps.engine_pin.outputs.commit }}'.ToLowerInvariant()
+          if ($actual -ne $expected) {
+            throw "Pinned engine mismatch. Expected $expected, found $actual."
+          }
 
       - name: Setup .NET
         uses: actions/setup-dotnet@26b0ec14cb23fa6904739307f278c14f94c95bf1 # v5
         with:
           dotnet-version: 8.0.4xx
           cache: true
           cache-dependency-path: |
-            Directory.Packages.props
-            src/**/packages.lock.json
-            tests/**/packages.lock.json
+            arsvin/Directory.Packages.props
+            arsvin/src/**/packages.lock.json
+            arsvin/tests/**/packages.lock.json
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
         with:
           languages: csharp
           build-mode: manual
 
-      - name: Restore locked solution dependency graph
-        run: dotnet restore ARSVIN.sln --locked-mode
+      - name: Restore pinned paired solution dependency graph
+        run: dotnet restore ARSVIN.sln
 
-      - name: Build solution with warnings as errors
+      - name: Build pinned paired solution with warnings as errors
         run: dotnet build ARSVIN.sln -c Release --no-restore -warnaserror
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
+        uses: github/codeql-action/analyze@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0

ARSVIN.sln

@@ -2,8 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ARSVIN.Engine", "src\ARSVIN.Engine\ARSVIN.Engine.csproj", "{B6A2A1F7-2B1A-47B5-9C73-1A94C60D0B8E}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ARSVIN", "src\ARSVIN\ARSVIN.csproj", "{C2A1F2F6-4C1A-4D6A-A3F1-1E4FD13C4D01}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ARSVIN.Subscriber", "src\ARSVIN.Subscriber\ARSVIN.Subscriber.csproj", "{A9F2E511-7D62-4C74-99CF-0E59B8D51377}"
@@ -16,10 +14,6 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B6A2A1F7-2B1A-47B5-9C73-1A94C60D0B8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6A2A1F7-2B1A-47B5-9C73-1A94C60D0B8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6A2A1F7-2B1A-47B5-9C73-1A94C60D0B8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B6A2A1F7-2B1A-47B5-9C73-1A94C60D0B8E}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C2A1F2F6-4C1A-4D6A-A3F1-1E4FD13C4D01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C2A1F2F6-4C1A-4D6A-A3F1-1E4FD13C4D01}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C2A1F2F6-4C1A-4D6A-A3F1-1E4FD13C4D01}.Release|Any CPU.ActiveCfg = Release|Any CPU

Directory.Build.props

@@ -7,7 +7,13 @@
     <ContinuousIntegrationBuild Condition="'$(CI)' == 'true'">true</ContinuousIntegrationBuild>
     <Deterministic>true</Deterministic>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
-    <RestoreLockedMode Condition="'$(CI)' == 'true'">true</RestoreLockedMode>
+    <!--
+      The sibling-project graph differs from the retired embedded engine graph. During this
+      unmerged migration PR, restore is intentionally unlocked so local and CI paired builds
+      can refresh dependency assets. Lock files will be regenerated after the paired branches
+      are accepted and pinned to reviewed commits.
+    -->
+    <RestoreLockedMode>false</RestoreLockedMode>
     <VersionPrefix>0.4.0</VersionPrefix>
     <SourceRevisionId Condition="'$(SourceRevisionId)' == '' and '$(GITHUB_SHA)' != ''">$(GITHUB_SHA)</SourceRevisionId>
     <IncludeSourceRevisionInInformationalVersion>true</IncludeSourceRevisionInInformationalVersion>
@@ -17,5 +23,13 @@
     <Authors>Ari Sulistiono</Authors>
     <Company>Ari Sulistiono</Company>
     <Copyright>Copyright © 2026 Ari Sulistiono</Copyright>
+
+    <!--
+      ARSVIN and ArSubsv are derived applications. Reusable IEC 61850 logic is owned by
+      the sibling ARIEC61850 repository rather than an embedded copy in this repository.
+    -->
+    <ARIEC61850_ROOT Condition="'$(ARIEC61850_ROOT)' == ''">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\ARIEC61850'))</ARIEC61850_ROOT>
+    <ARIEC61850_CORE_PROJECT>$(ARIEC61850_ROOT)\src\AR.Iec61850\AR.Iec61850.csproj</ARIEC61850_CORE_PROJECT>
+    <ARIEC61850_NPCAP_PROJECT>$(ARIEC61850_ROOT)\src\AR.Iec61850.Transports.Npcap\AR.Iec61850.Transports.Npcap.csproj</ARIEC61850_NPCAP_PROJECT>
   </PropertyGroup>
 </Project>

Directory.Build.targets

@@ -0,0 +1,10 @@
+<Project>
+  <Target Name="ValidateARIEC61850Sibling"
+          BeforeTargets="PrepareForBuild"
+          Condition="'$(MSBuildProjectName)' == 'ARSVIN' or '$(MSBuildProjectName)' == 'ARSVIN.Subscriber' or '$(MSBuildProjectName)' == 'ARSVIN.Tests'">
+    <Error Condition="!Exists('$(ARIEC61850_CORE_PROJECT)')"
+           Text="ARIEC61850 sibling repository was not found. Expected core project: $(ARIEC61850_CORE_PROJECT). Clone https://github.com/masarray/ARIEC61850 beside this repository or pass -p:ARIEC61850_ROOT=&quot;X:\path\ARIEC61850&quot;." />
+    <Error Condition="!Exists('$(ARIEC61850_NPCAP_PROJECT)')"
+           Text="ARIEC61850 Npcap transport project was not found. Expected: $(ARIEC61850_NPCAP_PROJECT)." />
+  </Target>
+</Project>