diff --git a/Examples/NativeAot/Program.cs b/Examples/NativeAot/Program.cs index 501adb2ed..35c5de043 100644 --- a/Examples/NativeAot/Program.cs +++ b/Examples/NativeAot/Program.cs @@ -101,13 +101,13 @@ public class ExampleWindow : Window { if (userNameText.Text == "admin" && passwordText.Text == "password") { - MessageBox.Query (App, "Logging In", "Login Successful", "Ok"); + MessageBox.Query (App!, "Logging In", "Login Successful", "Ok"); UserName = userNameText.Text; Application.RequestStop (); } else { - MessageBox.ErrorQuery (App, "Logging In", "Incorrect username or password", "Ok"); + MessageBox.ErrorQuery (App!, "Logging In", "Incorrect username or password", "Ok"); } // Anytime Accepting is handled, make sure to set e.Handled to true. e.Handled = true; diff --git a/Examples/SelfContained/Program.cs b/Examples/SelfContained/Program.cs index 319ae859f..f307c4fbf 100644 --- a/Examples/SelfContained/Program.cs +++ b/Examples/SelfContained/Program.cs @@ -100,13 +100,13 @@ public class ExampleWindow : Runnable { if (userNameText.Text == "admin" && passwordText.Text == "password") { - MessageBox.Query (App, "Logging In", "Login Successful", "Ok"); + MessageBox.Query (App!, "Logging In", "Login Successful", "Ok"); Result = userNameText.Text; App?.RequestStop (); } else { - MessageBox.ErrorQuery (App, "Logging In", "Incorrect username or password", "Ok"); + MessageBox.ErrorQuery (App!, "Logging In", "Incorrect username or password", "Ok"); } // When Accepting is handled, set e.Handled to true to prevent further processing. e.Handled = true; diff --git a/Examples/UICatalog/Scenarios/AnimationScenario/AnimationScenario.cs b/Examples/UICatalog/Scenarios/AnimationScenario/AnimationScenario.cs index 3660eeaeb..fecbb4c12 100644 --- a/Examples/UICatalog/Scenarios/AnimationScenario/AnimationScenario.cs +++ b/Examples/UICatalog/Scenarios/AnimationScenario/AnimationScenario.cs @@ -78,7 +78,7 @@ public class AnimationScenario : Scenario if (!f.Exists) { Debug.WriteLine ($"Could not find {f.FullName}"); - MessageBox.ErrorQuery (_imageView?.App, "Could not find gif", $"Could not find\n{f.FullName}", "Ok"); + MessageBox.ErrorQuery (_imageView?.App!, "Could not find gif", $"Could not find\n{f.FullName}", "Ok"); return; } diff --git a/Examples/UICatalog/Scenarios/ConfigurationEditor.cs b/Examples/UICatalog/Scenarios/ConfigurationEditor.cs index 5fba97bcc..748056835 100644 --- a/Examples/UICatalog/Scenarios/ConfigurationEditor.cs +++ b/Examples/UICatalog/Scenarios/ConfigurationEditor.cs @@ -153,7 +153,7 @@ public class ConfigurationEditor : Scenario continue; } - int? result = MessageBox.Query (editor?.App, + int? result = MessageBox.Query (editor?.App!, "Save Changes", $"Save changes to {editor?.FileInfo!.Name}", "_Yes", diff --git a/Examples/UICatalog/Scenarios/ContextMenus.cs b/Examples/UICatalog/Scenarios/ContextMenus.cs index ddb52f484..ab6746da0 100644 --- a/Examples/UICatalog/Scenarios/ContextMenus.cs +++ b/Examples/UICatalog/Scenarios/ContextMenus.cs @@ -129,7 +129,7 @@ public class ContextMenus : Scenario { Title = "_Configuration...", HelpText = "Show configuration", - Action = () => MessageBox.Query (app, + Action = () => MessageBox.Query (app!, 50, 10, "Configuration", @@ -147,7 +147,7 @@ public class ContextMenus : Scenario Title = "_Setup...", HelpText = "Perform setup", Action = () => MessageBox - .Query (app, + .Query (app!, 50, 10, "Setup", @@ -161,7 +161,7 @@ public class ContextMenus : Scenario Title = "_Maintenance...", HelpText = "Maintenance mode", Action = () => MessageBox - .Query (app, + .Query (app!, 50, 10, "Maintenance", diff --git a/Examples/UICatalog/Scenarios/EditorsAndHelpers/DimEditor.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/DimEditor.cs index b8e28730c..142286729 100644 --- a/Examples/UICatalog/Scenarios/EditorsAndHelpers/DimEditor.cs +++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/DimEditor.cs @@ -160,7 +160,7 @@ public class DimEditor : EditorBase } catch (Exception e) { - MessageBox.ErrorQuery (App, "Exception", e.Message, "Ok"); + MessageBox.ErrorQuery (App!, "Exception", e.Message, "Ok"); } } } diff --git a/Examples/UICatalog/Scenarios/EditorsAndHelpers/PosEditor.cs b/Examples/UICatalog/Scenarios/EditorsAndHelpers/PosEditor.cs index ae35161e6..b92e9c21c 100644 --- a/Examples/UICatalog/Scenarios/EditorsAndHelpers/PosEditor.cs +++ b/Examples/UICatalog/Scenarios/EditorsAndHelpers/PosEditor.cs @@ -157,7 +157,7 @@ public class PosEditor : EditorBase } catch (Exception e) { - MessageBox.ErrorQuery (App, "Exception", e.Message, "Ok"); + MessageBox.ErrorQuery (App!, "Exception", e.Message, "Ok"); } } } diff --git a/Examples/UICatalog/Scenarios/Menus.cs b/Examples/UICatalog/Scenarios/Menus.cs index f044749ba..d1f897824 100644 --- a/Examples/UICatalog/Scenarios/Menus.cs +++ b/Examples/UICatalog/Scenarios/Menus.cs @@ -347,7 +347,7 @@ public class Menus : Scenario }; ContextMenu.EnableForDesign (ref host); - Application.Popover.Register (ContextMenu); + Application.Popover?.Register (ContextMenu); ContextMenu.Visible = false; diff --git a/Examples/UICatalog/Scenarios/Shortcuts.cs b/Examples/UICatalog/Scenarios/Shortcuts.cs index e76dcfc05..5a76edd12 100644 --- a/Examples/UICatalog/Scenarios/Shortcuts.cs +++ b/Examples/UICatalog/Scenarios/Shortcuts.cs @@ -566,6 +566,6 @@ public class Shortcuts : Scenario { e.Handled = true; var view = sender as View; - MessageBox.Query ((sender as View)?.App, "Hi", $"You clicked {view?.Text}", "_Ok"); + MessageBox.Query ((sender as View)?.App!, "Hi", $"You clicked {view?.Text}", "_Ok"); } } diff --git a/Examples/UICatalog/Scenarios/SingleBackgroundWorker.cs b/Examples/UICatalog/Scenarios/SingleBackgroundWorker.cs index 424523c00..6f811df23 100644 --- a/Examples/UICatalog/Scenarios/SingleBackgroundWorker.cs +++ b/Examples/UICatalog/Scenarios/SingleBackgroundWorker.cs @@ -223,7 +223,7 @@ public class SingleBackgroundWorker : Scenario bool Close () { - int? n = MessageBox.Query (App, + int? n = MessageBox.Query (App!, 50, 7, "Close Window.", diff --git a/Examples/UICatalog/Scenarios/TableEditor.cs b/Examples/UICatalog/Scenarios/TableEditor.cs index 04d2bba24..1a240113a 100644 --- a/Examples/UICatalog/Scenarios/TableEditor.cs +++ b/Examples/UICatalog/Scenarios/TableEditor.cs @@ -1032,7 +1032,7 @@ public class TableEditor : Scenario } catch (Exception ex) { - MessageBox.ErrorQuery ((sender as View)?.App, 60, 20, "Failed to set text", ex.Message, "Ok"); + MessageBox.ErrorQuery ((sender as View)?.App!, 60, 20, "Failed to set text", ex.Message, "Ok"); } _tableView!.Update (); @@ -1171,7 +1171,7 @@ public class TableEditor : Scenario } catch (Exception e) { - MessageBox.ErrorQuery (_tableView?.App, "Could not find local drives", e.Message, "Ok"); + MessageBox.ErrorQuery (_tableView?.App!, "Could not find local drives", e.Message, "Ok"); } _tableView!.Table = source; @@ -1235,7 +1235,7 @@ public class TableEditor : Scenario } catch (Exception ex) { - MessageBox.ErrorQuery (_tableView.App, 60, 20, "Failed to set", ex.Message, "Ok"); + MessageBox.ErrorQuery (_tableView.App!, 60, 20, "Failed to set", ex.Message, "Ok"); } _tableView!.Update (); diff --git a/Examples/UICatalog/Scenarios/Transparent.cs b/Examples/UICatalog/Scenarios/Transparent.cs index e1c94b325..ed63ecbe1 100644 --- a/Examples/UICatalog/Scenarios/Transparent.cs +++ b/Examples/UICatalog/Scenarios/Transparent.cs @@ -47,7 +47,7 @@ public sealed class Transparent : Scenario }; appButton.Accepting += (sender, args) => { - MessageBox.Query ((sender as View)?.App, "AppButton", "Transparency is cool!", "_Ok"); + MessageBox.Query ((sender as View)?.App!, "AppButton", "Transparency is cool!", "_Ok"); args.Handled = true; }; appWindow.Add (appButton); @@ -112,7 +112,7 @@ public sealed class Transparent : Scenario }; button.Accepting += (sender, args) => { - MessageBox.Query (App, "Clicked!", "Button in Transparent View", "_Ok"); + MessageBox.Query (App!, "Clicked!", "Button in Transparent View", "_Ok"); args.Handled = true; }; diff --git a/Examples/UICatalog/Scenarios/WideGlyphs.cs b/Examples/UICatalog/Scenarios/WideGlyphs.cs index 7d95dec34..af249cab3 100644 --- a/Examples/UICatalog/Scenarios/WideGlyphs.cs +++ b/Examples/UICatalog/Scenarios/WideGlyphs.cs @@ -132,7 +132,7 @@ public sealed class WideGlyphs : Scenario }; arrangeableViewAtOdd.Accepting += (sender, args) => { - MessageBox.Query ((sender as View)?.App, "Button Pressed", "You Pressed it!"); + MessageBox.Query ((sender as View)?.App!, "Button Pressed", "You Pressed it!"); }; appWindow.Add (arrangeableViewAtOdd); diff --git a/Examples/UICatalog/Scenarios/WizardAsView.cs b/Examples/UICatalog/Scenarios/WizardAsView.cs index c3d7266d3..8860e2f8e 100644 --- a/Examples/UICatalog/Scenarios/WizardAsView.cs +++ b/Examples/UICatalog/Scenarios/WizardAsView.cs @@ -83,13 +83,13 @@ public class WizardAsView : Scenario wizard.Finished += (s, args) => { //args.Cancel = true; - MessageBox.Query ((s as View)?.App, "Setup Wizard", "Finished", "Ok"); + MessageBox.Query ((s as View)?.App!, "Setup Wizard", "Finished", "Ok"); Application.RequestStop (); }; wizard.Cancelled += (s, args) => { - int? btn = MessageBox.Query ((s as View)?.App, "Setup Wizard", "Are you sure you want to cancel?", "Yes", "No"); + int? btn = MessageBox.Query ((s as View)?.App!, "Setup Wizard", "Are you sure you want to cancel?", "Yes", "No"); args.Cancel = btn == 1; if (btn == 0) @@ -126,7 +126,7 @@ public class WizardAsView : Scenario { secondStep.Title = "2nd Step"; - MessageBox.Query ((s as View)?.App, + MessageBox.Query ((s as View)?.App!, "Wizard Scenario", "This Wizard Step's title was changed to '2nd Step'", "Ok" diff --git a/Examples/UICatalog/UICatalog.cs b/Examples/UICatalog/UICatalog.cs index 5d22a9c12..d243935c1 100644 --- a/Examples/UICatalog/UICatalog.cs +++ b/Examples/UICatalog/UICatalog.cs @@ -18,7 +18,6 @@ using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Globalization; using System.Reflection; -using System.Reflection.Metadata; using System.Text; using System.Text.Json; using Microsoft.Extensions.Logging; @@ -57,8 +56,9 @@ public class UICatalog { private static string? _forceDriver; private static string? _uiCatalogDriver; +#if DEBUG_IDISPOSABLE private static string? _scenarioDriver; - +#endif public static string LogFilePath { get; set; } = string.Empty; public static LoggingLevelSwitch LogLevelSwitch { get; } = new (); public const string LOGFILE_LOCATION = "logs"; @@ -90,13 +90,14 @@ public class UICatalog // Add validator separately (not chained) driverOption.AddValidator (result => - { - var value = result.GetValueOrDefault (); - if (result.Tokens.Count > 0 && !allowedDrivers.Contains (value)) - { - result.ErrorMessage = $"Invalid driver name '{value}'. Allowed values: {string.Join (", ", allowedDrivers)}"; - } - }); + { + var value = result.GetValueOrDefault (); + + if (result.Tokens.Count > 0 && !allowedDrivers.Contains (value)) + { + result.ErrorMessage = $"Invalid driver name '{value}'. Allowed values: {string.Join (", ", allowedDrivers)}"; + } + }); // Configuration Management Option disableConfigManagement = new ( @@ -137,8 +138,8 @@ public class UICatalog getDefaultValue: () => "none" ).FromAmong ( UICatalogRunnable.CachedScenarios.Select (s => s.GetName ()) - .Append ("none") - .ToArray () + .Append ("none") + .ToArray () ); var rootCommand = new RootCommand ("A comprehensive sample library and test app for Terminal.Gui") @@ -146,8 +147,7 @@ public class UICatalog scenarioArgument, debugLogLevel, benchmarkFlag, benchmarkTimeout, resultsFile, driverOption, disableConfigManagement }; - rootCommand.SetHandler ( - context => + rootCommand.SetHandler (context => { var options = new UICatalogCommandLineOptions { @@ -179,14 +179,15 @@ public class UICatalog return 0; } - var parseResult = parser.Parse (args); + ParseResult parseResult = parser.Parse (args); if (parseResult.Errors.Count > 0) { - foreach (var error in parseResult.Errors) + foreach (ParseError error in parseResult.Errors) { Console.Error.WriteLine (error.Message); } + return 1; // Non-zero exit code for error } @@ -204,16 +205,16 @@ public class UICatalog public static LogEventLevel LogLevelToLogEventLevel (LogLevel logLevel) { return logLevel switch - { - LogLevel.Trace => LogEventLevel.Verbose, - LogLevel.Debug => LogEventLevel.Debug, - LogLevel.Information => LogEventLevel.Information, - LogLevel.Warning => LogEventLevel.Warning, - LogLevel.Error => LogEventLevel.Error, - LogLevel.Critical => LogEventLevel.Fatal, - LogLevel.None => LogEventLevel.Fatal, // Default to Fatal if None is specified - _ => LogEventLevel.Fatal // Default to Information for any unspecified LogLevel - }; + { + LogLevel.Trace => LogEventLevel.Verbose, + LogLevel.Debug => LogEventLevel.Debug, + LogLevel.Information => LogEventLevel.Information, + LogLevel.Warning => LogEventLevel.Warning, + LogLevel.Error => LogEventLevel.Error, + LogLevel.Critical => LogEventLevel.Fatal, + LogLevel.None => LogEventLevel.Fatal, // Default to Fatal if None is specified + _ => LogEventLevel.Fatal // Default to Information for any unspecified LogLevel + }; } private static ILogger CreateLogger () @@ -232,8 +233,7 @@ public class UICatalog .CreateLogger (); // Create a logger factory compatible with Microsoft.Extensions.Logging - using ILoggerFactory loggerFactory = LoggerFactory.Create ( - builder => + using ILoggerFactory loggerFactory = LoggerFactory.Create (builder => { builder .AddSerilog (dispose: true) // Integrate Serilog with ILogger @@ -246,7 +246,8 @@ public class UICatalog /// /// Shows the UI Catalog selection UI. When the user selects a Scenario to run, the UI Catalog main app UI is - /// killed and the Scenario is run as though it were Application.TopRunnable. When the Scenario exits, this function exits. + /// killed and the Scenario is run as though it were Application.TopRunnable. When the Scenario exits, this function + /// exits. /// /// private static Scenario RunUICatalogRunnable () @@ -257,7 +258,7 @@ public class UICatalog // If the user specified a driver on the command line then use it, // ignoring Config files. - Application.Init (driverName: _forceDriver); + Application.Init (_forceDriver); _uiCatalogDriver = Application.Driver!.GetName (); @@ -326,10 +327,7 @@ public class UICatalog ThemeManager.ThemeChanged += ThemeManagerOnThemeChanged; } - private static void ThemeManagerOnThemeChanged (object? sender, EventArgs e) - { - CM.Apply (); - } + private static void ThemeManagerOnThemeChanged (object? sender, EventArgs e) { CM.Apply (); } private static void StopConfigWatcher () { @@ -372,11 +370,10 @@ public class UICatalog } int item = UICatalogRunnable.CachedScenarios!.IndexOf ( - UICatalogRunnable.CachedScenarios!.FirstOrDefault ( - s => - s.GetName () - .Equals (options.Scenario, StringComparison.OrdinalIgnoreCase) - )!); + UICatalogRunnable.CachedScenarios!.FirstOrDefault (s => + s.GetName () + .Equals (options.Scenario, StringComparison.OrdinalIgnoreCase) + )!); UICatalogRunnable.CachedSelectedScenario = (Scenario)Activator.CreateInstance (UICatalogRunnable.CachedScenarios [item].GetType ())!; BenchmarkResults? results = RunScenario (UICatalogRunnable.CachedSelectedScenario, options.Benchmark); diff --git a/Examples/UICatalog/UICatalogRunnable.cs b/Examples/UICatalog/UICatalogRunnable.cs index 3df05b8ae..89d65d06d 100644 --- a/Examples/UICatalog/UICatalogRunnable.cs +++ b/Examples/UICatalog/UICatalogRunnable.cs @@ -155,7 +155,7 @@ public class UICatalogRunnable : Runnable "_About...", "About UI Catalog", () => MessageBox.Query ( - App, + App!, "", GetAboutBoxMessage (), wrapMessage: false, diff --git a/Terminal.Gui/App/PopoverBaseImpl.cs b/Terminal.Gui/App/PopoverBaseImpl.cs index 81673e405..4f564a3fa 100644 --- a/Terminal.Gui/App/PopoverBaseImpl.cs +++ b/Terminal.Gui/App/PopoverBaseImpl.cs @@ -22,7 +22,7 @@ namespace Terminal.Gui.App; /// This base class provides: /// /// -/// Fills the screen by default ( = , = ). +/// Fills the screen by default ( = , = ). /// Transparent viewport settings for proper mouse event handling. /// Automatic layout when becoming visible. /// Focus restoration when hidden. @@ -44,7 +44,7 @@ public abstract class PopoverBaseImpl : View, IPopover /// Sets up default popover behavior: /// /// - /// Fills the screen ( = , = ). + /// Fills the screen ( = , = ). /// Sets to . /// Configures with and . /// Adds bound to which hides the popover when invoked. diff --git a/Terminal.Gui/ViewBase/Adornment/Margin.cs b/Terminal.Gui/ViewBase/Adornment/Margin.cs index 5c73bc6da..aecb704d3 100644 --- a/Terminal.Gui/ViewBase/Adornment/Margin.cs +++ b/Terminal.Gui/ViewBase/Adornment/Margin.cs @@ -67,7 +67,7 @@ public class Margin : Adornment } /// - /// INTERNAL API - Draws the transparent margins for the specified views. This is called from on each + /// INTERNAL API - Draws the transparent margins for the specified views. This is called from on each /// iteration of the main loop after all Views have been drawn. /// /// diff --git a/Terminal.Gui/Views/Menu/MenuBar.cs b/Terminal.Gui/Views/Menu/MenuBar.cs index 7e45d2d6f..82882b979 100644 --- a/Terminal.Gui/Views/Menu/MenuBar.cs +++ b/Terminal.Gui/Views/Menu/MenuBar.cs @@ -591,7 +591,7 @@ public class MenuBar : Menu, IDesignable { Title = "_File Settings...", HelpText = "More file settings", - Action = () => MessageBox.Query (App, + Action = () => MessageBox.Query (App!, "File Settings", "This is the File Settings Dialog\n", "_Ok", @@ -665,12 +665,12 @@ public class MenuBar : Menu, IDesignable new MenuItem { Title = "_Online Help...", - Action = () => MessageBox.Query (App, "Online Help", "https://gui-cs.github.io/Terminal.Gui", "Ok") + Action = () => MessageBox.Query (App!, "Online Help", "https://gui-cs.github.io/Terminal.Gui", "Ok") }, new MenuItem { Title = "About...", - Action = () => MessageBox.Query (App, "About", "Something About Mary.", "Ok") + Action = () => MessageBox.Query (App!, "About", "Something About Mary.", "Ok") } ] ) @@ -734,7 +734,7 @@ public class MenuBar : Menu, IDesignable { Title = "_Deeper Detail", Text = "Deeper Detail", - Action = () => { MessageBox.Query (App, "Deeper Detail", "Lots of details", "_Ok"); } + Action = () => { MessageBox.Query (App!, "Deeper Detail", "Lots of details", "_Ok"); } }; var belowLineDetail = new MenuItem diff --git a/Terminal.Gui/Views/StatusBar.cs b/Terminal.Gui/Views/StatusBar.cs index a964058a2..f2bc31af6 100644 --- a/Terminal.Gui/Views/StatusBar.cs +++ b/Terminal.Gui/Views/StatusBar.cs @@ -166,7 +166,7 @@ public class StatusBar : Bar, IDesignable return true; - void OnButtonClicked (object? sender, EventArgs? e) { MessageBox.Query (App, "Hi", $"You clicked {sender}"); } + void OnButtonClicked (object? sender, EventArgs? e) { MessageBox.Query (App!, "Hi", $"You clicked {sender}"); } } /// diff --git a/Tests/UnitTests/Application/ApplicationPopoverTests.cs b/Tests/UnitTests/Application/ApplicationPopoverTests.cs index 6056bee16..697f73c23 100644 --- a/Tests/UnitTests/Application/ApplicationPopoverTests.cs +++ b/Tests/UnitTests/Application/ApplicationPopoverTests.cs @@ -331,9 +331,12 @@ public class ApplicationPopoverTests public List HandledKeys { get; } = []; public int NewCommandInvokeCount { get; private set; } +#if DEBUG_IDISPOSABLE // NOTE: Hides the base DisposedCount property public new int DisposedCount { get; private set; } - +#else + public int DisposedCount { get; private set; } +#endif public PopoverTestClass () { CanFocus = true; diff --git a/Tests/UnitTestsParallelizable/ViewBase/Adornment/ShadowTests.cs b/Tests/UnitTestsParallelizable/ViewBase/Adornment/ShadowTests.cs index f3691ebb0..9fb8fe3df 100644 --- a/Tests/UnitTestsParallelizable/ViewBase/Adornment/ShadowTests.cs +++ b/Tests/UnitTestsParallelizable/ViewBase/Adornment/ShadowTests.cs @@ -226,7 +226,7 @@ public class ShadowTests (ITestOutputHelper output) └──┘🍎 � 🍎🍎 """, - output, + _output, app.Driver); view.Margin!.ShadowSize = new (1, 2); @@ -243,7 +243,7 @@ public class ShadowTests (ITestOutputHelper output) � 🍎🍎 � 🍎🍎 """, - output, + _output, app.Driver); view.Width = Dim.Fill (1); @@ -259,7 +259,7 @@ public class ShadowTests (ITestOutputHelper output) � 🍎� � 🍎� """, - output, + _output, app.Driver); } @@ -282,7 +282,7 @@ public class ShadowTests (ITestOutputHelper output) | Hi |▖ ▝▀▀▀▀▀▘ """, - output, + _output, app.Driver); app.Mouse.RaiseMouseEvent (new () { ScreenPosition = new (2, 0), Flags = MouseFlags.Button1Pressed }); @@ -292,7 +292,7 @@ public class ShadowTests (ITestOutputHelper output) """ | Hi | """, - output, + _output, app.Driver); app.Mouse.RaiseMouseEvent (new () { ScreenPosition = new (2, 0), Flags = MouseFlags.Button1Released }); @@ -303,7 +303,7 @@ public class ShadowTests (ITestOutputHelper output) | Hi |▖ ▝▀▀▀▀▀▘ """, - output, + _output, app.Driver); } @@ -457,7 +457,7 @@ public class ShadowTests (ITestOutputHelper output) 🍎🍎🍎🍎🍎 🍎🍎🍎🍎🍎 """, - output, + _output, app.Driver); Runnable modalSuperview = new () { Y = 1, Width = Dim.Fill (), Height = 4, BorderStyle = LineStyle.Single }; @@ -476,7 +476,7 @@ public class ShadowTests (ITestOutputHelper output) │▝▀▀▀▀▀▀▘│ └────────┘ """, - output, + _output, app.Driver); diff --git a/local_packages/Terminal.Gui.2.0.0.nupkg b/local_packages/Terminal.Gui.2.0.0.nupkg index f784c5fef..f53160df4 100644 Binary files a/local_packages/Terminal.Gui.2.0.0.nupkg and b/local_packages/Terminal.Gui.2.0.0.nupkg differ diff --git a/local_packages/Terminal.Gui.2.0.0.snupkg b/local_packages/Terminal.Gui.2.0.0.snupkg index 5b2fcc136..c819533d8 100644 Binary files a/local_packages/Terminal.Gui.2.0.0.snupkg and b/local_packages/Terminal.Gui.2.0.0.snupkg differ