DRAFT for console encoding in fsi tests

azure-pipelines-PR.yml

@@ -226,6 +226,7 @@ stages:
               DOTNET_DbgMiniDumpType: 3 # Triage dump, 1 for mini, 2 for Heap, 3 for triage, 4 for full. Don't use 4 unless you know what you're doing.
               DOTNET_DbgMiniDumpName: $(Build.SourcesDirectory)\artifacts\log\Release\$(Build.BuildId)-%e-%p-%t.dmp
               NativeToolsOnMachine: true
+              DOTNET_CLI_CONSOLE_USE_DEFAULT_ENCODING: 1
             displayName: Build
 
           - task: PublishBuildArtifacts@1
@@ -262,6 +263,7 @@ stages:
               DOTNET_DbgMiniDumpType: 3 # Triage dump, 1 for mini, 2 for Heap, 3 for triage, 4 for full. Don't use 4 unless you know what you're doing.
               DOTNET_DbgMiniDumpName: $(Build.SourcesDirectory)\artifacts\log\Release\$(Build.BuildId)-%e-%p-%t.dmp
               NativeToolsOnMachine: true
+              DOTNET_CLI_CONSOLE_USE_DEFAULT_ENCODING: 1
             displayName: Build
 
           - task: PublishTestResults@2
@@ -309,6 +311,7 @@ stages:
               DOTNET_DbgMiniDumpType: 3 # Triage dump, 1 for mini, 2 for Heap, 3 for triage, 4 for full. Don't use 4 unless you know what you're doing.
               DOTNET_DbgMiniDumpName: $(Build.SourcesDirectory)\artifacts\log\Release\$(Build.BuildId)-%e-%p-%t.dmp
               NativeToolsOnMachine: true
+              DOTNET_CLI_CONSOLE_USE_DEFAULT_ENCODING: 1
             displayName: Build
 
           - task: PublishTestResults@2
@@ -354,6 +357,7 @@ stages:
               DOTNET_DbgMiniDumpType: 3 # Triage dump, 1 for mini, 2 for Heap, 3 for triage, 4 for full. Don't use 4 unless you know what you're doing.
               DOTNET_DbgMiniDumpName: $(Build.SourcesDirectory)\artifacts\log\Release\$(Build.BuildId)-%e-%p-%t.dmp
               NativeToolsOnMachine: true
+              DOTNET_CLI_CONSOLE_USE_DEFAULT_ENCODING: 1
             displayName: Build
 
           - task: PublishBuildArtifacts@1
@@ -390,6 +394,7 @@ stages:
               DOTNET_DbgMiniDumpType: 3 # Triage dump, 1 for mini, 2 for Heap, 3 for triage, 4 for full. Don't use 4 unless you know what you're doing.
               DOTNET_DbgMiniDumpName: $(Build.SourcesDirectory)\artifacts\log\Release\$(Build.BuildId)-%e-%p-%t.dmp
               NativeToolsOnMachine: true
+              DOTNET_CLI_CONSOLE_USE_DEFAULT_ENCODING: 1
             displayName: Build
 
           - task: PublishBuildArtifacts@1
@@ -457,6 +462,7 @@ stages:
               DOTNET_DbgMiniDumpType: 3 # Triage dump, 1 for mini, 2 for Heap, 3 for triage, 4 for full. Don't use 4 unless you know what you're doing.
               DOTNET_DbgMiniDumpName: $(Build.SourcesDirectory)\artifacts\log\$(_configuration)\$(Build.BuildId)-%e-%p-%t.dmp
               NativeToolsOnMachine: true
+              DOTNET_CLI_CONSOLE_USE_DEFAULT_ENCODING: 1
             displayName: Build and Test $(_testKind) $(transparentCompiler)
 
           - task: PublishTestResults@2
@@ -530,6 +536,7 @@ stages:
               DOTNET_DbgMiniDumpType: 3 # Triage dump, 1 for mini, 2 for Heap, 3 for triage, 4 for full. Don't use 4 unless you know what you're doing.
               DOTNET_DbgMiniDumpName: $(Build.SourcesDirectory)\artifacts\log\Release\$(Build.BuildId)-%e-%p-%t.dmp
               NativeToolsOnMachine: true
+              DOTNET_CLI_CONSOLE_USE_DEFAULT_ENCODING: 1
             displayName: Build / Test
 
           - task: PublishTestResults@2

eng/Build.ps1

@@ -370,7 +370,11 @@ function TestUsingMSBuild([string] $testProject, [string] $targetFramework, [str
 
     $testResultsDir = "$ArtifactsDir\TestResults\$configuration"
     $testBinLogPath = "$LogDir\${projectName}_$targetFramework.binlog"
-
+
+    [Console]::InputEncoding | Write-Host
+
+    [Console]::InputEncoding
+
     # MTP requires --solution flag for .sln files
     $testTarget = if ($testProject.EndsWith('.sln')) { "--solution ""$testProject""" } else { "--project ""$testProject""" }
 
@@ -383,9 +387,7 @@ function TestUsingMSBuild([string] $testProject, [string] $targetFramework, [str
         $reportArgs = "--report-xunit-trx --report-xunit-trx-filename ""$testLogFileName"""
     }
 
-    $test_args = "test $testTarget -c $configuration -f $targetFramework $reportArgs --results-directory ""$testResultsDir"" /bl:$testBinLogPath"
-    # MTP HangDump extension replaces VSTest --blame-hang-timeout
-    $test_args += " --hangdump --hangdump-timeout 5m --hangdump-type Full"
+    $test_args = "run $testTarget --filter-method ""*fsiAndModifiers"" --no-progress --output detailed -c $configuration -f $targetFramework $reportArgs --results-directory ""$testResultsDir"" /bl:$testBinLogPath"
 
     if (-not $noVisualStudio -or $norestore) {
         $test_args += " --no-restore"
@@ -601,11 +603,11 @@ try {
     $script:BuildMessage = "Failure running tests"
 
     if ($testCoreClr) {
-        TestUsingMSBuild -testProject "$RepoRoot\FSharp.sln" -targetFramework $script:coreclrTargetFramework
+        TestUsingMSBuild -testProject "$RepoRoot\tests\fsharp\FSharpSuite.Tests.fsproj" -targetFramework $script:coreclrTargetFramework
     }
 
     if ($testDesktop) {
-        TestUsingMSBuild -testProject "$RepoRoot\FSharp.sln" -targetFramework $script:desktopTargetFramework
+        TestUsingMSBuild -testProject "$RepoRoot\tests\fsharp\FSharpSuite.Tests.fsproj" -targetFramework $script:desktopTargetFramework
     }
 
     if ($testFSharpCore) {

eng/build.sh

@@ -244,7 +244,7 @@ function Test() {
     reportargs="--report-xunit-trx --report-xunit-trx-filename $testlogfilename"
   fi
 
-  args=(test $testtarget "$testproject" --no-build -c "$configuration" -f "$targetframework" $reportargs --results-directory "$testresultsdir" --hangdump --hangdump-timeout 5m --hangdump-type Full)
+  args=(test $testtarget "$testproject" --no-build --filter-method "*fsiAndModifiers" -c "$configuration" -f "$targetframework" $reportargs --results-directory "$testresultsdir" --hangdump --hangdump-timeout 5m --hangdump-type Full)
 
   "$DOTNET_INSTALL_DIR/dotnet" "${args[@]}" || exit $?
 }

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "10.0.101",
+    "version": "11.0.100-preview.1.26104.118",
     "allowPrerelease": true,
     "paths": [
       ".dotnet",
@@ -12,7 +12,7 @@
     "runner": "Microsoft.Testing.Platform"
   },
   "tools": {
-    "dotnet": "10.0.101",
+    "dotnet": "11.0.100-preview.1.26104.118",
     "vs": {
       "version": "18.0",
       "components": [

tests/FSharp.Test.Utilities/TestFramework.fs

@@ -516,12 +516,7 @@ module Command =
     let exec dir envVars (redirect:RedirectInfo) path args =
 
 #if !NETCOREAPP
-        let ensureConsole () =
-            // Set UTF-8 encoding for console input/output to ensure FSI receives UTF-8 data.
-            // This is needed because on net472 ProcessStartInfo.StandardInputEncoding is unavailable,
-            // so the spawned process inherits the console's encoding settings.
-            Console.InputEncoding <- Text.UTF8Encoding(false)
-            Console.OutputEncoding <- Text.UTF8Encoding(false)
+        let ensureConsole () = ()
 #else
         let ensureConsole () = ()
 #endif

tests/scripts/scriptlib.fsx

@@ -168,7 +168,7 @@ module Scripting =
             | 0 ->
                 Success(string out)
             | errCode ->
-                let msg = sprintf "Error running command '%s' with args '%s' in directory '%s'" exePath arguments workDir
+                let msg = $"Console input encoding is '{System.Console.InputEncoding}', console is {System.Console.In}. Child process redirects input? '{p.StartInfo.RedirectStandardInput}'. \r\nStdOut:\r\n{out}\r\n\r\nStdErr:\r\n{err}"
                 ErrorLevel (msg, errCode)
 
     type OutPipe (writer: TextWriter) =