Fixes #4046 - Moves examples into `./Examples` and fixes `./Tests` (#4047)

* touching publish.yml

* Moved Examples into ./Examples

* Moved Benchmarks into ./Tests

* Moved Benchmarks into ./Tests

* Moved UICatalog into ./Examples

* Moved UICatalog into ./Examples 2

* Moved tests into ./Tests

* Updated nuget

Directory.Packages.props

@@ -32,8 +32,8 @@
     <PackageVersion Include="ReactiveUI.SourceGenerators" Version="[2.1.8,3)" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="[17.13,18)" />
     <PackageVersion Include="Moq" Version="[4.20.72,5)" />
-    <PackageVersion Include="ReportGenerator" Version="[5.4.4,6)" />
-    <PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="[22.0.11,23)" />
+    <PackageVersion Include="ReportGenerator" Version="5.4.5" />
+    <PackageVersion Include="TestableIO.System.IO.Abstractions.TestingHelpers" Version="22.0.14" />
     <PackageVersion Include="xunit" Version="[2.9.3,3)" />
     <PackageVersion Include="Xunit.Combinatorial" Version="[1.6.24,2)" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="[2.8.2,3)" />

CommunityToolkitExample/CommunityToolkitExample.csproj → Examples/CommunityToolkitExample/CommunityToolkitExample.csproj

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

Example/Example.csproj → Examples/Example/Example.csproj

@@ -1,15 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <!-- Version numbers are automatically updated by gitversion when a release is released -->
-    <!-- In the source tree the version will always be 1.0 for all projects. -->
-    <!-- Do not modify these. -->
-    <AssemblyVersion>2.0</AssemblyVersion>
-    <FileVersion>2.0</FileVersion>
-    <Version>2.0</Version>
-    <InformationalVersion>2.0</InformationalVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />
-  </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <!-- Version numbers are automatically updated by gitversion when a release is released -->
+    <!-- In the source tree the version will always be 1.0 for all projects. -->
+    <!-- Do not modify these. -->
+    <AssemblyVersion>2.0</AssemblyVersion>
+    <FileVersion>2.0</FileVersion>
+    <Version>2.0</Version>
+    <InformationalVersion>2.0</InformationalVersion>
+  </PropertyGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Terminal.Gui\Terminal.Gui.csproj" />
+  </ItemGroup>
 </Project>

FSharpExample/Program.fs → Examples/FSharpExample/Program.fs

@@ -1,48 +1,48 @@
-open Terminal.Gui
-
-type ExampleWindow() as this =
-    inherit Window()
-    
-    do
-        this.Title <- sprintf "Example App (%O to quit)" Application.QuitKey
-
-        // Create input components and labels
-        let usernameLabel = new Label(Text = "Username:")
-
-        let userNameText = new TextField(X = Pos.Right(usernameLabel) + Pos.op_Implicit(1), Width = Dim.Fill())
-
-        let passwordLabel = new Label(Text = "Password:", X = Pos.Left(usernameLabel), Y = Pos.Bottom(usernameLabel) +  Pos.op_Implicit(1))
-
-        let passwordText = new TextField(Secret = true, X = Pos.Left(userNameText), Y = Pos.Top(passwordLabel), Width = Dim.Fill())
-
-        // Create login button
-        let btnLogin = new Button(Text = "Login", Y = Pos.Bottom(passwordLabel) +  Pos.op_Implicit(1), X = Pos.Center(), IsDefault = true)
-
-        // When login button is clicked display a message popup
-        btnLogin.Accepting.Add(fun _ ->
-            if userNameText.Text = "admin" && passwordText.Text = "password" then
-                MessageBox.Query("Logging In", "Login Successful", "Ok") |> ignore
-                ExampleWindow.UserName <- userNameText.Text.ToString()
-                Application.RequestStop()
-            else
-                MessageBox.ErrorQuery("Logging In", "Incorrect username or password", "Ok") |> ignore
-        )
-
-        // Add the views to the Window
-        this.Add(usernameLabel, userNameText, passwordLabel, passwordText, btnLogin)
-
-    static member val UserName = "" with get, set
-
-[<EntryPoint>]
-let main argv =
-    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.
-    printfn "Username: %s" ExampleWindow.UserName
-    
-    0 // return an integer exit code
+open Terminal.Gui
+
+type ExampleWindow() as this =
+    inherit Window()
+    
+    do
+        this.Title <- sprintf "Example App (%O to quit)" Application.QuitKey
+
+        // Create input components and labels
+        let usernameLabel = new Label(Text = "Username:")
+
+        let userNameText = new TextField(X = Pos.Right(usernameLabel) + Pos.op_Implicit(1), Width = Dim.Fill())
+
+        let passwordLabel = new Label(Text = "Password:", X = Pos.Left(usernameLabel), Y = Pos.Bottom(usernameLabel) +  Pos.op_Implicit(1))
+
+        let passwordText = new TextField(Secret = true, X = Pos.Left(userNameText), Y = Pos.Top(passwordLabel), Width = Dim.Fill())
+
+        // Create login button
+        let btnLogin = new Button(Text = "Login", Y = Pos.Bottom(passwordLabel) +  Pos.op_Implicit(1), X = Pos.Center(), IsDefault = true)
+
+        // When login button is clicked display a message popup
+        btnLogin.Accepting.Add(fun _ ->
+            if userNameText.Text = "admin" && passwordText.Text = "password" then
+                MessageBox.Query("Logging In", "Login Successful", "Ok") |> ignore
+                ExampleWindow.UserName <- userNameText.Text.ToString()
+                Application.RequestStop()
+            else
+                MessageBox.ErrorQuery("Logging In", "Incorrect username or password", "Ok") |> ignore
+        )
+
+        // Add the views to the Window
+        this.Add(usernameLabel, userNameText, passwordLabel, passwordText, btnLogin)
+
+    static member val UserName = "" with get, set
+
+[<EntryPoint>]
+let main argv =
+    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.
+    printfn "Username: %s" ExampleWindow.UserName
+    
+    0 // return an integer exit code

NativeAot/NativeAot.csproj → Examples/NativeAot/NativeAot.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />
+    <ProjectReference Include="..\..\Terminal.Gui\Terminal.Gui.csproj" />
     <TrimmerRootAssembly Include="Terminal.Gui" />
   </ItemGroup>
 

ReactiveExample/ReactiveExample.csproj → Examples/ReactiveExample/ReactiveExample.csproj

@@ -15,6 +15,6 @@
     <PackageReference Include="ReactiveUI.SourceGenerators" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />
+    <ProjectReference Include="..\..\Terminal.Gui\Terminal.Gui.csproj" />
   </ItemGroup>
 </Project>

SelfContained/SelfContained.csproj → Examples/SelfContained/SelfContained.csproj

@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />
+    <ProjectReference Include="..\..\Terminal.Gui\Terminal.Gui.csproj" />
     <TrimmerRootAssembly Include="Terminal.Gui" />
   </ItemGroup>