Fixes #4046 - Moves examples into ./Examples and fixes ./Tests

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>
 

UICatalog/UICatalog.csproj → Examples/UICatalog/UICatalog.csproj

@@ -1,53 +1,53 @@
-<Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-	    <StartupObject>UICatalog.UICatalog</StartupObject>
-        <OutputType>Exe</OutputType>
-        <!-- Version numbers are automatically updated by gitversion when a release is released -->
-        <!-- In the source tree the version will always be 2.0 for all projects. -->
-        <!-- Do not modify these. -->
-        <AssemblyVersion>2.0</AssemblyVersion>
-        <FileVersion>2.0</FileVersion>
-        <Version>2.0</Version>
-        <InformationalVersion>2.0</InformationalVersion>
-        <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Configuration)'=='Release'">
-        <DefineConstants>TRACE</DefineConstants>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(Configuration)'=='Debug'">
-        <DefineConstants>TRACE;DEBUG_IDISPOSABLE</DefineConstants>
-    </PropertyGroup>
-    <ItemGroup>
-        <None Remove="Resources\config.json" />
-    </ItemGroup>
-    <ItemGroup>
-        <EmbeddedResource Include="Resources\config.json" />
-    </ItemGroup>
-    <ItemGroup>
-        <None Update="Scenarios\AnimationScenario\Spinning_globe_dark_small.gif" CopyToOutputDirectory="PreserveNewest" />
-    </ItemGroup>
-    <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations"  PrivateAssets="all" />
-        <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets"/>
-        <PackageReference Include="Serilog" />
-        <PackageReference Include="Serilog.Extensions.Logging" />
-        <PackageReference Include="Serilog.Sinks.Debug"  />
-        <PackageReference Include="Serilog.Sinks.File" />
-        <PackageReference Include="SixLabors.ImageSharp" />
-        <PackageReference Include="CsvHelper"  />
-        <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" />
-        <PackageReference Include="System.CommandLine" V="" />
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />
-    </ItemGroup>
-    <ItemGroup>
-        <Using Include="System.Drawing.Rectangle" Alias="Rectangle" />
-        <Using Include="System.Drawing.RectangleF" Alias="RectangleF" />
-        <Using Include="System.Drawing.Point" Alias="Point" />
-        <Using Include="System.Drawing.PointF" Alias="PointF" />
-        <Using Include="System.Drawing.Size" Alias="Size" />
-        <Using Include="System.Drawing.SizeF" Alias="SizeF" />
-        <Using Include="Terminal.Gui.EnumExtensions" />
-    </ItemGroup>
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+	    <StartupObject>UICatalog.UICatalog</StartupObject>
+        <OutputType>Exe</OutputType>
+        <!-- Version numbers are automatically updated by gitversion when a release is released -->
+        <!-- In the source tree the version will always be 2.0 for all projects. -->
+        <!-- Do not modify these. -->
+        <AssemblyVersion>2.0</AssemblyVersion>
+        <FileVersion>2.0</FileVersion>
+        <Version>2.0</Version>
+        <InformationalVersion>2.0</InformationalVersion>
+        <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)'=='Release'">
+        <DefineConstants>TRACE</DefineConstants>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)'=='Debug'">
+        <DefineConstants>TRACE;DEBUG_IDISPOSABLE</DefineConstants>
+    </PropertyGroup>
+    <ItemGroup>
+        <None Remove="Resources\config.json" />
+    </ItemGroup>
+    <ItemGroup>
+        <EmbeddedResource Include="Resources\config.json" />
+    </ItemGroup>
+    <ItemGroup>
+        <None Update="Scenarios\AnimationScenario\Spinning_globe_dark_small.gif" CopyToOutputDirectory="PreserveNewest" />
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="JetBrains.Annotations"  PrivateAssets="all" />
+        <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets"/>
+        <PackageReference Include="Serilog" />
+        <PackageReference Include="Serilog.Extensions.Logging" />
+        <PackageReference Include="Serilog.Sinks.Debug"  />
+        <PackageReference Include="Serilog.Sinks.File" />
+        <PackageReference Include="SixLabors.ImageSharp" />
+        <PackageReference Include="CsvHelper"  />
+        <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" />
+        <PackageReference Include="System.CommandLine" V="" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\Terminal.Gui\Terminal.Gui.csproj" />
+    </ItemGroup>
+    <ItemGroup>
+        <Using Include="System.Drawing.Rectangle" Alias="Rectangle" />
+        <Using Include="System.Drawing.RectangleF" Alias="RectangleF" />
+        <Using Include="System.Drawing.Point" Alias="Point" />
+        <Using Include="System.Drawing.PointF" Alias="PointF" />
+        <Using Include="System.Drawing.Size" Alias="Size" />
+        <Using Include="System.Drawing.SizeF" Alias="SizeF" />
+        <Using Include="Terminal.Gui.EnumExtensions" />
+    </ItemGroup>
 </Project>

README.md

@@ -28,6 +28,12 @@ cd myproj
 dotnet run
 ```
 
+To run the UICatalog demo app that shows all the controls and features of the toolkit, use the following command:
+
+```powershell
+dotnet run --project Examples/UICatalog/UICatalog.csproj
+```
+
 There is also a [visual designer](https://github.com/gui-cs/TerminalGuiDesigner) (uses Terminal.Gui itself).
 
 ## Documentation 
@@ -43,21 +49,22 @@ See the [`Terminal.Gui/`README](https://github.com/gui-cs/Terminal.Gui/tree/mast
 
 ## Showcase & Examples
 
-**Terminal.Gui** can be used with any .Net language to create feature rich and robust applications.  
-[Showcase](https://github.com/gui-cs/Terminal.Gui/blob/develop/Showcase.md) is a place where you can find all kind of projects from simple examples to advanced real world apps that fully utilize capabilities of the toolkit.  
-The team is looking forward to seeing new amazing projects made by the community to be added there!
+* The [./Examples/UICatalog](./Examples/UICatalog) project is a showcase of all the controls and features of the toolkit. There are more examples in the [./Examples](./Examples) folder.
+
+* [Showcase](https://github.com/gui-cs/Terminal.Gui/blob/develop/Showcase.md) is a place where you can find all kind of projects from simple examples to advanced real world apps that fully utilize capabilities of the toolkit. The team is looking forward to seeing new amazing projects made by the community to be added there!
 
 ## Sample Usage in C#
 
 The following example shows a basic Terminal.Gui application in C#:  
-[Example (source)](./Example/Example.cs)
+[Example (source)](./Examples/Example/Example.cs)
 
 When run the application looks as follows:
 
 ![Simple Usage app](./docfx/images/Example.png)
 
 ## Sample usage in F#  
-F# examples are located [here](./FSharpExample/Program.fs)
+
+An F# example is located [here](./Examples/FSharpExample/Program.fs).
 
 ## Installing
 

Terminal.sln

@@ -5,15 +5,15 @@ VisualStudioVersion = 17.2.32427.441
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Terminal.Gui", "Terminal.Gui\Terminal.Gui.csproj", "{00F366F8-DEE4-482C-B9FD-6DB0200B79E5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UICatalog", "UICatalog\UICatalog.csproj", "{88979F89-9A42-448F-AE3E-3060145F6375}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UICatalog", "Examples\UICatalog\UICatalog.csproj", "{88979F89-9A42-448F-AE3E-3060145F6375}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveExample", "ReactiveExample\ReactiveExample.csproj", "{44E15B48-0DB2-4560-82BD-D3B7989811C3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveExample", "Examples\ReactiveExample\ReactiveExample.csproj", "{44E15B48-0DB2-4560-82BD-D3B7989811C3}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example", "Example\Example.csproj", "{B0A602CD-E176-449D-8663-64238D54F857}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example", "Examples\Example\Example.csproj", "{B0A602CD-E176-449D-8663-64238D54F857}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{E143FB1F-0B88-48CB-9086-72CDCECFCD22}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkitExample", "CommunityToolkitExample\CommunityToolkitExample.csproj", "{58FDCA8F-08F7-4D80-9DA3-6A9AED01E163}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CommunityToolkitExample", "Examples\CommunityToolkitExample\CommunityToolkitExample.csproj", "{58FDCA8F-08F7-4D80-9DA3-6A9AED01E163}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Settings", "Settings", "{B8F48EE8-34A6-43B7-B00E-CD91CDD93962}"
 	ProjectSection(SolutionItems) = preProject
@@ -49,11 +49,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{C7A51224-5
 		README.md = README.md
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfContained", "SelfContained\SelfContained.csproj", "{524DEA78-7E7C-474D-B42D-52ED4C04FF14}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfContained", "Examples\SelfContained\SelfContained.csproj", "{524DEA78-7E7C-474D-B42D-52ED4C04FF14}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NativeAot", "NativeAot\NativeAot.csproj", "{E6D716C6-AC94-4150-B10A-44AE13F79344}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NativeAot", "Examples\NativeAot\NativeAot.csproj", "{E6D716C6-AC94-4150-B10A-44AE13F79344}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Benchmarks", "Benchmarks\Benchmarks.csproj", "{242FBD3E-2EC6-4274-BD40-8E62AF9327B2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Benchmarks", "Tests\Benchmarks\Benchmarks.csproj", "{242FBD3E-2EC6-4274-BD40-8E62AF9327B2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "Tests\UnitTests\UnitTests.csproj", "{038B09F5-EF3A-F21E-7C10-A6551866ECE2}"
 EndProject
@@ -63,11 +63,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StressTests", "Tests\Stress
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests.Parallelizable", "Tests\UnitTestsParallelizable\UnitTests.Parallelizable.csproj", "{DE780834-190A-8277-51FD-750CC666E82D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TerminalGuiFluentTesting", "TerminalGuiFluentTesting\TerminalGuiFluentTesting.csproj", "{2DBA7BDC-17AE-474B-A507-00807D087607}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TerminalGuiFluentTesting", "Tests\TerminalGuiFluentTesting\TerminalGuiFluentTesting.csproj", "{2DBA7BDC-17AE-474B-A507-00807D087607}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TerminalGuiFluentTestingXunit", "TerminalGuiFluentTestingXunit\TerminalGuiFluentTestingXunit.csproj", "{F56BAFFD-F227-4B0A-96F0-C800FAEF2036}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TerminalGuiFluentTestingXunit", "Tests\TerminalGuiFluentTestingXunit\TerminalGuiFluentTestingXunit.csproj", "{F56BAFFD-F227-4B0A-96F0-C800FAEF2036}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TerminalGuiFluentTestingXunit.Generator", "TerminalGuiFluentTestingXunit.Generator\TerminalGuiFluentTestingXunit.Generator.csproj", "{199F27D8-A905-4DDC-82CA-1FE1A90B1788}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TerminalGuiFluentTestingXunit.Generator", "Tests\TerminalGuiFluentTestingXunit.Generator\TerminalGuiFluentTestingXunit.Generator.csproj", "{199F27D8-A905-4DDC-82CA-1FE1A90B1788}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

Benchmarks/Benchmarks.csproj → Tests/Benchmarks/Benchmarks.csproj

@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Terminal.Gui\Terminal.Gui.csproj" />
+    <ProjectReference Include="..\..\Terminal.Gui\Terminal.Gui.csproj" />
   </ItemGroup>
 
 </Project>

Tests/IntegrationTests/IntegrationTests.csproj

@@ -26,9 +26,9 @@
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\Terminal.Gui\Terminal.Gui.csproj" />
-        <ProjectReference Include="..\..\TerminalGuiFluentTestingXunit\TerminalGuiFluentTestingXunit.csproj" />
-        <ProjectReference Include="..\..\TerminalGuiFluentTesting\TerminalGuiFluentTesting.csproj" />
-        <ProjectReference Include="..\..\UICatalog\UICatalog.csproj" />
+        <ProjectReference Include="..\..\Tests\TerminalGuiFluentTestingXunit\TerminalGuiFluentTestingXunit.csproj" />
+        <ProjectReference Include="..\..\Tests\TerminalGuiFluentTesting\TerminalGuiFluentTesting.csproj" />
+        <ProjectReference Include="..\..\Examples\UICatalog\UICatalog.csproj" />
         <ProjectReference Include="..\UnitTests\UnitTests.csproj" />
     </ItemGroup>
     <ItemGroup>