merge

Author: tig

README.md

@@ -49,16 +49,18 @@ Now you're ready to build the code.  You can do so in one of two ways:
 PS ./GraphicalTools> Invoke-Build Build -ModuleName Microsoft.PowerShell.ConsoleGuiTools
 ```
 
-From there you can import the module that you just built for example:
+From there you can import the module that you just built for example (start a fresh `pwsh` instance first so you can unload the module with an `exit`; otherwise building again may fail because the `.dll` will be held open):
 
 ```powershell
+pwsh
 Import-Module ./module/Microsoft.PowerShell.ConsoleGuiTools
 ```
 
 And then run the cmdlet you want to test, for example:
 
 ```powershell
 Get-Process | Out-ConsoleGridView
+exit
 ```
 
 > NOTE: If you change the code and rebuild the project, you'll need to launch a

src/Microsoft.PowerShell.ConsoleGuiTools/ConsoleGui.cs

@@ -46,15 +46,11 @@ public HashSet<int> Start(ApplicationData applicationData)
             // Copy DataTable into the ListView's DataSource
             _itemSource = LoadData();
 
-            // Add Filter UI
             if (!_applicationData.MinUI)
             {
+                // Add Filter UI
                 AddFilter(win);
-            }
-
-            // Add Header UI
-            if (!_applicationData.MinUI)
-            {
+                // Add Header UI
                 AddHeaders(win, gridHeaders);
             }
 
@@ -67,9 +63,6 @@ public HashSet<int> Start(ApplicationData applicationData)
             // If -Filter parameter is set, apply it. 
             ApplyFilter();
 
-            _filterField.Text = _applicationData.Filter ?? string.Empty;
-            _filterField.CursorPosition = _filterField.Text.Length;
-
             _listView.SetFocus();
 
             // Run the GUI.
@@ -85,7 +78,7 @@ public HashSet<int> Start(ApplicationData applicationData)
 
             // Ensure that only items that are marked AND not filtered out
             // get returned (See Issue #121)
-            List<GridViewRow> itemList = GridViewHelpers.FilterData(_itemSource.GridViewRowList, _filterField.Text.ToString());
+            List<GridViewRow> itemList = GridViewHelpers.FilterData(_itemSource.GridViewRowList, _applicationData.Filter);
             foreach (GridViewRow gvr in itemList)
             {
                 if (gvr.IsMarked)
@@ -327,6 +320,9 @@ private void AddFilter(Window win)
             };
 
             win.Add(_filterLabel, _filterField, filterErrorLabel);
+
+            _filterField.Text = _applicationData.Filter ?? string.Empty;
+            _filterField.CursorPosition = _filterField.Text.Length;            
         }
 
         private void AddHeaders(Window win, List<string> gridHeaders)

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.3'
+ModuleVersion = '0.7.2'
 
 # Supported PSEditions
 CompatiblePSEditions = @( 'Core' )
@@ -105,6 +105,13 @@ PrivateData = @{
 
         # ReleaseNotes of this module
         ReleaseNotes = '# Release Notes
+## v0.7.0
+
+Upgraded to PowerShell 7.2 and .NET target framework `net60`
+
+Updated Terminal.Gui to 1.7
+
+Fixed #131 - Strip ANSI
 
 ## v0.6.3
 

src/Microsoft.PowerShell.ConsoleGuiTools/TypeGetter.cs

@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using Microsoft.PowerShell.Commands;
 using OutGridView.Models;
+using System.Text.RegularExpressions;
 
 namespace OutGridView.Cmdlet
 {

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

@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.1" />
+        <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.6" />
     </ItemGroup>
 
     <ItemGroup>

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

@@ -4,6 +4,6 @@
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 </Project>