Feature underline

.devcontainer/devcontainer.json

@@ -0,0 +1,25 @@
+{
+	"name": "Terminal.Gui Codespace",
+	"image": "mcr.microsoft.com/vscode/devcontainers/dotnet:5.0",
+	"settings": {
+		"terminal.integrated.defaultProfile.linux": "pwsh"
+	},
+	"extensions": [
+		"eamodio.gitlens",
+		"ms-dotnettools.csharp",
+		"VisualStudioExptTeam.vscodeintellicode",
+		"ms-vscode.powershell",
+		"cschleiden.vscode-github-actions",
+		"redhat.vscode-yaml",
+		"bierner.markdown-preview-github-styles",
+		"ban.spellright",
+		"jmrog.vscode-nuget-package-manager",
+		"coenraads.bracket-pair-colorizer",
+		"vscode-icons-team.vscode-icons",
+		"editorconfig.editorconfig",
+		"formulahendry.dotnet-test-explorer"
+	],
+	"postCreateCommand": "dotnet restore && dotnet clean && dotnet build --configuration Release --no-restore && dotnet test --configuration Debug --no-restore --verbosity normal --collect:'XPlat Code Coverage' --settings UnitTests/coverlet.runsettings"
+}
+
+// Built with ❤ by [Pipeline Foundation](https://pipeline.foundation)

.github/workflows/publish.yml

@@ -36,7 +36,7 @@ jobs:
 
       - name: Publish Terminal.Gui
         id: publish_nuget
-        uses: brandedoutcast/publish-nuget@v2.5.5
+        uses: rohith/publish-nuget@v2
         with:
           VERSION_STATIC: ${{ env.MINVERVERSIONOVERRIDE }}
           NUGET_SOURCE: https://api.nuget.org

FSharpExample/FSharpExample.fsproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,7 +14,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="4.7.2" />
+    <PackageReference Update="FSharp.Core" Version="6.0.0" />
   </ItemGroup>
 
 </Project>

FSharpExample/Program.fs

@@ -235,11 +235,11 @@ let ShowHex (top: Toplevel) =
 
 type MenuItemDetails () =
     inherit MenuItem ()
-    new (title: ustring, help: string, action: Action) as this =
+    new (title: ustring, help: ustring, action: Action) as this =
         MenuItemDetails ()
         then
             this.Title <- title
-            this.Help <- ustr help
+            this.Help <- help
             this.Action <- action
 
     static member Instance (mi: MenuItem) =
@@ -362,10 +362,10 @@ let Main () =
             Width = Dim.Fill () - Dim.op_Implicit margin,
             Height = Dim.Fill () - Dim.op_Implicit margin)
     let menuItems =
-        [|MenuItemDetails (ustr "F_ind", "", Unchecked.defaultof<_>);
-            MenuItemDetails (ustr "_Replace", "", Unchecked.defaultof<_>);
-            MenuItemDetails (ustr "_Item1", "", Unchecked.defaultof<_>);
-            MenuItemDetails (ustr "_Also From Sub Menu", "", Unchecked.defaultof<_>)|]
+        [|MenuItemDetails (ustr "F_ind",ustr "", Unchecked.defaultof<_>);
+            MenuItemDetails (ustr "_Replace", ustr "", Unchecked.defaultof<_>);
+            MenuItemDetails (ustr "_Item1", ustr "", Unchecked.defaultof<_>);
+            MenuItemDetails (ustr "_Also From Sub Menu", ustr "", Unchecked.defaultof<_>)|]
     menuItems.[0].Action <- fun _ -> ShowMenuItem (menuItems.[0])
     menuItems.[1].Action <- fun _ -> ShowMenuItem (menuItems.[1])
     menuItems.[2].Action <- fun _ -> ShowMenuItem (menuItems.[2])
@@ -381,25 +381,29 @@ let Main () =
                        MenuItem (ustr "_Disabled", ustring.Empty, (fun () -> ()), (fun () -> false))
                        Unchecked.defaultof<_>
                        MenuItem (ustr "_Quit", ustring.Empty, (fun () -> if Quit() then top.Running <- false)) |])
-               MenuBarItem (ustr "_Edit", 
+               MenuBarItem (ustr "_Edit",
                     [| MenuItem (ustr "_Copy", ustring.Empty, fun () -> Copy())
                        MenuItem (ustr "C_ut", ustring.Empty, fun () -> Cut())
                        MenuItem (ustr "_Paste", ustring.Empty, fun () -> Paste())
                        MenuBarItem (ustr "_Find and Replace",
-                           [| menuItems.[0]
-                              menuItems.[1] |])
-                       menuItems.[3] |])
+                           [| menuItems.[0] :> MenuItem
+                              menuItems.[1] :> MenuItem |]) :> MenuItem
+                       menuItems.[3] :> MenuItem
+                    |])
                MenuBarItem (ustr "_List Demos", 
                     [| MenuItem (ustr "Select _Multiple Items", ustring.Empty, (fun () -> ListSelectionDemo true))
                        MenuItem (ustr "Select _Single Item", ustring.Empty, (fun () -> ListSelectionDemo false)) |])   
-               MenuBarItem(ustr "A_ssorted",
+               MenuBarItem (ustr "A_ssorted",
                     [| MenuItem (ustr "_Show text alignments", ustring.Empty, (fun () -> ShowTextAlignments())) 
                        MenuItem (ustr "_OnKeyDown/Press/Up", ustring.Empty, (fun () -> OnKeyDownPressUpDemo())) |])
-               MenuBarItem(ustr "_Test Menu and SubMenus",
+               MenuBarItem (ustr "_Test Menu and SubMenus",
                     [| MenuBarItem (ustr "SubMenu1Item_1",
                             [| MenuBarItem (ustr "SubMenu2Item_1",
                                     [| MenuBarItem (ustr "SubMenu3Item_1",
-                                            [| menuItems.[2] |]) |]) |]) |])
+                                            [| menuItems.[2] :> MenuItem |]) :> MenuItem
+                                    |]) :> MenuItem
+                            |]) :> MenuItem
+                    |])
                MenuBarItem (ustr "_About...", ustr "Demonstrates top-level menu item", (fun () -> MessageBox.ErrorQuery (50, 7, ustr "Error", ustr "This is a demo app for gui.cs", ustr "Ok") |> ignore)) |])
     menuKeysStyle <- new CheckBox (3, 25, ustr "UseKeysUpDownAsKeysLeftRight", true)
     menuKeysStyle.add_Toggled (Action<bool> (MenuKeysStyleToggled))
@@ -431,15 +435,17 @@ let Main () =
     win.Add bottom
     let bottom2 = new Label (ustr "This should go on the bottom of another top-level!")
     top.Add bottom2
-    Application.Loaded <- Action<Application.ResizedEventArgs> (
-        fun _ ->
+    top.add_LayoutComplete (Action<View.LayoutEventArgs>
+        (fun e ->
             bottom.X <- win.X
             bottom.Y <- Pos.Bottom win - Pos.Top win - Pos.At margin
             bottom2.X <- Pos.Left win
             bottom2.Y <- Pos.Bottom win)
+        )
     top.Add win
     top.Add (menu, statusBar)
     Application.Run ()
+    Application.Shutdown ();
 
 module Demo =
     [<EntryPoint>]

README.md

@@ -51,7 +51,7 @@ In addition, a complete Xterm/Vt100 terminal emulator that you can embed is now
 * **[Flexible Layout](https://migueldeicaza.github.io/gui.cs/articles/overview.html#layout)** - **Terminal.Gui** supports both *Absolute layout* and an innovative UI layout system referred to as *Computed Layout*. *Computed Layout* makes it easy to layout controls relative to each other and enables dynamic console GUIs.
 * **Clipboard support** - Cut, Copy, and Paste of text provided through the [`Clipboard`](https://migueldeicaza.github.io/gui.cs/api/Terminal.Gui/Terminal.Gui.Clipboard.html) class.
 * **[Arbitrary Views](https://migueldeicaza.github.io/gui.cs/api/Terminal.Gui/Terminal.Gui.View.html)** - All visible UI elements are subclasses of the `View` class, and these in turn can contain an arbitrary number of sub-views.
-* **Advanced App Features** - The [Mainloop](https://migueldeicaza.github.io/gui.cs/api/Terminal.Gui/Mono.Terminal.MainLoop.html) supports processing events, idle handlers, timers, and monitoring file
+* **Advanced App Features** - The [Mainloop](https://migueldeicaza.github.io/gui.cs/api/Terminal.Gui/Terminal.Gui.MainLoop.html) supports processing events, idle handlers, timers, and monitoring file
 descriptors.
 * **Reactive Extensions Support** - Use [reactive extensions](https://github.com/dotnet/reactive) and benefit from increased code readability, and the ability to apply the MVVM pattern and [ReactiveUI](https://www.reactiveui.net/) data bindings. See the [source code](https://github.com/migueldeicaza/gui.cs/tree/master/ReactiveExample) of a sample app in order to learn how to achieve this.
 
@@ -85,7 +85,9 @@ You can force the use of `System.Console` on Unix as well; see `Core.cs`.
 * **[Standalone Example](https://github.com/migueldeicaza/gui.cs/tree/master/StandaloneExample)** - A trivial .NET core sample application can be found in the `StandaloneExample` directory. Run `dotnet run` in directory to test.
 * **[F# Example](https://github.com/migueldeicaza/gui.cs/tree/master/FSharpExample)** - An example showing how to build a Terminal.Gui app using F#.
 * **[Powershell Sample]()** - (Coming soon! See PR #952. Shows how to build Terminal.Gui apps using Powershell.
-* **PowerShell's Out-ConsoleGridView** - The [`Out-ConsoleGridView` PowerShell Cmdlet](https://github.com/PowerShell/GraphicalTools/blob/master/docs/Microsoft.PowerShell.ConsoleGuiTools/Out-ConsoleGridView.md) sends the output from a command to a grid view window where the output is displayed in an interactive table. sends the output from a command to a grid view window where the output is displayed in an interactive table, using Terminal.Gui. 
+* **PowerShell's Out-ConsoleGridView** - The [`Out-ConsoleGridView` PowerShell Cmdlet](https://github.com/PowerShell/GraphicalTools/blob/master/docs/Microsoft.PowerShell.ConsoleGuiTools/Out-ConsoleGridView.md) sends the output from a command to a grid view window where the output is displayed in an interactive table. sends the output from a command to a grid view window where the output is displayed in an interactive table, using Terminal.Gui.
+* **[PoshRedisViewer](https://github.com/En3Tho/PoshRedisViewer)** - A compact Redis viewer module for PowerShell written in F# and Gui.cs
+
 
 ## Documentation
 
@@ -206,6 +208,8 @@ dotnet add package Terminal.Gui
 * Windows, Mac, and Linux - Build and run using the .NET SDK command line tools (`dotnet build` in the root directory). Run `UICatalog` with `dotnet run --project ./UICatalog` or by directly executing `./UICatalog/bin/Debug/net5.0/UICatalog.exe`.
 * Windows - Open `Terminal.Gui.sln` with Visual Studio 2019.
 
+Building in Release requires the [git command line tool](https://git-scm.com/) (a dependency of the [MinVer](https://github.com/adamralph/minver#can-i-disable-minver) build tool)
+
 ## Contributing
 
 See [CONTRIBUTING.md](https://github.com/migueldeicaza/gui.cs/blob/master/CONTRIBUTING.md).

ReactiveExample/LoginView.cs

@@ -3,6 +3,7 @@
 using NStack;
 using ReactiveUI;
 using Terminal.Gui;
+using ReactiveMarbles.ObservableEvents;
 
 namespace ReactiveExample {
 	public class LoginView : Window, IViewFor<LoginViewModel> {

ReactiveExample/ReactiveExample.csproj

@@ -1,13 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <TargetFramework>net5.0</TargetFramework>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Pharmacist.MsBuild" Version="2.0.8" PrivateAssets="all" />
-        <PackageReference Include="Pharmacist.Common" Version="2.0.8" />
-        <PackageReference Include="Terminal.Gui" Version="1.0.0-pre.*" />
-        <PackageReference Include="ReactiveUI.Fody" Version="13.2.18" />
-        <PackageReference Include="ReactiveUI" Version="13.2.18" />
+        <PackageReference Include="ReactiveUI.Fody" Version="14.2.1" />
+        <PackageReference Include="ReactiveUI" Version="14.2.1" />
+        <PackageReference
+            Include="ReactiveMarbles.ObservableEvents.SourceGenerator"
+            Version="1.1.4"
+            PrivateAssets="all" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />
     </ItemGroup>
 </Project>