From a64b4bc405f4e2935d0f29c66cc1d306df881bb5 Mon Sep 17 00:00:00 2001 From: Tig Date: Fri, 21 Mar 2025 09:17:49 +0100 Subject: [PATCH 1/8] touching publish.yml --- .github/workflows/publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 545f596053..507e68e8e9 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -2,7 +2,7 @@ name: Publish Terminal.Gui on: push: - branches: [ v1_release, v1_develop, v2_release, v2_develop ] + branches: [ v2_release, v2_develop ] tags: - v* paths-ignore: From 1d96911294065e9ec847b34753e836b850a15e69 Mon Sep 17 00:00:00 2001 From: Tig Date: Thu, 24 Apr 2025 12:40:45 -0600 Subject: [PATCH 2/8] Moved Examples into ./Examples --- .../CommunityToolkitExample.csproj | 2 +- .../CommunityToolkitExample}/LoginActions.cs | 0 .../LoginView.Designer.cs | 0 .../CommunityToolkitExample}/LoginView.cs | 0 .../LoginViewModel.cs | 0 .../CommunityToolkitExample}/Message.cs | 0 .../CommunityToolkitExample}/Program.cs | 0 .../CommunityToolkitExample}/README.md | 0 .../DemoFiles}/example_config.json | 0 {Example => Examples/Example}/Example.cs | 0 {Example => Examples/Example}/Example.csproj | 28 +++--- {Example => Examples/Example}/README.md | 0 .../FSharpExample}/.editorconfig | 0 .../FSharpExample}/FSharpExample.fsproj | 0 .../FSharpExample}/FSharpExample.sln | 0 .../FSharpExample}/Program.fs | 96 +++++++++---------- .../NativeAot}/NativeAot.csproj | 2 +- {NativeAot => Examples/NativeAot}/Program.cs | 0 .../FolderProfile_net8.0_win-x64_Debug.pubxml | 0 ...olderProfile_net8.0_win-x64_Release.pubxml | 0 .../NativeAot}/Properties/launchSettings.json | 0 .../NativeAot}/Publish_linux-x64_Debug.sh | 0 .../NativeAot}/Publish_linux-x64_Release.sh | 0 .../NativeAot}/Publish_osx-x64_Debug.sh | 0 .../NativeAot}/Publish_osx-x64_Release.sh | 0 {NativeAot => Examples/NativeAot}/README.md | 0 .../ReactiveExample}/LoginView.cs | 0 .../ReactiveExample}/LoginViewModel.cs | 0 .../ReactiveExample}/Program.cs | 0 .../ReactiveExample}/README.md | 0 .../ReactiveExample}/ReactiveExample.csproj | 2 +- .../ReactiveExample}/TerminalScheduler.cs | 0 .../ReactiveExample}/ViewExtensions.cs | 0 .../SelfContained}/Program.cs | 0 ...olderProfile_net8.0_linux-x64_Debug.pubxml | 0 ...derProfile_net8.0_linux-x64_Release.pubxml | 0 .../FolderProfile_net8.0_osx-x64_Debug.pubxml | 0 ...olderProfile_net8.0_osx-x64_Release.pubxml | 0 .../FolderProfile_net8.0_win-x64_Debug.pubxml | 0 ...olderProfile_net8.0_win-x64_Release.pubxml | 0 .../SelfContained}/README.md | 0 .../SelfContained}/SelfContained.csproj | 2 +- Terminal.sln | 10 +- 43 files changed, 71 insertions(+), 71 deletions(-) rename {CommunityToolkitExample => Examples/CommunityToolkitExample}/CommunityToolkitExample.csproj (80%) rename {CommunityToolkitExample => Examples/CommunityToolkitExample}/LoginActions.cs (100%) rename {CommunityToolkitExample => Examples/CommunityToolkitExample}/LoginView.Designer.cs (100%) rename {CommunityToolkitExample => Examples/CommunityToolkitExample}/LoginView.cs (100%) rename {CommunityToolkitExample => Examples/CommunityToolkitExample}/LoginViewModel.cs (100%) rename {CommunityToolkitExample => Examples/CommunityToolkitExample}/Message.cs (100%) rename {CommunityToolkitExample => Examples/CommunityToolkitExample}/Program.cs (100%) rename {CommunityToolkitExample => Examples/CommunityToolkitExample}/README.md (100%) rename {DemoFiles => Examples/DemoFiles}/example_config.json (100%) rename {Example => Examples/Example}/Example.cs (100%) rename {Example => Examples/Example}/Example.csproj (85%) rename {Example => Examples/Example}/README.md (100%) rename {FSharpExample => Examples/FSharpExample}/.editorconfig (100%) rename {FSharpExample => Examples/FSharpExample}/FSharpExample.fsproj (100%) rename {FSharpExample => Examples/FSharpExample}/FSharpExample.sln (100%) rename {FSharpExample => Examples/FSharpExample}/Program.fs (97%) rename {NativeAot => Examples/NativeAot}/NativeAot.csproj (88%) rename {NativeAot => Examples/NativeAot}/Program.cs (100%) rename {NativeAot => Examples/NativeAot}/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Debug.pubxml (100%) rename {NativeAot => Examples/NativeAot}/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Release.pubxml (100%) rename {NativeAot => Examples/NativeAot}/Properties/launchSettings.json (100%) rename {NativeAot => Examples/NativeAot}/Publish_linux-x64_Debug.sh (100%) rename {NativeAot => Examples/NativeAot}/Publish_linux-x64_Release.sh (100%) rename {NativeAot => Examples/NativeAot}/Publish_osx-x64_Debug.sh (100%) rename {NativeAot => Examples/NativeAot}/Publish_osx-x64_Release.sh (100%) rename {NativeAot => Examples/NativeAot}/README.md (100%) rename {ReactiveExample => Examples/ReactiveExample}/LoginView.cs (100%) rename {ReactiveExample => Examples/ReactiveExample}/LoginViewModel.cs (100%) rename {ReactiveExample => Examples/ReactiveExample}/Program.cs (100%) rename {ReactiveExample => Examples/ReactiveExample}/README.md (100%) rename {ReactiveExample => Examples/ReactiveExample}/ReactiveExample.csproj (91%) rename {ReactiveExample => Examples/ReactiveExample}/TerminalScheduler.cs (100%) rename {ReactiveExample => Examples/ReactiveExample}/ViewExtensions.cs (100%) rename {SelfContained => Examples/SelfContained}/Program.cs (100%) rename {SelfContained => Examples/SelfContained}/Properties/PublishProfiles/FolderProfile_net8.0_linux-x64_Debug.pubxml (100%) rename {SelfContained => Examples/SelfContained}/Properties/PublishProfiles/FolderProfile_net8.0_linux-x64_Release.pubxml (100%) rename {SelfContained => Examples/SelfContained}/Properties/PublishProfiles/FolderProfile_net8.0_osx-x64_Debug.pubxml (100%) rename {SelfContained => Examples/SelfContained}/Properties/PublishProfiles/FolderProfile_net8.0_osx-x64_Release.pubxml (100%) rename {SelfContained => Examples/SelfContained}/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Debug.pubxml (100%) rename {SelfContained => Examples/SelfContained}/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Release.pubxml (100%) rename {SelfContained => Examples/SelfContained}/README.md (100%) rename {SelfContained => Examples/SelfContained}/SelfContained.csproj (90%) diff --git a/CommunityToolkitExample/CommunityToolkitExample.csproj b/Examples/CommunityToolkitExample/CommunityToolkitExample.csproj similarity index 80% rename from CommunityToolkitExample/CommunityToolkitExample.csproj rename to Examples/CommunityToolkitExample/CommunityToolkitExample.csproj index 13ed599665..f01c030b97 100644 --- a/CommunityToolkitExample/CommunityToolkitExample.csproj +++ b/Examples/CommunityToolkitExample/CommunityToolkitExample.csproj @@ -8,7 +8,7 @@ - + diff --git a/CommunityToolkitExample/LoginActions.cs b/Examples/CommunityToolkitExample/LoginActions.cs similarity index 100% rename from CommunityToolkitExample/LoginActions.cs rename to Examples/CommunityToolkitExample/LoginActions.cs diff --git a/CommunityToolkitExample/LoginView.Designer.cs b/Examples/CommunityToolkitExample/LoginView.Designer.cs similarity index 100% rename from CommunityToolkitExample/LoginView.Designer.cs rename to Examples/CommunityToolkitExample/LoginView.Designer.cs diff --git a/CommunityToolkitExample/LoginView.cs b/Examples/CommunityToolkitExample/LoginView.cs similarity index 100% rename from CommunityToolkitExample/LoginView.cs rename to Examples/CommunityToolkitExample/LoginView.cs diff --git a/CommunityToolkitExample/LoginViewModel.cs b/Examples/CommunityToolkitExample/LoginViewModel.cs similarity index 100% rename from CommunityToolkitExample/LoginViewModel.cs rename to Examples/CommunityToolkitExample/LoginViewModel.cs diff --git a/CommunityToolkitExample/Message.cs b/Examples/CommunityToolkitExample/Message.cs similarity index 100% rename from CommunityToolkitExample/Message.cs rename to Examples/CommunityToolkitExample/Message.cs diff --git a/CommunityToolkitExample/Program.cs b/Examples/CommunityToolkitExample/Program.cs similarity index 100% rename from CommunityToolkitExample/Program.cs rename to Examples/CommunityToolkitExample/Program.cs diff --git a/CommunityToolkitExample/README.md b/Examples/CommunityToolkitExample/README.md similarity index 100% rename from CommunityToolkitExample/README.md rename to Examples/CommunityToolkitExample/README.md diff --git a/DemoFiles/example_config.json b/Examples/DemoFiles/example_config.json similarity index 100% rename from DemoFiles/example_config.json rename to Examples/DemoFiles/example_config.json diff --git a/Example/Example.cs b/Examples/Example/Example.cs similarity index 100% rename from Example/Example.cs rename to Examples/Example/Example.cs diff --git a/Example/Example.csproj b/Examples/Example/Example.csproj similarity index 85% rename from Example/Example.csproj rename to Examples/Example/Example.csproj index be1d5c0354..6d7e8c1b5a 100644 --- a/Example/Example.csproj +++ b/Examples/Example/Example.csproj @@ -1,15 +1,15 @@ - - - Exe - - - - 2.0 - 2.0 - 2.0 - 2.0 - - - - + + + Exe + + + + 2.0 + 2.0 + 2.0 + 2.0 + + + + \ No newline at end of file diff --git a/Example/README.md b/Examples/Example/README.md similarity index 100% rename from Example/README.md rename to Examples/Example/README.md diff --git a/FSharpExample/.editorconfig b/Examples/FSharpExample/.editorconfig similarity index 100% rename from FSharpExample/.editorconfig rename to Examples/FSharpExample/.editorconfig diff --git a/FSharpExample/FSharpExample.fsproj b/Examples/FSharpExample/FSharpExample.fsproj similarity index 100% rename from FSharpExample/FSharpExample.fsproj rename to Examples/FSharpExample/FSharpExample.fsproj diff --git a/FSharpExample/FSharpExample.sln b/Examples/FSharpExample/FSharpExample.sln similarity index 100% rename from FSharpExample/FSharpExample.sln rename to Examples/FSharpExample/FSharpExample.sln diff --git a/FSharpExample/Program.fs b/Examples/FSharpExample/Program.fs similarity index 97% rename from FSharpExample/Program.fs rename to Examples/FSharpExample/Program.fs index febff32a2d..9859ce16fd 100644 --- a/FSharpExample/Program.fs +++ b/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 - -[] -let main argv = - Application.Init() - Application.Run().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 + +[] +let main argv = + Application.Init() + Application.Run().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 diff --git a/NativeAot/NativeAot.csproj b/Examples/NativeAot/NativeAot.csproj similarity index 88% rename from NativeAot/NativeAot.csproj rename to Examples/NativeAot/NativeAot.csproj index 2dffeb5af5..928c003f39 100644 --- a/NativeAot/NativeAot.csproj +++ b/Examples/NativeAot/NativeAot.csproj @@ -8,7 +8,7 @@ - + diff --git a/NativeAot/Program.cs b/Examples/NativeAot/Program.cs similarity index 100% rename from NativeAot/Program.cs rename to Examples/NativeAot/Program.cs diff --git a/NativeAot/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Debug.pubxml b/Examples/NativeAot/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Debug.pubxml similarity index 100% rename from NativeAot/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Debug.pubxml rename to Examples/NativeAot/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Debug.pubxml diff --git a/NativeAot/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Release.pubxml b/Examples/NativeAot/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Release.pubxml similarity index 100% rename from NativeAot/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Release.pubxml rename to Examples/NativeAot/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Release.pubxml diff --git a/NativeAot/Properties/launchSettings.json b/Examples/NativeAot/Properties/launchSettings.json similarity index 100% rename from NativeAot/Properties/launchSettings.json rename to Examples/NativeAot/Properties/launchSettings.json diff --git a/NativeAot/Publish_linux-x64_Debug.sh b/Examples/NativeAot/Publish_linux-x64_Debug.sh similarity index 100% rename from NativeAot/Publish_linux-x64_Debug.sh rename to Examples/NativeAot/Publish_linux-x64_Debug.sh diff --git a/NativeAot/Publish_linux-x64_Release.sh b/Examples/NativeAot/Publish_linux-x64_Release.sh similarity index 100% rename from NativeAot/Publish_linux-x64_Release.sh rename to Examples/NativeAot/Publish_linux-x64_Release.sh diff --git a/NativeAot/Publish_osx-x64_Debug.sh b/Examples/NativeAot/Publish_osx-x64_Debug.sh similarity index 100% rename from NativeAot/Publish_osx-x64_Debug.sh rename to Examples/NativeAot/Publish_osx-x64_Debug.sh diff --git a/NativeAot/Publish_osx-x64_Release.sh b/Examples/NativeAot/Publish_osx-x64_Release.sh similarity index 100% rename from NativeAot/Publish_osx-x64_Release.sh rename to Examples/NativeAot/Publish_osx-x64_Release.sh diff --git a/NativeAot/README.md b/Examples/NativeAot/README.md similarity index 100% rename from NativeAot/README.md rename to Examples/NativeAot/README.md diff --git a/ReactiveExample/LoginView.cs b/Examples/ReactiveExample/LoginView.cs similarity index 100% rename from ReactiveExample/LoginView.cs rename to Examples/ReactiveExample/LoginView.cs diff --git a/ReactiveExample/LoginViewModel.cs b/Examples/ReactiveExample/LoginViewModel.cs similarity index 100% rename from ReactiveExample/LoginViewModel.cs rename to Examples/ReactiveExample/LoginViewModel.cs diff --git a/ReactiveExample/Program.cs b/Examples/ReactiveExample/Program.cs similarity index 100% rename from ReactiveExample/Program.cs rename to Examples/ReactiveExample/Program.cs diff --git a/ReactiveExample/README.md b/Examples/ReactiveExample/README.md similarity index 100% rename from ReactiveExample/README.md rename to Examples/ReactiveExample/README.md diff --git a/ReactiveExample/ReactiveExample.csproj b/Examples/ReactiveExample/ReactiveExample.csproj similarity index 91% rename from ReactiveExample/ReactiveExample.csproj rename to Examples/ReactiveExample/ReactiveExample.csproj index 0e61fcdbbb..f639a03d79 100644 --- a/ReactiveExample/ReactiveExample.csproj +++ b/Examples/ReactiveExample/ReactiveExample.csproj @@ -15,6 +15,6 @@ - + \ No newline at end of file diff --git a/ReactiveExample/TerminalScheduler.cs b/Examples/ReactiveExample/TerminalScheduler.cs similarity index 100% rename from ReactiveExample/TerminalScheduler.cs rename to Examples/ReactiveExample/TerminalScheduler.cs diff --git a/ReactiveExample/ViewExtensions.cs b/Examples/ReactiveExample/ViewExtensions.cs similarity index 100% rename from ReactiveExample/ViewExtensions.cs rename to Examples/ReactiveExample/ViewExtensions.cs diff --git a/SelfContained/Program.cs b/Examples/SelfContained/Program.cs similarity index 100% rename from SelfContained/Program.cs rename to Examples/SelfContained/Program.cs diff --git a/SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_linux-x64_Debug.pubxml b/Examples/SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_linux-x64_Debug.pubxml similarity index 100% rename from SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_linux-x64_Debug.pubxml rename to Examples/SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_linux-x64_Debug.pubxml diff --git a/SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_linux-x64_Release.pubxml b/Examples/SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_linux-x64_Release.pubxml similarity index 100% rename from SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_linux-x64_Release.pubxml rename to Examples/SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_linux-x64_Release.pubxml diff --git a/SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_osx-x64_Debug.pubxml b/Examples/SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_osx-x64_Debug.pubxml similarity index 100% rename from SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_osx-x64_Debug.pubxml rename to Examples/SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_osx-x64_Debug.pubxml diff --git a/SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_osx-x64_Release.pubxml b/Examples/SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_osx-x64_Release.pubxml similarity index 100% rename from SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_osx-x64_Release.pubxml rename to Examples/SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_osx-x64_Release.pubxml diff --git a/SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Debug.pubxml b/Examples/SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Debug.pubxml similarity index 100% rename from SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Debug.pubxml rename to Examples/SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Debug.pubxml diff --git a/SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Release.pubxml b/Examples/SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Release.pubxml similarity index 100% rename from SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Release.pubxml rename to Examples/SelfContained/Properties/PublishProfiles/FolderProfile_net8.0_win-x64_Release.pubxml diff --git a/SelfContained/README.md b/Examples/SelfContained/README.md similarity index 100% rename from SelfContained/README.md rename to Examples/SelfContained/README.md diff --git a/SelfContained/SelfContained.csproj b/Examples/SelfContained/SelfContained.csproj similarity index 90% rename from SelfContained/SelfContained.csproj rename to Examples/SelfContained/SelfContained.csproj index 3aec661bcb..c7f907753b 100644 --- a/SelfContained/SelfContained.csproj +++ b/Examples/SelfContained/SelfContained.csproj @@ -11,7 +11,7 @@ - + diff --git a/Terminal.sln b/Terminal.sln index 1456297b83..fc723d166b 100644 --- a/Terminal.sln +++ b/Terminal.sln @@ -7,13 +7,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Terminal.Gui", "Terminal.Gu EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UICatalog", "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,9 +49,9 @@ 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}" EndProject From 50dfcf663694b43af4db6f74fb2e245a85ca1eed Mon Sep 17 00:00:00 2001 From: Tig Date: Thu, 24 Apr 2025 12:46:28 -0600 Subject: [PATCH 3/8] Moved Benchmarks into ./Tests --- README.md | 11 ++++++----- Terminal.sln | 2 +- {Benchmarks => Tests/Benchmarks}/Benchmarks.csproj | 0 .../ConsoleDrivers/EscSeqUtils/CSI_SetVsAppend.cs | 0 .../ConsoleDrivers/EscSeqUtils/CSI_SetVsWrite.cs | 0 {Benchmarks => Tests/Benchmarks}/Program.cs | 0 .../Text/RuneExtensions/DecodeSurrogatePair.cs | 0 .../Benchmarks}/Text/RuneExtensions/Encode.cs | 0 .../Text/RuneExtensions/EncodeSurrogatePair.cs | 0 .../Text/RuneExtensions/GetEncodingLength.cs | 0 .../Text/RuneExtensions/IsSurrogatePair.cs | 0 .../Text/StringExtensions/ToStringEnumerable.cs | 0 .../Text/TextFormatter/RemoveHotKeySpecifier.cs | 0 .../Text/TextFormatter/ReplaceCRLFWithSpace.cs | 0 .../Benchmarks}/Text/TextFormatter/StripCRLF.cs | 0 15 files changed, 7 insertions(+), 6 deletions(-) rename {Benchmarks => Tests/Benchmarks}/Benchmarks.csproj (100%) rename {Benchmarks => Tests/Benchmarks}/ConsoleDrivers/EscSeqUtils/CSI_SetVsAppend.cs (100%) rename {Benchmarks => Tests/Benchmarks}/ConsoleDrivers/EscSeqUtils/CSI_SetVsWrite.cs (100%) rename {Benchmarks => Tests/Benchmarks}/Program.cs (100%) rename {Benchmarks => Tests/Benchmarks}/Text/RuneExtensions/DecodeSurrogatePair.cs (100%) rename {Benchmarks => Tests/Benchmarks}/Text/RuneExtensions/Encode.cs (100%) rename {Benchmarks => Tests/Benchmarks}/Text/RuneExtensions/EncodeSurrogatePair.cs (100%) rename {Benchmarks => Tests/Benchmarks}/Text/RuneExtensions/GetEncodingLength.cs (100%) rename {Benchmarks => Tests/Benchmarks}/Text/RuneExtensions/IsSurrogatePair.cs (100%) rename {Benchmarks => Tests/Benchmarks}/Text/StringExtensions/ToStringEnumerable.cs (100%) rename {Benchmarks => Tests/Benchmarks}/Text/TextFormatter/RemoveHotKeySpecifier.cs (100%) rename {Benchmarks => Tests/Benchmarks}/Text/TextFormatter/ReplaceCRLFWithSpace.cs (100%) rename {Benchmarks => Tests/Benchmarks}/Text/TextFormatter/StripCRLF.cs (100%) diff --git a/README.md b/README.md index e82ec4c30c..fe3d07f7f3 100644 --- a/README.md +++ b/README.md @@ -43,21 +43,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 diff --git a/Terminal.sln b/Terminal.sln index fc723d166b..b3e438630d 100644 --- a/Terminal.sln +++ b/Terminal.sln @@ -53,7 +53,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SelfContained", "Examples\S EndProject 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 diff --git a/Benchmarks/Benchmarks.csproj b/Tests/Benchmarks/Benchmarks.csproj similarity index 100% rename from Benchmarks/Benchmarks.csproj rename to Tests/Benchmarks/Benchmarks.csproj diff --git a/Benchmarks/ConsoleDrivers/EscSeqUtils/CSI_SetVsAppend.cs b/Tests/Benchmarks/ConsoleDrivers/EscSeqUtils/CSI_SetVsAppend.cs similarity index 100% rename from Benchmarks/ConsoleDrivers/EscSeqUtils/CSI_SetVsAppend.cs rename to Tests/Benchmarks/ConsoleDrivers/EscSeqUtils/CSI_SetVsAppend.cs diff --git a/Benchmarks/ConsoleDrivers/EscSeqUtils/CSI_SetVsWrite.cs b/Tests/Benchmarks/ConsoleDrivers/EscSeqUtils/CSI_SetVsWrite.cs similarity index 100% rename from Benchmarks/ConsoleDrivers/EscSeqUtils/CSI_SetVsWrite.cs rename to Tests/Benchmarks/ConsoleDrivers/EscSeqUtils/CSI_SetVsWrite.cs diff --git a/Benchmarks/Program.cs b/Tests/Benchmarks/Program.cs similarity index 100% rename from Benchmarks/Program.cs rename to Tests/Benchmarks/Program.cs diff --git a/Benchmarks/Text/RuneExtensions/DecodeSurrogatePair.cs b/Tests/Benchmarks/Text/RuneExtensions/DecodeSurrogatePair.cs similarity index 100% rename from Benchmarks/Text/RuneExtensions/DecodeSurrogatePair.cs rename to Tests/Benchmarks/Text/RuneExtensions/DecodeSurrogatePair.cs diff --git a/Benchmarks/Text/RuneExtensions/Encode.cs b/Tests/Benchmarks/Text/RuneExtensions/Encode.cs similarity index 100% rename from Benchmarks/Text/RuneExtensions/Encode.cs rename to Tests/Benchmarks/Text/RuneExtensions/Encode.cs diff --git a/Benchmarks/Text/RuneExtensions/EncodeSurrogatePair.cs b/Tests/Benchmarks/Text/RuneExtensions/EncodeSurrogatePair.cs similarity index 100% rename from Benchmarks/Text/RuneExtensions/EncodeSurrogatePair.cs rename to Tests/Benchmarks/Text/RuneExtensions/EncodeSurrogatePair.cs diff --git a/Benchmarks/Text/RuneExtensions/GetEncodingLength.cs b/Tests/Benchmarks/Text/RuneExtensions/GetEncodingLength.cs similarity index 100% rename from Benchmarks/Text/RuneExtensions/GetEncodingLength.cs rename to Tests/Benchmarks/Text/RuneExtensions/GetEncodingLength.cs diff --git a/Benchmarks/Text/RuneExtensions/IsSurrogatePair.cs b/Tests/Benchmarks/Text/RuneExtensions/IsSurrogatePair.cs similarity index 100% rename from Benchmarks/Text/RuneExtensions/IsSurrogatePair.cs rename to Tests/Benchmarks/Text/RuneExtensions/IsSurrogatePair.cs diff --git a/Benchmarks/Text/StringExtensions/ToStringEnumerable.cs b/Tests/Benchmarks/Text/StringExtensions/ToStringEnumerable.cs similarity index 100% rename from Benchmarks/Text/StringExtensions/ToStringEnumerable.cs rename to Tests/Benchmarks/Text/StringExtensions/ToStringEnumerable.cs diff --git a/Benchmarks/Text/TextFormatter/RemoveHotKeySpecifier.cs b/Tests/Benchmarks/Text/TextFormatter/RemoveHotKeySpecifier.cs similarity index 100% rename from Benchmarks/Text/TextFormatter/RemoveHotKeySpecifier.cs rename to Tests/Benchmarks/Text/TextFormatter/RemoveHotKeySpecifier.cs diff --git a/Benchmarks/Text/TextFormatter/ReplaceCRLFWithSpace.cs b/Tests/Benchmarks/Text/TextFormatter/ReplaceCRLFWithSpace.cs similarity index 100% rename from Benchmarks/Text/TextFormatter/ReplaceCRLFWithSpace.cs rename to Tests/Benchmarks/Text/TextFormatter/ReplaceCRLFWithSpace.cs diff --git a/Benchmarks/Text/TextFormatter/StripCRLF.cs b/Tests/Benchmarks/Text/TextFormatter/StripCRLF.cs similarity index 100% rename from Benchmarks/Text/TextFormatter/StripCRLF.cs rename to Tests/Benchmarks/Text/TextFormatter/StripCRLF.cs From 74345e39e474b57043a3a8c015c63b4f34d8be50 Mon Sep 17 00:00:00 2001 From: Tig Date: Thu, 24 Apr 2025 12:47:39 -0600 Subject: [PATCH 4/8] Moved Benchmarks into ./Tests --- {UICatalog => Examples/UICatalog}/.gitignore | 0 .../UICatalog}/BenchmarkResults.cs | 0 {UICatalog => Examples/UICatalog}/Dockerfile | 0 .../UICatalog}/NumberToWords.cs | 0 .../UICatalog}/Properties/launchSettings.json | 0 {UICatalog => Examples/UICatalog}/README.md | 0 .../UICatalog}/Resources/config.json | 0 {UICatalog => Examples/UICatalog}/Scenario.cs | 0 .../UICatalog}/ScenarioCategory.cs | 0 .../UICatalog}/ScenarioMetadata.cs | 0 .../UICatalog}/Scenarios/Adornments.cs | 0 .../UICatalog}/Scenarios/AllViewsTester.cs | 0 .../AnimationScenario/AnimationScenario.cs | 0 .../Spinning_globe_dark_small.gif | Bin .../spinning-globe-attribution.txt | 0 .../Scenarios/AnsiRequestsScenario.cs | 0 .../UICatalog}/Scenarios/Arrangement.cs | 0 .../UICatalog}/Scenarios/Bars.cs | 0 .../UICatalog}/Scenarios/Buttons.cs | 0 .../Scenarios/CharacterMap/CharacterMap.cs | 0 .../UICatalog}/Scenarios/ChineseUI.cs | 0 .../UICatalog}/Scenarios/ClassExplorer.cs | 0 .../UICatalog}/Scenarios/Clipping.cs | 0 .../Scenarios/CollectionNavigatorTester.cs | 0 .../UICatalog}/Scenarios/ColorPicker.cs | 0 .../UICatalog}/Scenarios/CombiningMarks.cs | 0 .../UICatalog}/Scenarios/ComboBoxIteration.cs | 0 .../UICatalog}/Scenarios/ComputedLayout.cs | 0 .../Scenarios/ConfigurationEditor.cs | 0 .../UICatalog}/Scenarios/ContextMenus.cs | 0 .../UICatalog}/Scenarios/CsvEditor.cs | 0 .../UICatalog}/Scenarios/DatePickers.cs | 0 .../UICatalog}/Scenarios/Dialogs.cs | 0 .../UICatalog}/Scenarios/DimAutoDemo.cs | 0 .../UICatalog}/Scenarios/DynamicMenuBar.cs | 0 .../UICatalog}/Scenarios/DynamicStatusBar.cs | 0 .../UICatalog}/Scenarios/Editor.cs | 0 .../Scenarios/Editors/AdornmentEditor.cs | 0 .../Scenarios/Editors/AdornmentsEditor.cs | 0 .../Scenarios/Editors/ArrangementEditor.cs | 0 .../Scenarios/Editors/BorderEditor.cs | 0 .../UICatalog}/Scenarios/Editors/DimEditor.cs | 0 .../Scenarios/Editors/EditorBase.cs | 0 .../UICatalog}/Scenarios/Editors/EventLog.cs | 0 .../Scenarios/Editors/ExpanderButton.cs | 0 .../Scenarios/Editors/LayoutEditor.cs | 0 .../Scenarios/Editors/MarginEditor.cs | 0 .../Scenarios/Editors/PaddingEditor.cs | 0 .../UICatalog}/Scenarios/Editors/PosEditor.cs | 0 .../Editors/ViewportSettingsEditor.cs | 0 .../Scenarios/FileDialogExamples.cs | 0 .../UICatalog}/Scenarios/Generic.cs | 0 .../UICatalog}/Scenarios/GraphViewExample.cs | 0 .../UICatalog}/Scenarios/HexEditor.cs | 0 .../UICatalog}/Scenarios/HotKeys.cs | 0 .../UICatalog}/Scenarios/Images.cs | 0 .../UICatalog}/Scenarios/InteractiveTree.cs | 0 .../UICatalog}/Scenarios/InvertColors.cs | 0 .../UICatalog}/Scenarios/KeyBindings.cs | 0 .../UICatalog}/Scenarios/Keys.cs | 0 .../Scenarios/LineCanvasExperiment.cs | 0 .../UICatalog}/Scenarios/LineDrawing.cs | 0 .../UICatalog}/Scenarios/LineViewExample.cs | 0 .../UICatalog}/Scenarios/ListColumns.cs | 0 .../Scenarios/ListViewWithSelection.cs | 0 .../UICatalog}/Scenarios/ListsAndCombos.cs | 0 .../UICatalog}/Scenarios/Localization.cs | 0 .../UICatalog}/Scenarios/MenuBarScenario.cs | 0 .../UICatalog}/Scenarios/Menus.cs | 0 .../UICatalog}/Scenarios/MessageBoxes.cs | 0 .../UICatalog}/Scenarios/Mouse.cs | 0 .../Scenarios/MultiColouredTable.cs | 0 .../UICatalog}/Scenarios/Navigation.cs | 0 .../UICatalog}/Scenarios/Notepad.cs | 0 .../UICatalog}/Scenarios/NumericUpDownDemo.cs | 0 .../UICatalog}/Scenarios/PosAlignDemo.cs | 0 .../UICatalog}/Scenarios/ProcessTable.cs | 0 .../UICatalog}/Scenarios/Progress.cs | 0 .../UICatalog}/Scenarios/ProgressBarStyles.cs | 0 .../UICatalog}/Scenarios/RegionScenario.cs | 0 .../UICatalog}/Scenarios/RunTExample.cs | 0 .../Scenarios/RuneWidthGreaterThanOne.cs | 0 .../UICatalog}/Scenarios/ScrollBarDemo.cs | 0 .../UICatalog}/Scenarios/Scrolling.cs | 0 .../UICatalog}/Scenarios/SendKeys.cs | 0 .../UICatalog}/Scenarios/ShadowStyles.cs | 0 .../UICatalog}/Scenarios/Shortcuts.cs | 0 .../UICatalog}/Scenarios/SimpleDialog.cs | 0 .../Scenarios/SingleBackgroundWorker.cs | 0 .../UICatalog}/Scenarios/Sliders.cs | 0 .../UICatalog}/Scenarios/Snake.cs | 0 .../UICatalog}/Scenarios/SpinnerStyles.cs | 0 .../Scenarios/SyntaxHighlighting.cs | 0 .../UICatalog}/Scenarios/TabViewExample.cs | 0 .../UICatalog}/Scenarios/TableEditor.cs | 0 .../UICatalog}/Scenarios/Text.cs | 0 .../Scenarios/TextAlignmentAndDirection.cs | 0 .../Scenarios/TextEffectsScenario.cs | 0 .../UICatalog}/Scenarios/TextFormatterDemo.cs | 0 .../Scenarios/TextViewAutocompletePopup.cs | 0 .../UICatalog}/Scenarios/Threading.cs | 0 .../UICatalog}/Scenarios/TileViewNesting.cs | 0 .../UICatalog}/Scenarios/TimeAndDate.cs | 0 .../UICatalog}/Scenarios/Transparent.cs | 0 .../UICatalog}/Scenarios/TreeUseCases.cs | 0 .../Scenarios/TreeViewFileSystem.cs | 0 .../UICatalog}/Scenarios/TrueColors.cs | 0 .../UICatalog}/Scenarios/Unicode.cs | 0 .../UICatalog}/Scenarios/ViewExperiments.cs | 0 .../UICatalog}/Scenarios/ViewportSettings.cs | 0 .../Scenarios/VkeyPacketSimulator.cs | 0 .../Scenarios/WindowsAndFrameViews.cs | 0 .../UICatalog}/Scenarios/WizardAsView.cs | 0 .../UICatalog}/Scenarios/Wizards.cs | 0 .../UICatalog}/UICatalog.cs | 0 .../UICatalog}/UICatalog.csproj | 104 +++++++++--------- .../UICatalog}/UICatalog.csproj.DotSettings | 0 .../UICatalog}/UICatalogCommandLineOptions.cs | 0 .../UICatalog}/UICatalogTop.cs | 0 .../UICatalog}/generic_screenshot.png | Bin .../UICatalog}/screenshot.png | Bin Tests/Benchmarks/Benchmarks.csproj | 2 +- 122 files changed, 53 insertions(+), 53 deletions(-) rename {UICatalog => Examples/UICatalog}/.gitignore (100%) rename {UICatalog => Examples/UICatalog}/BenchmarkResults.cs (100%) rename {UICatalog => Examples/UICatalog}/Dockerfile (100%) rename {UICatalog => Examples/UICatalog}/NumberToWords.cs (100%) rename {UICatalog => Examples/UICatalog}/Properties/launchSettings.json (100%) rename {UICatalog => Examples/UICatalog}/README.md (100%) rename {UICatalog => Examples/UICatalog}/Resources/config.json (100%) rename {UICatalog => Examples/UICatalog}/Scenario.cs (100%) rename {UICatalog => Examples/UICatalog}/ScenarioCategory.cs (100%) rename {UICatalog => Examples/UICatalog}/ScenarioMetadata.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Adornments.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/AllViewsTester.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/AnimationScenario/AnimationScenario.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/AnimationScenario/Spinning_globe_dark_small.gif (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/AnimationScenario/spinning-globe-attribution.txt (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/AnsiRequestsScenario.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Arrangement.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Bars.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Buttons.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/CharacterMap/CharacterMap.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/ChineseUI.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/ClassExplorer.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Clipping.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/CollectionNavigatorTester.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/ColorPicker.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/CombiningMarks.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/ComboBoxIteration.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/ComputedLayout.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/ConfigurationEditor.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/ContextMenus.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/CsvEditor.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/DatePickers.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Dialogs.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/DimAutoDemo.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/DynamicMenuBar.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/DynamicStatusBar.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Editor.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Editors/AdornmentEditor.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Editors/AdornmentsEditor.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Editors/ArrangementEditor.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Editors/BorderEditor.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Editors/DimEditor.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Editors/EditorBase.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Editors/EventLog.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Editors/ExpanderButton.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Editors/LayoutEditor.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Editors/MarginEditor.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Editors/PaddingEditor.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Editors/PosEditor.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Editors/ViewportSettingsEditor.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/FileDialogExamples.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Generic.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/GraphViewExample.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/HexEditor.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/HotKeys.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Images.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/InteractiveTree.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/InvertColors.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/KeyBindings.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Keys.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/LineCanvasExperiment.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/LineDrawing.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/LineViewExample.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/ListColumns.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/ListViewWithSelection.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/ListsAndCombos.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Localization.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/MenuBarScenario.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Menus.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/MessageBoxes.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Mouse.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/MultiColouredTable.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Navigation.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Notepad.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/NumericUpDownDemo.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/PosAlignDemo.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/ProcessTable.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Progress.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/ProgressBarStyles.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/RegionScenario.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/RunTExample.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/RuneWidthGreaterThanOne.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/ScrollBarDemo.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Scrolling.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/SendKeys.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/ShadowStyles.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Shortcuts.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/SimpleDialog.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/SingleBackgroundWorker.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Sliders.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Snake.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/SpinnerStyles.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/SyntaxHighlighting.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/TabViewExample.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/TableEditor.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Text.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/TextAlignmentAndDirection.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/TextEffectsScenario.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/TextFormatterDemo.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/TextViewAutocompletePopup.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Threading.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/TileViewNesting.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/TimeAndDate.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Transparent.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/TreeUseCases.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/TreeViewFileSystem.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/TrueColors.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Unicode.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/ViewExperiments.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/ViewportSettings.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/VkeyPacketSimulator.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/WindowsAndFrameViews.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/WizardAsView.cs (100%) rename {UICatalog => Examples/UICatalog}/Scenarios/Wizards.cs (100%) rename {UICatalog => Examples/UICatalog}/UICatalog.cs (100%) rename {UICatalog => Examples/UICatalog}/UICatalog.csproj (97%) rename {UICatalog => Examples/UICatalog}/UICatalog.csproj.DotSettings (100%) rename {UICatalog => Examples/UICatalog}/UICatalogCommandLineOptions.cs (100%) rename {UICatalog => Examples/UICatalog}/UICatalogTop.cs (100%) rename {UICatalog => Examples/UICatalog}/generic_screenshot.png (100%) rename {UICatalog => Examples/UICatalog}/screenshot.png (100%) diff --git a/UICatalog/.gitignore b/Examples/UICatalog/.gitignore similarity index 100% rename from UICatalog/.gitignore rename to Examples/UICatalog/.gitignore diff --git a/UICatalog/BenchmarkResults.cs b/Examples/UICatalog/BenchmarkResults.cs similarity index 100% rename from UICatalog/BenchmarkResults.cs rename to Examples/UICatalog/BenchmarkResults.cs diff --git a/UICatalog/Dockerfile b/Examples/UICatalog/Dockerfile similarity index 100% rename from UICatalog/Dockerfile rename to Examples/UICatalog/Dockerfile diff --git a/UICatalog/NumberToWords.cs b/Examples/UICatalog/NumberToWords.cs similarity index 100% rename from UICatalog/NumberToWords.cs rename to Examples/UICatalog/NumberToWords.cs diff --git a/UICatalog/Properties/launchSettings.json b/Examples/UICatalog/Properties/launchSettings.json similarity index 100% rename from UICatalog/Properties/launchSettings.json rename to Examples/UICatalog/Properties/launchSettings.json diff --git a/UICatalog/README.md b/Examples/UICatalog/README.md similarity index 100% rename from UICatalog/README.md rename to Examples/UICatalog/README.md diff --git a/UICatalog/Resources/config.json b/Examples/UICatalog/Resources/config.json similarity index 100% rename from UICatalog/Resources/config.json rename to Examples/UICatalog/Resources/config.json diff --git a/UICatalog/Scenario.cs b/Examples/UICatalog/Scenario.cs similarity index 100% rename from UICatalog/Scenario.cs rename to Examples/UICatalog/Scenario.cs diff --git a/UICatalog/ScenarioCategory.cs b/Examples/UICatalog/ScenarioCategory.cs similarity index 100% rename from UICatalog/ScenarioCategory.cs rename to Examples/UICatalog/ScenarioCategory.cs diff --git a/UICatalog/ScenarioMetadata.cs b/Examples/UICatalog/ScenarioMetadata.cs similarity index 100% rename from UICatalog/ScenarioMetadata.cs rename to Examples/UICatalog/ScenarioMetadata.cs diff --git a/UICatalog/Scenarios/Adornments.cs b/Examples/UICatalog/Scenarios/Adornments.cs similarity index 100% rename from UICatalog/Scenarios/Adornments.cs rename to Examples/UICatalog/Scenarios/Adornments.cs diff --git a/UICatalog/Scenarios/AllViewsTester.cs b/Examples/UICatalog/Scenarios/AllViewsTester.cs similarity index 100% rename from UICatalog/Scenarios/AllViewsTester.cs rename to Examples/UICatalog/Scenarios/AllViewsTester.cs diff --git a/UICatalog/Scenarios/AnimationScenario/AnimationScenario.cs b/Examples/UICatalog/Scenarios/AnimationScenario/AnimationScenario.cs similarity index 100% rename from UICatalog/Scenarios/AnimationScenario/AnimationScenario.cs rename to Examples/UICatalog/Scenarios/AnimationScenario/AnimationScenario.cs diff --git a/UICatalog/Scenarios/AnimationScenario/Spinning_globe_dark_small.gif b/Examples/UICatalog/Scenarios/AnimationScenario/Spinning_globe_dark_small.gif similarity index 100% rename from UICatalog/Scenarios/AnimationScenario/Spinning_globe_dark_small.gif rename to Examples/UICatalog/Scenarios/AnimationScenario/Spinning_globe_dark_small.gif diff --git a/UICatalog/Scenarios/AnimationScenario/spinning-globe-attribution.txt b/Examples/UICatalog/Scenarios/AnimationScenario/spinning-globe-attribution.txt similarity index 100% rename from UICatalog/Scenarios/AnimationScenario/spinning-globe-attribution.txt rename to Examples/UICatalog/Scenarios/AnimationScenario/spinning-globe-attribution.txt diff --git a/UICatalog/Scenarios/AnsiRequestsScenario.cs b/Examples/UICatalog/Scenarios/AnsiRequestsScenario.cs similarity index 100% rename from UICatalog/Scenarios/AnsiRequestsScenario.cs rename to Examples/UICatalog/Scenarios/AnsiRequestsScenario.cs diff --git a/UICatalog/Scenarios/Arrangement.cs b/Examples/UICatalog/Scenarios/Arrangement.cs similarity index 100% rename from UICatalog/Scenarios/Arrangement.cs rename to Examples/UICatalog/Scenarios/Arrangement.cs diff --git a/UICatalog/Scenarios/Bars.cs b/Examples/UICatalog/Scenarios/Bars.cs similarity index 100% rename from UICatalog/Scenarios/Bars.cs rename to Examples/UICatalog/Scenarios/Bars.cs diff --git a/UICatalog/Scenarios/Buttons.cs b/Examples/UICatalog/Scenarios/Buttons.cs similarity index 100% rename from UICatalog/Scenarios/Buttons.cs rename to Examples/UICatalog/Scenarios/Buttons.cs diff --git a/UICatalog/Scenarios/CharacterMap/CharacterMap.cs b/Examples/UICatalog/Scenarios/CharacterMap/CharacterMap.cs similarity index 100% rename from UICatalog/Scenarios/CharacterMap/CharacterMap.cs rename to Examples/UICatalog/Scenarios/CharacterMap/CharacterMap.cs diff --git a/UICatalog/Scenarios/ChineseUI.cs b/Examples/UICatalog/Scenarios/ChineseUI.cs similarity index 100% rename from UICatalog/Scenarios/ChineseUI.cs rename to Examples/UICatalog/Scenarios/ChineseUI.cs diff --git a/UICatalog/Scenarios/ClassExplorer.cs b/Examples/UICatalog/Scenarios/ClassExplorer.cs similarity index 100% rename from UICatalog/Scenarios/ClassExplorer.cs rename to Examples/UICatalog/Scenarios/ClassExplorer.cs diff --git a/UICatalog/Scenarios/Clipping.cs b/Examples/UICatalog/Scenarios/Clipping.cs similarity index 100% rename from UICatalog/Scenarios/Clipping.cs rename to Examples/UICatalog/Scenarios/Clipping.cs diff --git a/UICatalog/Scenarios/CollectionNavigatorTester.cs b/Examples/UICatalog/Scenarios/CollectionNavigatorTester.cs similarity index 100% rename from UICatalog/Scenarios/CollectionNavigatorTester.cs rename to Examples/UICatalog/Scenarios/CollectionNavigatorTester.cs diff --git a/UICatalog/Scenarios/ColorPicker.cs b/Examples/UICatalog/Scenarios/ColorPicker.cs similarity index 100% rename from UICatalog/Scenarios/ColorPicker.cs rename to Examples/UICatalog/Scenarios/ColorPicker.cs diff --git a/UICatalog/Scenarios/CombiningMarks.cs b/Examples/UICatalog/Scenarios/CombiningMarks.cs similarity index 100% rename from UICatalog/Scenarios/CombiningMarks.cs rename to Examples/UICatalog/Scenarios/CombiningMarks.cs diff --git a/UICatalog/Scenarios/ComboBoxIteration.cs b/Examples/UICatalog/Scenarios/ComboBoxIteration.cs similarity index 100% rename from UICatalog/Scenarios/ComboBoxIteration.cs rename to Examples/UICatalog/Scenarios/ComboBoxIteration.cs diff --git a/UICatalog/Scenarios/ComputedLayout.cs b/Examples/UICatalog/Scenarios/ComputedLayout.cs similarity index 100% rename from UICatalog/Scenarios/ComputedLayout.cs rename to Examples/UICatalog/Scenarios/ComputedLayout.cs diff --git a/UICatalog/Scenarios/ConfigurationEditor.cs b/Examples/UICatalog/Scenarios/ConfigurationEditor.cs similarity index 100% rename from UICatalog/Scenarios/ConfigurationEditor.cs rename to Examples/UICatalog/Scenarios/ConfigurationEditor.cs diff --git a/UICatalog/Scenarios/ContextMenus.cs b/Examples/UICatalog/Scenarios/ContextMenus.cs similarity index 100% rename from UICatalog/Scenarios/ContextMenus.cs rename to Examples/UICatalog/Scenarios/ContextMenus.cs diff --git a/UICatalog/Scenarios/CsvEditor.cs b/Examples/UICatalog/Scenarios/CsvEditor.cs similarity index 100% rename from UICatalog/Scenarios/CsvEditor.cs rename to Examples/UICatalog/Scenarios/CsvEditor.cs diff --git a/UICatalog/Scenarios/DatePickers.cs b/Examples/UICatalog/Scenarios/DatePickers.cs similarity index 100% rename from UICatalog/Scenarios/DatePickers.cs rename to Examples/UICatalog/Scenarios/DatePickers.cs diff --git a/UICatalog/Scenarios/Dialogs.cs b/Examples/UICatalog/Scenarios/Dialogs.cs similarity index 100% rename from UICatalog/Scenarios/Dialogs.cs rename to Examples/UICatalog/Scenarios/Dialogs.cs diff --git a/UICatalog/Scenarios/DimAutoDemo.cs b/Examples/UICatalog/Scenarios/DimAutoDemo.cs similarity index 100% rename from UICatalog/Scenarios/DimAutoDemo.cs rename to Examples/UICatalog/Scenarios/DimAutoDemo.cs diff --git a/UICatalog/Scenarios/DynamicMenuBar.cs b/Examples/UICatalog/Scenarios/DynamicMenuBar.cs similarity index 100% rename from UICatalog/Scenarios/DynamicMenuBar.cs rename to Examples/UICatalog/Scenarios/DynamicMenuBar.cs diff --git a/UICatalog/Scenarios/DynamicStatusBar.cs b/Examples/UICatalog/Scenarios/DynamicStatusBar.cs similarity index 100% rename from UICatalog/Scenarios/DynamicStatusBar.cs rename to Examples/UICatalog/Scenarios/DynamicStatusBar.cs diff --git a/UICatalog/Scenarios/Editor.cs b/Examples/UICatalog/Scenarios/Editor.cs similarity index 100% rename from UICatalog/Scenarios/Editor.cs rename to Examples/UICatalog/Scenarios/Editor.cs diff --git a/UICatalog/Scenarios/Editors/AdornmentEditor.cs b/Examples/UICatalog/Scenarios/Editors/AdornmentEditor.cs similarity index 100% rename from UICatalog/Scenarios/Editors/AdornmentEditor.cs rename to Examples/UICatalog/Scenarios/Editors/AdornmentEditor.cs diff --git a/UICatalog/Scenarios/Editors/AdornmentsEditor.cs b/Examples/UICatalog/Scenarios/Editors/AdornmentsEditor.cs similarity index 100% rename from UICatalog/Scenarios/Editors/AdornmentsEditor.cs rename to Examples/UICatalog/Scenarios/Editors/AdornmentsEditor.cs diff --git a/UICatalog/Scenarios/Editors/ArrangementEditor.cs b/Examples/UICatalog/Scenarios/Editors/ArrangementEditor.cs similarity index 100% rename from UICatalog/Scenarios/Editors/ArrangementEditor.cs rename to Examples/UICatalog/Scenarios/Editors/ArrangementEditor.cs diff --git a/UICatalog/Scenarios/Editors/BorderEditor.cs b/Examples/UICatalog/Scenarios/Editors/BorderEditor.cs similarity index 100% rename from UICatalog/Scenarios/Editors/BorderEditor.cs rename to Examples/UICatalog/Scenarios/Editors/BorderEditor.cs diff --git a/UICatalog/Scenarios/Editors/DimEditor.cs b/Examples/UICatalog/Scenarios/Editors/DimEditor.cs similarity index 100% rename from UICatalog/Scenarios/Editors/DimEditor.cs rename to Examples/UICatalog/Scenarios/Editors/DimEditor.cs diff --git a/UICatalog/Scenarios/Editors/EditorBase.cs b/Examples/UICatalog/Scenarios/Editors/EditorBase.cs similarity index 100% rename from UICatalog/Scenarios/Editors/EditorBase.cs rename to Examples/UICatalog/Scenarios/Editors/EditorBase.cs diff --git a/UICatalog/Scenarios/Editors/EventLog.cs b/Examples/UICatalog/Scenarios/Editors/EventLog.cs similarity index 100% rename from UICatalog/Scenarios/Editors/EventLog.cs rename to Examples/UICatalog/Scenarios/Editors/EventLog.cs diff --git a/UICatalog/Scenarios/Editors/ExpanderButton.cs b/Examples/UICatalog/Scenarios/Editors/ExpanderButton.cs similarity index 100% rename from UICatalog/Scenarios/Editors/ExpanderButton.cs rename to Examples/UICatalog/Scenarios/Editors/ExpanderButton.cs diff --git a/UICatalog/Scenarios/Editors/LayoutEditor.cs b/Examples/UICatalog/Scenarios/Editors/LayoutEditor.cs similarity index 100% rename from UICatalog/Scenarios/Editors/LayoutEditor.cs rename to Examples/UICatalog/Scenarios/Editors/LayoutEditor.cs diff --git a/UICatalog/Scenarios/Editors/MarginEditor.cs b/Examples/UICatalog/Scenarios/Editors/MarginEditor.cs similarity index 100% rename from UICatalog/Scenarios/Editors/MarginEditor.cs rename to Examples/UICatalog/Scenarios/Editors/MarginEditor.cs diff --git a/UICatalog/Scenarios/Editors/PaddingEditor.cs b/Examples/UICatalog/Scenarios/Editors/PaddingEditor.cs similarity index 100% rename from UICatalog/Scenarios/Editors/PaddingEditor.cs rename to Examples/UICatalog/Scenarios/Editors/PaddingEditor.cs diff --git a/UICatalog/Scenarios/Editors/PosEditor.cs b/Examples/UICatalog/Scenarios/Editors/PosEditor.cs similarity index 100% rename from UICatalog/Scenarios/Editors/PosEditor.cs rename to Examples/UICatalog/Scenarios/Editors/PosEditor.cs diff --git a/UICatalog/Scenarios/Editors/ViewportSettingsEditor.cs b/Examples/UICatalog/Scenarios/Editors/ViewportSettingsEditor.cs similarity index 100% rename from UICatalog/Scenarios/Editors/ViewportSettingsEditor.cs rename to Examples/UICatalog/Scenarios/Editors/ViewportSettingsEditor.cs diff --git a/UICatalog/Scenarios/FileDialogExamples.cs b/Examples/UICatalog/Scenarios/FileDialogExamples.cs similarity index 100% rename from UICatalog/Scenarios/FileDialogExamples.cs rename to Examples/UICatalog/Scenarios/FileDialogExamples.cs diff --git a/UICatalog/Scenarios/Generic.cs b/Examples/UICatalog/Scenarios/Generic.cs similarity index 100% rename from UICatalog/Scenarios/Generic.cs rename to Examples/UICatalog/Scenarios/Generic.cs diff --git a/UICatalog/Scenarios/GraphViewExample.cs b/Examples/UICatalog/Scenarios/GraphViewExample.cs similarity index 100% rename from UICatalog/Scenarios/GraphViewExample.cs rename to Examples/UICatalog/Scenarios/GraphViewExample.cs diff --git a/UICatalog/Scenarios/HexEditor.cs b/Examples/UICatalog/Scenarios/HexEditor.cs similarity index 100% rename from UICatalog/Scenarios/HexEditor.cs rename to Examples/UICatalog/Scenarios/HexEditor.cs diff --git a/UICatalog/Scenarios/HotKeys.cs b/Examples/UICatalog/Scenarios/HotKeys.cs similarity index 100% rename from UICatalog/Scenarios/HotKeys.cs rename to Examples/UICatalog/Scenarios/HotKeys.cs diff --git a/UICatalog/Scenarios/Images.cs b/Examples/UICatalog/Scenarios/Images.cs similarity index 100% rename from UICatalog/Scenarios/Images.cs rename to Examples/UICatalog/Scenarios/Images.cs diff --git a/UICatalog/Scenarios/InteractiveTree.cs b/Examples/UICatalog/Scenarios/InteractiveTree.cs similarity index 100% rename from UICatalog/Scenarios/InteractiveTree.cs rename to Examples/UICatalog/Scenarios/InteractiveTree.cs diff --git a/UICatalog/Scenarios/InvertColors.cs b/Examples/UICatalog/Scenarios/InvertColors.cs similarity index 100% rename from UICatalog/Scenarios/InvertColors.cs rename to Examples/UICatalog/Scenarios/InvertColors.cs diff --git a/UICatalog/Scenarios/KeyBindings.cs b/Examples/UICatalog/Scenarios/KeyBindings.cs similarity index 100% rename from UICatalog/Scenarios/KeyBindings.cs rename to Examples/UICatalog/Scenarios/KeyBindings.cs diff --git a/UICatalog/Scenarios/Keys.cs b/Examples/UICatalog/Scenarios/Keys.cs similarity index 100% rename from UICatalog/Scenarios/Keys.cs rename to Examples/UICatalog/Scenarios/Keys.cs diff --git a/UICatalog/Scenarios/LineCanvasExperiment.cs b/Examples/UICatalog/Scenarios/LineCanvasExperiment.cs similarity index 100% rename from UICatalog/Scenarios/LineCanvasExperiment.cs rename to Examples/UICatalog/Scenarios/LineCanvasExperiment.cs diff --git a/UICatalog/Scenarios/LineDrawing.cs b/Examples/UICatalog/Scenarios/LineDrawing.cs similarity index 100% rename from UICatalog/Scenarios/LineDrawing.cs rename to Examples/UICatalog/Scenarios/LineDrawing.cs diff --git a/UICatalog/Scenarios/LineViewExample.cs b/Examples/UICatalog/Scenarios/LineViewExample.cs similarity index 100% rename from UICatalog/Scenarios/LineViewExample.cs rename to Examples/UICatalog/Scenarios/LineViewExample.cs diff --git a/UICatalog/Scenarios/ListColumns.cs b/Examples/UICatalog/Scenarios/ListColumns.cs similarity index 100% rename from UICatalog/Scenarios/ListColumns.cs rename to Examples/UICatalog/Scenarios/ListColumns.cs diff --git a/UICatalog/Scenarios/ListViewWithSelection.cs b/Examples/UICatalog/Scenarios/ListViewWithSelection.cs similarity index 100% rename from UICatalog/Scenarios/ListViewWithSelection.cs rename to Examples/UICatalog/Scenarios/ListViewWithSelection.cs diff --git a/UICatalog/Scenarios/ListsAndCombos.cs b/Examples/UICatalog/Scenarios/ListsAndCombos.cs similarity index 100% rename from UICatalog/Scenarios/ListsAndCombos.cs rename to Examples/UICatalog/Scenarios/ListsAndCombos.cs diff --git a/UICatalog/Scenarios/Localization.cs b/Examples/UICatalog/Scenarios/Localization.cs similarity index 100% rename from UICatalog/Scenarios/Localization.cs rename to Examples/UICatalog/Scenarios/Localization.cs diff --git a/UICatalog/Scenarios/MenuBarScenario.cs b/Examples/UICatalog/Scenarios/MenuBarScenario.cs similarity index 100% rename from UICatalog/Scenarios/MenuBarScenario.cs rename to Examples/UICatalog/Scenarios/MenuBarScenario.cs diff --git a/UICatalog/Scenarios/Menus.cs b/Examples/UICatalog/Scenarios/Menus.cs similarity index 100% rename from UICatalog/Scenarios/Menus.cs rename to Examples/UICatalog/Scenarios/Menus.cs diff --git a/UICatalog/Scenarios/MessageBoxes.cs b/Examples/UICatalog/Scenarios/MessageBoxes.cs similarity index 100% rename from UICatalog/Scenarios/MessageBoxes.cs rename to Examples/UICatalog/Scenarios/MessageBoxes.cs diff --git a/UICatalog/Scenarios/Mouse.cs b/Examples/UICatalog/Scenarios/Mouse.cs similarity index 100% rename from UICatalog/Scenarios/Mouse.cs rename to Examples/UICatalog/Scenarios/Mouse.cs diff --git a/UICatalog/Scenarios/MultiColouredTable.cs b/Examples/UICatalog/Scenarios/MultiColouredTable.cs similarity index 100% rename from UICatalog/Scenarios/MultiColouredTable.cs rename to Examples/UICatalog/Scenarios/MultiColouredTable.cs diff --git a/UICatalog/Scenarios/Navigation.cs b/Examples/UICatalog/Scenarios/Navigation.cs similarity index 100% rename from UICatalog/Scenarios/Navigation.cs rename to Examples/UICatalog/Scenarios/Navigation.cs diff --git a/UICatalog/Scenarios/Notepad.cs b/Examples/UICatalog/Scenarios/Notepad.cs similarity index 100% rename from UICatalog/Scenarios/Notepad.cs rename to Examples/UICatalog/Scenarios/Notepad.cs diff --git a/UICatalog/Scenarios/NumericUpDownDemo.cs b/Examples/UICatalog/Scenarios/NumericUpDownDemo.cs similarity index 100% rename from UICatalog/Scenarios/NumericUpDownDemo.cs rename to Examples/UICatalog/Scenarios/NumericUpDownDemo.cs diff --git a/UICatalog/Scenarios/PosAlignDemo.cs b/Examples/UICatalog/Scenarios/PosAlignDemo.cs similarity index 100% rename from UICatalog/Scenarios/PosAlignDemo.cs rename to Examples/UICatalog/Scenarios/PosAlignDemo.cs diff --git a/UICatalog/Scenarios/ProcessTable.cs b/Examples/UICatalog/Scenarios/ProcessTable.cs similarity index 100% rename from UICatalog/Scenarios/ProcessTable.cs rename to Examples/UICatalog/Scenarios/ProcessTable.cs diff --git a/UICatalog/Scenarios/Progress.cs b/Examples/UICatalog/Scenarios/Progress.cs similarity index 100% rename from UICatalog/Scenarios/Progress.cs rename to Examples/UICatalog/Scenarios/Progress.cs diff --git a/UICatalog/Scenarios/ProgressBarStyles.cs b/Examples/UICatalog/Scenarios/ProgressBarStyles.cs similarity index 100% rename from UICatalog/Scenarios/ProgressBarStyles.cs rename to Examples/UICatalog/Scenarios/ProgressBarStyles.cs diff --git a/UICatalog/Scenarios/RegionScenario.cs b/Examples/UICatalog/Scenarios/RegionScenario.cs similarity index 100% rename from UICatalog/Scenarios/RegionScenario.cs rename to Examples/UICatalog/Scenarios/RegionScenario.cs diff --git a/UICatalog/Scenarios/RunTExample.cs b/Examples/UICatalog/Scenarios/RunTExample.cs similarity index 100% rename from UICatalog/Scenarios/RunTExample.cs rename to Examples/UICatalog/Scenarios/RunTExample.cs diff --git a/UICatalog/Scenarios/RuneWidthGreaterThanOne.cs b/Examples/UICatalog/Scenarios/RuneWidthGreaterThanOne.cs similarity index 100% rename from UICatalog/Scenarios/RuneWidthGreaterThanOne.cs rename to Examples/UICatalog/Scenarios/RuneWidthGreaterThanOne.cs diff --git a/UICatalog/Scenarios/ScrollBarDemo.cs b/Examples/UICatalog/Scenarios/ScrollBarDemo.cs similarity index 100% rename from UICatalog/Scenarios/ScrollBarDemo.cs rename to Examples/UICatalog/Scenarios/ScrollBarDemo.cs diff --git a/UICatalog/Scenarios/Scrolling.cs b/Examples/UICatalog/Scenarios/Scrolling.cs similarity index 100% rename from UICatalog/Scenarios/Scrolling.cs rename to Examples/UICatalog/Scenarios/Scrolling.cs diff --git a/UICatalog/Scenarios/SendKeys.cs b/Examples/UICatalog/Scenarios/SendKeys.cs similarity index 100% rename from UICatalog/Scenarios/SendKeys.cs rename to Examples/UICatalog/Scenarios/SendKeys.cs diff --git a/UICatalog/Scenarios/ShadowStyles.cs b/Examples/UICatalog/Scenarios/ShadowStyles.cs similarity index 100% rename from UICatalog/Scenarios/ShadowStyles.cs rename to Examples/UICatalog/Scenarios/ShadowStyles.cs diff --git a/UICatalog/Scenarios/Shortcuts.cs b/Examples/UICatalog/Scenarios/Shortcuts.cs similarity index 100% rename from UICatalog/Scenarios/Shortcuts.cs rename to Examples/UICatalog/Scenarios/Shortcuts.cs diff --git a/UICatalog/Scenarios/SimpleDialog.cs b/Examples/UICatalog/Scenarios/SimpleDialog.cs similarity index 100% rename from UICatalog/Scenarios/SimpleDialog.cs rename to Examples/UICatalog/Scenarios/SimpleDialog.cs diff --git a/UICatalog/Scenarios/SingleBackgroundWorker.cs b/Examples/UICatalog/Scenarios/SingleBackgroundWorker.cs similarity index 100% rename from UICatalog/Scenarios/SingleBackgroundWorker.cs rename to Examples/UICatalog/Scenarios/SingleBackgroundWorker.cs diff --git a/UICatalog/Scenarios/Sliders.cs b/Examples/UICatalog/Scenarios/Sliders.cs similarity index 100% rename from UICatalog/Scenarios/Sliders.cs rename to Examples/UICatalog/Scenarios/Sliders.cs diff --git a/UICatalog/Scenarios/Snake.cs b/Examples/UICatalog/Scenarios/Snake.cs similarity index 100% rename from UICatalog/Scenarios/Snake.cs rename to Examples/UICatalog/Scenarios/Snake.cs diff --git a/UICatalog/Scenarios/SpinnerStyles.cs b/Examples/UICatalog/Scenarios/SpinnerStyles.cs similarity index 100% rename from UICatalog/Scenarios/SpinnerStyles.cs rename to Examples/UICatalog/Scenarios/SpinnerStyles.cs diff --git a/UICatalog/Scenarios/SyntaxHighlighting.cs b/Examples/UICatalog/Scenarios/SyntaxHighlighting.cs similarity index 100% rename from UICatalog/Scenarios/SyntaxHighlighting.cs rename to Examples/UICatalog/Scenarios/SyntaxHighlighting.cs diff --git a/UICatalog/Scenarios/TabViewExample.cs b/Examples/UICatalog/Scenarios/TabViewExample.cs similarity index 100% rename from UICatalog/Scenarios/TabViewExample.cs rename to Examples/UICatalog/Scenarios/TabViewExample.cs diff --git a/UICatalog/Scenarios/TableEditor.cs b/Examples/UICatalog/Scenarios/TableEditor.cs similarity index 100% rename from UICatalog/Scenarios/TableEditor.cs rename to Examples/UICatalog/Scenarios/TableEditor.cs diff --git a/UICatalog/Scenarios/Text.cs b/Examples/UICatalog/Scenarios/Text.cs similarity index 100% rename from UICatalog/Scenarios/Text.cs rename to Examples/UICatalog/Scenarios/Text.cs diff --git a/UICatalog/Scenarios/TextAlignmentAndDirection.cs b/Examples/UICatalog/Scenarios/TextAlignmentAndDirection.cs similarity index 100% rename from UICatalog/Scenarios/TextAlignmentAndDirection.cs rename to Examples/UICatalog/Scenarios/TextAlignmentAndDirection.cs diff --git a/UICatalog/Scenarios/TextEffectsScenario.cs b/Examples/UICatalog/Scenarios/TextEffectsScenario.cs similarity index 100% rename from UICatalog/Scenarios/TextEffectsScenario.cs rename to Examples/UICatalog/Scenarios/TextEffectsScenario.cs diff --git a/UICatalog/Scenarios/TextFormatterDemo.cs b/Examples/UICatalog/Scenarios/TextFormatterDemo.cs similarity index 100% rename from UICatalog/Scenarios/TextFormatterDemo.cs rename to Examples/UICatalog/Scenarios/TextFormatterDemo.cs diff --git a/UICatalog/Scenarios/TextViewAutocompletePopup.cs b/Examples/UICatalog/Scenarios/TextViewAutocompletePopup.cs similarity index 100% rename from UICatalog/Scenarios/TextViewAutocompletePopup.cs rename to Examples/UICatalog/Scenarios/TextViewAutocompletePopup.cs diff --git a/UICatalog/Scenarios/Threading.cs b/Examples/UICatalog/Scenarios/Threading.cs similarity index 100% rename from UICatalog/Scenarios/Threading.cs rename to Examples/UICatalog/Scenarios/Threading.cs diff --git a/UICatalog/Scenarios/TileViewNesting.cs b/Examples/UICatalog/Scenarios/TileViewNesting.cs similarity index 100% rename from UICatalog/Scenarios/TileViewNesting.cs rename to Examples/UICatalog/Scenarios/TileViewNesting.cs diff --git a/UICatalog/Scenarios/TimeAndDate.cs b/Examples/UICatalog/Scenarios/TimeAndDate.cs similarity index 100% rename from UICatalog/Scenarios/TimeAndDate.cs rename to Examples/UICatalog/Scenarios/TimeAndDate.cs diff --git a/UICatalog/Scenarios/Transparent.cs b/Examples/UICatalog/Scenarios/Transparent.cs similarity index 100% rename from UICatalog/Scenarios/Transparent.cs rename to Examples/UICatalog/Scenarios/Transparent.cs diff --git a/UICatalog/Scenarios/TreeUseCases.cs b/Examples/UICatalog/Scenarios/TreeUseCases.cs similarity index 100% rename from UICatalog/Scenarios/TreeUseCases.cs rename to Examples/UICatalog/Scenarios/TreeUseCases.cs diff --git a/UICatalog/Scenarios/TreeViewFileSystem.cs b/Examples/UICatalog/Scenarios/TreeViewFileSystem.cs similarity index 100% rename from UICatalog/Scenarios/TreeViewFileSystem.cs rename to Examples/UICatalog/Scenarios/TreeViewFileSystem.cs diff --git a/UICatalog/Scenarios/TrueColors.cs b/Examples/UICatalog/Scenarios/TrueColors.cs similarity index 100% rename from UICatalog/Scenarios/TrueColors.cs rename to Examples/UICatalog/Scenarios/TrueColors.cs diff --git a/UICatalog/Scenarios/Unicode.cs b/Examples/UICatalog/Scenarios/Unicode.cs similarity index 100% rename from UICatalog/Scenarios/Unicode.cs rename to Examples/UICatalog/Scenarios/Unicode.cs diff --git a/UICatalog/Scenarios/ViewExperiments.cs b/Examples/UICatalog/Scenarios/ViewExperiments.cs similarity index 100% rename from UICatalog/Scenarios/ViewExperiments.cs rename to Examples/UICatalog/Scenarios/ViewExperiments.cs diff --git a/UICatalog/Scenarios/ViewportSettings.cs b/Examples/UICatalog/Scenarios/ViewportSettings.cs similarity index 100% rename from UICatalog/Scenarios/ViewportSettings.cs rename to Examples/UICatalog/Scenarios/ViewportSettings.cs diff --git a/UICatalog/Scenarios/VkeyPacketSimulator.cs b/Examples/UICatalog/Scenarios/VkeyPacketSimulator.cs similarity index 100% rename from UICatalog/Scenarios/VkeyPacketSimulator.cs rename to Examples/UICatalog/Scenarios/VkeyPacketSimulator.cs diff --git a/UICatalog/Scenarios/WindowsAndFrameViews.cs b/Examples/UICatalog/Scenarios/WindowsAndFrameViews.cs similarity index 100% rename from UICatalog/Scenarios/WindowsAndFrameViews.cs rename to Examples/UICatalog/Scenarios/WindowsAndFrameViews.cs diff --git a/UICatalog/Scenarios/WizardAsView.cs b/Examples/UICatalog/Scenarios/WizardAsView.cs similarity index 100% rename from UICatalog/Scenarios/WizardAsView.cs rename to Examples/UICatalog/Scenarios/WizardAsView.cs diff --git a/UICatalog/Scenarios/Wizards.cs b/Examples/UICatalog/Scenarios/Wizards.cs similarity index 100% rename from UICatalog/Scenarios/Wizards.cs rename to Examples/UICatalog/Scenarios/Wizards.cs diff --git a/UICatalog/UICatalog.cs b/Examples/UICatalog/UICatalog.cs similarity index 100% rename from UICatalog/UICatalog.cs rename to Examples/UICatalog/UICatalog.cs diff --git a/UICatalog/UICatalog.csproj b/Examples/UICatalog/UICatalog.csproj similarity index 97% rename from UICatalog/UICatalog.csproj rename to Examples/UICatalog/UICatalog.csproj index d3a11147d8..dd8f36a050 100644 --- a/UICatalog/UICatalog.csproj +++ b/Examples/UICatalog/UICatalog.csproj @@ -1,53 +1,53 @@ - - - UICatalog.UICatalog - Exe - - - - 2.0 - 2.0 - 2.0 - 2.0 - Linux - - - TRACE - - - TRACE;DEBUG_IDISPOSABLE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + UICatalog.UICatalog + Exe + + + + 2.0 + 2.0 + 2.0 + 2.0 + Linux + + + TRACE + + + TRACE;DEBUG_IDISPOSABLE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/UICatalog/UICatalog.csproj.DotSettings b/Examples/UICatalog/UICatalog.csproj.DotSettings similarity index 100% rename from UICatalog/UICatalog.csproj.DotSettings rename to Examples/UICatalog/UICatalog.csproj.DotSettings diff --git a/UICatalog/UICatalogCommandLineOptions.cs b/Examples/UICatalog/UICatalogCommandLineOptions.cs similarity index 100% rename from UICatalog/UICatalogCommandLineOptions.cs rename to Examples/UICatalog/UICatalogCommandLineOptions.cs diff --git a/UICatalog/UICatalogTop.cs b/Examples/UICatalog/UICatalogTop.cs similarity index 100% rename from UICatalog/UICatalogTop.cs rename to Examples/UICatalog/UICatalogTop.cs diff --git a/UICatalog/generic_screenshot.png b/Examples/UICatalog/generic_screenshot.png similarity index 100% rename from UICatalog/generic_screenshot.png rename to Examples/UICatalog/generic_screenshot.png diff --git a/UICatalog/screenshot.png b/Examples/UICatalog/screenshot.png similarity index 100% rename from UICatalog/screenshot.png rename to Examples/UICatalog/screenshot.png diff --git a/Tests/Benchmarks/Benchmarks.csproj b/Tests/Benchmarks/Benchmarks.csproj index 369ee89ec0..88412359fc 100644 --- a/Tests/Benchmarks/Benchmarks.csproj +++ b/Tests/Benchmarks/Benchmarks.csproj @@ -12,7 +12,7 @@ - + From 278815314f97ea75a847d745561b0e67f9586143 Mon Sep 17 00:00:00 2001 From: Tig Date: Thu, 24 Apr 2025 12:49:45 -0600 Subject: [PATCH 5/8] Moved UICatalog into ./Examples --- Examples/UICatalog/UICatalog.csproj | 2 +- Terminal.sln | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/UICatalog/UICatalog.csproj b/Examples/UICatalog/UICatalog.csproj index dd8f36a050..40dc982c85 100644 --- a/Examples/UICatalog/UICatalog.csproj +++ b/Examples/UICatalog/UICatalog.csproj @@ -39,7 +39,7 @@ - + diff --git a/Terminal.sln b/Terminal.sln index b3e438630d..2780ca6f0f 100644 --- a/Terminal.sln +++ b/Terminal.sln @@ -5,7 +5,7 @@ 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", "Examples\ReactiveExample\ReactiveExample.csproj", "{44E15B48-0DB2-4560-82BD-D3B7989811C3}" EndProject From 9a2bcf3659acc8e63fac8f992912b4aa023f36ab Mon Sep 17 00:00:00 2001 From: Tig Date: Thu, 24 Apr 2025 12:53:57 -0600 Subject: [PATCH 6/8] Moved UICatalog into ./Examples 2 --- README.md | 6 ++++++ Tests/IntegrationTests/IntegrationTests.csproj | 2 +- Tests/StressTests/StressTests.csproj | 2 +- Tests/UnitTests/UnitTests.csproj | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index fe3d07f7f3..d3339303be 100644 --- a/README.md +++ b/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 diff --git a/Tests/IntegrationTests/IntegrationTests.csproj b/Tests/IntegrationTests/IntegrationTests.csproj index ef275b3eb8..0757e34410 100644 --- a/Tests/IntegrationTests/IntegrationTests.csproj +++ b/Tests/IntegrationTests/IntegrationTests.csproj @@ -28,7 +28,7 @@ - + diff --git a/Tests/StressTests/StressTests.csproj b/Tests/StressTests/StressTests.csproj index 62efd367f4..ccb7fc33a5 100644 --- a/Tests/StressTests/StressTests.csproj +++ b/Tests/StressTests/StressTests.csproj @@ -30,7 +30,7 @@ - + diff --git a/Tests/UnitTests/UnitTests.csproj b/Tests/UnitTests/UnitTests.csproj index fa84707494..9bfd1b2db5 100644 --- a/Tests/UnitTests/UnitTests.csproj +++ b/Tests/UnitTests/UnitTests.csproj @@ -45,7 +45,7 @@ - + From 819981cb1a9b70c18e3b1783673c34942d50b5f7 Mon Sep 17 00:00:00 2001 From: Tig Date: Thu, 24 Apr 2025 13:01:00 -0600 Subject: [PATCH 7/8] Moved tests into ./Tests --- Terminal.sln | 6 +++--- Tests/IntegrationTests/IntegrationTests.csproj | 4 ++-- .../TerminalGuiFluentTesting}/ClassDiagram1.cd | 0 .../TerminalGuiFluentTesting}/FakeInput.cs | 0 .../TerminalGuiFluentTesting}/FakeNetInput.cs | 0 .../TerminalGuiFluentTesting}/FakeOutput.cs | 0 .../TerminalGuiFluentTesting}/FakeWindowsInput.cs | 0 .../TerminalGuiFluentTesting}/GuiTestContext.cs | 0 .../TerminalGuiFluentTesting}/NetSequences.cs | 0 .../TerminalGuiFluentTesting.csproj | 2 +- .../TerminalGuiFluentTesting}/TextWriterLogger.cs | 0 .../TerminalGuiFluentTesting}/TextWriterLoggerProvider.cs | 0 .../TerminalGuiFluentTesting}/V2TestDriver.cs | 0 .../TerminalGuiFluentTesting}/With.cs | 0 .../TerminalGuiFluentTestingXunit.Generator.csproj | 0 .../TheGenerator.cs | 0 .../TerminalGuiFluentTestingXunit.csproj | 0 .../XunitContextExtensions.cs | 0 18 files changed, 6 insertions(+), 6 deletions(-) rename {TerminalGuiFluentTesting => Tests/TerminalGuiFluentTesting}/ClassDiagram1.cd (100%) rename {TerminalGuiFluentTesting => Tests/TerminalGuiFluentTesting}/FakeInput.cs (100%) rename {TerminalGuiFluentTesting => Tests/TerminalGuiFluentTesting}/FakeNetInput.cs (100%) rename {TerminalGuiFluentTesting => Tests/TerminalGuiFluentTesting}/FakeOutput.cs (100%) rename {TerminalGuiFluentTesting => Tests/TerminalGuiFluentTesting}/FakeWindowsInput.cs (100%) rename {TerminalGuiFluentTesting => Tests/TerminalGuiFluentTesting}/GuiTestContext.cs (100%) rename {TerminalGuiFluentTesting => Tests/TerminalGuiFluentTesting}/NetSequences.cs (100%) rename {TerminalGuiFluentTesting => Tests/TerminalGuiFluentTesting}/TerminalGuiFluentTesting.csproj (81%) rename {TerminalGuiFluentTesting => Tests/TerminalGuiFluentTesting}/TextWriterLogger.cs (100%) rename {TerminalGuiFluentTesting => Tests/TerminalGuiFluentTesting}/TextWriterLoggerProvider.cs (100%) rename {TerminalGuiFluentTesting => Tests/TerminalGuiFluentTesting}/V2TestDriver.cs (100%) rename {TerminalGuiFluentTesting => Tests/TerminalGuiFluentTesting}/With.cs (100%) rename {TerminalGuiFluentTestingXunit.Generator => Tests/TerminalGuiFluentTestingXunit.Generator}/TerminalGuiFluentTestingXunit.Generator.csproj (100%) rename {TerminalGuiFluentTestingXunit.Generator => Tests/TerminalGuiFluentTestingXunit.Generator}/TheGenerator.cs (100%) rename {TerminalGuiFluentTestingXunit => Tests/TerminalGuiFluentTestingXunit}/TerminalGuiFluentTestingXunit.csproj (100%) rename {TerminalGuiFluentTestingXunit => Tests/TerminalGuiFluentTestingXunit}/XunitContextExtensions.cs (100%) diff --git a/Terminal.sln b/Terminal.sln index 2780ca6f0f..e1e22c58c9 100644 --- a/Terminal.sln +++ b/Terminal.sln @@ -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 diff --git a/Tests/IntegrationTests/IntegrationTests.csproj b/Tests/IntegrationTests/IntegrationTests.csproj index 0757e34410..6d3dae9bc3 100644 --- a/Tests/IntegrationTests/IntegrationTests.csproj +++ b/Tests/IntegrationTests/IntegrationTests.csproj @@ -26,8 +26,8 @@ - - + + diff --git a/TerminalGuiFluentTesting/ClassDiagram1.cd b/Tests/TerminalGuiFluentTesting/ClassDiagram1.cd similarity index 100% rename from TerminalGuiFluentTesting/ClassDiagram1.cd rename to Tests/TerminalGuiFluentTesting/ClassDiagram1.cd diff --git a/TerminalGuiFluentTesting/FakeInput.cs b/Tests/TerminalGuiFluentTesting/FakeInput.cs similarity index 100% rename from TerminalGuiFluentTesting/FakeInput.cs rename to Tests/TerminalGuiFluentTesting/FakeInput.cs diff --git a/TerminalGuiFluentTesting/FakeNetInput.cs b/Tests/TerminalGuiFluentTesting/FakeNetInput.cs similarity index 100% rename from TerminalGuiFluentTesting/FakeNetInput.cs rename to Tests/TerminalGuiFluentTesting/FakeNetInput.cs diff --git a/TerminalGuiFluentTesting/FakeOutput.cs b/Tests/TerminalGuiFluentTesting/FakeOutput.cs similarity index 100% rename from TerminalGuiFluentTesting/FakeOutput.cs rename to Tests/TerminalGuiFluentTesting/FakeOutput.cs diff --git a/TerminalGuiFluentTesting/FakeWindowsInput.cs b/Tests/TerminalGuiFluentTesting/FakeWindowsInput.cs similarity index 100% rename from TerminalGuiFluentTesting/FakeWindowsInput.cs rename to Tests/TerminalGuiFluentTesting/FakeWindowsInput.cs diff --git a/TerminalGuiFluentTesting/GuiTestContext.cs b/Tests/TerminalGuiFluentTesting/GuiTestContext.cs similarity index 100% rename from TerminalGuiFluentTesting/GuiTestContext.cs rename to Tests/TerminalGuiFluentTesting/GuiTestContext.cs diff --git a/TerminalGuiFluentTesting/NetSequences.cs b/Tests/TerminalGuiFluentTesting/NetSequences.cs similarity index 100% rename from TerminalGuiFluentTesting/NetSequences.cs rename to Tests/TerminalGuiFluentTesting/NetSequences.cs diff --git a/TerminalGuiFluentTesting/TerminalGuiFluentTesting.csproj b/Tests/TerminalGuiFluentTesting/TerminalGuiFluentTesting.csproj similarity index 81% rename from TerminalGuiFluentTesting/TerminalGuiFluentTesting.csproj rename to Tests/TerminalGuiFluentTesting/TerminalGuiFluentTesting.csproj index 21dc13b4d1..bf250a284a 100644 --- a/TerminalGuiFluentTesting/TerminalGuiFluentTesting.csproj +++ b/Tests/TerminalGuiFluentTesting/TerminalGuiFluentTesting.csproj @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/TerminalGuiFluentTesting/TextWriterLogger.cs b/Tests/TerminalGuiFluentTesting/TextWriterLogger.cs similarity index 100% rename from TerminalGuiFluentTesting/TextWriterLogger.cs rename to Tests/TerminalGuiFluentTesting/TextWriterLogger.cs diff --git a/TerminalGuiFluentTesting/TextWriterLoggerProvider.cs b/Tests/TerminalGuiFluentTesting/TextWriterLoggerProvider.cs similarity index 100% rename from TerminalGuiFluentTesting/TextWriterLoggerProvider.cs rename to Tests/TerminalGuiFluentTesting/TextWriterLoggerProvider.cs diff --git a/TerminalGuiFluentTesting/V2TestDriver.cs b/Tests/TerminalGuiFluentTesting/V2TestDriver.cs similarity index 100% rename from TerminalGuiFluentTesting/V2TestDriver.cs rename to Tests/TerminalGuiFluentTesting/V2TestDriver.cs diff --git a/TerminalGuiFluentTesting/With.cs b/Tests/TerminalGuiFluentTesting/With.cs similarity index 100% rename from TerminalGuiFluentTesting/With.cs rename to Tests/TerminalGuiFluentTesting/With.cs diff --git a/TerminalGuiFluentTestingXunit.Generator/TerminalGuiFluentTestingXunit.Generator.csproj b/Tests/TerminalGuiFluentTestingXunit.Generator/TerminalGuiFluentTestingXunit.Generator.csproj similarity index 100% rename from TerminalGuiFluentTestingXunit.Generator/TerminalGuiFluentTestingXunit.Generator.csproj rename to Tests/TerminalGuiFluentTestingXunit.Generator/TerminalGuiFluentTestingXunit.Generator.csproj diff --git a/TerminalGuiFluentTestingXunit.Generator/TheGenerator.cs b/Tests/TerminalGuiFluentTestingXunit.Generator/TheGenerator.cs similarity index 100% rename from TerminalGuiFluentTestingXunit.Generator/TheGenerator.cs rename to Tests/TerminalGuiFluentTestingXunit.Generator/TheGenerator.cs diff --git a/TerminalGuiFluentTestingXunit/TerminalGuiFluentTestingXunit.csproj b/Tests/TerminalGuiFluentTestingXunit/TerminalGuiFluentTestingXunit.csproj similarity index 100% rename from TerminalGuiFluentTestingXunit/TerminalGuiFluentTestingXunit.csproj rename to Tests/TerminalGuiFluentTestingXunit/TerminalGuiFluentTestingXunit.csproj diff --git a/TerminalGuiFluentTestingXunit/XunitContextExtensions.cs b/Tests/TerminalGuiFluentTestingXunit/XunitContextExtensions.cs similarity index 100% rename from TerminalGuiFluentTestingXunit/XunitContextExtensions.cs rename to Tests/TerminalGuiFluentTestingXunit/XunitContextExtensions.cs From ba0fabb9f8ec784d1ac88f17a53478b93dc4dbee Mon Sep 17 00:00:00 2001 From: Tig Date: Fri, 25 Apr 2025 05:43:07 -0600 Subject: [PATCH 8/8] Updated nuget --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 1a0afff7a4..974bb98f4f 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -32,8 +32,8 @@ - - + +