Updates OCGV and SHOT to Terminal.Gui v2

.github/workflows/ci-test.yml

@@ -34,7 +34,7 @@ jobs:
 
       - name: Build and test
         shell: pwsh
-        run: Invoke-Build -Configuration Release Build, Package
+        run: Invoke-Build -Configuration Release Build, Test, Package
 
       - name: Upload module
         if: always()

.gitignore

@@ -4,3 +4,12 @@ bin/
 obj/
 publish/
 *.sln
+
+# IDE support (keep locally, don't track)
+/.vs/
+*.user
+*.suo
+*.sln.DotSettings
+Properties/launchSettings.json
+nuget.local.config
+GraphicalTools.Dev.slnx

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+    "recommendations": [
+        "ms-dotnettools.csdevkit",
+        "ms-dotnettools.csharp",
+        "ms-vscode.powershell"
+    ]
+}

.vscode/launch.json

@@ -0,0 +1,40 @@
+{
+    // Single debug profile that prompts for a sample command at launch.
+    // Add new scenarios by appending an option to the "sampleCommand" input below.
+    "version": "0.2.0",
+    "inputs": [
+        {
+            "id": "sampleCommand",
+            "type": "pickString",
+            "description": "Sample command to run after importing the module",
+            "default": "Get-Process | Out-ConsoleGridView -Debug",
+            "options": [
+                "Get-Process | Out-ConsoleGridView -Debug",
+                "Get-Process | Select-Object ProcessName, Id, CPU | Out-ConsoleGridView -Debug -Filter com",
+                "Get-Process | Out-ConsoleGridView -MinUi",
+                "Get-Process | Select-Object ProcessName, Id, Handles, NPM, PM, WS, CPU | Out-ConsoleGridView",
+                "Get-ChildItem | Out-ConsoleGridView -OutputMode Single",
+                "Get-Process | Show-ObjectTree"
+            ]
+        }
+    ],
+    "configurations": [
+        {
+            "name": "ConsoleGuiTools",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build",
+            "program": "pwsh",
+            "args": [
+                "-NoProfile",
+                "-NoLogo",
+                "-NoExit",
+                "-Command",
+                "Import-Module ${workspaceFolder}/module/Microsoft.PowerShell.ConsoleGuiTools.psd1; ${input:sampleCommand}"
+            ],
+            "cwd": "${workspaceFolder}",
+            "console": "integratedTerminal",
+            "stopAtEntry": false
+        }
+    ]
+}

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "git.ignoreLimitWarning": true
+}

.vscode/tasks.json

@@ -0,0 +1,60 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "detail": "Build module via Invoke-Build (copies to ./module/)",
+            "type": "process",
+            "command": "pwsh",
+            "args": [
+                "-NoProfile",
+                "-Command",
+                "Invoke-Build Build"
+            ],
+            "options": {
+                "cwd": "${workspaceFolder}"
+            },
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
+            "presentation": {
+                "reveal": "silent",
+                "panel": "shared",
+                "clear": true
+            },
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "test",
+            "detail": "Run xunit tests via dotnet test (resolves GraphicalTools.slnx)",
+            "type": "process",
+            "command": "dotnet",
+            "args": [
+                "test"
+            ],
+            "options": {
+                "cwd": "${workspaceFolder}"
+            },
+            "group": {
+                "kind": "test",
+                "isDefault": true
+            },
+            "problemMatcher": "$msCompile"
+        },
+        {
+            "label": "clean",
+            "type": "process",
+            "command": "pwsh",
+            "args": [
+                "-NoProfile",
+                "-Command",
+                "Invoke-Build Clean"
+            ],
+            "options": {
+                "cwd": "${workspaceFolder}"
+            },
+            "problemMatcher": []
+        }
+    ]
+}

ConsoleGuiTools.Common.props

@@ -1,6 +1,6 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
-        <VersionPrefix>0.7.7</VersionPrefix>
+        <VersionPrefix>1.0.0</VersionPrefix>
         <VersionSuffix></VersionSuffix>
         <Company>Microsoft</Company>
         <Copyright>© Microsoft Corporation.</Copyright>

ConsoleGuiTools.build.ps1

@@ -23,15 +23,18 @@ task Build {
 
     Push-Location src/Microsoft.PowerShell.ConsoleGuiTools
     Invoke-BuildExec { & dotnet publish --configuration $Configuration --output publish }
-    $Assets = $(
-        "./publish/Microsoft.PowerShell.ConsoleGuiTools.dll",
-        "./publish/Microsoft.PowerShell.ConsoleGuiTools.psd1",
-        "./publish/Microsoft.PowerShell.OutGridView.Models.dll",
-        "./publish/Terminal.Gui.dll",
-        "./publish/NStack.dll")
-    $Assets | ForEach-Object {
-        Copy-Item -Force -Path $_ -Destination ../../module
+
+    # Copy all DLLs except PowerShell SDK dependencies (those are provided by PowerShell itself)
+    Get-ChildItem "./publish/*.dll" | Where-Object { 
+        $_.Name -notlike "System.Management.Automation.dll" -and
+        $_.Name -notlike "Microsoft.PowerShell.Commands.Diagnostics.dll" -and
+        $_.Name -notlike "Microsoft.Management.Infrastructure.CimCmdlets.dll"
+    } | ForEach-Object {
+        Copy-Item -Force -Path $_.FullName -Destination ../../module
     }
+
+    # Copy the module manifest
+    Copy-Item -Force -Path "./publish/Microsoft.PowerShell.ConsoleGuiTools.psd1" -Destination ../../module
     Pop-Location
 
     $Assets = $(
@@ -45,6 +48,10 @@ task Build {
     New-ExternalHelp -Path docs/Microsoft.PowerShell.ConsoleGuiTools -OutputPath module/en-US -Force
 }
 
+task Test {
+    Invoke-BuildExec { & dotnet test GraphicalTools.slnx --configuration $Configuration }
+}
+
 task Package {
     New-Item -ItemType Directory -Force ./out | Out-Null
     if (-Not (Get-PSResourceRepository -Name ConsoleGuiTools -ErrorAction SilentlyContinue)) {
@@ -53,4 +60,4 @@ task Package {
     Publish-PSResource -Path ./module -Repository ConsoleGuiTools -Verbose
 }
 
-task . Clean, Build
+task . Clean, Build, Test

Directory.Build.props

@@ -1,5 +1,8 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <!-- Use nuget.local.config if present (gitignored). Create it to override the
+         default nuget.config, e.g. to use nuget.org instead of the Azure DevOps feed. -->
+    <RestoreConfigFile Condition="Exists('$(MSBuildThisFileDirectory)nuget.local.config')">$(MSBuildThisFileDirectory)nuget.local.config</RestoreConfigFile>
   </PropertyGroup>
 </Project>

Directory.Packages.props

@@ -1,8 +1,13 @@
 <Project>
   <ItemGroup>
-    <PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.4.7" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="Nstack.Core" Version="1.1.1" />
-    <PackageVersion Include="Terminal.Gui" Version="1.17.1" />
+    <PackageVersion Include="Microsoft.PowerShell.SDK" Version="7.5.4" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
+    <PackageVersion Include="System.Management.Automation" Version="7.5.4" />
+    <PackageVersion Include="Terminal.Gui" Version="2.0.1" />
+    <!-- Test dependencies -->
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageVersion Include="xunit" Version="2.9.3" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.4" />
   </ItemGroup>
-</Project>
+</Project>

GraphicalTools.slnx

@@ -0,0 +1,5 @@
+<Solution>
+  <Project Path="src/Microsoft.PowerShell.ConsoleGuiTools/Microsoft.PowerShell.ConsoleGuiTools.csproj" />
+  <Project Path="src/Microsoft.PowerShell.OutGridView.Models/Microsoft.PowerShell.OutGridView.Models.csproj" />
+  <Project Path="test/Microsoft.PowerShell.ConsoleGuiTools.Tests/Microsoft.PowerShell.ConsoleGuiTools.Tests.csproj" />
+</Solution>

README.md

@@ -1,7 +1,7 @@
 # ConsoleGuiTools - `Out-ConsoleGridView` and `Show-ObjectTree`
 
-This repo contains the `Out-ConsoleGridView`
-PowerShell Cmdlet providing console-based GUI experiences based on
+This repo contains the `Out-ConsoleGridView` and `Show-ObjectTree`
+PowerShell Cmdlets providing console-based GUI experiences based on
 [Terminal.Gui (gui.cs)](https://github.com/gui-cs/Terminal.Gui).
 
 _Note:_ A module named `Microsoft.PowerShell.GraphicalTools` used to be built and published out of this repo, but per [#101](https://github.com/PowerShell/ConsoleGuiTools/issues/101) it is deprecated and unmaintained until such time that it can be rewritten on top of [.NET MAUI](https://devblogs.microsoft.com/dotnet/introducing-net-multi-platform-app-ui/).
@@ -14,7 +14,7 @@ Install-Module Microsoft.PowerShell.ConsoleGuiTools
 
 ## Features
 
-* [`Out-ConsoleGridview`](docs/Microsoft.PowerShell.ConsoleGuiTools/Out-ConsoleGridView.md) - Send objects to a grid view window for interactive filtering and sorting.
+* [`Out-ConsoleGridView`](docs/Microsoft.PowerShell.ConsoleGuiTools/Out-ConsoleGridView.md) - Send objects to an interactive table view with column headers, horizontal scrolling, streaming, sorting, and native multi-selection.
 * [`Show-ObjectTree`](docs/Microsoft.PowerShell.ConsoleGuiTools/Show-ObjectTree.md) - Send objects to a tree view window for interactive filtering and sorting.
 
 * Cross-platform - Works on any platform that supports PowerShell 7.2+.
@@ -122,18 +122,34 @@ Whatever was typed on the command line prior to hitting `F7` or `Shift-F7` will
 ### Example 8: Output processes to a tree view
 
 ```PowerShell
-PS C:\> Get-Process | Show-ObjectTree
+Get-Process | Show-ObjectTree
 ```
 
 This command gets the processes running on the local computer and sends them to a tree view window.
 
 Use right arrow when a row has a `+` symbol to expand the tree. Left arrow will collapse the tree.
 
+### Example 9: Output processes to a grid view with streaming
+
+```PowerShell
+Get-Process | Out-ConsoleGridView
+```
+
+This command gets the processes running on the local computer and sends them to an interactive table with column headers. The table appears as soon as the first object arrives — rows stream in as the pipeline executes.
+
+### Example 10: Search for a specific row in the grid view
+
+```PowerShell
+Get-Service | ocgv -Search "wuauserv" -Focus Filter
+```
+
+This command displays all services in a grid view, positions the cursor on the first row matching "wuauserv", and starts with focus in the filter field.
+
 ## Development
 
-### 1. Install PowerShell 7.2+
+### 1. Install PowerShell 7.6+
 
-Install PowerShell 7.2+ with [these instructions](https://github.com/PowerShell/PowerShell#get-powershell).
+Install PowerShell 7.6+ with [these instructions](https://github.com/PowerShell/PowerShell#get-powershell).
 
 ### 2. Clone the GitHub repository
 
@@ -203,7 +219,7 @@ to learn more.
 
 `ConsoleGuiTools` consists of 2 .NET Projects:
 
-* ConsoleGuiTools - Cmdlet implementation for Out-ConsoleGridView
+* ConsoleGuiTools - Cmdlet implementation for Out-ConsoleGridView and Show-ObjectTree
 * OutGridView.Models - Contains data contracts between the GUI & Cmdlet
 
 _Note:_ Previously, this repo included `Microsoft.PowerShell.GraphicalTools` which included the Avalonia-based `Out-GridView` (implemented in `.\Microsoft.PowerShell.GraphicalTools` and `.\OutGridView.Gui`). These components have been deprecated (see note above).