Revert "Fixes #4274. Using Windows Host Console v2win is rendering window siz…" (#4286)

This reverts commit 75f5a847c0.

Tests/IntegrationTests/UICatalog/ScenarioTests.cs

@@ -41,9 +41,8 @@ public class ScenarioTests : TestsAllViews
 
         _output.WriteLine ($"Running Scenario '{scenarioType}'");
         var scenario = Activator.CreateInstance (scenarioType) as Scenario;
-        var scenarioName = scenario!.GetName ();
 
-        uint abortTime = 2200;
+        uint abortTime = 2000;
         object? timeout = null;
         var initialized = false;
         var shutdownGracefully = false;
@@ -71,7 +70,7 @@ public class ScenarioTests : TestsAllViews
         Assert.True (initialized);
 
 
-        Assert.True (shutdownGracefully, $"Scenario '{scenarioName}' Failed to Quit with {quitKey} after {abortTime}ms and {iterationCount} iterations. Force quit.");
+        Assert.True (shutdownGracefully, $"Scenario Failed to Quit with {quitKey} after {abortTime}ms and {iterationCount} iterations. Force quit.");
 
 #if DEBUG_IDISPOSABLE
         Assert.Empty (View.Instances);
@@ -92,6 +91,11 @@ public class ScenarioTests : TestsAllViews
             {
                 Application.Iteration += OnApplicationOnIteration;
                 initialized = true;
+
+                lock (_timeoutLock)
+                {
+                    timeout = Application.AddTimeout (TimeSpan.FromMilliseconds (abortTime), ForceCloseCallback);
+                }
             }
             else
             {
@@ -122,15 +126,6 @@ public class ScenarioTests : TestsAllViews
 
         void OnApplicationOnIteration (object? s, IterationEventArgs a)
         {
-            if (iterationCount == 0)
-            {
-                // Start the timeout countdown on the first iteration
-                lock (_timeoutLock)
-                {
-                    timeout = Application.AddTimeout (TimeSpan.FromMilliseconds (abortTime), ForceCloseCallback);
-                }
-            }
-
             iterationCount++;
 
             if (Application.Initialized)

Tests/UnitTests/Application/ApplicationScreenTests.cs

@@ -47,7 +47,7 @@ public class ApplicationScreenTests
         Assert.Equal (0, clearedContentsRaised);
 
         // Act
-        Application.Top!.SetNeedsLayout ();
+        Application.Top.SetNeedsLayout ();
         Application.LayoutAndDraw ();
 
         // Assert
@@ -67,20 +67,6 @@ public class ApplicationScreenTests
         // Assert
         Assert.Equal (2, clearedContentsRaised);
 
-        // Act
-        Application.Top.Y = 1;
-        Application.LayoutAndDraw ();
-
-        // Assert
-        Assert.Equal (3, clearedContentsRaised);
-
-        // Act
-        Application.Top.Height = 10;
-        Application.LayoutAndDraw ();
-
-        // Assert
-        Assert.Equal (4, clearedContentsRaised);
-
         Application.End (rs);
 
         return;

Tests/UnitTests/Application/SynchronizatonContextTests.cs

@@ -10,7 +10,7 @@ public class SyncrhonizationContextTests
     public void SynchronizationContext_CreateCopy ()
     {
         ConsoleDriver.RunningUnitTests = true;
-        Application.Init (null, "fake");
+        Application.Init ();
         SynchronizationContext context = SynchronizationContext.Current;
         Assert.NotNull (context);
 

Tests/UnitTests/Configuration/ConfigurationMangerTests.cs

@@ -1010,6 +1010,8 @@ public class ConfigurationManagerTests (ITestOutputHelper output)
         finally
         {
             Disable (resetToHardCodedDefaults: true);
+
         }
     }
+
 }

Tests/UnitTests/Views/ComboBoxTests.cs

@@ -525,9 +525,7 @@ public class ComboBoxTests (ITestOutputHelper output)
         Assert.True (cb.IsShow);
         Assert.Equal (-1, cb.SelectedItem);
         Assert.Equal ("", cb.Text);
-        Assert.False (Application.ClearScreenNextIteration);
-        Assert.True (cb.NeedsLayout);
-        Assert.True (cb.NeedsDraw);
+
         cb.Layout ();
 
         cb.Draw ();