Change build to .NET 6.0 to use PS7.2 to remove ANSI from string properties

Author: SteveL-MSFT

.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

global.json

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

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.16.0" />
-        <PackageReference Include="Terminal.Gui" Version="1.0" />
-        <PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.1" />
+        <PackageReference Include="Nstack.Core" Version="0.17.*" />
+        <PackageReference Include="Terminal.Gui" Version="1.6.*" />
+        <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.*" />
     </ItemGroup>
 
     <ItemGroup>

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

@@ -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 = ''

src/Microsoft.PowerShell.ConsoleGuiTools/OutConsoleGridviewCmdletCommand.cs

@@ -111,16 +111,6 @@ baseObject is PSReference ||
                 ThrowTerminatingError(error);
             }
 
-            // Remove any potential ANSI escape codes from strings
-            foeach (var property in input.Properties)
-            {
-                if (property.Value is string)
-                {
-                    var stringDecorated = new StringDecorated(property.Value as string);
-                    property.Value = stringDecorated.ToString(OutputRendering.PlainText);
-                }
-            }
-
             _psObjects.Add(input);
         }
 

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" />

src/OutGridView.Gui/OutGridView.Gui.csproj

@@ -2,7 +2,7 @@
   <Import Project="..\..\GraphicalTools.Common.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Models\" />