Fixes #4102. Add AOT version of Tests

.github/workflows/unit-tests.yml

@@ -54,6 +54,10 @@ jobs:
 
        # mv -v Tests/UnitTests/TestResults/*/*.* TestResults/UnitTests/
 
+    - name: Run UnitTests.AOT
+      run: |
+       dotnet test Tests/UnitTests.AOT --no-build --verbosity normal --collect:"XPlat Code Coverage" --settings Tests/UnitTests.AOT/coverlet.runsettings --diag:logs/UnitTests.AOT/${{ runner.os }}/logs.txt --blame --blame-crash --blame-hang --blame-hang-timeout 60s --blame-crash-collect-always -- xunit.stopOnFail=true
+
     - name: Upload Test Logs
       if: always()
       uses: actions/upload-artifact@v4

Examples/CommunityToolkitExample/CommunityToolkitExample.csproj

@@ -9,6 +9,6 @@
     <PackageReference Include="CommunityToolkit.Mvvm" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <ProjectReference Include="..\..\Terminal.Gui\Terminal.Gui.csproj" />
+    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" />
   </ItemGroup>
-
 </Project>

Examples/CommunityToolkitExample/LoginView.cs

@@ -1,6 +1,6 @@
 using CommunityToolkit.Mvvm.Messaging;
 using Terminal.Gui.App;
-using Terminal.Gui.ViewBase;
+using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;
 
 namespace CommunityToolkitExample;
 

Examples/CommunityToolkitExample/Program.cs

@@ -1,7 +1,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using Terminal.Gui.Configuration;
 using Terminal.Gui.App;
-using Terminal.Gui.ViewBase;
 
 
 namespace CommunityToolkitExample;

Examples/Example/Example.csproj

@@ -9,6 +9,11 @@
     <Version>2.0</Version>
     <InformationalVersion>2.0</InformationalVersion>
   </PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" />
+	</ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\Terminal.Gui\Terminal.Gui.csproj" />
   </ItemGroup>

Examples/Example/ExampleWindow.cs

@@ -0,0 +1,76 @@
+using Terminal.Gui.App;
+using Terminal.Gui.ViewBase;
+using Terminal.Gui.Views;
+using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;
+
+// Defines a top-level window with border and title
+public class ExampleWindow : Window
+{
+    public static string? UserName { get; set; }
+
+    public ExampleWindow ()
+    {
+        Title = $"Example App ({Application.QuitKey} to quit)";
+
+        // Create input components and labels
+        var usernameLabel = new Label { Text = "Username:" };
+
+        var userNameText = new TextField
+        {
+            // Position text field adjacent to the label
+            X = Pos.Right (usernameLabel) + 1,
+
+            // Fill remaining horizontal space
+            Width = Dim.Fill ()
+        };
+
+        var passwordLabel = new Label
+        {
+            Text = "Password:", X = Pos.Left (usernameLabel), Y = Pos.Bottom (usernameLabel) + 1
+        };
+
+        var passwordText = new TextField
+        {
+            Secret = true,
+
+            // align with the text box above
+            X = Pos.Left (userNameText),
+            Y = Pos.Top (passwordLabel),
+            Width = Dim.Fill ()
+        };
+
+        // Create login button
+        var btnLogin = new Button
+        {
+            Text = "Login",
+            Y = Pos.Bottom (passwordLabel) + 1,
+
+            // center the login button horizontally
+            X = Pos.Center (),
+            IsDefault = true
+        };
+
+        // When login button is clicked display a message popup
+        btnLogin.Accepting += (s, e) =>
+        {
+            if (userNameText.Text == "admin" && passwordText.Text == "password")
+            {
+                MessageBox.Query ("Logging In", "Login Successful", "Ok");
+                UserName = userNameText.Text;
+                Application.RequestStop ();
+            }
+            else
+            {
+                MessageBox.ErrorQuery ("Logging In", "Incorrect username or password", "Ok");
+            }
+            // When Accepting is handled, set e.Handled to true to prevent further processing.
+            e.Handled = true;
+        };
+
+        Height = Dim.Fill ();
+        Width = Dim.Fill ();
+
+        // Add the views to the Window
+        Add (usernameLabel, userNameText, passwordLabel, passwordText, btnLogin);
+    }
+}

Examples/Example/Program.cs

@@ -0,0 +1,21 @@
+// A simple Terminal.Gui example in C# - using C# 9.0 Top-level statements
+
+// This is a simple example application.  For the full range of functionality
+// see the UICatalog project
+
+using Terminal.Gui.Configuration;
+using Terminal.Gui.App;
+
+// Override the default configuration for the application to use the Light theme
+ConfigurationManager.RuntimeConfig = """{ "Theme": "Light" }""";
+ConfigurationManager.Enable(ConfigLocations.All);
+
+// As Run<T> is used to start the application, it will create an instance of ExampleWindow and run it without needing to explicitly call `Application.Init()`.
+Application.Run<ExampleWindow> ().Dispose ();
+
+// Before the application exits, reset Terminal.Gui for clean shutdown
+Application.Shutdown ();
+
+// To see this output on the screen it must be done after shutdown,
+// which restores the previous screen.
+Console.WriteLine ($@"Username: {ExampleWindow.UserName}");

Examples/NativeAot/NativeAot.csproj

@@ -7,6 +7,10 @@
     <InvariantGlobalization>false</InvariantGlobalization>
   </PropertyGroup>
 
+	<ItemGroup>
+		<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" />
+	</ItemGroup>
+
   <ItemGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <ProjectReference Include="..\..\Terminal.Gui\Terminal.Gui.csproj" />
     <TrimmerRootAssembly Include="Terminal.Gui" />
@@ -17,4 +21,7 @@
     <TrimmerRootAssembly Include="Terminal.Gui" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\Example\ExampleWindow.cs" Link="ExampleWindow.cs" />
+  </ItemGroup>
 </Project>

Examples/NativeAot/Program.cs

@@ -4,9 +4,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using Terminal.Gui.Configuration;
-using Terminal.Gui.Views;
 using Terminal.Gui.App;
-using Terminal.Gui.ViewBase;
 
 namespace NativeAot;
 
@@ -48,72 +46,3 @@ private static void Main (string [] args)
         Console.WriteLine ($@"Username: {ExampleWindow.UserName}");
     }
 }
-
-// Defines a top-level window with border and title
-public class ExampleWindow : Window
-{
-    public static string? UserName;
-
-    public ExampleWindow ()
-    {
-        Title = $"Example App ({Application.QuitKey} to quit)";
-
-        // Create input components and labels
-        var usernameLabel = new Label { Text = "Username:" };
-
-        var userNameText = new TextField
-        {
-            // Position text field adjacent to the label
-            X = Pos.Right (usernameLabel) + 1,
-
-            // Fill remaining horizontal space
-            Width = Dim.Fill ()
-        };
-
-        var passwordLabel = new Label
-        {
-            Text = "Password:", X = Pos.Left (usernameLabel), Y = Pos.Bottom (usernameLabel) + 1
-        };
-
-        var passwordText = new TextField
-        {
-            Secret = true,
-
-            // align with the text box above
-            X = Pos.Left (userNameText),
-            Y = Pos.Top (passwordLabel),
-            Width = Dim.Fill ()
-        };
-
-        // Create login button
-        var btnLogin = new Button
-        {
-            Text = "Login",
-            Y = Pos.Bottom (passwordLabel) + 1,
-
-            // center the login button horizontally
-            X = Pos.Center (),
-            IsDefault = true
-        };
-
-        // When login button is clicked display a message popup
-        btnLogin.Accepting += (s, e) =>
-        {
-            if (userNameText.Text == "admin" && passwordText.Text == "password")
-            {
-                MessageBox.Query ("Logging In", "Login Successful", "Ok");
-                UserName = userNameText.Text;
-                Application.RequestStop ();
-            }
-            else
-            {
-                MessageBox.ErrorQuery ("Logging In", "Incorrect username or password", "Ok");
-            }
-            // Anytime Accepting is handled, make sure to set e.Handled to true.
-            e.Handled = true;
-        };
-
-        // Add the views to the Window
-        Add (usernameLabel, userNameText, passwordLabel, passwordText, btnLogin);
-    }
-}

Examples/NativeAot/README.md

@@ -1,4 +1,4 @@
-# Terminal.Gui C# SelfContained
+# Terminal.Gui C# NativeAot
 
 This project aims to test the `Terminal.Gui` library to create a simple `native AOT` `self-container` GUI application in C#, ensuring that all its features are available.
 

Examples/ReactiveExample/LoginView.cs

@@ -6,6 +6,7 @@
 using Terminal.Gui.Views;
 using Terminal.Gui.App;
 using Terminal.Gui.ViewBase;
+using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;
 
 namespace ReactiveExample;
 

Examples/ReactiveExample/ReactiveExample.csproj

@@ -13,6 +13,7 @@
     <PackageReference Include="ReactiveUI" />
     <PackageReference Include="ReactiveMarbles.ObservableEvents.SourceGenerator" PrivateAssets="all" />
     <PackageReference Include="ReactiveUI.SourceGenerators" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Terminal.Gui\Terminal.Gui.csproj" />