Follow up to TestDisplayResultsWithCurrentUICulture : Test was failing for VB...

Follow up to TestDisplayResultsWithCurrentUICulture : Test was failing for VB but I corrected the corresponding test in C#. Changes in C# are partially reverted (test is sipped again) and VB is fixed.

src/Scripting/CSharpTest/CommandLineRunnerTests.cs

@@ -136,10 +136,15 @@ public void Await()
                 runner.Console.Error.ToString());
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/dotnet/roslyn/issues/17043")]
         [WorkItem(7133, "http://github.com/dotnet/roslyn/issues/7133")]
         public void TestDisplayResultsWithCurrentUICulture1()
         {
+            // logoOutput needs to be retrieved before the runner is started, because the runner changes the culture to de-DE. 
+            var logoOutput = $@"{ string.Format(CSharpScriptingResources.LogoLine1, s_compilerVersion) }
+{ CSharpScriptingResources.LogoLine2}
+
+{ ScriptingResources.HelpPrompt}";
             var runner = CreateRunner(input:
 @"using System.Globalization;
 CultureInfo.DefaultThreadCurrentUICulture = new CultureInfo(""en-GB"", useUserOverride: false)
@@ -150,10 +155,7 @@ public void TestDisplayResultsWithCurrentUICulture1()
             runner.RunInteractive();
 
             AssertEx.AssertEqualToleratingWhitespaceDifferences(
-$@"{ string.Format(CSharpScriptingResources.LogoLine1, s_compilerVersion) }
-{CSharpScriptingResources.LogoLine2}
-
-{ScriptingResources.HelpPrompt}
+$@"{ logoOutput }
 > using System.Globalization;
 > CultureInfo.DefaultThreadCurrentUICulture = new CultureInfo(""en-GB"", useUserOverride: false)
 [en-GB]
@@ -166,7 +168,7 @@ > Math.PI
 >", runner.Console.Out.ToString());
         }
 
-        [Fact]
+        [Fact(Skip = "https://github.com/dotnet/roslyn/issues/17043")]
         [WorkItem(7133, "http://github.com/dotnet/roslyn/issues/7133")]
         public void TestDisplayResultsWithCurrentUICulture2()
         {

src/Scripting/VisualBasicTest/CommandLineRunnerTests.vb

@@ -137,7 +137,11 @@ VBScriptingResources.LogoLine2 + "
 
         <Fact()>
         <WorkItem(7133, "https://github.com/dotnet/roslyn/issues/7133")>
-        Public Sub TestDisplayResultsWithCurrentUICulture()
+        Public Sub TestDisplayResultsWithCurrentUICulture1()
+            Dim logoText = String.Format(VBScriptingResources.LogoLine1, s_compilerVersion) + vbNewLine +
+VBScriptingResources.LogoLine2 + "
+
+" + ScriptingResources.HelpPrompt
             Dim runner = CreateRunner(args:={}, input:="Imports System.Globalization
 System.Globalization.CultureInfo.DefaultThreadCurrentUICulture = System.Globalization.CultureInfo.GetCultureInfo(""en-GB"")
 ? System.Math.PI
@@ -147,10 +151,7 @@ System.Globalization.CultureInfo.DefaultThreadCurrentUICulture = System.Globaliz
             runner.RunInteractive()
 
             AssertEx.AssertEqualToleratingWhitespaceDifferences(
-String.Format(VBScriptingResources.LogoLine1, s_compilerVersion) + vbNewLine +
-VBScriptingResources.LogoLine2 + "
-
-" + ScriptingResources.HelpPrompt + "
+logoText + "
 > Imports System.Globalization
 > System.Globalization.CultureInfo.DefaultThreadCurrentUICulture = System.Globalization.CultureInfo.GetCultureInfo(""en-GB"")
 > ? System.Math.PI
@@ -159,9 +160,17 @@ VBScriptingResources.LogoLine2 + "
 > ? System.Math.PI
 3,1415926535897931
 >", runner.Console.Out.ToString())
+        End Sub
 
+        <Fact()>
+        <WorkItem(7133, "https://github.com/dotnet/roslyn/issues/7133")>
+        Public Sub TestDisplayResultsWithCurrentUICulture2()
             ' Tests that DefaultThreadCurrentUICulture is respected and not DefaultThreadCurrentCulture.
-            runner = CreateRunner(args:={}, input:="Imports System.Globalization
+            Dim logoText = String.Format(VBScriptingResources.LogoLine1, s_compilerVersion) + vbNewLine +
+VBScriptingResources.LogoLine2 + "
+
+" + ScriptingResources.HelpPrompt
+            Dim runner = CreateRunner(args:={}, input:="Imports System.Globalization
 System.Globalization.CultureInfo.DefaultThreadCurrentUICulture = System.Globalization.CultureInfo.GetCultureInfo(""en-GB"")
 System.Globalization.CultureInfo.DefaultThreadCurrentCulture = System.Globalization.CultureInfo.GetCultureInfo(""en-GB"")
 ? System.Math.PI
@@ -171,10 +180,7 @@ System.Globalization.CultureInfo.DefaultThreadCurrentCulture = System.Globalizat
             runner.RunInteractive()
 
             AssertEx.AssertEqualToleratingWhitespaceDifferences(
-"Microsoft (R) Visual Basic – interaktive Compilerversion " + s_compilerVersion + "
-Copyright (C) Microsoft Corporation. Alle Rechte vorbehalten.
-
-Weitere Informationen erhalten Sie nach der Eingabe von ""#help"".
+logoText + "
 > Imports System.Globalization
 > System.Globalization.CultureInfo.DefaultThreadCurrentUICulture = System.Globalization.CultureInfo.GetCultureInfo(""en-GB"")
 > System.Globalization.CultureInfo.DefaultThreadCurrentCulture = System.Globalization.CultureInfo.GetCultureInfo(""en-GB"")