Merge branch 'master' of tig:tig/GraphicalTools

Author: tig

.vscode/launch.json

@@ -9,7 +9,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/Cmdlet/bin/Debug/netcoreapp3.0/win10-x64/OutGridViewCmdlet.dll",
+            "program": "${workspaceFolder}/Cmdlet/bin/Debug/net6.0/win10-x64/OutGridViewCmdlet.dll",
             "args": [],
             "cwd": "${workspaceFolder}/Cmdlet",
             "console": "internalConsole",
@@ -20,7 +20,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/Application/bin/Debug/netcoreapp3.0/win10-x64/OutGridViewApplication.dll",
+            "program": "${workspaceFolder}/Application/bin/Debug/net6.0/win10-x64/OutGridViewApplication.dll",
             "args": [],
             "cwd": "${workspaceFolder}/Application",
             "console": "internalConsole",

GraphicalTools.build.ps1

@@ -3,14 +3,14 @@ param(
     [ValidateSet("Debug", "Release")]
     [string]$Configuration = "Debug",
 
-    [string[]]$ModuleName = @( 
-        "Microsoft.PowerShell.GraphicalTools", 
-        "Microsoft.PowerShell.ConsoleGuiTools" ) 
+    [string[]]$ModuleName = @(
+        #"Microsoft.PowerShell.GraphicalTools",
+        "Microsoft.PowerShell.ConsoleGuiTools" )
 )
 
 $script:IsUnix = $PSVersionTable.PSEdition -and $PSVersionTable.PSEdition -eq "Core" -and !$IsWindows
 
-$script:TargetFramework = "netcoreapp3.0"
+$script:TargetFramework = "net6.0"
 $script:RequiredSdkVersion = (Get-Content (Join-Path $PSScriptRoot 'global.json') | ConvertFrom-Json).sdk.version
 
 $script:ModuleLayouts = @{}
@@ -152,12 +152,12 @@ task LayoutModule -After Build {
         foreach ($projectName in $moduleLayout.NativeBuildAssets.Keys) {
             foreach ($targetPlatform in $moduleLayout.NativeBuildAssets[$projectName]) {
                 $destDir = Join-Path $moduleBinPath $projectName $targetPlatform
-    
+
                 $null = New-Item -Force $destDir -Type Directory
-    
+
                 # Get the project build dir path
                 $publishPath = [System.IO.Path]::Combine($PSScriptRoot, 'src', $projectName, 'bin', $Configuration, $script:TargetFramework, $targetPlatform, "publish\*" )
-    
+
                 Write-Host $publishPath
                 # Binplace the asset
                 Copy-Item -Recurse -Force  $publishPath $destDir

README.md

@@ -1,86 +1,58 @@
 # GraphicalTools
 
-The GraphicalTools repo contains several different graphical-related PowerShell modules including:
+The GraphicalTools repo contains `Microsoft.PowerShell.ConsoleGuiTools`: a
+module that provides console-based GUI experiences based on
+[Terminal.Gui (gui.cs)](https://github.com/migueldeicaza/gui.cs).
 
-* `Microsoft.PowerShell.GraphicalTools` - A module that provides GUI experiences based on Avalonia.
-* `Microsoft.PowerShell.ConsoleGuiTools` - A module that provides console-based GUI experiences based on [Terminal.Gui (gui.cs)](https://github.com/migueldeicaza/gui.cs).
+Note that a module named `Microsoft.PowerShell.GraphicalTools` used to be built
+and published out of this repo, but per [#101](https://github.com/PowerShell/GraphicalTools/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/).
 
 ## Installation
 
-### Microsoft.PowerShell.GraphicalTools
-
-```powershell
-Install-Module Microsoft.PowerShell.GraphicalTools
-```
-
-### Microsoft.PowerShell.ConsoleGuiTools
-
 ```powershell
 Install-Module Microsoft.PowerShell.ConsoleGuiTools
 ```
 
 ## Features
 
-### Microsoft.PowerShell.GraphicalTools
-
-[Out-GridView documentation](docs/Microsoft.PowerShell.ConsoleGuiTools/Out-GridView.md)
-
-#### Cross-Platform
-|Linux   |Windows   |Mac   |
-|---|---|---|
-| ![linux-gif](https://powershell.github.io/PowerShell-Blog/Images/2019-08-13-OutGridView-Returns/OutGridViewLinux.gif) |  ![window-gif](https://powershell.github.io/PowerShell-Blog/Images/2019-08-13-OutGridView-Returns/OutGridViewWindows.gif) | ![macos-gif](https://powershell.github.io/PowerShell-Blog/Images/2019-08-13-OutGridView-Returns/OutGridViewMac.gif)|
-
-- Out-Gridview
-    - View and filter objects
-    - Generate reusable filter code
-
-### Microsoft.PowerShell.ConsoleGuiTools
-
-[Out-ConsoleGridView documentation](docs/Microsoft.PowerShell.ConsoleGuiTools/Out-ConsoleGridView.md)
+Cross-platform! Use the cmdlet
+[`Out-ConsoleGridview`](docs/Microsoft.PowerShell.ConsoleGuiTools/Out-ConsoleGridView.md)
+to view and filter objects graphically.
 
 ![screenshot of Out-ConsoleGridView](docs/Microsoft.PowerShell.ConsoleGuiTools/ocgv.gif)
 
-#### Cross-Platform
-
-- Out-ConsoleGridview
-    - View and filter objects
-
 ## Development
 
-### 1. Install PowerShell 6.2+
+### 1. Install PowerShell 7.1+
 
-Install PowerShell 6.2+ with [these instructions](https://github.com/PowerShell/PowerShell#get-powershell).
+Install PowerShell 7.1+ with [these instructions](https://github.com/PowerShell/PowerShell#get-powershell).
 
-### 3. Clone the GitHub repository:
+### 2. Clone the GitHub repository
 
 ```powershell
 git clone https://github.com/PowerShell/GraphicalTools.git
 ```
 
-### 4. Install [Invoke-Build](https://github.com/nightroman/Invoke-Build)
+### 3. Install [Invoke-Build](https://github.com/nightroman/Invoke-Build)
 
 ```powershell
 Install-Module InvokeBuild -Scope CurrentUser
 ```
 
 Now you're ready to build the code.  You can do so in one of two ways:
 
-### Building the code from PowerShell
+### 4. Building the code from PowerShell
 
 ```powershell
-PS C:\path\to\GraphicalTools> Invoke-Build Build
+PS ./GraphicalTools> Invoke-Build Build -ModuleName Microsoft.PowerShell.ConsoleGuiTools
 ```
 
-> Note: You can build a single module using the -ModuleName parameter:
->
-> ```powershell
-> Invoke-Build Build -ModuleName Microsoft.PowerShell.ConsoleGuiTools
-> ```
-
 From there you can import the module that you just built for example:
 
 ```powershell
-Import-Module .\module\Microsoft.PowerShell.ConsoleGuiTools
+Import-Module ./module/Microsoft.PowerShell.ConsoleGuiTools
 ```
 
 And then run the cmdlet you want to test, for example:
@@ -90,52 +62,63 @@ Get-Process | Out-ConsoleGridView
 ```
 
 > NOTE: If you change the code and rebuild the project, you'll need to launch a
-> _new_ PowerShell process since the dll is already loaded and can't be unloaded.
-
-### Debugging in Visual Studio Code
+> _new_ PowerShell process since the DLL is already loaded and can't be unloaded.
 
+### 5. Debugging in Visual Studio Code
 
 ```powershell
-PS C:\path\to\GraphicalTools> code .
+PS ./GraphicalTools> code .
 ```
 
-Build by hitting `Ctrl-Shift-b` in VS Code.
+Build by hitting `Ctrl-Shift-B` in VS Code.
 
 To debug:
 
-In a Powershell session in the `c:\path\to\GraphicalTools` directory, run `pwsh` (thus nesting powershell).
+In a PowerShell session in the `./GraphicalTools` directory, run `pwsh` (thus
+nesting PowerShell).
 
 Then do the folowing:
 
 ```powershell
-Import-Module .\module\Microsoft.PowerShell.ConsoleGuiTools
+Import-Module ./module/Microsoft.PowerShell.ConsoleGuiTools
 $pid
 ```
 
-This will import the latest built DLL and output the process ID you'll need for debugging. Copy this ID to the clipboard.
+This will import the latest built DLL and output the process ID you'll need
+for debugging. Copy this ID to the clipboard.
 
-In VScode, set your breakpoints, etc... Then hit `F5`. In the VScode search box, paste the value printed by `$pid`. You'll see something like `pwsh.exe 18328`. Click that and the debug session will start.
+In VScode, set your breakpoints, etc. Then hit `F5`. In the VScode search
+box, paste the value printed by `$pid`. You'll see something like `pwsh.exe
+18328`. Click that and the debug session will start.
 
-In the Powershell session run your commands; breakpoints will be hit, etc...
+In the PowerShell session run your commands; breakpoints will be hit, etc.
 
-When done, run `exit` to exit the nested PowerShell and run `pwsh` again. This unloads the DLL. Repeat.
+When done, run `exit` to exit the nested PowerShell and run `pwsh` again.
+This unloads the DLL.  Repeat.
 
-## Contributions Welcome!
+## Contributions Welcome
 
-We would love to incorporate community contributions into this project.  If you would like to
-contribute code, documentation, tests, or bug reports, please read the [development section above](https://github.com/PowerShell/GraphicalTools#development) to learn more.
+We would love to incorporate community contributions into this project.  If
+you would like to contribute code, documentation, tests, or bug reports,
+please read the [development section above](https://github.com/PowerShell/GraphicalTools#development)
+to learn more.
 
-## Microsoft.PowerShell.GraphicalTools Architecture
+## (Deprecated) Microsoft.PowerShell.GraphicalTools Architecture
 
-Due to the quirks of the PowerShell threading implementation, the design of GUIs in this application are non-standard. The cmdlet invokes an Avalonia application as a separate process to guarantee the GUI is running on the main thread. Graphical tools therefore consists of 3 .NET Projects. 
+Due to the quirks of the PowerShell threading implementation, the design of
+GUIs in this application are non-standard. The cmdlet invokes an Avalonia
+application as a separate process to guarantee the GUI is running on the main
+thread. Graphical tools therefore consists of 3 .NET Projects.
 
 - Microsoft.PowerShell.GraphicalTools - Cmdlet implementations
 - OutGridView.Gui - Implementation of the Out-GridView window
 - OutGridView.Models - Contains data contracts between the GUI & Cmdlet
 
 ## Maintainers
 
-- [Tyler Leonhardt](https://github.com/tylerleonhardt) - [@TylerLeonhardt](http://twitter.com/tylerleonhardt)
+- [Andrew Schwartzmeyer](https://andschwa.com) - [@andschwa](https://github.com/andschwa)
+
+Originally authored by [Tyler Leonhardt](http://twitter.com/tylerleonhardt).
 
 ## License
 

global.json

@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "3.1.102"
+        "version": "6.0.100"
     }
 }

src/Microsoft.PowerShell.ConsoleGuiTools/GridViewDataSource.cs

@@ -20,14 +20,16 @@ public GridViewDataSource(List<GridViewRow> itemList)
             GridViewRowList = itemList;
         }
 
-        public bool IsMarked(int item) => GridViewRowList[item].IsMarked;
+        public int Length { get; }
 
-        public void Render(ListView container, ConsoleDriver driver, bool selected, int item, int col, int line, int width)
+        public void Render(ListView container, ConsoleDriver driver, bool selected, int item, int col, int line, int width, int start)
         {
             container.Move(col, line);
             RenderUstr(driver, GridViewRowList[item].DisplayString, col, line, width);
         }
 
+        public bool IsMarked(int item) => GridViewRowList[item].IsMarked;
+
         public void SetMark(int item, bool value)
         {
             GridViewRowList[item].IsMarked = value;

src/Microsoft.PowerShell.ConsoleGuiTools/Microsoft.PowerShell.ConsoleGuiTools.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="..\..\GraphicalTools.Common.props" />
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Nstack.Core" Version="0.14.0" />
-        <PackageReference Include="Terminal.Gui" Version="0.90.3" />
-        <PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.1" />
+        <PackageReference Include="Nstack.Core" Version="0.17.*" />
+        <PackageReference Include="Terminal.Gui" Version="1.7.*" />
+        <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.*" />
     </ItemGroup>
 
     <ItemGroup>

src/Microsoft.PowerShell.ConsoleGuiTools/Microsoft.PowerShell.ConsoleGuiTools.psd1

@@ -9,7 +9,7 @@
 RootModule = 'Microsoft.PowerShell.ConsoleGuiTools.dll'
 
 # Version number of this module.
-ModuleVersion = '0.6.2'
+ModuleVersion = '0.6.3'
 
 # Supported PSEditions
 CompatiblePSEditions = @( 'Core' )
@@ -30,7 +30,7 @@ Copyright = '(c) Microsoft Corporation.'
 Description = 'Cross-platform Console Gui Tools for PowerShell'
 
 # Minimum version of the PowerShell engine required by this module
-PowerShellVersion = '6.2'
+PowerShellVersion = '7.2'
 
 # Name of the PowerShell host required by this module
 # PowerShellHostName = ''
@@ -106,8 +106,16 @@ PrivateData = @{
         # ReleaseNotes of this module
         ReleaseNotes = '# Release Notes
 
+## v0.6.3
+
+Unreleased!
+
 ## v0.6.2
 
+Update Terminal.Gui to 1.0.
+
+Disable mouse mode to fix bug with mouse movement being printed to console.
+
 Gracefully fail when running in remote sessions.
 
 ## v0.6.1

src/Microsoft.PowerShell.ConsoleGuiTools/TypeGetter.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Management.Automation;
+using System.Management.Automation.Internal;
 using System.Linq;
 using System.Globalization;
 using System.Collections.Generic;
@@ -26,7 +27,7 @@ public FormatViewDefinition GetFormatViewDefinitionForObject(PSObject obj)
             var types = _cmdlet.InvokeCommand.InvokeScript(@"Microsoft.PowerShell.Utility\Get-FormatData " + typeName).ToList();
 
             //No custom type definitions found - try the PowerShell specific format data
-            if (types == null || types.Count == 0) 
+            if (types == null || types.Count == 0)
             {
                 types = _cmdlet.InvokeCommand
                     .InvokeScript(@"Microsoft.PowerShell.Utility\Get-FormatData -PowerShellVersion $PSVersionTable.PSVersion " + typeName).ToList();
@@ -62,7 +63,8 @@ public DataTableRow CastObjectToDataTableRow(PSObject ps, List<DataTableColumn>
                 }
                 else
                 {
-                    valuePairs[dataColumn.ToString()] = new StringValue { DisplayValue = stringValue };
+                    var stringDecorated = new StringDecorated(stringValue);
+                    valuePairs[dataColumn.ToString()] = new StringValue { DisplayValue = stringDecorated.ToString(OutputRendering.PlainText) };
                 }
             }
 

src/Microsoft.PowerShell.GraphicalTools/Microsoft.PowerShell.GraphicalTools.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <Import Project="..\..\GraphicalTools.Common.props" />
     <PropertyGroup>
-        <TargetFramework>netcoreapp3.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>

src/Microsoft.PowerShell.OutGridView.Models/Microsoft.PowerShell.OutGridView.Models.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\GraphicalTools.Common.props" />
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />