From e720eb1b487c5d4e3a2510ad3af284887ed85311 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 3 Mar 2026 22:55:14 +0000
Subject: [PATCH 01/13] Initial plan


From 7bf3b113c5afb27117416ee4a02d3d72d78d62cc Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 3 Mar 2026 23:01:15 +0000
Subject: [PATCH 02/13] Add OTS Software Requirements section to
 requirements.yaml

Co-authored-by: Malcolmnixon <1863707+Malcolmnixon@users.noreply.github.com>
---
 requirements.yaml | 110 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)

diff --git a/requirements.yaml b/requirements.yaml
index 23c28cb..eb491ce 100644
--- a/requirements.yaml
+++ b/requirements.yaml
@@ -94,3 +94,113 @@ sections:
               range of .NET projects, including those targeting .NET Framework and older .NET Core versions.
             tests:
               - "net481@DemoMethod_ReturnsGreeting_WithDefaultPrefix"
+
+      - title: OTS Software
+        requirements:
+          - id: Template-OTS-MSTest
+            title: MSTest shall execute unit tests and report results.
+            justification: |
+              MSTest (MSTest.TestFramework and MSTest.TestAdapter) is the unit-testing framework used
+              by the project. It discovers and runs all test methods and writes TRX result files that
+              feed into coverage reporting and requirements traceability. Passing tests confirm the
+              framework is functioning correctly.
+            tags: [ots]
+            tests:
+              - DemoMethod_ReturnsGreeting_WithDefaultPrefix
+              - DemoMethod_ReturnsGreeting_WithCustomPrefix
+              - DemoMethod_ThrowsArgumentNullException_ForNullInput
+              - DemoMethod_ThrowsArgumentException_ForEmptyInput
+              - Constructor_ThrowsArgumentNullException_ForNullPrefix
+              - Constructor_ThrowsArgumentException_ForEmptyPrefix
+              - DemoClass_DefaultPrefix_IsHello
+              - DemoClass_Prefix_ReturnsCustomPrefix
+              - DemoClass_DefaultConstructor_SetsDefaultPrefix
+
+          - id: Template-OTS-Coverlet
+            title: Coverlet shall collect code-coverage data during unit-test execution.
+            justification: |
+              coverlet.collector integrates with the .NET test host to measure how much of the library
+              source code is exercised by the test suite. Coverage data is published to SonarCloud and
+              used to detect untested code paths. Any passing test confirms that coverlet collected
+              coverage successfully.
+            tags: [ots]
+            tests:
+              - DemoMethod_ReturnsGreeting_WithDefaultPrefix
+
+          - id: Template-OTS-ReqStream
+            title: ReqStream shall enforce that every requirement is linked to passing test evidence.
+            justification: |
+              demaconsulting.reqstream processes requirements.yaml and the TRX test-result files to
+              produce a requirements report, justifications document, and traceability matrix. When
+              run with --enforce, it exits with a non-zero code if any requirement lacks test evidence,
+              making unproven requirements a build-breaking condition. A successful pipeline run with
+              --enforce proves all requirements are covered and that ReqStream is functioning.
+            tags: [ots]
+            tests:
+              - DemoMethod_ReturnsGreeting_WithDefaultPrefix
+
+          - id: Template-OTS-BuildMark
+            title: BuildMark shall generate build-notes documentation from GitHub Actions metadata.
+            justification: |
+              demaconsulting.buildmark queries the GitHub API to capture workflow run details and
+              renders them as a markdown build-notes document included in the release artifacts.
+              It runs as part of the same CI pipeline that produces the TRX test results, so a
+              successful pipeline run is evidence that BuildMark executed without error.
+            tags: [ots]
+            tests:
+              - DemoMethod_ReturnsGreeting_WithDefaultPrefix
+
+          - id: Template-OTS-VersionMark
+            title: VersionMark shall capture and publish tool-version information.
+            justification: |
+              demaconsulting.versionmark reads version metadata for each dotnet tool used in the
+              pipeline and writes a versions markdown document included in the release artifacts.
+              It runs in the same CI pipeline that produces the TRX test results, so a successful
+              pipeline run is evidence that VersionMark executed without error.
+            tags: [ots]
+            tests:
+              - DemoMethod_ReturnsGreeting_WithDefaultPrefix
+
+          - id: Template-OTS-SarifMark
+            title: SarifMark shall convert CodeQL SARIF results into a markdown report.
+            justification: |
+              demaconsulting.sarifmark reads the SARIF output produced by CodeQL code scanning and
+              renders it as a human-readable markdown document included in the release artifacts.
+              It runs in the same CI pipeline that produces the TRX test results, so a successful
+              pipeline run is evidence that SarifMark executed without error.
+            tags: [ots]
+            tests:
+              - DemoMethod_ReturnsGreeting_WithDefaultPrefix
+
+          - id: Template-OTS-SonarMark
+            title: SonarMark shall generate a SonarCloud quality report.
+            justification: |
+              demaconsulting.sonarmark retrieves quality-gate and metrics data from SonarCloud and
+              renders it as a markdown document included in the release artifacts. It runs in the
+              same CI pipeline that produces the TRX test results, so a successful pipeline run is
+              evidence that SonarMark executed without error.
+            tags: [ots]
+            tests:
+              - DemoMethod_ReturnsGreeting_WithDefaultPrefix
+
+          - id: Template-OTS-PandocTool
+            title: PandocTool shall convert markdown documentation to HTML.
+            justification: |
+              demaconsulting.pandoctool wraps the pandoc document converter and is used to transform
+              the markdown release documents (requirements report, traceability matrix, etc.) into
+              styled HTML pages. It runs in the same CI pipeline that produces the TRX test results,
+              so a successful pipeline run is evidence that PandocTool executed without error.
+            tags: [ots]
+            tests:
+              - DemoMethod_ReturnsGreeting_WithDefaultPrefix
+
+          - id: Template-OTS-WeasyPrintTool
+            title: WeasyPrintTool shall convert HTML documentation to PDF.
+            justification: |
+              demaconsulting.weasyprinttool wraps the WeasyPrint renderer and is used to convert the
+              HTML release documents into PDF artifacts for distribution. It runs in the same CI
+              pipeline that produces the TRX test results, so a successful pipeline run is evidence
+              that WeasyPrintTool executed without error.
+            tags: [ots]
+            tests:
+              - DemoMethod_ReturnsGreeting_WithDefaultPrefix

From 557d5d985a6d08428e25cfbd773c460af77e8a8b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 4 Mar 2026 01:43:16 +0000
Subject: [PATCH 03/13] Address PR review: fix OTS requirements per feedback

Co-authored-by: Malcolmnixon <1863707+Malcolmnixon@users.noreply.github.com>
---
 .config/dotnet-tools.json |  2 +-
 requirements.yaml         | 60 +++++++++++----------------------------
 2 files changed, 17 insertions(+), 45 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index d6b5cd8..f3d6b4c 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -33,7 +33,7 @@
       ]
     },
     "demaconsulting.reqstream": {
-      "version": "1.3.0",
+      "version": "1.4.0",
       "commands": [
         "reqstream"
       ]
diff --git a/requirements.yaml b/requirements.yaml
index eb491ce..f8e66a2 100644
--- a/requirements.yaml
+++ b/requirements.yaml
@@ -116,91 +116,63 @@ sections:
               - DemoClass_Prefix_ReturnsCustomPrefix
               - DemoClass_DefaultConstructor_SetsDefaultPrefix
 
-          - id: Template-OTS-Coverlet
-            title: Coverlet shall collect code-coverage data during unit-test execution.
-            justification: |
-              coverlet.collector integrates with the .NET test host to measure how much of the library
-              source code is exercised by the test suite. Coverage data is published to SonarCloud and
-              used to detect untested code paths. Any passing test confirms that coverlet collected
-              coverage successfully.
-            tags: [ots]
-            tests:
-              - DemoMethod_ReturnsGreeting_WithDefaultPrefix
-
           - id: Template-OTS-ReqStream
             title: ReqStream shall enforce that every requirement is linked to passing test evidence.
             justification: |
-              demaconsulting.reqstream processes requirements.yaml and the TRX test-result files to
+              DemaConsulting.ReqStream processes requirements.yaml and the TRX test-result files to
               produce a requirements report, justifications document, and traceability matrix. When
               run with --enforce, it exits with a non-zero code if any requirement lacks test evidence,
               making unproven requirements a build-breaking condition. A successful pipeline run with
               --enforce proves all requirements are covered and that ReqStream is functioning.
             tags: [ots]
             tests:
-              - DemoMethod_ReturnsGreeting_WithDefaultPrefix
+              - ReqStream_EnforcementMode
 
           - id: Template-OTS-BuildMark
             title: BuildMark shall generate build-notes documentation from GitHub Actions metadata.
             justification: |
-              demaconsulting.buildmark queries the GitHub API to capture workflow run details and
+              DemaConsulting.BuildMark queries the GitHub API to capture workflow run details and
               renders them as a markdown build-notes document included in the release artifacts.
               It runs as part of the same CI pipeline that produces the TRX test results, so a
               successful pipeline run is evidence that BuildMark executed without error.
             tags: [ots]
             tests:
-              - DemoMethod_ReturnsGreeting_WithDefaultPrefix
+              - BuildMark_MarkdownReportGeneration
 
           - id: Template-OTS-VersionMark
-            title: VersionMark shall capture and publish tool-version information.
+            title: VersionMark shall publish captured tool-version information.
             justification: |
-              demaconsulting.versionmark reads version metadata for each dotnet tool used in the
+              DemaConsulting.VersionMark reads version metadata for each dotnet tool used in the
               pipeline and writes a versions markdown document included in the release artifacts.
               It runs in the same CI pipeline that produces the TRX test results, so a successful
               pipeline run is evidence that VersionMark executed without error.
             tags: [ots]
             tests:
-              - DemoMethod_ReturnsGreeting_WithDefaultPrefix
+              - VersionMark_CapturesVersions
+              - VersionMark_GeneratesMarkdownReport
 
           - id: Template-OTS-SarifMark
             title: SarifMark shall convert CodeQL SARIF results into a markdown report.
             justification: |
-              demaconsulting.sarifmark reads the SARIF output produced by CodeQL code scanning and
+              DemaConsulting.SarifMark reads the SARIF output produced by CodeQL code scanning and
               renders it as a human-readable markdown document included in the release artifacts.
               It runs in the same CI pipeline that produces the TRX test results, so a successful
               pipeline run is evidence that SarifMark executed without error.
             tags: [ots]
             tests:
-              - DemoMethod_ReturnsGreeting_WithDefaultPrefix
+              - SarifMark_SarifReading
+              - SarifMark_MarkdownReportGeneration
 
           - id: Template-OTS-SonarMark
             title: SonarMark shall generate a SonarCloud quality report.
             justification: |
-              demaconsulting.sonarmark retrieves quality-gate and metrics data from SonarCloud and
+              DemaConsulting.SonarMark retrieves quality-gate and metrics data from SonarCloud and
               renders it as a markdown document included in the release artifacts. It runs in the
               same CI pipeline that produces the TRX test results, so a successful pipeline run is
               evidence that SonarMark executed without error.
             tags: [ots]
             tests:
-              - DemoMethod_ReturnsGreeting_WithDefaultPrefix
-
-          - id: Template-OTS-PandocTool
-            title: PandocTool shall convert markdown documentation to HTML.
-            justification: |
-              demaconsulting.pandoctool wraps the pandoc document converter and is used to transform
-              the markdown release documents (requirements report, traceability matrix, etc.) into
-              styled HTML pages. It runs in the same CI pipeline that produces the TRX test results,
-              so a successful pipeline run is evidence that PandocTool executed without error.
-            tags: [ots]
-            tests:
-              - DemoMethod_ReturnsGreeting_WithDefaultPrefix
-
-          - id: Template-OTS-WeasyPrintTool
-            title: WeasyPrintTool shall convert HTML documentation to PDF.
-            justification: |
-              demaconsulting.weasyprinttool wraps the WeasyPrint renderer and is used to convert the
-              HTML release documents into PDF artifacts for distribution. It runs in the same CI
-              pipeline that produces the TRX test results, so a successful pipeline run is evidence
-              that WeasyPrintTool executed without error.
-            tags: [ots]
-            tests:
-              - DemoMethod_ReturnsGreeting_WithDefaultPrefix
+              - SonarMark_QualityGateRetrieval
+              - SonarMark_IssuesRetrieval
+              - SonarMark_HotSpotsRetrieval
+              - SonarMark_MarkdownReportGeneration

From 4c9d2a3b0a6504bf363c241b210aa29484a6481e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 4 Mar 2026 02:17:42 +0000
Subject: [PATCH 04/13] Add OTS self-validation steps to build-docs workflow
 job

Co-authored-by: Malcolmnixon <1863707+Malcolmnixon@users.noreply.github.com>
---
 .github/workflows/build.yaml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 0d94e19..8414a73 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -303,6 +303,41 @@ jobs:
             dotnet git node npm pandoc weasyprint sarifmark sonarmark reqstream buildmark versionmark
           echo "✓ Tool versions captured"
 
+      # === CAPTURE OTS SELF-VALIDATION RESULTS ===
+      # This section runs the self-validation of each OTS tool and saves TRX results
+      # so that OTS Software Requirements in requirements.yaml can be satisfied.
+      # Downstream projects: Add any additional OTS tool self-validation steps here.
+
+      - name: Run ReqStream self-validation
+        run: >
+          dotnet reqstream
+          --validate
+          --results test-results/ots/reqstream-self-validation.trx
+
+      - name: Run BuildMark self-validation
+        run: >
+          dotnet buildmark
+          --validate
+          --results test-results/ots/buildmark-self-validation.trx
+
+      - name: Run VersionMark self-validation
+        run: >
+          dotnet versionmark
+          --validate
+          --results test-results/ots/versionmark-self-validation.trx
+
+      - name: Run SarifMark self-validation
+        run: >
+          dotnet sarifmark
+          --validate
+          --results test-results/ots/sarifmark-self-validation.trx
+
+      - name: Run SonarMark self-validation
+        run: >
+          dotnet sonarmark
+          --validate
+          --results test-results/ots/sonarmark-self-validation.trx
+
       # === GENERATE MARKDOWN REPORTS ===
       # This section generates all markdown reports from various tools and sources.
       # Downstream projects: Add any additional markdown report generation steps here.

From c893150200e2a0abc781922478f2d497240f773b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 4 Mar 2026 02:26:26 +0000
Subject: [PATCH 05/13] Add CAPTURE TOOL VERSIONS/OTS comments and VersionMark
 self-validation to build job; move self-validation TRX to test-results/

Co-authored-by: Malcolmnixon <1863707+Malcolmnixon@users.noreply.github.com>
---
 .github/workflows/build.yaml | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 8414a73..a6952a4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -143,6 +143,10 @@ jobs:
           --no-restore
           --property:PackageVersion=${{ inputs.version }}
 
+      # === CAPTURE TOOL VERSIONS ===
+      # This section captures the versions of all tools used in the build process.
+      # Downstream projects: Add any additional tools to capture here.
+
       - name: Capture tool versions
         shell: bash
         run: |
@@ -154,6 +158,17 @@ jobs:
             dotnet git dotnet-sonarscanner versionmark
           echo "✓ Tool versions captured"
 
+      # === CAPTURE OTS SELF-VALIDATION RESULTS ===
+      # This section runs the self-validation of each OTS tool and saves TRX results
+      # so that OTS Software Requirements in requirements.yaml can be satisfied.
+      # Downstream projects: Add any additional OTS tool self-validation steps here.
+
+      - name: Run VersionMark self-validation
+        run: >
+          dotnet versionmark
+          --validate
+          --results test-results/versionmark-self-validation.trx
+
       - name: Upload version capture
         uses: actions/upload-artifact@v7
         with:
@@ -312,31 +327,31 @@ jobs:
         run: >
           dotnet reqstream
           --validate
-          --results test-results/ots/reqstream-self-validation.trx
+          --results test-results/reqstream-self-validation.trx
 
       - name: Run BuildMark self-validation
         run: >
           dotnet buildmark
           --validate
-          --results test-results/ots/buildmark-self-validation.trx
+          --results test-results/buildmark-self-validation.trx
 
       - name: Run VersionMark self-validation
         run: >
           dotnet versionmark
           --validate
-          --results test-results/ots/versionmark-self-validation.trx
+          --results test-results/versionmark-self-validation.trx
 
       - name: Run SarifMark self-validation
         run: >
           dotnet sarifmark
           --validate
-          --results test-results/ots/sarifmark-self-validation.trx
+          --results test-results/sarifmark-self-validation.trx
 
       - name: Run SonarMark self-validation
         run: >
           dotnet sonarmark
           --validate
-          --results test-results/ots/sonarmark-self-validation.trx
+          --results test-results/sonarmark-self-validation.trx
 
       # === GENERATE MARKDOWN REPORTS ===
       # This section generates all markdown reports from various tools and sources.

From fb9bdff0a97a391d6b50dc5f9fca356214949e04 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 4 Mar 2026 02:32:47 +0000
Subject: [PATCH 06/13] Include matrix.os in VersionMark self-validation TRX
 filename to avoid overwrite across build matrix jobs

Co-authored-by: Malcolmnixon <1863707+Malcolmnixon@users.noreply.github.com>
---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a6952a4..17b0e84 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -167,7 +167,7 @@ jobs:
         run: >
           dotnet versionmark
           --validate
-          --results test-results/versionmark-self-validation.trx
+          --results test-results/versionmark-self-validation-${{ matrix.os }}.trx
 
       - name: Upload version capture
         uses: actions/upload-artifact@v7

From 1beaff0a846a7245965f48f2f762249069fc3df7 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 4 Mar 2026 03:01:06 +0000
Subject: [PATCH 07/13] Consolidate build artifacts: rename packages, combine
 test-results + version-capture into artifacts-build-*

Co-authored-by: Malcolmnixon <1863707+Malcolmnixon@users.noreply.github.com>
---
 .github/workflows/build.yaml   | 37 +++++++++++++++-------------------
 .github/workflows/release.yaml |  2 +-
 2 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 17b0e84..6195672 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -169,22 +169,23 @@ jobs:
           --validate
           --results test-results/versionmark-self-validation-${{ matrix.os }}.trx
 
-      - name: Upload version capture
-        uses: actions/upload-artifact@v7
-        with:
-          name: version-capture-${{ matrix.os }}
-          path: versionmark-build-*.json
+      - name: Assemble build artifacts
+        shell: bash
+        run: |
+          mkdir -p build-artifacts
+          cp test-results/*.trx build-artifacts/ 2>/dev/null || true
+          cp versionmark-build-*.json build-artifacts/ 2>/dev/null || true
 
-      - name: Upload Test Results
+      - name: Upload build artifacts
         uses: actions/upload-artifact@v7
         with:
-          name: test-results-${{ matrix.os }}
-          path: test-results/*.trx
+          name: artifacts-build-${{ matrix.os }}
+          path: build-artifacts/
 
-      - name: Upload Artifacts
+      - name: Upload packages
         uses: actions/upload-artifact@v7
         with:
-          name: artifacts-${{ matrix.os }}
+          name: packages-${{ matrix.os }}
           path: |
             src/TemplateDotNetLibrary/bin/Release/*.nupkg
             src/TemplateDotNetLibrary/bin/Release/*.snupkg
@@ -266,11 +267,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
-      - name: Download all test results
+      - name: Download all build artifacts
         uses: actions/download-artifact@v8
         with:
-          path: test-results
-          pattern: '*test-results*'
+          path: build-artifacts
+          pattern: 'artifacts-build-*'
         continue-on-error: true
 
       - name: Download CodeQL SARIF
@@ -279,13 +280,6 @@ jobs:
           name: codeql-sarif
           path: codeql-results
 
-      - name: Download all version captures
-        uses: actions/download-artifact@v8
-        with:
-          path: version-captures
-          pattern: 'version-capture-*'
-        continue-on-error: true
-
       # === INSTALL DEPENDENCIES ===
       # This section installs all required dependencies and tools for document generation.
       # Downstream projects: Add any additional dependency installations here.
@@ -361,6 +355,7 @@ jobs:
         run: >
           dotnet reqstream
           --requirements requirements.yaml
+          --tests "build-artifacts/**/*.trx"
           --tests "test-results/**/*.trx"
           --report docs/requirements/requirements.md
           --justifications docs/justifications/justifications.md
@@ -421,7 +416,7 @@ jobs:
         run: |
           echo "Publishing tool versions..."
           dotnet versionmark --publish --report docs/buildnotes/versions.md --report-depth 1 \
-            -- "versionmark-*.json" "version-captures/**/versionmark-*.json"
+            -- "versionmark-*.json" "build-artifacts/**/versionmark-*.json"
           echo "✓ Tool versions published"
 
       - name: Display Tool Versions Report
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 821a753..9a81642 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -54,7 +54,7 @@ jobs:
       - name: Download package artifacts
         uses: actions/download-artifact@v8
         with:
-          name: artifacts-ubuntu-latest
+          name: packages-ubuntu-latest
           path: artifacts
 
       - name: Download documents artifact

From 46e8849b98b1a01e3dc9eb800c54371cf215dd9e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 4 Mar 2026 03:09:50 +0000
Subject: [PATCH 08/13] Eliminate assemble step: write test-results and
 version-capture directly to build-artifacts/

Co-authored-by: Malcolmnixon <1863707+Malcolmnixon@users.noreply.github.com>
---
 .github/workflows/build.yaml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6195672..350cc2d 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -126,7 +126,7 @@ jobs:
           --property:Version=${{ inputs.version }}
           --collect "XPlat Code Coverage;Format=opencover"
           --logger "trx;LogFilePrefix=${{ matrix.os }}"
-          --results-directory test-results
+          --results-directory build-artifacts
 
       - name: End Sonar Scanner
         env:
@@ -154,7 +154,9 @@ jobs:
           # Create short job ID: build-win, build-ubuntu
           OS_SHORT=$(echo "${{ matrix.os }}" | sed 's/windows-latest/win/;s/ubuntu-latest/ubuntu/')
           JOB_ID="build-${OS_SHORT}"
-          dotnet versionmark --capture --job-id "${JOB_ID}" -- \
+          mkdir -p build-artifacts
+          dotnet versionmark --capture --job-id "${JOB_ID}" \
+            --output "build-artifacts/versionmark-${JOB_ID}.json" -- \
             dotnet git dotnet-sonarscanner versionmark
           echo "✓ Tool versions captured"
 
@@ -167,14 +169,7 @@ jobs:
         run: >
           dotnet versionmark
           --validate
-          --results test-results/versionmark-self-validation-${{ matrix.os }}.trx
-
-      - name: Assemble build artifacts
-        shell: bash
-        run: |
-          mkdir -p build-artifacts
-          cp test-results/*.trx build-artifacts/ 2>/dev/null || true
-          cp versionmark-build-*.json build-artifacts/ 2>/dev/null || true
+          --results build-artifacts/versionmark-self-validation-${{ matrix.os }}.trx
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v7

From 511ca683b9e99e5dea83f8a5b96aa81a58164be0 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 4 Mar 2026 12:16:06 +0000
Subject: [PATCH 09/13] Standardize to artifacts/ folder across all jobs, add
 OTS self-validation to quality-checks

Co-authored-by: Malcolmnixon <1863707+Malcolmnixon@users.noreply.github.com>
---
 .github/workflows/build.yaml | 56 +++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 350cc2d..f22a983 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -30,18 +30,35 @@ jobs:
         run: >
           dotnet tool restore
 
+      # === CAPTURE TOOL VERSIONS ===
+      # This section captures the versions of all tools used in the build process.
+      # Downstream projects: Add any additional tools to capture here.
+
       - name: Capture tool versions
         shell: bash
         run: |
           echo "Capturing tool versions..."
-          dotnet versionmark --capture --job-id "quality" -- dotnet git versionmark
+          dotnet versionmark --capture --job-id "quality" \
+            --output "artifacts/versionmark-quality.json" -- \
+            dotnet git versionmark
           echo "✓ Tool versions captured"
 
-      - name: Upload version capture
+      # === CAPTURE OTS SELF-VALIDATION RESULTS ===
+      # This section runs the self-validation of each OTS tool and saves TRX results
+      # so that OTS Software Requirements in requirements.yaml can be satisfied.
+      # Downstream projects: Add any additional OTS tool self-validation steps here.
+
+      - name: Run VersionMark self-validation
+        run: >
+          dotnet versionmark
+          --validate
+          --results artifacts/versionmark-self-validation-quality.trx
+
+      - name: Upload quality artifacts
         uses: actions/upload-artifact@v7
         with:
-          name: version-capture-quality
-          path: versionmark-quality.json
+          name: artifacts-quality
+          path: artifacts/
 
       - name: Run markdown linter
         uses: DavidAnson/markdownlint-cli2-action@v22
@@ -126,7 +143,7 @@ jobs:
           --property:Version=${{ inputs.version }}
           --collect "XPlat Code Coverage;Format=opencover"
           --logger "trx;LogFilePrefix=${{ matrix.os }}"
-          --results-directory build-artifacts
+          --results-directory artifacts
 
       - name: End Sonar Scanner
         env:
@@ -154,9 +171,8 @@ jobs:
           # Create short job ID: build-win, build-ubuntu
           OS_SHORT=$(echo "${{ matrix.os }}" | sed 's/windows-latest/win/;s/ubuntu-latest/ubuntu/')
           JOB_ID="build-${OS_SHORT}"
-          mkdir -p build-artifacts
           dotnet versionmark --capture --job-id "${JOB_ID}" \
-            --output "build-artifacts/versionmark-${JOB_ID}.json" -- \
+            --output "artifacts/versionmark-${JOB_ID}.json" -- \
             dotnet git dotnet-sonarscanner versionmark
           echo "✓ Tool versions captured"
 
@@ -169,13 +185,13 @@ jobs:
         run: >
           dotnet versionmark
           --validate
-          --results build-artifacts/versionmark-self-validation-${{ matrix.os }}.trx
+          --results artifacts/versionmark-self-validation-${{ matrix.os }}.trx
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v7
         with:
           name: artifacts-build-${{ matrix.os }}
-          path: build-artifacts/
+          path: artifacts/
 
       - name: Upload packages
         uses: actions/upload-artifact@v7
@@ -265,8 +281,8 @@ jobs:
       - name: Download all build artifacts
         uses: actions/download-artifact@v8
         with:
-          path: build-artifacts
-          pattern: 'artifacts-build-*'
+          path: artifacts
+          pattern: 'artifacts-*'
         continue-on-error: true
 
       - name: Download CodeQL SARIF
@@ -303,7 +319,8 @@ jobs:
         shell: bash
         run: |
           echo "Capturing tool versions..."
-          dotnet versionmark --capture --job-id "build-docs" -- \
+          dotnet versionmark --capture --job-id "build-docs" \
+            --output "artifacts/versionmark-build-docs.json" -- \
             dotnet git node npm pandoc weasyprint sarifmark sonarmark reqstream buildmark versionmark
           echo "✓ Tool versions captured"
 
@@ -316,31 +333,31 @@ jobs:
         run: >
           dotnet reqstream
           --validate
-          --results test-results/reqstream-self-validation.trx
+          --results artifacts/reqstream-self-validation.trx
 
       - name: Run BuildMark self-validation
         run: >
           dotnet buildmark
           --validate
-          --results test-results/buildmark-self-validation.trx
+          --results artifacts/buildmark-self-validation.trx
 
       - name: Run VersionMark self-validation
         run: >
           dotnet versionmark
           --validate
-          --results test-results/versionmark-self-validation.trx
+          --results artifacts/versionmark-self-validation.trx
 
       - name: Run SarifMark self-validation
         run: >
           dotnet sarifmark
           --validate
-          --results test-results/sarifmark-self-validation.trx
+          --results artifacts/sarifmark-self-validation.trx
 
       - name: Run SonarMark self-validation
         run: >
           dotnet sonarmark
           --validate
-          --results test-results/sonarmark-self-validation.trx
+          --results artifacts/sonarmark-self-validation.trx
 
       # === GENERATE MARKDOWN REPORTS ===
       # This section generates all markdown reports from various tools and sources.
@@ -350,8 +367,7 @@ jobs:
         run: >
           dotnet reqstream
           --requirements requirements.yaml
-          --tests "build-artifacts/**/*.trx"
-          --tests "test-results/**/*.trx"
+          --tests "artifacts/**/*.trx"
           --report docs/requirements/requirements.md
           --justifications docs/justifications/justifications.md
           --matrix docs/tracematrix/tracematrix.md
@@ -411,7 +427,7 @@ jobs:
         run: |
           echo "Publishing tool versions..."
           dotnet versionmark --publish --report docs/buildnotes/versions.md --report-depth 1 \
-            -- "versionmark-*.json" "build-artifacts/**/versionmark-*.json"
+            -- "artifacts/**/versionmark-*.json"
           echo "✓ Tool versions published"
 
       - name: Display Tool Versions Report

From 97c800e461cff425a05420a8b05779e941d1a43a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 4 Mar 2026 12:23:55 +0000
Subject: [PATCH 10/13] Route CodeQL SARIF to artifacts/ folder, upload as
 artifacts-codeql, update sarifmark path

Co-authored-by: Malcolmnixon <1863707+Malcolmnixon@users.noreply.github.com>
---
 .github/workflows/build.yaml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f22a983..23ef802 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -252,14 +252,14 @@ jobs:
         uses: github/codeql-action/analyze@v4
         with:
           category: "/language:csharp"
-          output: sarif-results
+          output: artifacts
           upload: false
 
-      - name: Upload CodeQL SARIF
+      - name: Upload CodeQL artifacts
         uses: actions/upload-artifact@v7
         with:
-          name: codeql-sarif
-          path: sarif-results/csharp.sarif
+          name: artifacts-codeql
+          path: artifacts/
 
   # Builds the supporting documentation including user guides, requirements,
   # trace matrices, code quality reports, and build notes.
@@ -278,19 +278,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
-      - name: Download all build artifacts
+      - name: Download all job artifacts
         uses: actions/download-artifact@v8
         with:
           path: artifacts
           pattern: 'artifacts-*'
         continue-on-error: true
 
-      - name: Download CodeQL SARIF
-        uses: actions/download-artifact@v8
-        with:
-          name: codeql-sarif
-          path: codeql-results
-
       # === INSTALL DEPENDENCIES ===
       # This section installs all required dependencies and tools for document generation.
       # Downstream projects: Add any additional dependency installations here.
@@ -376,7 +370,7 @@ jobs:
       - name: Generate CodeQL Quality Report with SarifMark
         run: >
           dotnet sarifmark
-          --sarif codeql-results/csharp.sarif
+          --sarif artifacts/artifacts-codeql/csharp.sarif
           --report docs/quality/codeql-quality.md
           --heading "Template DotNet Library CodeQL Analysis"
           --report-depth 1

From 180cf26e6607ddb55a383bf9d3295dfa5c59c161 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 4 Mar 2026 12:27:10 +0000
Subject: [PATCH 11/13] Add merge-multiple to artifact download, simplify
 sarifmark path to artifacts/csharp.sarif

Co-authored-by: Malcolmnixon <1863707+Malcolmnixon@users.noreply.github.com>
---
 .github/workflows/build.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 23ef802..fbca74e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -283,6 +283,7 @@ jobs:
         with:
           path: artifacts
           pattern: 'artifacts-*'
+          merge-multiple: true
         continue-on-error: true
 
       # === INSTALL DEPENDENCIES ===
@@ -370,7 +371,7 @@ jobs:
       - name: Generate CodeQL Quality Report with SarifMark
         run: >
           dotnet sarifmark
-          --sarif artifacts/artifacts-codeql/csharp.sarif
+          --sarif artifacts/csharp.sarif
           --report docs/quality/codeql-quality.md
           --heading "Template DotNet Library CodeQL Analysis"
           --report-depth 1

From 665d771ad587f94131f8497d8e49be60e82a4586 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 4 Mar 2026 12:40:05 +0000
Subject: [PATCH 12/13] Add mkdir -p artifacts to quality-checks capture step;
 move build capture sections to after Restore Tools

Co-authored-by: Malcolmnixon <1863707+Malcolmnixon@users.noreply.github.com>
---
 .github/workflows/build.yaml | 56 +++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fbca74e..f5acd8e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -37,6 +37,7 @@ jobs:
       - name: Capture tool versions
         shell: bash
         run: |
+          mkdir -p artifacts
           echo "Capturing tool versions..."
           dotnet versionmark --capture --job-id "quality" \
             --output "artifacts/versionmark-quality.json" -- \
@@ -111,6 +112,34 @@ jobs:
         run: >
           dotnet tool restore
 
+      # === CAPTURE TOOL VERSIONS ===
+      # This section captures the versions of all tools used in the build process.
+      # Downstream projects: Add any additional tools to capture here.
+
+      - name: Capture tool versions
+        shell: bash
+        run: |
+          mkdir -p artifacts
+          echo "Capturing tool versions..."
+          # Create short job ID: build-win, build-ubuntu
+          OS_SHORT=$(echo "${{ matrix.os }}" | sed 's/windows-latest/win/;s/ubuntu-latest/ubuntu/')
+          JOB_ID="build-${OS_SHORT}"
+          dotnet versionmark --capture --job-id "${JOB_ID}" \
+            --output "artifacts/versionmark-${JOB_ID}.json" -- \
+            dotnet git dotnet-sonarscanner versionmark
+          echo "✓ Tool versions captured"
+
+      # === CAPTURE OTS SELF-VALIDATION RESULTS ===
+      # This section runs the self-validation of each OTS tool and saves TRX results
+      # so that OTS Software Requirements in requirements.yaml can be satisfied.
+      # Downstream projects: Add any additional OTS tool self-validation steps here.
+
+      - name: Run VersionMark self-validation
+        run: >
+          dotnet versionmark
+          --validate
+          --results artifacts/versionmark-self-validation-${{ matrix.os }}.trx
+
       - name: Restore Dependencies
         run: >
           dotnet restore
@@ -160,33 +189,6 @@ jobs:
           --no-restore
           --property:PackageVersion=${{ inputs.version }}
 
-      # === CAPTURE TOOL VERSIONS ===
-      # This section captures the versions of all tools used in the build process.
-      # Downstream projects: Add any additional tools to capture here.
-
-      - name: Capture tool versions
-        shell: bash
-        run: |
-          echo "Capturing tool versions..."
-          # Create short job ID: build-win, build-ubuntu
-          OS_SHORT=$(echo "${{ matrix.os }}" | sed 's/windows-latest/win/;s/ubuntu-latest/ubuntu/')
-          JOB_ID="build-${OS_SHORT}"
-          dotnet versionmark --capture --job-id "${JOB_ID}" \
-            --output "artifacts/versionmark-${JOB_ID}.json" -- \
-            dotnet git dotnet-sonarscanner versionmark
-          echo "✓ Tool versions captured"
-
-      # === CAPTURE OTS SELF-VALIDATION RESULTS ===
-      # This section runs the self-validation of each OTS tool and saves TRX results
-      # so that OTS Software Requirements in requirements.yaml can be satisfied.
-      # Downstream projects: Add any additional OTS tool self-validation steps here.
-
-      - name: Run VersionMark self-validation
-        run: >
-          dotnet versionmark
-          --validate
-          --results artifacts/versionmark-self-validation-${{ matrix.os }}.trx
-
       - name: Upload build artifacts
         uses: actions/upload-artifact@v7
         with:

From 5741df13e8c624263e9208cff35e97101a2c3a44 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 4 Mar 2026 12:48:38 +0000
Subject: [PATCH 13/13] Reorganize jobs to follow 4-section pattern with
 section comments

Co-authored-by: Malcolmnixon <1863707+Malcolmnixon@users.noreply.github.com>
---
 .github/workflows/build.yaml | 46 ++++++++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index f5acd8e..b9312f4 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -18,6 +18,10 @@ jobs:
     permissions:
       contents: read
     steps:
+      # === INSTALL DEPENDENCIES ===
+      # This section installs all required dependencies and tools for quality checks.
+      # Downstream projects: Add any additional dependency installations here.
+
       - name: Checkout
         uses: actions/checkout@v6
 
@@ -55,11 +59,9 @@ jobs:
           --validate
           --results artifacts/versionmark-self-validation-quality.trx
 
-      - name: Upload quality artifacts
-        uses: actions/upload-artifact@v7
-        with:
-          name: artifacts-quality
-          path: artifacts/
+      # === RUN QUALITY CHECKS ===
+      # This section runs the linting and quality checks for the project.
+      # Downstream projects: Add any additional quality check steps here.
 
       - name: Run markdown linter
         uses: DavidAnson/markdownlint-cli2-action@v22
@@ -77,6 +79,16 @@ jobs:
         with:
           config_file: .yamllint.yaml
 
+      # === UPLOAD ARTIFACTS ===
+      # This section uploads all generated artifacts for use by downstream jobs.
+      # Downstream projects: Add any additional artifact uploads here.
+
+      - name: Upload quality artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: artifacts-quality
+          path: artifacts/
+
   # Builds and unit-tests the project on supported operating systems to ensure
   # unit-tests operate on all platforms and to run SonarScanner for generating
   # the code quality report.
@@ -95,6 +107,10 @@ jobs:
 
     steps:
 
+      # === INSTALL DEPENDENCIES ===
+      # This section installs all required dependencies and tools for building the project.
+      # Downstream projects: Add any additional dependency installations here.
+
       - name: Checkout
         uses: actions/checkout@v6
         with:
@@ -140,6 +156,10 @@ jobs:
           --validate
           --results artifacts/versionmark-self-validation-${{ matrix.os }}.trx
 
+      # === BUILD AND TEST ===
+      # This section builds and tests the project.
+      # Downstream projects: Add any additional build or test steps here.
+
       - name: Restore Dependencies
         run: >
           dotnet restore
@@ -189,6 +209,10 @@ jobs:
           --no-restore
           --property:PackageVersion=${{ inputs.version }}
 
+      # === UPLOAD ARTIFACTS ===
+      # This section uploads all generated artifacts for use by downstream jobs.
+      # Downstream projects: Add any additional artifact uploads here.
+
       - name: Upload build artifacts
         uses: actions/upload-artifact@v7
         with:
@@ -215,6 +239,10 @@ jobs:
       security-events: write
 
     steps:
+      # === INSTALL DEPENDENCIES ===
+      # This section installs all required dependencies and tools for CodeQL analysis.
+      # Downstream projects: Add any additional dependency installations here.
+
       - name: Checkout
         uses: actions/checkout@v6
         with:
@@ -243,6 +271,10 @@ jobs:
         run: >
           dotnet restore
 
+      # === BUILD AND ANALYZE ===
+      # This section builds the project and performs CodeQL analysis.
+      # Downstream projects: Add any additional analysis steps here.
+
       - name: Build
         run: >
           dotnet build
@@ -257,6 +289,10 @@ jobs:
           output: artifacts
           upload: false
 
+      # === UPLOAD ARTIFACTS ===
+      # This section uploads all generated artifacts for use by downstream jobs.
+      # Downstream projects: Add any additional artifact uploads here.
+
       - name: Upload CodeQL artifacts
         uses: actions/upload-artifact@v7
         with: