Support PSObject wrapped values in ArgumentToEncodingTransformationAttribute (PowerShell#24555)

jborean93 · web-flow · commit ba238808fbae · 2024-11-12T08:41:22.000+05:00
diff --git a/src/System.Management.Automation/utils/EncodingUtils.cs b/src/System.Management.Automation/utils/EncodingUtils.cs
@@ -115,6 +115,8 @@ internal sealed class ArgumentToEncodingTransformationAttribute : ArgumentTransf
     {
         public override object Transform(EngineIntrinsics engineIntrinsics, object inputData)
         {
+            inputData = PSObject.Base(inputData);
+
             switch (inputData)
             {
                 case string stringName:
diff --git a/test/powershell/engine/Basic/Encoding.Tests.ps1 b/test/powershell/engine/Basic/Encoding.Tests.ps1
@@ -89,6 +89,8 @@ Describe "File encoding tests" -Tag CI {
         It "Parameter 'Encoding' should accept '<encoding>'" -TestCases @(
             @{ encoding = 1251 }
             @{ encoding = "windows-1251" }
+            # Piping the string creates a PSObject boxed value that we are testing.
+            @{ encoding = ("windows-1251" | Write-Output) }
         ) {
             param ( $encoding )
             $testFile = "${TESTDRIVE}/fileEncoding-$($encoding).txt"

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,8 @@ internal sealed class ArgumentToEncodingTransformationAttribute : ArgumentTransf`
`115`	`115`	`{`
`116`	`116`	`public override object Transform(EngineIntrinsics engineIntrinsics, object inputData)`
`117`	`117`	`{`
	`118`	`+ inputData = PSObject.Base(inputData);`
	`119`	`+`
`118`	`120`	`switch (inputData)`
`119`	`121`	`{`
`120`	`122`	`case string stringName:`