Merge pull request #19 from TimeWarpEngineering/Cramer/2025-12-22/dev

StevenTCramer · web-flow · commit 3df1972a8a94 · 2026-03-19T00:55:06.000+07:00
feat: MSBuild variables in runfiles and CancelKeyPress event
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -1,4 +1,4 @@
-name: CI/CD
+name: CI/CD Workflow
 
 on:
   push:
@@ -51,9 +51,9 @@ jobs:
       - name: Run CI Pipeline
         run: |
           if [ "${{ github.event_name }}" == "release" ]; then
-            dotnet run tools/dev-cli/dev.cs -- ci --api-key "${{ steps.nuget-login.outputs.NUGET_API_KEY }}"
+            dotnet run tools/dev-cli/dev.cs -- workflow --api-key "${{ steps.nuget-login.outputs.NUGET_API_KEY }}"
           else
-            dotnet run tools/dev-cli/dev.cs -- ci
+            dotnet run tools/dev-cli/dev.cs -- workflow
           fi
 
       - name: Upload Artifacts
diff --git a/kanban/done/017-update-all-runfile-project-directives-to-use-msbuild-variables.md b/kanban/done/017-update-all-runfile-project-directives-to-use-msbuild-variables.md
@@ -0,0 +1,90 @@
+# Update all runfile #:project directives to use MSBuild variables
+
+## Description
+
+Update all `#:project` directives in runfiles to use MSBuild variables (e.g., `$(SourceDirectory)`) instead of hardcoded relative paths. This leverages .NET 10's support for MSBuild property expansion in `#:project` directives (PR #51108).
+
+## Checklist
+
+### samples/ (5 files)
+- [x] samples/table-widget.cs (already updated)
+- [x] samples/hyperlink-widget.cs
+- [x] samples/emoji-table-widget.cs
+- [x] samples/rule-widget.cs
+- [x] samples/panel-widget.cs
+
+### tests/ (23 files)
+- [x] tests/table-widget-01-basic.cs
+- [x] tests/table-widget-02-borders.cs
+- [x] tests/table-widget-03-styling.cs
+- [x] tests/table-widget-04-expand.cs
+- [x] tests/table-widget-05-shrink.cs
+- [x] tests/table-widget-06-emoji.cs
+- [x] tests/table-widget-07-grow.cs
+- [x] tests/panel-widget-01-basic.cs
+- [x] tests/panel-widget-02-terminal-extensions.cs
+- [x] tests/panel-widget-03-word-wrap.cs
+- [x] tests/rule-widget-01-basic.cs
+- [x] tests/rule-widget-02-terminal-extensions.cs
+- [x] tests/hyperlink-01-basic.cs
+- [x] tests/terminal-static-01-basic.cs
+- [x] tests/terminal-static-02-properties.cs
+- [x] tests/terminal-static-03-operations.cs
+- [x] tests/terminal-static-04-format.cs
+- [x] tests/terminal-static-05-widgets.cs
+- [x] tests/terminal-static-06-color.cs
+- [x] tests/ansi-string-utils-01-basic.cs
+- [x] tests/ansi-string-utils-02-wrap-text.cs
+- [x] tests/ansi-string-utils-03-emoji-width.cs
+- [x] tests/unicode-width-01-basic.cs
+
+### Verification
+- [x] Run all updated runfiles to verify they work
+- [x] Commit changes
+
+## Notes
+
+### MSBuild Variable Support
+
+.NET 10.0.201 supports MSBuild variable expansion in `#:project` directives (merged in PR #51108). The `Directory.Build.props` imports `msbuild/repository.props` which defines:
+
+- `$(SourceDirectory)` = `$(RepositoryRoot)source/`
+- `$(TestsDirectory)` = `$(RepositoryRoot)tests/`
+- `$(SamplesDirectory)` = `$(RepositoryRoot)samples/`
+
+### Change Pattern
+
+Replace:
+```csharp
+#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+```
+
+With:
+```csharp
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
+```
+
+### Benefits
+
+1. **Consistency** - All runfiles use the same path resolution mechanism
+2. **Maintainability** - If project structure changes, only `repository.props` needs updating
+3. **Clarity** - Intent is clearer (`SourceDirectory` vs `../source`)
+
+## Results
+
+Successfully updated all 28 runfiles to use MSBuild variables in `#:project` directives.
+
+### Files Changed
+- 5 files in `samples/`: table-widget.cs, hyperlink-widget.cs, emoji-table-widget.cs, rule-widget.cs, panel-widget.cs
+- 23 files in `tests/`: all test runfiles
+
+### Change Made
+Replaced: `#:project ../source/timewarp-terminal/timewarp-terminal.csproj`
+With: `#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj`
+
+### Verification
+- Ran multiple runfiles to verify they execute correctly
+- All tests pass with the new variable-based paths
+
+### Commits
+- `refactor: use MSBuild variables in all runfile #:project directives` (9ae34e9)
diff --git a/msbuild/repository.props b/msbuild/repository.props
@@ -8,7 +8,7 @@
     <TestsDirectory>$(RepositoryRoot)tests/</TestsDirectory>
     <SamplesDirectory>$(RepositoryRoot)samples/</SamplesDirectory>
     <BenchmarksDirectory>$(RepositoryRoot)benchmarks/</BenchmarksDirectory>
-    <ScriptsDirectory>$(RepositoryRoot)scripts/</ScriptsDirectory>
+    <ToolsDirectory>$(RepositoryRoot)tools/</ToolsDirectory>
     <ArtifactsDirectory>$(RepositoryRoot)artifacts/</ArtifactsDirectory>
     <PackagesDirectory>$(ArtifactsDirectory)packages/</PackagesDirectory>
   </PropertyGroup>
diff --git a/samples/emoji-table-widget.cs b/samples/emoji-table-widget.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Demonstrates emoji and wide character alignment in table/panel/rule borders
 using TimeWarp.Terminal;
diff --git a/samples/hyperlink-widget.cs b/samples/hyperlink-widget.cs
@@ -1,7 +1,7 @@
 #!/usr/bin/dotnet --
 // hyperlink-widget-demo - Demonstrates OSC 8 hyperlinks in terminal output
 // GitHub Issue: https://github.com/TimeWarpEngineering/timewarp-terminal/issues/95
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 using TimeWarp.Terminal;
 
@@ -74,6 +74,16 @@
     .Padding(2, 1))
   .WriteLine();
 
+// 7b. Hyperlink inside a table row
+terminal
+  .WriteLine("7b. Hyperlink in a table row:")
+  .WriteLine()
+  .WriteTable(table => table
+    .AddColumn("Name")
+    .AddColumn("Link")
+    .AddRow("TimeWarp", "Website".Link("https://timewarp.software").Cyan()))
+  .WriteLine();
+
 // 8. Conditional hyperlinks
 terminal.WriteLine("8. Graceful degradation:");
 if (terminal.SupportsHyperlinks)
diff --git a/samples/panel-widget.cs b/samples/panel-widget.cs
@@ -1,7 +1,7 @@
 #!/usr/bin/dotnet --
 // panel-widget-demo - Demonstrates the Panel widget for bordered boxes
 // GitHub Issue: https://github.com/TimeWarpEngineering/timewarp-terminal/issues/90
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 using TimeWarp.Terminal;
 
diff --git a/samples/rule-widget.cs b/samples/rule-widget.cs
@@ -1,7 +1,7 @@
 #!/usr/bin/dotnet --
 // rule-widget-demo - Demonstrates the Rule widget for horizontal divider lines
 // GitHub Issue: https://github.com/TimeWarpEngineering/timewarp-terminal/issues/89
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 using TimeWarp.Terminal;
 
diff --git a/samples/table-widget.cs b/samples/table-widget.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Demonstrates the Table widget for rendering columnar data
 using TimeWarp.Terminal;
diff --git a/source/Directory.Build.props b/source/Directory.Build.props
@@ -4,7 +4,7 @@
 
   <!-- Default package metadata (can be overridden in individual projects) -->
   <PropertyGroup Label="Package Metadata">
-    <Version>1.0.0-beta.7</Version>
+    <Version>1.0.0-beta.8</Version>
     <Authors>Steven T. Cramer</Authors>
     <RepositoryUrl>https://github.com/TimeWarpEngineering/timewarp-terminal</RepositoryUrl>
     <PackageLicenseExpression>Unlicense</PackageLicenseExpression>
diff --git a/tests/ansi-string-utils-01-basic.cs b/tests/ansi-string-utils-01-basic.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test AnsiStringUtils functionality
 
diff --git a/tests/ansi-string-utils-02-wrap-text.cs b/tests/ansi-string-utils-02-wrap-text.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test AnsiStringUtils.WrapText functionality
 
diff --git a/tests/ansi-string-utils-03-emoji-width.cs b/tests/ansi-string-utils-03-emoji-width.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test AnsiStringUtils with emoji and wide characters
 
diff --git a/tests/hyperlink-01-basic.cs b/tests/hyperlink-01-basic.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test OSC 8 hyperlink functionality
 
diff --git a/tests/panel-widget-01-basic.cs b/tests/panel-widget-01-basic.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test Panel widget basic functionality
 
diff --git a/tests/panel-widget-02-terminal-extensions.cs b/tests/panel-widget-02-terminal-extensions.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test Panel widget terminal extension methods
 
diff --git a/tests/panel-widget-03-word-wrap.cs b/tests/panel-widget-03-word-wrap.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test Panel widget word wrapping functionality
 
diff --git a/tests/rule-widget-01-basic.cs b/tests/rule-widget-01-basic.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test Rule widget basic functionality
 
diff --git a/tests/rule-widget-02-terminal-extensions.cs b/tests/rule-widget-02-terminal-extensions.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test Rule widget terminal extension methods
 
diff --git a/tests/table-widget-01-basic.cs b/tests/table-widget-01-basic.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test Table widget basic functionality
 
diff --git a/tests/table-widget-02-borders.cs b/tests/table-widget-02-borders.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test Table widget border styles
 
diff --git a/tests/table-widget-03-styling.cs b/tests/table-widget-03-styling.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test Table widget with styled content (ANSI colors)
 
diff --git a/tests/table-widget-04-expand.cs b/tests/table-widget-04-expand.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test Table widget expand functionality
 
diff --git a/tests/table-widget-05-shrink.cs b/tests/table-widget-05-shrink.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test Table widget shrink functionality
 
diff --git a/tests/table-widget-06-emoji.cs b/tests/table-widget-06-emoji.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test Table widget with emoji content
 
diff --git a/tests/table-widget-07-grow.cs b/tests/table-widget-07-grow.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test Table widget Grow column functionality
 
diff --git a/tests/terminal-static-01-basic.cs b/tests/terminal-static-01-basic.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test Terminal static facade class
 // CA1849: We deliberately test sync methods in async test methods
diff --git a/tests/terminal-static-02-properties.cs b/tests/terminal-static-02-properties.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test Terminal static facade class - Properties
 
diff --git a/tests/terminal-static-03-operations.cs b/tests/terminal-static-03-operations.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test Terminal static facade class - Operations
 // CA1849: We deliberately test sync methods in async test methods
diff --git a/tests/terminal-static-04-format.cs b/tests/terminal-static-04-format.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test Terminal format method overloads
 // CA1849: We deliberately test sync methods in async test methods
diff --git a/tests/terminal-static-05-widgets.cs b/tests/terminal-static-05-widgets.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test Terminal static facade widget methods
 // CA1849: We deliberately test sync methods in async test methods
diff --git a/tests/terminal-static-06-color.cs b/tests/terminal-static-06-color.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 // Test Terminal static class color overloads
 // CA1849: We deliberately test sync methods in async test methods
diff --git a/tests/unicode-width-01-basic.cs b/tests/unicode-width-01-basic.cs
@@ -1,5 +1,5 @@
 #!/usr/bin/dotnet --
-#:project ../source/timewarp-terminal/timewarp-terminal.csproj
+#:project $(SourceDirectory)timewarp-terminal/timewarp-terminal.csproj
 
 using System.Text;
 
diff --git a/tools/dev-cli/dev.cs b/tools/dev-cli/dev.cs
@@ -19,9 +19,9 @@
 //   - AOT-compatible design for maximum performance
 //
 // Commands (Phase 1 - CI/CD Orchestration):
-//   dev ci                 - Run full CI/CD pipeline (auto-detects mode)
-//   dev ci --mode pr       - PR workflow: build -> verify-samples -> test
-//   dev ci --mode release  - Release workflow: build -> check-version -> pack -> push
+//   dev workflow            - Run full CI/CD pipeline (auto-detects mode)
+//   dev workflow --mode pr  - PR workflow: build -> verify-samples -> test
+//   dev workflow --mode release  - Release workflow: build -> check-version -> pack -> push
 //   dev build              - Build all TimeWarp.Terminal projects
 //   dev clean              - Clean solution and artifacts
 //   dev test               - Run CI test suite
diff --git a/tools/dev-cli/endpoints/build.cs b/tools/dev-cli/endpoints/build.cs
diff --git a/tools/dev-cli/endpoints/check-version.cs b/tools/dev-cli/endpoints/check-version.cs
diff --git a/tools/dev-cli/endpoints/clean.cs b/tools/dev-cli/endpoints/clean.cs
diff --git a/tools/dev-cli/endpoints/self-install.cs b/tools/dev-cli/endpoints/self-install.cs
diff --git a/tools/dev-cli/endpoints/test.cs b/tools/dev-cli/endpoints/test.cs
diff --git a/tools/dev-cli/endpoints/verify-samples.cs b/tools/dev-cli/endpoints/verify-samples.cs
diff --git a/tools/dev-cli/endpoints/workflow.cs b/tools/dev-cli/endpoints/workflow.cs
@@ -1,5 +1,5 @@
 // ═══════════════════════════════════════════════════════════════════════════════
-// CI COMMAND
+// WORKFLOW COMMAND
 // ═══════════════════════════════════════════════════════════════════════════════
 // Orchestrates the full CI/CD pipeline.
 // For PR: clean -> build -> verify-samples -> test
@@ -10,13 +10,13 @@ namespace DevCli;
 /// <summary>
 /// Run full CI/CD pipeline
 /// </summary>
-[NuruRoute("ci", Description = "Run full CI/CD pipeline")]
-internal sealed class CiCommand : ICommand<Unit>
+[NuruRoute("workflow", Description = "Run full CI/CD pipeline")]
+internal sealed class WorkflowCommand : ICommand<Unit>
 {
   [Option("api-key", Description = "NuGet API key for publishing (from OIDC Trusted Publishing)")]
   public string? ApiKey { get; set; }
 
-  internal sealed class Handler : ICommandHandler<CiCommand, Unit>
+  internal sealed class Handler : ICommandHandler<WorkflowCommand, Unit>
   {
     private readonly ITerminal Terminal;
 
@@ -25,7 +25,7 @@ public Handler(ITerminal terminal)
       Terminal = terminal;
     }
 
-    public async ValueTask<Unit> Handle(CiCommand command, CancellationToken ct)
+    public async ValueTask<Unit> Handle(WorkflowCommand command, CancellationToken ct)
     {
       // Auto-detect from GitHub Actions environment
       string? eventName = Environment.GetEnvironmentVariable("GITHUB_EVENT_NAME");
