Removes automatic registration of settings

Original intention was to register Settings automatically for DI. This ran into problem when the container verifies the configuration is valid for a settings using the constructor for initialization. It tries to resolve the parameters and fails.

This removes the automatic registration and falls back ActivatorCreateInstance when no Setting is registered.

.github/workflows/ci.yaml

@@ -21,7 +21,7 @@ jobs:
     - name: Setup dotnet
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 5.0.202
 
     - name: Build
       shell: bash
@@ -63,7 +63,7 @@ jobs:
       - name: Setup dotnet 5.0.100
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.100
+          dotnet-version: 5.0.202
 
       - name: Integration Tests
         shell: bash

.github/workflows/docs.yaml

@@ -24,7 +24,7 @@ jobs:
     - name: Setup dotnet
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 5.0.202
 
     - name: Publish
       shell: bash

.github/workflows/publish.yaml

@@ -29,7 +29,7 @@ jobs:
     - name: Setup dotnet
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 5.0.202
 
     - name: Build
       shell: bash
@@ -72,7 +72,7 @@ jobs:
       - name: Setup dotnet 5.0.100
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.100
+          dotnet-version: 5.0.202
 
       - name: Build
         shell: bash
@@ -103,7 +103,7 @@ jobs:
       - name: Setup dotnet 5.0.100
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.100
+          dotnet-version: 5.0.202
 
       - name: Publish
         shell: bash

.gitignore

@@ -79,7 +79,6 @@ x64/
 _ReSharper*
 
 # NCrunch
-*.ncrunch*
 .*crunch*.local.xml
 _NCrunch_*
 

CONTRIBUTING.md

@@ -0,0 +1,161 @@
+# Contribution Guidelines
+
+* [Prerequisites](#prerequisites)
+* [Definition of trivial contributions](#definition-of-trivial-contributions)
+* [Code](#code)
+  * [Code style](#code-style)
+  * [Dependencies](#dependencies)
+  * [Unit tests](#unit-tests)
+* [Contributing process](#contributing-process)
+  * [Get buyoff or find open community issues or features](#get-buyoff-or-find-open-community-issues-or-features)
+  * [Set up your environment](#Set-up-your-environment)
+  * [Prepare commits](#prepare-commits)
+  * [Submit pull request](#Submit-pull-request)
+  * [Respond to feedback on pull request](#respond-to-feedback-on-pull-request)
+* [Other general information](#other-general-information)
+* [Acknowledgement](#acknowledgement)
+
+## Prerequisites
+
+By contributing to Spectre.Console, you assert that:
+
+* The contribution is your own original work.
+* You have the right to assign the copyright for the work (it is not owned by your employer, or
+  you have been given copyright assignment in writing).
+* You [license](https://github.com/spectreconsole/spectre.console/blob/main/LICENSE) the contribution under the terms applied to the rest of the Spectre.Console project.
+* You agree to follow the [code of conduct](https://github.com/spectreconsole/spectre.console/blob/main/CODE_OF_CONDUCT.md).
+
+## Definition of trivial contributions
+It's hard to define what is a trivial contribution. Sometimes even a 1 character change can be considered significant.
+Unfortunately because it can be subjective, the decision on what is trivial comes from the maintainers of the project
+and not from folks contributing to the project.
+
+What is generally considered trivial:
+
+* Fixing a typo.
+* Documentation changes.
+
+## Code
+### Code style
+
+Normal .NET coding guidelines apply.
+See the [Framework Design Guidelines](https://msdn.microsoft.com/en-us/library/ms229042%28v=vs.110%29.aspx) for more information.
+
+### Dependencies
+
+The assembly `Spectre.Console` should have no dependencies except the .NET BCL library.
+
+### Unit tests
+
+Make sure to run all unit tests before creating a pull request.
+Any new code should also have reasonable unit test coverage.
+
+## Contributing process
+### Get buyoff or find open community issues or features
+
+ * Through GitHub, or through the [GitHub discussions](https://github.com/spectreconsole/spectre.console/discussions) (preferred),
+   you talk about a feature you would like to see (or a bug), and why it should be in Spectre.Console.
+   * If approved through the GitHub discussions, ensure an accompanying GitHub issue is created with
+     information and a link back to the discussion.
+  * Once you get a nod from someone in the Spectre.Console Team, you can start on the feature.
+  * Alternatively, if a feature is on the issues list with the
+   [Up For Grabs](https://github.com/spectreconsole/spectre.console/labels/up-for-grabs) label,
+   it is open for a community member (contributor) to patch. You should comment that you are signing up for it on
+   the issue so someone else doesn't also sign up for the work.
+
+### Set up your environment
+
+ * You create, or update, a fork of `spectreconsole/spectre.console` under your GitHub account.
+ * From there you create a branch named specific to the feature.
+ * In the branch you do work specific to the feature.
+ * Please also observe the following:
+    * No reformatting
+    * No changing files that are not specific to the feature.
+    * More covered below in the **Prepare commits** section.
+ * Test your changes and please help us out by updating and implementing some automated tests.
+   It is recommended that all contributors spend some time looking over the tests in the source code.
+   You can't go wrong emulating one of the existing tests and then changing it specific to the behavior you are testing.
+ * Please do not update your branch from the main branch unless we ask you to. See the responding to feedback section below.
+
+### Prepare commits
+This section serves to help you understand what makes a good commit.
+
+A commit should observe the following:
+
+ * A commit is a small logical unit that represents a change.
+ * Should include new or changed tests relevant to the changes you are making.
+ * No unnecessary whitespace. Check for whitespace with `git diff --check` and `git diff --cached --check` before commit.
+ * You can stage parts of a file for commit.
+
+### Submit pull request
+Prerequisites:
+
+ * You are making commits in a feature branch.
+ * All code should compile without errors or warnings.
+ * All tests should be passing.
+
+Submitting PR:
+
+ * Once you feel it is ready, submit the pull request to the `spectreconsole/spectre.console` repository against the `main` branch
+   unless specifically requested to submit it against another branch.
+   * In the case of a larger change that is going to require more discussion,
+     please submit a PR sooner. Waiting until you are ready may mean more changes than you are
+     interested in if the changes are taking things in a direction the maintainers do not want to go.
+ * In the pull request, outline what you did and point to specific conversations (as in URLs)
+   and issues that you are resolving. This is a tremendous help for us in evaluation and acceptance.
+ * Once the pull request is in, please do not delete the branch or close the pull request
+   (unless something is wrong with it).
+ * One of the Spectre.Console team members, or one of the maintainers, will evaluate it within a
+   reasonable time period (which is to say usually within 1-3 weeks). Some things get evaluated
+   faster or fast tracked. We are human and we have active lives outside of open source so don't
+   fret if you haven't seen any activity on your pull request within a month or two.
+   We don't have a Service Level Agreement (SLA) for pull requests.
+   Just know that we will evaluate your pull request.
+
+### Respond to feedback on pull request
+
+We may have feedback for you to fix or change some things. We generally like to see that pushed against
+the same topic branch (it will automatically update the Pull Request). You can also fix/squash/rebase
+commits and push the same topic branch with `--force` (it's generally acceptable to do this on topic
+branches not in the main repository, it is generally unacceptable and should be avoided at all costs
+against the main repository).
+
+If we have comments or questions when we do evaluate it and receive no response, it will probably
+lessen the chance of getting accepted. Eventually, this means it will be closed if it is not accepted.
+Please know this doesn't mean we don't value your contribution, just that things go stale. If in the
+future you want to pick it back up, feel free to address our concerns/questions/feedback and reopen
+the issue/open a new PR (referencing old one).
+
+Sometimes we may need you to rebase your commit against the latest code before we can review it further.
+If this happens, you can do the following:
+
+ * `git fetch upstream` (upstream remote would be `spectreconsole/spectre.console`)
+ * `git checkout main`
+ * `git rebase upstream/main`
+ * `git checkout your-branch`
+ * `git rebase main`
+ * Fix any merge conflicts
+ * `git push origin your-branch` (origin would be your GitHub repo or `your-github-username/spectre.console` in this case).
+   You may need to `git push origin your-branch --force` to get the commits pushed.
+   This is generally acceptable with topic branches not in the mainstream repository.
+
+The only reasons a pull request should be closed and resubmitted are as follows:
+
+ * When the pull request is targeting the wrong branch (this doesn't happen as often).
+ * When there are updates made to the original by someone other than the original contributor.
+   Then the old branch is closed with a note on the newer branch this supersedes #github_number.
+
+## Other general information
+If you reformat code or hit core functionality without an approval from a person on the Spectre.Console Team,
+it's likely that no matter how awesome it looks afterwards, it will probably not get accepted.
+Reformatting code makes it harder for us to evaluate exactly what was changed.
+
+If you do these things, it will be make evaluation and acceptance easy.
+Now if you stray outside of the guidelines we have above, it doesn't mean we are going to ignore
+your pull request. It will just make things harder for us.
+Harder for us roughly translates to a longer SLA for your pull request.
+
+## Acknowledgement
+
+This contribution guide was taken from the [Chocolatey project](https://chocolatey.org/)
+with permission and was edited to follow Spectre.Console's conventions and processes.

LICENSE.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Spectre Systems AB
+Copyright (c) 2020 Patrik Svensson, Phil Scott
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

NuGet.Config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
+  </packageSources>
+</configuration>

README.fa.md

@@ -0,0 +1,77 @@
+# `Spectre.Console`
+
+_[![Spectre.Console NuGet Version](https://img.shields.io/nuget/v/spectre.console.svg?style=flat&label=NuGet%3A%20Spectre.Console)](https://www.nuget.org/packages/spectre.console)_
+
+<div dir="rtl">
+
+یک کتابخانه NET Standard 2.0/.NET 5. که ایجاد Console Applicationهای زیبا و cross platform را آسان‌تر می‌کند.  
+از کتابخانه عالی [Rich](https://github.com/willmcgugan/rich)  برای پایتون، بسیار الهام گرفته شده است.
+
+## فهرست
+
+1. [امکانات](#features)
+2. [نصب](#installing)
+3. [مستندات](#documentation)
+4. [مثال‌ها](#examples)
+5. [مجوز](#license)
+
+<h2 id="features">امکانات</h2>
+
+* با در نظر گرفتن تست واحد نوشته شده است.
+* جداول، چارچوب‌ها، پنل‌ها و یک زبان نشانه گذاری که از [rich](https://github.com/willmcgugan/rich) الهام گرفته شده است را پشتیبانی می‌کند.
+* از رایج ترین پارامترهای SRG در هنگام فرم دهی متن مانند پررنگ، کم نور، اریب، زیرخط، خط زدن و چشمک زدن پشتیبانی می‌کند.
+* پشتیبانی از رنگ‌های 28/8/4/3-بیت در ترمینال.  
+  این کتابخانه توانایی ترمینال فعلی را تشخیص داده و در صورت لزوم رنگ‌ها را کاهش می‌دهد.
+
+
+![Example](docs/input/assets/images/example.png)
+
+<h2 id="installing">نصب</h2>
+
+سریع ترین راه برای شروع `Spectre.Console` نصب از طریق NuGet Package می‌باشد.
+
+<pre dir="ltr">
+dotnet add package Spectre.Console
+</pre>
+
+<h2 id="documentation">مستندات</h2>
+
+مستندات `Spectre.Console` را در اینجا می‌توایند پیدا کنید:
+
+<div dir="ltr">
+https://spectreconsole.net/
+</div>
+
+<h2 id="examples">مثال‌ها</h2>
+
+برای بررسی `Spectre.Console` در عمل، ابزار سراسری
+[dotnet-example](https://github.com/patriksvensson/dotnet-example)
+را نصب کنید.
+
+<pre dir="ltr">
+> dotnet tool restore
+</pre>
+
+حالا شما می‌توانید مثال‌های موجود در این مخزن را لیست کنید:
+
+<pre dir="ltr">
+> dotnet example
+</pre>
+
+و برای اجرای مثال:
+
+<pre dir="ltr">
+> dotnet example tables
+</pre>
+
+<h2 id="license">مجوز</h2>
+
+<div dir="ltr">
+Copyright © Patrik Svensson, Phil Scott
+</div>
+
+همانطور که Spectre.Console تحت مجوز MIT ارائه شده است؛ برای کسب اطلاعات بیشتر به مجوز مراجعه کنید.
+
+* برای SixLabors.ImageSharp، مشاهده کنید: https://github.com/SixLabors/ImageSharp/blob/master/LICENSE
+
+</div>

README.jp.md

@@ -29,7 +29,7 @@ Python用の素晴らしい[Rich ライブラリ](https://github.com/willmcgugan
 
 ## 例
 
-![Example](resources/gfx/screenshots/example.png)
+![Example](docs/input/assets/images/example.png)
 
 ## 使用方法
 
@@ -111,6 +111,7 @@ Spectre.Consoleでできることを見るために、
 │ Panels     │ examples/Panels/Panels.csproj         │ Demonstrates how to render items in panels.          │
 │ Rules      │ examples/Rules/Rules.csproj           │ Demonstrates how to render horizontal rules (lines). │
 │ Tables     │ examples/Tables/Tables.csproj         │ Demonstrates how to render tables in a console.      │
+│ Trees      │ examples/Trees/Trees.csproj           │ Demonstrates how to render trees in a console.       │
 ╰────────────┴───────────────────────────────────────┴──────────────────────────────────────────────────────╯
 ```
 

README.md

@@ -12,6 +12,7 @@ for Python.
 2. [Installing](#installing)
 3. [Documentation](#documentation)
 4. [Examples](#examples)
+5. [Sponsors](#sponsors)
 5. [License](#license)
 
 ## Features
@@ -26,7 +27,7 @@ for Python.
   and downgrade colors as needed.  
 
 
-![Example](resources/gfx/screenshots/example.png)
+![Example](docs/input/assets/images/example.png)
 
 ## Installing
 
@@ -39,7 +40,7 @@ dotnet add package Spectre.Console
 ## Documentation
 
 The documentation for `Spectre.Console` can be found at
-https://spectresystems.github.io/spectre.console/
+https://spectreconsole.net/
 
 ## Examples
 
@@ -63,9 +64,28 @@ And to run an example:
 > dotnet example tables
 ```
 
+## Sponsors
+
+The following people are [sponsoring](https://github.com/sponsors/patriksvensson)
+Spectre.Console to show their support and to ensure the longevity of the project.
+
+* [Rodney Littles II](https://github.com/RLittlesII)
+* [Martin Björkström](https://github.com/bjorkstromm)
+* [Dave Glick](https://github.com/daveaglick)
+* [Kim Gunanrsson](https://github.com/kimgunnarsson)
+* [Andrew McClenaghan](https://github.com/andymac4182)
+* [C. Augusto Proiete](https://github.com/augustoproiete)
+* [Viktor Elofsson](https://github.com/vktr)
+* [Steven Knox](https://github.com/stevenknox)
+* [David Pendray](https://github.com/dpen2000)
+* [Elmah.io](https://github.com/elmahio)
+
+I really appreciate it.  
+**Thank you very much!**
+
 ## License
 
-Copyright © Spectre Systems.
+Copyright © Patrik Svensson, Phil Scott
 
 Spectre.Console is provided as-is under the MIT license. For more information see LICENSE.
 

README.zh.md

@@ -34,7 +34,7 @@ dotnet add package Spectre.Console
 ## 文档
 
 `Spectre.Console`的文档可以在这里查看
-https://spectresystems.github.io/spectre.console/
+https://spectreconsole.net/
 
 ## 例子
 
@@ -58,7 +58,7 @@ https://spectresystems.github.io/spectre.console/
 
 ## License
 
-版权所有 © Spectre Systems。
+版权所有 © Patrik Svensson, Phil Scott
 
 Spectre.Console 基于 MIT 协议提供。查看 LICENSE 文件了解更多信息。
 

docs/Preview.ps1

@@ -1 +1 @@
-dotnet run -- preview --virtual-dir "spectre.console"
+dotnet run -- preview

docs/Program.cs

@@ -11,11 +11,10 @@ namespace Docs
         public static async Task<int> Main(string[] args) =>
             await Bootstrapper.Factory
                 .CreateWeb(args)
-                .AddSetting(Keys.Host, "spectresystems.github.io")
-                .AddSetting(Keys.LinkRoot, "/spectre.console")
+                .AddSetting(Keys.Host, "spectreconsole.net")
                 .AddSetting(Keys.LinksUseHttps, true)
                 .AddSetting(Constants.EditLink, ConfigureEditLink())
-                .ConfigureSite("spectresystems", "spectre.console", "main")
+                .ConfigureSite("spectreconsole", "spectre.console", "main")
                 .ConfigureDeployment(deployBranch: "docs")
                 .AddShortcode("Children", typeof(ChildrenShortcode))
                 .AddShortcode("ColorTable", typeof(ColorTableShortcode))

docs/README.md

@@ -1,13 +1,13 @@
 # Documentation
 
-To start contributing to the [Spectre.Console](https://github.com/spectresystems/spectre.console) documentation, you will need the [.NET Core SDK](https://dot.net) 3.1 or higher.
+To start contributing to the [Spectre.Console](https://github.com/spectreconsole/spectre.console) documentation, you will need the [.NET Core SDK](https://dot.net) 3.1 or higher.
 
 ## Running Preview Site
 
 The documentation site uses [Statiq](https://statiq.dev), a static site generator. To build the documentation site run the following in a command-line terminal.
 
 ```
-> dotnet run preview --virtual-dir "spectre.console"
+> Preview.ps1
 ```
 
 After the build is complete, you can navigate to [http://localhost:5080/spectre.console](http://localhost:5080/spectre.console).
@@ -29,19 +29,13 @@ Layout and styling can also be found in the [input](./input) directory. Look for
     
 ## Custom Build Features
 
-The documentation site has custom enhancements to Statiq located under the [./src](./src) directory. Enhancements to the build process include:
-
-- [Extension Methods](./src/Extensions)
-- [Models](./src/Models)
-- [Pipelines](./src/Pipelines)
-- [Shortcodes](./src/Shortcodes)
-- [Utilities](./src/Utilities)
+The documentation site has custom enhancements to Statiq located under the [./src](./src) directory.
 
 ## License
 
 MIT License
 
-Copyright (c) 2020 Spectre Systems AB
+Copyright (c) 2020 Patrik Svensson, Phil Scott
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

docs/input/CNAME

@@ -0,0 +1 @@
+spectreconsole.net

docs/input/_layout.cshtml

@@ -41,7 +41,7 @@
                                 <a class="nav-link font-weight-light font-size-lg text-red" href="https://github.com/sponsors/patriksvensson"><i class="far fa-heart"></i> Sponsor</a>
                             </li>
                             <li class="nav-item">
-                                <a class="nav-link font-weight-light font-size-lg" href="https://github.com/spectresystems/spectre.console"><i class="fab fa-github"></i> GitHub</a>
+                                <a class="nav-link font-weight-light font-size-lg" href="https://github.com/spectreconsole/spectre.console"><i class="fab fa-github"></i> GitHub</a>
                             </li>
                         </ul>
                     </div>
@@ -203,7 +203,7 @@
         <div id="footer" class="p-3 text-white font-size-sm">
             <div class="container">
                 <div>
-                    <span>© @DateTime.Today.Year Spectre Systems AB</span>
+                    <span>© @DateTime.Today.Year Patrik Svensson, Phil Scott</span>
                     <span class="float-right" style="color: #888888;">@VersionUtilities.GetVersion()</span>
                 </div>
             </div>

docs/input/cli/introduction.md

@@ -58,21 +58,25 @@ in the previous step.
 ```csharp
 public class AddPackageCommand : Command<AddPackageSettings>
 {
-    public override int Execute(AddPackageSettings settings, ILookup<string, string> remaining)
+    public override int Execute(CommandContext context, AddPackageSettings settings)
     {
         // Omitted
+        return 0;
     }
 }
 
 public class AddReferenceCommand : Command<AddReferenceSettings>
 {
-    public override int Execute(AddReferenceSettings settings, ILookup<string, string> remaining)
+    public override int Execute(CommandContext context, AddReferenceSettings settings)
     {
         // Omitted
+        return 0;
     }
 }
 ```
 
+You can use `AsyncCommand` if you need async support.
+
 ## Let's tie it together
 
 Now when we have our commands and settings implemented, we can compose a command tree
@@ -114,4 +118,4 @@ This make the resulting code very clean and easy to navigate, not to mention to
 And most importantly at all, the type system guides me to do the right thing. I can't configure 
 commands in non-compatible ways, and if I want to add a new top-level `add-package` command 
 (or move the command completely), it's just a single line to change. This makes it easy to 
-experiment and makes the CLI experience a first class citizen of your application.
+experiment and makes the CLI experience a first class citizen of your application.

docs/input/exceptions.md

@@ -2,7 +2,7 @@ Title: Exceptions
 Order: 3
 ---
 
-Exceptions isn't always readable when viewed in the terminal.  
+Exceptions aren't always readable when viewed in the terminal.  
 You can make exception a bit more readable by using the `WriteException` method.
 
 ```csharp

docs/input/index.md

@@ -22,5 +22,5 @@ for Python written by Will McGugan.
 
 ## Examples
 
-<img src="assets/images/table.gif" style="max-width: 100%; margin-top: 15px; margin-bottom: 25px;" />
-<img src="https://github.com/spectresystems/spectre.console/raw/main/resources/gfx/screenshots/example.png" style="max-width: 100%;" />
+<img src="./assets/images/example.png" style="max-width: 100%; margin-top: 15px; margin-bottom: 25px;" />
+<img src="./assets/images/table.gif" style="max-width: 100%;" />

docs/input/live/index.cshtml

@@ -0,0 +1,12 @@
+Title: Live Displays
+Order: 4
+---
+
+<h1>Sections</h1>
+
+<ul>
+@foreach (IDocument child in OutputPages.GetChildrenOf(Document))
+{
+  <li>@Html.DocumentLink(child)</li>
+}
+</ul>

docs/input/live/progress.md

@@ -1,16 +1,23 @@
 Title: Progress
 Order: 5
+RedirectFrom: progress
 ---
 
 Spectre.Console can display information about long running tasks in the console. 
 
-<img src="assets/images/progress.png" style="max-width: 100%;margin-bottom:20px;">
+<img src="../assets/images/progress.png" style="max-width: 100%;margin-bottom:20px;">
+
+<div class="alert alert-warning" role="alert">
+  <i class="fas fa-exclamation-triangle icon-web"></i> The progress display is not 
+  thread safe, and using it together with other interactive components such as 
+  prompts, status displays or other progress displays are not supported.
+</div>
 
 If the current terminal isn't considered "interactive", such as when running 
 in a continuous integration system, or the terminal can't display 
 ANSI control sequence, any progress will be displayed in a simpler way.
 
-<img src="assets/images/progress_fallback.png" style="max-width: 100%;">
+<img src="../assets/images/progress_fallback.png" style="max-width: 100%;">
 
 # Usage
 
@@ -63,6 +70,7 @@ await AnsiConsole.Progress()
 AnsiConsole.Progress()
     .AutoRefresh(false) // Turn off auto refresh
     .AutoClear(false)   // Do not remove the task list when done
+    .HideCompleted(false)   // Hide tasks as they are completed
     .Columns(new ProgressColumn[] 
     {
         new TaskDescriptionColumn(),    // Task description

docs/input/live/status.md

@@ -1,10 +1,17 @@
 Title: Status
 Order: 6
+RedirectFrom: status
 ---
 
 Spectre.Console can display information about long running tasks in the console. 
 
-<img src="assets/images/status.gif" style="max-width: 100%;margin-bottom:20px;">
+<img src="../assets/images/status.gif" style="max-width: 100%;margin-bottom:20px;">
+
+<div class="alert alert-warning" role="alert">
+  <i class="fas fa-exclamation-triangle icon-web"></i> The status display is not 
+  thread safe, and using it together with other interactive components such as 
+  prompts, progress displays or other status displays are not supported.
+</div>
 
 If the current terminal isn't considered "interactive", such as when running 
 in a continuous integration system, or the terminal can't display 

docs/input/prompts/index.cshtml

@@ -0,0 +1,12 @@
+Title: Prompts
+Order: 5
+---
+
+<h1>Sections</h1>
+
+<ul>
+@foreach (IDocument child in OutputPages.GetChildrenOf(Document))
+{
+  <li>@Html.DocumentLink(child)</li>
+}
+</ul>

docs/input/prompts/multiselection.md

@@ -0,0 +1,40 @@
+Title: Multi Selection
+Order: 3
+---
+
+The `MultiSelectionPrompt` can be used when you want the user to select
+one or many items from a provided list.
+
+<img src="../assets/images/multiselection.gif" style="width: 100%;" />
+
+<div class="alert alert-warning" role="alert" style="margin-top:20px;">
+  <i class="fas fa-exclamation-triangle icon-web"></i> The use of prompts 
+  insides status or progress displays is not supported.
+</div>
+
+# Usage
+
+```csharp
+// Ask for the user's favorite fruits
+var fruits = AnsiConsole.Prompt(
+    new MultiSelectionPrompt<string>()
+        .Title("What are your [green]favorite fruits[/]?")
+        .NotRequired() // Not required to have a favorite fruit
+        .PageSize(10)
+        .MoreChoicesText("[grey](Move up and down to reveal more fruits)[/]")
+        .InstructionsText(
+            "[grey](Press [blue]<space>[/] to toggle a fruit, " + 
+            "[green]<enter>[/] to accept)[/]")
+        .AddChoice("Apple")
+        .AddChoices(new[] {
+            "Apricot", "Avocado", 
+            "Banana", "Blackcurrant", "Blueberry",
+            "Cherry", "Cloudberry", "Cocunut",
+        }));
+
+// Write the selected fruits to the terminal
+foreach (string fruit in fruits) 
+{
+    AnsiConsole.WriteLine(fruit);
+}
+```

docs/input/prompts/selection.md

@@ -0,0 +1,33 @@
+Title: Selection
+Order: 1
+---
+
+The `SelectionPrompt` can be used when you want the user to select
+a single item from a provided list.
+
+<img src="../assets/images/selection.gif" style="width: 100%;" />
+
+<div class="alert alert-warning" role="alert" style="margin-top:20px;">
+  <i class="fas fa-exclamation-triangle icon-web"></i> Using prompts inside 
+  status or progress displays, are not supported.
+</div>
+
+# Usage
+
+```csharp
+// Ask for the user's favorite fruit
+var fruit = AnsiConsole.Prompt(
+    new SelectionPrompt<string>()
+        .Title("What's your [green]favorite fruit[/]?")
+        .PageSize(10)
+        .MoreChoicesText("[grey](Move up and down to reveal more fruits)[/]")
+        .AddChoice("Apple")
+        .AddChoices(new[] {
+            "Apricot", "Avocado", 
+            "Banana", "Blackcurrant", "Blueberry",
+            "Cherry", "Cloudberry", "Cocunut",
+        }));
+
+// Echo the fruit back to the terminal
+AnsiConsole.WriteLine($"I agree. {fruit} is tasty!");
+```

docs/input/prompts/text.md

@@ -1,10 +1,16 @@
-Title: Prompt
-Order: 4
+Title: Text prompt
+Order: 0
+RedirectFrom: prompt
 ---
 
 Sometimes you want to get some input from the user, and for this
 you can use the `Prompt<TResult>`.
 
+<div class="alert alert-warning" role="alert">
+  <i class="fas fa-exclamation-triangle icon-web"></i> The use of prompts 
+  insides status or progress displays is not supported.
+</div>
+
 # Confirmation
 
 ```csharp

docs/input/sponsors.md

@@ -0,0 +1,20 @@
+Title: Sponsors
+Order: 0
+---
+
+The following people are [sponsoring](https://github.com/sponsors/patriksvensson)
+Spectre.Console to show their support and to ensure the longevity of the project.
+
+* [Rodney Littles II](https://github.com/RLittlesII)
+* [Martin Björkström](https://github.com/bjorkstromm)
+* [Dave Glick](https://github.com/daveaglick)
+* [Kim Gunanrsson](https://github.com/kimgunnarsson)
+* [Andrew McClenaghan](https://github.com/andymac4182)
+* [C. Augusto Proiete](https://github.com/augustoproiete)
+* [Viktor Elofsson](https://github.com/vktr)
+* [Steven Knox](https://github.com/stevenknox)
+* [David Pendray](https://github.com/dpen2000)
+* [Elmah.io](https://github.com/elmahio)
+
+I really appreciate it.  
+**Thank you very much!**

docs/input/widgets/barchart.md

@@ -1,5 +1,5 @@
 Title: Bar Chart
-Order: 1
+Order: 20
 ---
 
 Use `BarChart` to render bar charts to the console.

docs/input/widgets/calendar.md

@@ -1,5 +1,5 @@
 Title: Calendar
-Order: 3
+Order: 40
 RedirectFrom: calendar
 ---
 

docs/input/widgets/canvas-image.md

@@ -1,5 +1,5 @@
 Title: Canvas Image
-Order: 6
+Order: 70
 ---
 
 To add [ImageSharp](https://github.com/SixLabors/ImageSharp) superpowers to 

docs/input/widgets/canvas.md

@@ -1,5 +1,5 @@
 Title: Canvas
-Order: 5
+Order: 60
 ---
 
 `Canvas` is a widget that allows you to render arbitrary "pixels" 

docs/input/widgets/figlet.md

@@ -1,5 +1,5 @@
 Title: Figlet
-Order: 4
+Order: 50
 RedirectFrom: figlet
 ---
 

docs/input/widgets/rule.md

@@ -1,5 +1,5 @@
 Title: Rule
-Order: 2
+Order: 30
 RedirectFrom: rule
 ---
 

docs/input/widgets/tree.md

@@ -0,0 +1,70 @@
+Title: Tree
+Order: 10
+---
+
+The `Tree` widget can be used to render hierarchical data.
+
+<img src="../assets/images/tree.png" style="width: 100%;" />
+
+# Usage
+
+```csharp
+// Create the tree
+var root = new Tree("Root");
+
+// Add some nodes
+var foo = root.AddNode("[yellow]Foo[/]");
+var table = foo.AddNode(new Table()
+    .RoundedBorder()
+    .AddColumn("First")
+    .AddColumn("Second")
+    .AddRow("1", "2")
+    .AddRow("3", "4")
+    .AddRow("5", "6"));
+
+table.AddNode("[blue]Baz[/]");
+foo.AddNode("Qux");
+
+var bar = root.AddNode("[yellow]Bar[/]");
+bar.AddNode(new Calendar(2020, 12)
+    .AddCalendarEvent(2020, 12, 12)
+    .HideHeader());
+
+// Render the tree
+AnsiConsole.Render(root);
+```
+
+# Collapsing nodes
+
+```csharp
+root.AddNode("Label").Collapsed();
+```
+
+# Appearance
+
+## Style
+
+```csharp
+var root = new Tree("Root")
+    .Style("white on red");
+```
+
+## Guide lines
+
+```csharp
+// ASCII guide lines
+var root = new Tree("Root")
+    .Guide(TreeGuide.Ascii);
+
+// Default guide lines
+var root = new Tree("Root")
+    .Guide(TreeGuide.Line);
+
+// Double guide lines
+var root = new Tree("Root")
+    .Guide(TreeGuide.DoubleLine);
+
+// Bold guide lines
+var root = new Tree("Root")
+    .Guide(TreeGuide.BoldLine);
+```

docs/src/Constants.cs

@@ -17,7 +17,7 @@ namespace Docs
 
         public static class Colors
         {
-            public const string Url = "https://raw.githubusercontent.com/spectresystems/spectre.console/main/resources/scripts/Generator/Data/colors.json";
+            public const string Url = "https://raw.githubusercontent.com/spectreconsole/spectre.console/main/resources/scripts/Generator/Data/colors.json";
             public const string Root = "COLORS_ROOT";
         }
 

dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "1.0.0-rc0002",
+      "version": "1.1.0",
       "commands": [
         "dotnet-cake"
       ]

examples/Cli/Delegates/BarSettings.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using Spectre.Console.Cli;
 
-namespace Delegates
+namespace Spectre.Console.Examples
 {
     public static partial class Program
     {

examples/Cli/Delegates/Delegates.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Cli/Delegates/Program.cs

@@ -1,7 +1,6 @@
-using System;
 using Spectre.Console.Cli;
 
-namespace Delegates
+namespace Spectre.Console.Examples
 {
     public static partial class Program
     {
@@ -22,7 +21,7 @@ namespace Delegates
 
         private static int Foo(CommandContext context)
         {
-            Console.WriteLine("Foo");
+            AnsiConsole.WriteLine("Foo");
             return 0;
         }
 
@@ -30,7 +29,7 @@ namespace Delegates
         {
             for (var index = 0; index < settings.Count; index++)
             {
-                Console.WriteLine("Bar");
+                AnsiConsole.WriteLine("Bar");
             }
 
             return 0;

examples/Cli/Dynamic/Dynamic.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Cli/Dynamic/MyCommand.cs

@@ -1,7 +1,7 @@
 using System;
 using Spectre.Console.Cli;
 
-namespace Dynamic
+namespace Spectre.Console.Examples
 {
     public sealed class MyCommand : Command
     {
@@ -13,7 +13,7 @@ namespace Dynamic
                 
             }
 
-            Console.WriteLine("Value = {0}", data);
+            AnsiConsole.WriteLine("Value = {0}", data);
             return 0;
         }
     }

examples/Cli/Dynamic/Program.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 using Spectre.Console.Cli;
 
-namespace Dynamic
+namespace Spectre.Console.Examples
 {
     public static class Program
     {

examples/Cli/Injection/Commands/DefaultCommand.cs

@@ -2,7 +2,7 @@ using System;
 using System.ComponentModel;
 using Spectre.Console.Cli;
 
-namespace Injection.Commands
+namespace Spectre.Console.Examples
 {
     public sealed class DefaultCommand : Command<DefaultCommand.Settings>
     {

examples/Cli/Injection/IGreeter.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace Injection
+namespace Spectre.Console.Examples
 {
     public interface IGreeter
     {
@@ -11,7 +9,7 @@ namespace Injection
     {
         public void Greet(string name)
         {
-            Console.WriteLine($"Hello {name}!");
+            AnsiConsole.WriteLine($"Hello {name}!");
         }
     }
 }

examples/Cli/Injection/Infrastructure/TypeRegistrar.cs

@@ -2,7 +2,7 @@ using System;
 using Microsoft.Extensions.DependencyInjection;
 using Spectre.Console.Cli;
 
-namespace Injection
+namespace Spectre.Console.Examples
 {
     public sealed class TypeRegistrar : ITypeRegistrar
     {
@@ -27,5 +27,15 @@ namespace Injection
         {
             _builder.AddSingleton(service, implementation);
         }
+
+        public void RegisterLazy(Type service, Func<object> func)
+        {
+            if (func is null)
+            {
+                throw new ArgumentNullException(nameof(func));
+            }
+
+            _builder.AddSingleton(service, (provider) => func());
+        }
     }
 }

examples/Cli/Injection/Infrastructure/TypeResolver.cs

@@ -2,9 +2,9 @@ using System;
 using Microsoft.Extensions.DependencyInjection;
 using Spectre.Console.Cli;
 
-namespace Injection
+namespace Spectre.Console.Examples
 {
-    public sealed class TypeResolver : ITypeResolver
+    public sealed class TypeResolver : ITypeResolver, IDisposable
     {
         private readonly IServiceProvider _provider;
 
@@ -17,5 +17,13 @@ namespace Injection
         {
             return _provider.GetRequiredService(type);
         }
+
+        public void Dispose()
+        {
+            if (_provider is IDisposable disposable)
+            {
+                disposable.Dispose();
+            }
+        }
     }
 }

examples/Cli/Injection/Injection.csproj

@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Cli/Injection/Program.cs

@@ -1,8 +1,7 @@
-using Injection.Commands;
 using Microsoft.Extensions.DependencyInjection;
 using Spectre.Console.Cli;
 
-namespace Injection
+namespace Spectre.Console.Examples
 {
     public class Program
     {

examples/Cli/Logging/Commands/HelloCommand.cs

@@ -0,0 +1,34 @@
+using Microsoft.Extensions.Logging;
+using Spectre.Console.Cli;
+
+namespace Spectre.Console.Examples
+{
+    public class HelloCommand : Command<HelloCommand.Settings>
+    {
+        private ILogger<HelloCommand> _logger;
+        private IAnsiConsole _console;
+
+        public HelloCommand(IAnsiConsole console, ILogger<HelloCommand> logger)
+        {
+            _console = console;
+            _logger = logger;
+            _logger.LogDebug("{0} initialized", nameof(HelloCommand));
+        }
+
+        public class Settings : LogCommandSettings
+        {
+            [CommandArgument(0, "[Name]")]
+            public string Name { get; set; }
+        }
+
+
+        public override int Execute(CommandContext context, Settings settings)
+        {
+            _logger.LogInformation("Starting my command");
+            AnsiConsole.MarkupLine($"Hello, [blue]{settings.Name}[/]");
+            _logger.LogInformation("Completed my command");
+
+            return 0;
+        }
+    }
+}

examples/Cli/Logging/Commands/LogCommandSettings.cs

@@ -0,0 +1,56 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Globalization;
+using Serilog.Events;
+using Spectre.Console.Cli;
+
+namespace Spectre.Console.Examples
+{
+    public class LogCommandSettings : CommandSettings
+    {
+        [CommandOption("--logFile")]
+        [Description("Path and file name for logging")]
+        public string LogFile { get; set; }
+
+        [CommandOption("--logLevel")]
+        [Description("Minimum level for logging")]
+        [TypeConverter(typeof(VerbosityConverter))]
+        [DefaultValue(LogEventLevel.Information)]
+        public LogEventLevel LogLevel { get; set; }
+    }
+
+    public sealed class VerbosityConverter : TypeConverter
+    {
+        private readonly Dictionary<string, LogEventLevel> _lookup;
+
+        public VerbosityConverter()
+        {
+            _lookup = new Dictionary<string, LogEventLevel>(StringComparer.OrdinalIgnoreCase)
+            {
+                {"d", LogEventLevel.Debug},
+                {"v", LogEventLevel.Verbose},
+                {"i", LogEventLevel.Information},
+                {"w", LogEventLevel.Warning},
+                {"e", LogEventLevel.Error},
+                {"f", LogEventLevel.Fatal}
+            };
+        }
+
+        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        {
+            if (value is string stringValue)
+            {
+                var result = _lookup.TryGetValue(stringValue, out var verbosity);
+                if (!result)
+                {
+                    const string format = "The value '{0}' is not a valid verbosity.";
+                    var message = string.Format(CultureInfo.InvariantCulture, format, value);
+                    throw new InvalidOperationException(message);
+                }
+                return verbosity;
+            }
+            throw new NotSupportedException("Can't convert value to verbosity.");
+        }
+    }
+}

examples/Cli/Logging/Infrastructure/LogInterceptor.cs

@@ -0,0 +1,19 @@
+using Serilog.Core;
+using Spectre.Console.Cli;
+
+namespace Spectre.Console.Examples
+{
+    public class LogInterceptor : ICommandInterceptor
+    {
+        public static readonly LoggingLevelSwitch LogLevel = new();
+
+        public void Intercept(CommandContext context, CommandSettings settings)
+        {
+            if (settings is LogCommandSettings logSettings)
+            {
+                LoggingEnricher.Path = logSettings.LogFile ?? "application.log";
+                LogLevel.MinimumLevel = logSettings.LogLevel;
+            }
+        }
+    }
+}

examples/Cli/Logging/Infrastructure/LoggingEnricher.cs

@@ -0,0 +1,38 @@
+using Serilog.Core;
+using Serilog.Events;
+
+namespace Spectre.Console.Examples
+{
+    internal class LoggingEnricher : ILogEventEnricher
+    {
+        private string _cachedLogFilePath;
+        private LogEventProperty _cachedLogFilePathProperty;
+
+        // this path and level will be set by the LogInterceptor.cs after parsing the settings
+        public static string Path = string.Empty;
+
+        public const string LogFilePathPropertyName = "LogFilePath";
+
+        public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
+        {
+            // the settings might not have a path or we might not be within a command in which case
+            // we won't have the setting so a default value for the log file will be required
+            LogEventProperty logFilePathProperty;
+
+            if (_cachedLogFilePathProperty != null && Path.Equals(_cachedLogFilePath))
+            {
+                // Path hasn't changed, so let's use the cached property
+                logFilePathProperty = _cachedLogFilePathProperty;
+            }
+            else
+            {
+                // We've got a new path for the log. Let's create a new property
+                // and cache it for future log events to use
+                _cachedLogFilePath = Path;
+                _cachedLogFilePathProperty = logFilePathProperty = propertyFactory.CreateProperty(LogFilePathPropertyName, Path);
+            }
+
+            logEvent.AddPropertyIfAbsent(logFilePathProperty);
+        }
+    }
+}

examples/Cli/Logging/Infrastructure/TypeRegistrar.cs

@@ -0,0 +1,41 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Spectre.Console.Cli;
+
+namespace Spectre.Console.Examples
+{
+    public sealed class TypeRegistrar : ITypeRegistrar
+    {
+        private readonly IServiceCollection _builder;
+
+        public TypeRegistrar(IServiceCollection builder)
+        {
+            _builder = builder;
+        }
+
+        public ITypeResolver Build()
+        {
+            return new TypeResolver(_builder.BuildServiceProvider());
+        }
+
+        public void Register(Type service, Type implementation)
+        {
+            _builder.AddSingleton(service, implementation);
+        }
+
+        public void RegisterInstance(Type service, object implementation)
+        {
+            _builder.AddSingleton(service, implementation);
+        }
+
+        public void RegisterLazy(Type service, Func<object> func)
+        {
+            if (func is null)
+            {
+                throw new ArgumentNullException(nameof(func));
+            }
+
+            _builder.AddSingleton(service, _ => func());
+        }
+    }
+}

examples/Cli/Logging/Infrastructure/TypeResolver.cs

@@ -0,0 +1,21 @@
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Spectre.Console.Cli;
+
+namespace Spectre.Console.Examples
+{
+    public sealed class TypeResolver : ITypeResolver
+    {
+        private readonly IServiceProvider _provider;
+
+        public TypeResolver(IServiceProvider provider)
+        {
+            _provider = provider ?? throw new ArgumentNullException(nameof(provider));
+        }
+
+        public object Resolve(Type type)
+        {
+            return _provider.GetRequiredService(type);
+        }
+    }
+}

examples/Cli/Logging/Logging.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net5.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <ExampleName>Logging</ExampleName>
+    <ExampleDescription>Demonstrates how to dynamically configure Serilog for logging using parameters from a command.</ExampleDescription>
+    <ExampleGroup>Cli</ExampleGroup>
+    <ExampleVisible>false</ExampleVisible>
+    <Nullable>disable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
+    <PackageReference Include="Serilog" Version="2.10.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
+    <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
+    <PackageReference Include="Serilog.Sinks.Map" Version="1.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
+  </ItemGroup>
+
+</Project>

examples/Cli/Logging/Program.cs

@@ -0,0 +1,53 @@
+using Microsoft.Extensions.DependencyInjection;
+using Serilog;
+using Spectre.Console.Cli;
+
+/*
+ * Dynamically control serilog configuration via command line parameters
+ *
+ * This works around the chicken and egg situation with configuring serilog via the command line.
+ * The logger needs to be configured prior to executing the parser, but the logger needs the parsed values
+ * to be configured. By using serilog.sinks.map we can defer configuration. We use a LogLevelSwitch to control the
+ * logging levels dynamically, and then we use a serilog enricher that has it's state populated via a
+ * Spectre.Console CommandInterceptor
+ */
+
+namespace Spectre.Console.Examples
+{
+    public class Program
+    {
+        static int Main(string[] args)
+        {
+            // to retrieve the log file name, we must first parse the command settings
+            // this will require us to delay setting the file path for the file writer.
+            // With serilog we can use an enricher and Serilog.Sinks.Map to dynamically
+            // pull this setting.
+            var serviceCollection = new ServiceCollection()
+                .AddLogging(configure =>
+                    configure.AddSerilog(new LoggerConfiguration()
+                        // log level will be dynamically be controlled by our log interceptor upon running
+                        .MinimumLevel.ControlledBy(LogInterceptor.LogLevel)
+                        // the log enricher will add a new property with the log file path from the settings
+                        // that we can use to set the path dynamically
+                        .Enrich.With<LoggingEnricher>()
+                        // serilog.sinks.map will defer the configuration of the sink to be ondemand
+                        // allowing us to look at the properties set by the enricher to set the path appropriately
+                        .WriteTo.Map(LoggingEnricher.LogFilePathPropertyName,
+                            (logFilePath, wt) => wt.File($"{logFilePath}"), 1)
+                        .CreateLogger()
+                    )
+                );
+
+            var registrar = new TypeRegistrar(serviceCollection);
+            var app = new CommandApp(registrar);
+
+            app.Configure(config =>
+            {
+                config.SetInterceptor(new LogInterceptor()); // add the interceptor
+                config.AddCommand<HelloCommand>("hello");
+            });
+
+            return app.Run(args);
+        }
+    }
+}

examples/Console/Borders/Borders.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Console/Borders/Program.cs

@@ -1,7 +1,6 @@
-using Spectre.Console;
 using Spectre.Console.Rendering;
 
-namespace BordersExample
+namespace Spectre.Console.Examples
 {
     public static class Program
     {

examples/Console/Calendars/Calendars.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Console/Calendars/Program.cs

@@ -1,6 +1,4 @@
-using Spectre.Console;
-
-namespace Calendars
+namespace Spectre.Console.Examples
 {
     public static class Program
     {

examples/Console/Canvas/Canvas.csproj

@@ -2,21 +2,21 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <ExampleTitle>Canvas</ExampleTitle>
     <ExampleDescription>Demonstrates how to render pixels and images.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>
   </PropertyGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
     <ProjectReference Include="..\..\..\src\Spectre.Console.ImageSharp\Spectre.Console.ImageSharp.csproj" />
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="cake.png">
+    <EmbeddedResource Include="cake.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    </EmbeddedResource>
   </ItemGroup>
 
 </Project>

examples/Console/Canvas/Mandelbrot.cs

@@ -4,9 +4,8 @@ Licensed under GNU Free Documentation License 1.2
 */
 
 using System;
-using Spectre.Console;
 
-namespace CanvasExample
+namespace Spectre.Console.Examples
 {
     public static class Mandelbrot
     {

examples/Console/Canvas/Program.cs

@@ -1,8 +1,9 @@
+using System.Diagnostics;
+using System.Reflection;
 using SixLabors.ImageSharp.Processing;
-using Spectre.Console;
 using Spectre.Console.Rendering;
 
-namespace CanvasExample
+namespace Spectre.Console.Examples
 {
     public static class Program
     {
@@ -23,6 +24,16 @@ namespace CanvasExample
             image.NoMaxWidth();
             image.Mutate(ctx => ctx.Grayscale().Rotate(-45).EntropyCrop());
             Render(image, "Image from file (fit, greyscale, rotated)");
+
+            // Draw image again, but load from embedded resource rather than file
+            using (var fileStream = Assembly.GetExecutingAssembly().GetManifestResourceStream("Canvas.cake.png"))
+            {
+                Debug.Assert(fileStream != null);
+                var embeddedImage = new CanvasImage(fileStream);
+                embeddedImage.BilinearResampler();
+                embeddedImage.MaxWidth(16);
+                Render(embeddedImage, "Image from embedded resource (16 wide)");
+            }
         }
 
         private static void Render(IRenderable canvas, string title)

examples/Console/Charts/Charts.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Console/Charts/Program.cs

@@ -1,21 +1,41 @@
-using Spectre.Console;
+using Spectre.Console.Rendering;
 
-namespace InfoExample
+namespace Spectre.Console.Examples
 {
     public static class Program
     {
         public static void Main()
         {
-            var chart = new BarChart()
+            // Render a bar chart
+            AnsiConsole.WriteLine();
+            Render("Fruits per month", new BarChart()
                 .Width(60)
                 .Label("[green bold underline]Number of fruits[/]")
                 .CenterLabel()
                 .AddItem("Apple", 12, Color.Yellow)
                 .AddItem("Orange", 54, Color.Green)
-                .AddItem("Banana", 33, Color.Red);
+                .AddItem("Banana", 33, Color.Red));
 
+            // Render a breakdown chart
             AnsiConsole.WriteLine();
-            AnsiConsole.Render(chart);
+            Render("Languages used", new BreakdownChart()
+                .FullSize()
+                .Width(60)
+                .ShowPercentage()
+                .AddItem("SCSS", 37, Color.Red)
+                .AddItem("HTML", 28.3, Color.Blue)
+                .AddItem("C#", 22.6, Color.Green)
+                .AddItem("JavaScript", 6, Color.Yellow)
+                .AddItem("Ruby", 6, Color.LightGreen)
+                .AddItem("Shell", 0.1, Color.Aqua));
+        }
+
+        private static void Render(string title, IRenderable chart)
+        {
+            AnsiConsole.Render(
+                new Panel(chart)
+                    .Padding(1, 1)
+                    .Header(title));
         }
     }
 }

examples/Console/Colors/Colors.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Console/Colors/Program.cs

@@ -1,27 +1,23 @@
-using Spectre.Console;
-
-namespace ColorExample
+namespace Spectre.Console.Examples
 {
     public static class Program
     {
         public static void Main()
         {
-            if (AnsiConsole.Capabilities.ColorSystem == ColorSystem.NoColors)
+            /////////////////////////////////////////////////////////////////
+            // No colors
+            /////////////////////////////////////////////////////////////////
+            if (AnsiConsole.Profile.Capabilities.ColorSystem == ColorSystem.NoColors)
             {
-                /////////////////////////////////////////////////////////////////
-                // No colors
-                /////////////////////////////////////////////////////////////////
-
                 AnsiConsole.WriteLine("No colors are supported.");
                 return;
             }
 
-            if (AnsiConsole.Capabilities.Supports(ColorSystem.Legacy))
+            /////////////////////////////////////////////////////////////////
+            // 3-BIT
+            /////////////////////////////////////////////////////////////////
+            if (AnsiConsole.Profile.Supports(ColorSystem.Legacy))
             {
-                /////////////////////////////////////////////////////////////////
-                // 3-BIT
-                /////////////////////////////////////////////////////////////////
-
                 AnsiConsole.ResetColors();
                 AnsiConsole.WriteLine();
                 AnsiConsole.Render(new Rule("[yellow bold underline]3-bit Colors[/]").RuleStyle("grey").LeftAligned());
@@ -30,6 +26,7 @@ namespace ColorExample
                 for (var i = 0; i < 8; i++)
                 {
                     AnsiConsole.Background = Color.FromInt32(i);
+                    AnsiConsole.Foreground = AnsiConsole.Background.GetInvertedColor();
                     AnsiConsole.Write(string.Format(" {0,-9}", AnsiConsole.Background.ToString()));
                     AnsiConsole.ResetColors();
                     if ((i + 1) % 8 == 0)
@@ -39,12 +36,11 @@ namespace ColorExample
                 }
             }
 
-            if (AnsiConsole.Capabilities.Supports(ColorSystem.Standard))
+            /////////////////////////////////////////////////////////////////
+            // 4-BIT
+            /////////////////////////////////////////////////////////////////
+            if (AnsiConsole.Profile.Supports(ColorSystem.Standard))
             {
-                /////////////////////////////////////////////////////////////////
-                // 4-BIT
-                /////////////////////////////////////////////////////////////////
-
                 AnsiConsole.ResetColors();
                 AnsiConsole.WriteLine();
                 AnsiConsole.Render(new Rule("[yellow bold underline]4-bit Colors[/]").RuleStyle("grey").LeftAligned());
@@ -53,6 +49,7 @@ namespace ColorExample
                 for (var i = 0; i < 16; i++)
                 {
                     AnsiConsole.Background = Color.FromInt32(i);
+                    AnsiConsole.Foreground = AnsiConsole.Background.GetInvertedColor();
                     AnsiConsole.Write(string.Format(" {0,-9}", AnsiConsole.Background.ToString()));
                     AnsiConsole.ResetColors();
                     if ((i + 1) % 8 == 0)
@@ -62,12 +59,11 @@ namespace ColorExample
                 }
             }
 
-            if (AnsiConsole.Capabilities.Supports(ColorSystem.EightBit))
+            /////////////////////////////////////////////////////////////////
+            // 8-BIT
+            /////////////////////////////////////////////////////////////////
+            if (AnsiConsole.Profile.Supports(ColorSystem.EightBit))
             {
-                /////////////////////////////////////////////////////////////////
-                // 8-BIT
-                /////////////////////////////////////////////////////////////////
-
                 AnsiConsole.ResetColors();
                 AnsiConsole.WriteLine();
                 AnsiConsole.Render(new Rule("[yellow bold underline]8-bit Colors[/]").RuleStyle("grey").LeftAligned());
@@ -79,6 +75,7 @@ namespace ColorExample
                     {
                         var number = i * 16 + j;
                         AnsiConsole.Background = Color.FromInt32(number);
+                        AnsiConsole.Foreground = AnsiConsole.Background.GetInvertedColor();
                         AnsiConsole.Write(string.Format(" {0,-4}", number));
                         AnsiConsole.ResetColors();
                         if ((number + 1) % 16 == 0)
@@ -89,31 +86,17 @@ namespace ColorExample
                 }
             }
 
-            if (AnsiConsole.Capabilities.Supports(ColorSystem.TrueColor))
+            /////////////////////////////////////////////////////////////////
+            // 24-BIT
+            /////////////////////////////////////////////////////////////////
+            if (AnsiConsole.Profile.Supports(ColorSystem.TrueColor))
             {
-                /////////////////////////////////////////////////////////////////
-                // 24-BIT
-                /////////////////////////////////////////////////////////////////
-
                 AnsiConsole.ResetColors();
                 AnsiConsole.WriteLine();
                 AnsiConsole.Render(new Rule("[yellow bold underline]24-bit Colors[/]").RuleStyle("grey").LeftAligned());
                 AnsiConsole.WriteLine();
 
-                var index = 0;
-                for (var i = 0.0005; i < 1; i += 0.0025)
-                {
-                    index++;
-
-                    var color = Utilities.HSL2RGB(i, 0.5, 0.5);
-                    AnsiConsole.Background = new Color(color.R, color.G, color.B);
-                    AnsiConsole.Write(" ");
-
-                    if (index % 50 == 0)
-                    {
-                        AnsiConsole.WriteLine();
-                    }
-                }
+                AnsiConsole.Render(new ColorBox(width: 80, height: 15));
             }
         }
     }

examples/Console/Colors/Utilities.cs

@@ -1,77 +0,0 @@
-using System;
-using Spectre.Console;
-
-namespace ColorExample
-{
-    public static class Utilities
-    {
-        // Borrowed from https://geekymonkey.com/Programming/CSharp/RGB2HSL_HSL2RGB.htm
-        public static Color HSL2RGB(double h, double sl, double l)
-        {
-            double v;
-            double r, g, b;
-
-            r = l;   // default to gray
-            g = l;
-            b = l;
-            v = (l <= 0.5) ? (l * (1.0 + sl)) : (l + sl - l * sl);
-
-            if (v > 0)
-            {
-                double m;
-                double sv;
-                int sextant;
-                double fract, vsf, mid1, mid2;
-
-                m = l + l - v;
-                sv = (v - m) / v;
-                h *= 6.0;
-
-                sextant = (int)h;
-                fract = h - sextant;
-                vsf = v * sv * fract;
-                mid1 = m + vsf;
-                mid2 = v - vsf;
-
-                switch (sextant)
-                {
-                    case 0:
-                        r = v;
-                        g = mid1;
-                        b = m;
-                        break;
-                    case 1:
-                        r = mid2;
-                        g = v;
-                        b = m;
-                        break;
-                    case 2:
-                        r = m;
-                        g = v;
-                        b = mid1;
-                        break;
-                    case 3:
-                        r = m;
-                        g = mid2;
-                        b = v;
-                        break;
-                    case 4:
-                        r = mid1;
-                        g = m;
-                        b = v;
-                        break;
-                    case 5:
-                        r = v;
-                        g = m;
-                        b = mid2;
-                        break;
-                }
-            }
-
-            return new Color(
-                Convert.ToByte(r * 255.0f),
-                Convert.ToByte(g * 255.0f),
-                Convert.ToByte(b * 255.0f));
-        }
-    }
-}

examples/Console/Columns/Columns.csproj

@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Console/Columns/Program.cs

@@ -1,7 +1,6 @@
 using System.Collections.Generic;
-using Spectre.Console;
 
-namespace ColumnsExample
+namespace Spectre.Console.Examples
 {
     public static class Program
     {

examples/Console/Columns/User.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace ColumnsExample
+namespace Spectre.Console.Examples
 {
     public sealed class User
     {
@@ -22,9 +22,9 @@ namespace ColumnsExample
                 },
                 new User
                 {
-                    FirstName = "Brandon",
-                    LastName = "Cole",
-                    City = "Washington",
+                    FirstName = "Phil",
+                    LastName = "Scott",
+                    City = "Dayton",
                     Country = "United States",
                 },
                 new User

examples/Console/Cursor/Cursor.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Console/Cursor/Program.cs

@@ -1,6 +1,4 @@
-using Spectre.Console;
-
-namespace Cursor
+namespace Spectre.Console.Examples
 {
     public static class Program
     {

examples/Console/Emojis/Emojis.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Console/Emojis/Program.cs

@@ -1,6 +1,4 @@
-using Spectre.Console;
-
-namespace EmojiExample
+namespace Spectre.Console.Examples
 {
     public static class Program
     {

examples/Console/Exceptions/Exceptions.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Console/Exceptions/Program.cs

@@ -1,8 +1,7 @@
 using System;
 using System.Security.Authentication;
-using Spectre.Console;
 
-namespace Exceptions
+namespace Spectre.Console.Examples
 {
     public static class Program
     {

examples/Console/Figlet/Figlet.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Console/Figlet/Program.cs

@@ -1,6 +1,4 @@
-using Spectre.Console;
-
-namespace EmojiExample
+namespace Spectre.Console.Examples
 {
     public static class Program
     {

examples/Console/Grids/Grids.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Console/Grids/Program.cs

@@ -1,6 +1,4 @@
-using Spectre.Console;
-
-namespace GridExample
+namespace Spectre.Console.Examples
 {
     public static class Program
     {

examples/Console/Info/Info.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Console/Info/Program.cs

@@ -1,6 +1,4 @@
-using Spectre.Console;
-
-namespace InfoExample
+namespace Spectre.Console.Examples
 {
     public static class Program
     {
@@ -9,12 +7,17 @@ namespace InfoExample
             var grid = new Grid()
                 .AddColumn(new GridColumn().NoWrap().PadRight(4))
                 .AddColumn()
-                .AddRow("[b]Color system[/]", $"{AnsiConsole.Capabilities.ColorSystem}")
-                .AddRow("[b]Supports ansi?[/]", $"{YesNo(AnsiConsole.Capabilities.SupportsAnsi)}")
-                .AddRow("[b]Legacy console?[/]", $"{YesNo(AnsiConsole.Capabilities.LegacyConsole)}")
-                .AddRow("[b]Interactive?[/]", $"{YesNo(AnsiConsole.Capabilities.SupportsInteraction)}")
-                .AddRow("[b]Buffer width[/]", $"{AnsiConsole.Console.Width}")
-                .AddRow("[b]Buffer height[/]", $"{AnsiConsole.Console.Height}");
+                .AddRow("[b]Enrichers[/]", string.Join(", ", AnsiConsole.Profile.Enrichers))
+                .AddRow("[b]Color system[/]", $"{AnsiConsole.Profile.Capabilities.ColorSystem}")
+                .AddRow("[b]Unicode?[/]", $"{YesNo(AnsiConsole.Profile.Capabilities.Unicode)}")
+                .AddRow("[b]Supports ansi?[/]", $"{YesNo(AnsiConsole.Profile.Capabilities.Ansi)}")
+                .AddRow("[b]Supports links?[/]", $"{YesNo(AnsiConsole.Profile.Capabilities.Links)}")
+                .AddRow("[b]Legacy console?[/]", $"{YesNo(AnsiConsole.Profile.Capabilities.Legacy)}")
+                .AddRow("[b]Interactive?[/]", $"{YesNo(AnsiConsole.Profile.Capabilities.Interactive)}")
+                .AddRow("[b]Terminal?[/]", $"{YesNo(AnsiConsole.Profile.Out.IsTerminal)}")
+                .AddRow("[b]Buffer width[/]", $"{AnsiConsole.Console.Profile.Width}")
+                .AddRow("[b]Buffer height[/]", $"{AnsiConsole.Console.Profile.Height}")
+                .AddRow("[b]Encoding[/]", $"{AnsiConsole.Console.Profile.Encoding.EncodingName}");
 
             AnsiConsole.Render(
                 new Panel(grid)

examples/Console/Links/Links.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Console/Links/Program.cs

@@ -1,12 +1,10 @@
-using Spectre.Console;
-
-namespace LinkExample
+namespace Spectre.Console.Examples
 {
     public static class Program
     {
         public static void Main()
         {
-            if (AnsiConsole.Capabilities.SupportLinks)
+            if (AnsiConsole.Profile.Capabilities.Links)
             {
                 AnsiConsole.MarkupLine("[link=https://patriksvensson.se]Click to visit my blog[/]!");
             }

examples/Console/Panels/Panels.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Console/Panels/Program.cs

@@ -1,6 +1,4 @@
-using Spectre.Console;
-
-namespace PanelExample
+namespace Spectre.Console.Examples
 {
     public static class Program
     {

examples/Console/Progress/DescriptionGenerator.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ProgressExample
+namespace Spectre.Console.Examples
 {
     public static class DescriptionGenerator
     {

examples/Console/Progress/Program.cs

@@ -1,9 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using Spectre.Console;
 
-namespace ProgressExample
+namespace Spectre.Console.Examples
 {
     public static class Program
     {
@@ -25,8 +24,12 @@ namespace ProgressExample
                 .Start(ctx =>
                 {
                     var random = new Random(DateTime.Now.Millisecond);
-                    var tasks = CreateTasks(ctx, random);
 
+                    // Create some tasks
+                    var tasks = CreateTasks(ctx, random);
+                    var warpTask = ctx.AddTask("Going to warp", autoStart: false).IsIndeterminate();
+
+                    // Wait for all tasks (except the indeterminate one) to complete
                     while (!ctx.IsFinished)
                     {
                         // Increment progress
@@ -44,13 +47,24 @@ namespace ProgressExample
                         // Simulate some delay
                         Thread.Sleep(100);
                     }
+
+                    // Now start the "warp" task
+                    warpTask.StartTask();
+                    warpTask.IsIndeterminate(false);
+                    while (!ctx.IsFinished)
+                    {
+                        warpTask.Increment(12 * random.NextDouble());
+
+                        // Simulate some delay
+                        Thread.Sleep(100);
+                    }
                 });
 
             // Done
             AnsiConsole.MarkupLine("[green]Done![/]");
         }
 
-        private static List<(ProgressTask, int)> CreateTasks(ProgressContext progress, Random random)
+        private static List<(ProgressTask Task, int Delay)> CreateTasks(ProgressContext progress, Random random)
         {
             var tasks = new List<(ProgressTask, int)>();
             while (tasks.Count < 5)

examples/Console/Progress/Progress.csproj

@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Console/Prompt/Program.cs

@@ -1,13 +1,11 @@
-using Spectre.Console;
-
-namespace Cursor
+namespace Spectre.Console.Examples
 {
     public static class Program
     {
         public static void Main(string[] args)
         {
             // Check if we can accept key strokes
-            if (!AnsiConsole.Capabilities.SupportsInteraction)
+            if (!AnsiConsole.Profile.Capabilities.Interactive)
             {
                 AnsiConsole.MarkupLine("[red]Environment does not support interaction.[/]");
                 return;
@@ -20,26 +18,90 @@ namespace Cursor
                 return;
             }
 
-            // String
+            // Ask the user for some different things
+            var name = AskName();
+            var fruit = AskFruit();
+            var sport = AskSport();
+            var age = AskAge();
+            var password = AskPassword();
+            var color = AskColor();
+
+            // Summary
+            AnsiConsole.WriteLine();
+            AnsiConsole.Render(new Rule("[yellow]Results[/]").RuleStyle("grey").LeftAligned());
+            AnsiConsole.Render(new Table().AddColumns("[grey]Question[/]", "[grey]Answer[/]")
+                .RoundedBorder()
+                .BorderColor(Color.Grey)
+                .AddRow("[grey]Name[/]", name)
+                .AddRow("[grey]Favorite fruit[/]", fruit)
+                .AddRow("[grey]Favorite sport[/]", sport)
+                .AddRow("[grey]Age[/]", age.ToString())
+                .AddRow("[grey]Password[/]", password)
+                .AddRow("[grey]Favorite color[/]", string.IsNullOrEmpty(color) ? "Unknown" : color));
+        }
+
+        private static string AskName()
+        {
             AnsiConsole.WriteLine();
             AnsiConsole.Render(new Rule("[yellow]Strings[/]").RuleStyle("grey").LeftAligned());
             var name = AnsiConsole.Ask<string>("What's your [green]name[/]?");
+            return name;
+        }
 
-            // String with choices
+        private static string AskFruit()
+        {
+            AnsiConsole.WriteLine();
+            AnsiConsole.Render(new Rule("[yellow]Lists[/]").RuleStyle("grey").LeftAligned());
+
+            var favorites = AnsiConsole.Prompt(
+                new MultiSelectionPrompt<string>()
+                    .PageSize(10)
+                    .Title("What are your [green]favorite fruits[/]?")
+                    .MoreChoicesText("[grey](Move up and down to reveal more fruits)[/]")
+                    .InstructionsText("[grey](Press [blue]<space>[/] to toggle a fruit, [green]<enter>[/] to accept)[/]")
+                    .AddChoices(new[]
+                    {
+                        "Apple", "Apricot", "Avocado", "Banana", "Blackcurrant", "Blueberry",
+                        "Cherry", "Cloudberry", "Cocunut", "Date", "Dragonfruit", "Durian",
+                        "Egg plant", "Elderberry", "Fig", "Grape", "Guava", "Honeyberry",
+                        "Jackfruit", "Jambul", "Kiwano", "Kiwifruit", "Lime", "Lylo",
+                        "Lychee", "Melon", "Mulberry", "Nectarine", "Orange", "Olive"
+                    }));
+
+            var fruit = favorites.Count == 1 ? favorites[0] : null;
+            if (string.IsNullOrWhiteSpace(fruit))
+            {
+                fruit = AnsiConsole.Prompt(
+                    new SelectionPrompt<string>()
+                        .Title("Ok, but if you could only choose [green]one[/]?")
+                        .MoreChoicesText("[grey](Move up and down to reveal more fruits)[/]")
+                        .AddChoices(favorites));
+            }
+
+            AnsiConsole.MarkupLine("Your selected: [yellow]{0}[/]", fruit);
+            return fruit;
+        }
+
+        private static string AskSport()
+        {
             AnsiConsole.WriteLine();
             AnsiConsole.Render(new Rule("[yellow]Choices[/]").RuleStyle("grey").LeftAligned());
-            var fruit = AnsiConsole.Prompt(
-                new TextPrompt<string>("What's your [green]favorite fruit[/]?")
-                    .InvalidChoiceMessage("[red]That's not a valid fruit[/]")
-                    .DefaultValue("Orange")
-                    .AddChoice("Apple")
-                    .AddChoice("Banana")
-                    .AddChoice("Orange"));
 
-            // Integer
+            return AnsiConsole.Prompt(
+                new TextPrompt<string>("What's your [green]favorite sport[/]?")
+                    .InvalidChoiceMessage("[red]That's not a sport![/]")
+                    .DefaultValue("Sport?")
+                    .AddChoice("Soccer")
+                    .AddChoice("Hockey")
+                    .AddChoice("Basketball"));
+        }
+
+        private static int AskAge()
+        {
             AnsiConsole.WriteLine();
             AnsiConsole.Render(new Rule("[yellow]Integers[/]").RuleStyle("grey").LeftAligned());
-            var age = AnsiConsole.Prompt(
+
+            return AnsiConsole.Prompt(
                 new TextPrompt<int>("How [green]old[/] are you?")
                     .PromptStyle("green")
                     .ValidationErrorMessage("[red]That's not a valid age[/]")
@@ -52,33 +114,27 @@ namespace Cursor
                             _ => ValidationResult.Success(),
                         };
                     }));
+        }
 
-            // Secret
+        private static string AskPassword()
+        {
             AnsiConsole.WriteLine();
             AnsiConsole.Render(new Rule("[yellow]Secrets[/]").RuleStyle("grey").LeftAligned());
-            var password = AnsiConsole.Prompt(
+
+            return AnsiConsole.Prompt(
                 new TextPrompt<string>("Enter [green]password[/]?")
                     .PromptStyle("red")
                     .Secret());
+        }
 
-            // Optional
+        private static string AskColor()
+        {
             AnsiConsole.WriteLine();
             AnsiConsole.Render(new Rule("[yellow]Optional[/]").RuleStyle("grey").LeftAligned());
-            var color = AnsiConsole.Prompt(
+
+            return AnsiConsole.Prompt(
                 new TextPrompt<string>("[grey][[Optional]][/] What is your [green]favorite color[/]?")
                     .AllowEmpty());
-
-            // Summary
-            AnsiConsole.WriteLine();
-            AnsiConsole.Render(new Rule("[yellow]Results[/]").RuleStyle("grey").LeftAligned());
-            AnsiConsole.Render(new Table().AddColumns("[grey]Question[/]", "[grey]Answer[/]")
-                .RoundedBorder()
-                .BorderColor(Color.Grey)
-                .AddRow("[grey]Name[/]", name)
-                .AddRow("[grey]Favorite fruit[/]", fruit)
-                .AddRow("[grey]Age[/]", age.ToString())
-                .AddRow("[grey]Password[/]", password)
-                .AddRow("[grey]Favorite color[/]", string.IsNullOrEmpty(color) ? "Unknown" : color));
         }
     }
 }

examples/Console/Prompt/Prompt.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <LangVersion>9</LangVersion>
     <ExampleTitle>Prompt</ExampleTitle>
     <ExampleDescription>Demonstrates how to get input from a user.</ExampleDescription>
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Console/Rules/Program.cs

@@ -1,6 +1,4 @@
-using Spectre.Console;
-
-namespace EmojiExample
+namespace Spectre.Console.Examples
 {
     public static class Program
     {

examples/Console/Rules/Rules.csproj

@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
   </ItemGroup>
 
 </Project>

examples/Console/Showcase/ExceptionGenerator.cs

@@ -0,0 +1,30 @@
+using System;
+
+namespace Spectre.Console.Examples
+{
+    public static class ExceptionGenerator
+    {
+        public static Exception GenerateException()
+        {
+            try
+            {
+                SomeOperation();
+                throw new InvalidOperationException();
+            }
+            catch (Exception ex)
+            {
+                return ex;
+            }
+        }
+
+        private static void SomeOperation()
+        {
+            SomeOperationGoingWrong();
+        }
+
+        private static void SomeOperationGoingWrong()
+        {
+            throw new InvalidOperationException("Something went very wrong!");
+        }
+    }
+}

examples/Console/Showcase/Program.cs

@@ -0,0 +1,153 @@
+using Spectre.Console.Rendering;
+
+namespace Spectre.Console.Examples
+{
+    public static partial class Program
+    {
+        public static void Main()
+        {
+            var table = new Table().HideHeaders().NoBorder();
+            table.Title("[u][yellow]Spectre.Console[/] [b]Features[/][/]");
+            table.AddColumn("Feature", c => c.NoWrap().RightAligned().Width(10).PadRight(3));
+            table.AddColumn("Demonstration", c => c.PadRight(0));
+            table.AddEmptyRow();
+
+            // Colors
+            table.AddRow(
+                new Markup("[red]Colors[/]"),
+                GetColorTable());
+
+            // Styles
+            table.AddEmptyRow();
+            table.AddRow(
+                new Markup("[red]OS[/]"),
+                new Grid().Expand().AddColumns(3)
+                .AddRow(
+                    "[bold green]Windows[/]",
+                    "[bold blue]macOS[/]",
+                    "[bold yellow]Linux[/]"));
+
+            // Styles
+            table.AddEmptyRow();
+            table.AddRow(
+                "[red]Styles[/]",
+                "All ansi styles: [bold]bold[/], [dim]dim[/], [italic]italic[/], [underline]underline[/], "
+                    + "[strikethrough]strikethrough[/], [reverse]reverse[/], and even [blink]blink[/].");
+
+            // Text
+            table.AddEmptyRow();
+            table.AddRow(
+                new Markup("[red]Text[/]"),
+                new Markup("Word wrap text. Justify [green]left[/], [yellow]center[/] or [blue]right[/]."));
+
+            table.AddEmptyRow();
+            table.AddRow(
+                Text.Empty,
+                GetTextGrid());
+
+            // Markup
+            table.AddEmptyRow();
+            table.AddRow(
+                "[red]Markup[/]",
+                "[bold purple]Spectre.Console[/] supports a simple [i]bbcode[/] like "
+                    + "[b]markup[/] for [yellow]color[/], [underline]style[/], and emoji! "
+                    + ":thumbs_up: :red_apple: :ant: :bear: :baguette_bread: :bus:");
+
+            // Trees and tables
+            table.AddEmptyRow();
+            table.AddRow(
+                new Markup("[red]Tables and Trees[/]"),
+                GetTreeTable());
+
+            // Charts
+            table.AddRow(
+                new Markup("[red]Charts[/]"),
+                new Grid().Collapse().AddColumns(2).AddRow(
+                    new Panel(GetBreakdownChart()).BorderColor(Color.Grey),
+                    new Panel(GetBarChart()).BorderColor(Color.Grey)));
+
+
+            // Exceptions
+            table.AddEmptyRow();
+            table.AddRow(
+                new Markup("[red]Exceptions[/]"),
+                ExceptionGenerator.GenerateException().GetRenderable());
+
+            // Much more
+            table.AddEmptyRow();
+            table.AddRow(
+                "[red]+ Much more![/]",
+                "Tables, Grids, Trees, Progress bars, Status, Bar charts, Calendars, Figlet, Images, Text prompts, "
+                    + "List boxes, Separators, Pretty exceptions, Canvas, CLI parsing");
+            table.AddEmptyRow();
+
+            // Render the table
+            AnsiConsole.WriteLine();
+            AnsiConsole.Render(table);
+        }
+
+        private static IRenderable GetColorTable()
+        {
+            var colorTable = new Table().Collapse().HideHeaders().NoBorder();
+            colorTable.AddColumn("Desc", c => c.PadRight(3)).AddColumn("Colors", c => c.PadRight(0));
+            colorTable.AddRow(
+                new Markup(
+                    "✓ [bold grey]NO_COLOR support[/]\n" +
+                    "✓ [bold green]3-bit color[/]\n" +
+                    "✓ [bold blue]4-bit color[/]\n" +
+                    "✓ [bold purple]8-bit color[/]\n" +
+                    "✓ [bold yellow]Truecolor (16.7 million)[/]\n" +
+                    "✓ [bold aqua]Automatic color conversion[/]"),
+                new ColorBox(height: 6));
+
+            return colorTable;
+        }
+
+        private static IRenderable GetTextGrid()
+        {
+            var loremTable = new Grid();
+            var lorem = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque in metus sed sapien ultricies pretium a at justo. Maecenas luctus velit et auctor maximus.";
+            loremTable.AddColumn(new GridColumn().LeftAligned());
+            loremTable.AddColumn(new GridColumn().Centered());
+            loremTable.AddColumn(new GridColumn().RightAligned());
+            loremTable.AddRow($"[green]{lorem}[/]", $"[yellow]{lorem}[/]", $"[blue]{lorem}[/]");
+            return loremTable;
+        }
+
+        private static IRenderable GetTreeTable()
+        {
+            var tree = new Tree("📁 src");
+            tree.AddNode("📁 foo").AddNode("📄 bar.cs");
+            tree.AddNode("📁 baz").AddNode("📁 qux").AddNode("📄 corgi.txt");
+            tree.AddNode("📄 waldo.xml");
+
+            var table = new Table().SimpleBorder().BorderColor(Color.Grey);
+            table.AddColumn(new TableColumn("Overview"));
+            table.AddColumn(new TableColumn("").Footer("[grey]3 Files, 225 KiB[/]"));
+            table.AddRow(new Markup("[yellow]Files[/]"), tree);
+
+            return new Table().RoundedBorder().Collapse().BorderColor(Color.Yellow)
+                .AddColumn("Foo").AddColumn("Bar")
+                .AddRow(new Text("Baz"), table)
+                .AddRow("Qux", "Corgi");
+        }
+
+        private static IRenderable GetBarChart()
+        {
+            return new BarChart()
+                .AddItem("Apple", 32, Color.Green)
+                .AddItem("Oranges", 13, Color.Orange1)
+                .AddItem("Bananas", 22, Color.Yellow);
+        }
+
+        private static IRenderable GetBreakdownChart()
+        {
+            return new BreakdownChart()
+                .ShowPercentage()
+                .FullSize()
+                .AddItem("C#", 82, Color.Green)
+                .AddItem("PowerShell", 13, Color.Red)
+                .AddItem("Bash", 5, Color.Blue);
+        }
+    }
+}