Minor refactors (#1081)

Fixes #1163

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: ''
-labels: bug
+labels: ["bug", "needs triage"]
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: ''
-labels: enhancement
+labels: ["feature", "needs triage"]
 assignees: ''
 
 ---

.github/renovate.json

@@ -0,0 +1,20 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base"
+  ],
+  "dependencyDashboard": false,
+  "commitMessagePrefix": "chore:",
+  "labels": ["dependencies"],
+  "npm": {
+    "ignorePaths": [
+      "**/node_modules/**",
+      "**/bower_components/**",
+      "docs/**"
+    ]
+  },
+  "ignorePaths": [
+    "resources/scripts/**",
+    "docs/**"
+  ]
+}

.github/workflows/backlog.yaml

@@ -0,0 +1,18 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
+name: Add issues/PRs to backlog automatically
+
+on:
+  issues:
+    types:
+      - opened
+      - transferred
+
+jobs:
+  add-to-project:
+    name: Add issue to backlog
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/add-to-project@main
+        with:
+          project-url: https://github.com/orgs/spectreconsole/projects/1
+          github-token: ${{ secrets.PROJECT_TOKEN }}

.github/workflows/ci.yaml

@@ -1,4 +1,5 @@
-name: Continuous Integration
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
+name: Pull Request
 on: pull_request
 
 env:
@@ -19,19 +20,15 @@ jobs:
       uses: actions/checkout@master
 
     - name: Setup .NET SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: | 
-          5.0.301
-          6.0.100
+      uses: actions/setup-dotnet@v3
 
     - name: Setup Node.js
-      uses: actions/setup-node@v2
+      uses: actions/setup-node@v3
       with:
         node-version: '16'
 
     - name: Cache dependencies
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
         path: ~/.npm
         key: npm-${{ hashFiles('package-lock.json') }}
@@ -47,7 +44,7 @@ jobs:
         dotnet run --configuration Release
 
     - name: Archive doc generation
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: documentation-output
         path: docs/output/
@@ -73,23 +70,12 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: | 
-            3.1.402
-            5.0.301
-            6.0.100
-
-      - name: Integration Tests
-        shell: bash
-        run: |
-          dotnet tool restore
-          dotnet example --all --skip live --skip livetable --skip prompt --skip screens
+        uses: actions/setup-dotnet@v3
 
       - name: Build
         shell: bash
@@ -99,7 +85,7 @@ jobs:
 
       - name: Upload Verify Test Results
         if: failure()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: verify-test-results
           path: |

.github/workflows/docs.yaml

@@ -1,55 +0,0 @@
-name: Deploy Documentation
-on:
-    workflow_dispatch:
-    push:
-        paths:
-        - 'docs/**'
-        - 'src/**'
-        - 'test/**'
-        - 'examples/**'
-        - '.github/**'
-
-jobs:
-
-  ###################################################
-  # DOCS
-  ###################################################
-
-  build:
-    name: Deploy
-    runs-on: windows-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-
-    - name: Setup .NET SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: | 
-          5.0.301
-          6.0.100
-
-    - name: Setup Node.js
-      uses: actions/setup-node@v2
-      with:
-        node-version: '16'
-
-    - name: Cache dependencies
-      uses: actions/cache@v2
-      with:
-        path: ~/.npm
-        key: npm-${{ hashFiles('package-lock.json') }}
-        restore-keys: npm-
-
-    - name: Publish
-      shell: bash
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        NETLIFY_ACCESS_TOKEN: ${{ secrets.NETLIFY_ACCESS_TOKEN }}
-        NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
-      run: |
-        cd docs
-        dotnet tool restore
-        dotnet run --configuration Release -- deploy

.github/workflows/publish.yaml

@@ -1,3 +1,4 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
 name: Publish
 
 on:
@@ -13,41 +14,16 @@ env:
 
 jobs:
 
-  ###################################################
-  # DOCS
-  ###################################################
-
-  docs:
-    name: Documentation
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@master
-
-    - name: Setup .NET SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: | 
-          5.0.301
-          6.0.100
-
-    - name: Build
-      shell: bash
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        cd docs
-        dotnet tool restore
-        dotnet run --configuration Release
-
   ###################################################
   # BUILD
   ###################################################
 
   build:
     name: Build
-    needs: [docs]
-    if: "!contains(github.event.head_commit.message, 'skip-ci') || startsWith(github.ref, 'refs/tags/')"
+    if: |
+      (!startsWith(github.event.head_commit.message, 'skip-ci') 
+      && !startsWith(github.event.head_commit.message, 'chore:'))
+      || startsWith(github.ref, 'refs/tags/')
     strategy:
       matrix:
         kind: ['linux', 'windows', 'macOS']
@@ -61,17 +37,12 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: | 
-            3.1.402
-            5.0.301
-            6.0.100
+        uses: actions/setup-dotnet@v3
 
       - name: Build
         shell: bash
@@ -79,28 +50,63 @@ jobs:
           dotnet tool restore
           dotnet cake
 
+  ###################################################
+  # DOCS
+  ###################################################
+
+  documentation:
+    name: Publish Documentation
+    needs: [build]
+    runs-on: windows-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: Setup .NET SDK
+      uses: actions/setup-dotnet@v3
+
+    - name: Setup Node.js
+      uses: actions/setup-node@v3
+      with:
+        node-version: '16'
+
+    - name: Cache dependencies
+      uses: actions/cache@v3
+      with:
+        path: ~/.npm
+        key: npm-${{ hashFiles('package-lock.json') }}
+        restore-keys: npm-
+
+    - name: Publish Documentation
+      shell: bash
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        NETLIFY_ACCESS_TOKEN: ${{ secrets.NETLIFY_ACCESS_TOKEN }}
+        NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
+      run: |
+        cd docs
+        dotnet tool restore
+        dotnet run --configuration Release -- deploy
+
   ###################################################
   # PUBLISH
   ###################################################
 
   publish:
-    name: Publish
+    name: Publish NuGet Packages
     needs: [build]
     if: "!contains(github.event.head_commit.message, 'skip-ci') || startsWith(github.ref, 'refs/tags/')"
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: | 
-            3.1.402
-            5.0.301
-            6.0.100
+        uses: actions/setup-dotnet@v3
 
       - name: Publish
         shell: bash

CODE_OF_CONDUCT.md

@@ -2,45 +2,131 @@
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a professional setting
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at hello@spectresystems.se. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+conduct@dotnetfoundation.org.
+All complaints will be reviewed and investigated promptly and fairly.
 
-Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
 
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
+[https://www.contributor-covenant.org/translations][translations].
+
+[homepage]: https://www.contributor-covenant.org
+[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations

README.fa.md

@@ -4,7 +4,7 @@ _[![Spectre.Console NuGet Version](https://img.shields.io/nuget/v/spectre.consol
 
 <div dir="rtl">
 
-یک کتابخانه NET Standard 2.0/.NET 5. که ایجاد Console Applicationهای زیبا و cross platform را آسان‌تر می‌کند.  
+یک کتابخانه .NET. که ایجاد Console Applicationهای زیبا و cross platform را آسان‌تر می‌کند.  
 از کتابخانه عالی [Rich](https://github.com/willmcgugan/rich)  برای پایتون، بسیار الهام گرفته شده است.
 
 ## فهرست

README.jp.md

@@ -2,7 +2,7 @@
 
 _[![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)_
 
-綺麗なコンソールアプリケーションを簡単に作成するための.NET Standard 2.0ライブラリです。
+綺麗なコンソールアプリケーションを簡単に作成するための.NETライブラリです。
 Python用の素晴らしい[Rich ライブラリ](https://github.com/willmcgugan/rich)に強く影響を受けています。
 
 ## 目次

README.md

@@ -1,19 +1,21 @@
 # `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)_ [![Netlify Status](https://api.netlify.com/api/v1/badges/1eaf215a-eb9c-45e4-8c64-c90b62963149/deploy-status)](https://app.netlify.com/sites/spectreconsole/deploys)
+_[![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)_ _[![Spectre.Console CLI NuGet Version](https://img.shields.io/nuget/v/spectre.console.cli.svg?style=flat&label=NuGet%3A%20Spectre.Console.Cli)](https://www.nuget.org/packages/spectre.console.cli)_ [![Netlify Status](https://api.netlify.com/api/v1/badges/1eaf215a-eb9c-45e4-8c64-c90b62963149/deploy-status)](https://app.netlify.com/sites/spectreconsole/deploys)
 
-A .NET 5/.NET Standard 2.0 library that makes it easier to create beautiful, cross platform, console applications.  
+A .NET library that makes it easier to create beautiful, cross platform, console applications.  
 It is heavily inspired by the excellent [Rich library](https://github.com/willmcgugan/rich) 
-for Python.
+for Python. For detailed usage instructions, [please refer to the documentation at https://spectreconsole.net/.](https://spectreconsole.net/)
 
 ## Table of Contents
 
 1. [Features](#features)
-2. [Installing](#installing)
-3. [Documentation](#documentation)
-4. [Examples](#examples)
-5. [Sponsors](#sponsors)
-5. [License](#license)
+1. [Installing](#installing)
+1. [Documentation](#documentation)
+1. [Examples](#examples)
+1. [Sponsors](#sponsors)
+1. [Code of Conduct](#code-of-conduct)
+1. [.NET Foundation](#net-foundation)
+1. [License](#license)
 
 ## Features
 
@@ -72,21 +74,31 @@ 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)
+* [Kim Gunnarsson](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)
+* [Tom Kerkhove](https://github.com/tomkerkhove)
 
-I really appreciate it.  
+We really appreciate it.  
 **Thank you very much!**
 
+## Code of Conduct
+
+This project has adopted the code of conduct defined by the Contributor Covenant to clarify expected behavior in our community.
+For more information see the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct).
+
+## .NET Foundation
+
+This project is supported by the [.NET Foundation](https://dotnetfoundation.org).
+
 ## License
 
 Copyright © Patrik Svensson, Phil Scott, Nils Andresen
 
 Spectre.Console is provided as-is under the MIT license. For more information see LICENSE.
 
-* For SixLabors.ImageSharp, see https://github.com/SixLabors/ImageSharp/blob/master/LICENSE
+* SixLabors.ImageSharp, a library which Spectre.Console relies upon, is licensed under Apache 2.0 when distributed as part of Spectre.Console. The Six Labors Split License covers all other usage, see: https://github.com/SixLabors/ImageSharp/blob/master/LICENSE 

README.pt-BR.md

@@ -2,7 +2,7 @@
 
 _[![Spectre.Console NuGet Versão](https://img.shields.io/nuget/v/spectre.console.svg?style=flat&label=NuGet%3A%20Spectre.Console)](https://www.nuget.org/packages/spectre.console)_
 
-Uma biblioteca .NET 5/.NET Standard 2.0 que torna mais fácil criar aplicativos de console bonitos e multiplataforma. 
+Uma biblioteca .NET que torna mais fácil criar aplicativos de console bonitos e multiplataforma. 
 É fortemente inspirada na excelente [biblioteca Rich](https://github.com/willmcgugan/rich) 
 para Python.
 

README.zh.md

@@ -2,7 +2,7 @@
 
 _[![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)_
 
-`Spectre.Console`是一个 .NET 5/.NET Standard 2.0 的库，能让您在终端里更方便地生成精美的界面。
+`Spectre.Console`是一个 .NET 的库，可以更轻松地创建美观的跨平台控制台应用程序。
 
 深受 [Rich](https://github.com/willmcgugan/rich) 这个Python优秀库的启发。
 
@@ -26,7 +26,7 @@ _[![Spectre.Console NuGet Version](https://img.shields.io/nuget/v/spectre.consol
 
 ## 安装
 
-最快的安装方式，就是用NuGet包管理直接安装Spectre.Console。
+最快的安装方式，就是用NuGet包管理直接安装`Spectre.Console`。
 
 ```csharp
 dotnet add package Spectre.Console

build.cake

@@ -17,7 +17,7 @@ Task("Build")
     DotNetBuild("./src/Spectre.Console.sln", new DotNetBuildSettings {
         Configuration = configuration,
         NoIncremental = context.HasArgument("rebuild"),
-        MSBuildSettings = new DotNetCoreMSBuildSettings()
+        MSBuildSettings = new DotNetMSBuildSettings()
             .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error)
     });
 });
@@ -29,7 +29,7 @@ Task("Build-Analyzer")
     DotNetBuild("./src/Spectre.Console.Analyzer.sln", new DotNetBuildSettings {
         Configuration = configuration,
         NoIncremental = context.HasArgument("rebuild"),
-        MSBuildSettings = new DotNetCoreMSBuildSettings()
+        MSBuildSettings = new DotNetMSBuildSettings()
             .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error)
     });
 });
@@ -41,7 +41,7 @@ Task("Build-Examples")
     DotNetBuild("./examples/Examples.sln", new DotNetBuildSettings {
         Configuration = configuration,
         NoIncremental = context.HasArgument("rebuild"),
-        MSBuildSettings = new DotNetCoreMSBuildSettings()
+        MSBuildSettings = new DotNetMSBuildSettings()
             .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error)
     });
 });
@@ -58,6 +58,12 @@ Task("Test")
         NoBuild = true,
     });
 
+    DotNetTest("./test/Spectre.Console.Cli.Tests/Spectre.Console.Cli.Tests.csproj", new DotNetTestSettings {
+        Configuration = configuration,
+        NoRestore = true,
+        NoBuild = true,
+    });
+
     DotNetTest("./test/Spectre.Console.Analyzer.Tests/Spectre.Console.Analyzer.Tests.csproj", new DotNetTestSettings {
         Configuration = configuration,
         NoRestore = true,
@@ -74,7 +80,7 @@ Task("Package")
         NoRestore = true,
         NoBuild = true,
         OutputDirectory = "./.artifacts",
-        MSBuildSettings = new DotNetCoreMSBuildSettings()
+        MSBuildSettings = new DotNetMSBuildSettings()
             .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error)
     });
 
@@ -83,7 +89,7 @@ Task("Package")
         NoRestore = true,
         NoBuild = true,
         OutputDirectory = "./.artifacts",
-        MSBuildSettings = new DotNetCoreMSBuildSettings()
+        MSBuildSettings = new DotNetMSBuildSettings()
             .TreatAllWarningsAs(MSBuildTreatAllWarningsAs.Error)
     });
 });

docs/Docs.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <RunWorkingDirectory>$(MSBuildProjectDirectory)</RunWorkingDirectory>
     <DefaultItemExcludes>$(DefaultItemExcludes);output\**;.gitignore</DefaultItemExcludes>
     <NoWarn>MVC1000</NoWarn>
@@ -38,7 +38,7 @@
     <PackageReference Include="Statiq.CodeAnalysis" Version="1.0.0-beta.58" />
     <PackageReference Include="Statiq.Common" Version="1.0.0-beta.58" />
     <PackageReference Include="Statiq.Web" Version="1.0.0-beta.44" />
-    <PackageReference Include="MinVer" PrivateAssets="All" Version="2.3.1" />
+    <PackageReference Include="MinVer" PrivateAssets="All" Version="2.5.0" />
     <PackageReference Include="Statiq.Web.Netlify" Version="1.0.0-beta.44" />
   </ItemGroup>
 

docs/Program.cs

@@ -22,7 +22,9 @@ namespace Docs
                 .AddSetting(Constants.SourceFiles, new List<string>
                 {
                     "../../src/Spectre.Console/**/{!bin,!obj,!packages,!*.Tests,}/**/*.cs",
-                    "../../src/Spectre.Console.ImageSharp/**/{!bin,!obj,!packages,!*.Tests,}/**/*.cs"
+                    "../../src/Spectre.Console.Cli/**/{!bin,!obj,!packages,!*.Tests,}/**/*.cs",
+                    "../../src/Spectre.Console.ImageSharp/**/{!bin,!obj,!packages,!*.Tests,}/**/*.cs",
+                    "../../src/Spectre.Console.Json/**/{!bin,!obj,!packages,!*.Tests,}/**/*.cs"
                 })
                 .AddSetting(Constants.ExampleSourceFiles, new List<string>
                     {

docs/README.md

@@ -1,6 +1,6 @@
 # Documentation
 
-To start contributing to the [Spectre.Console](https://github.com/spectreconsole/spectre.console) documentation, you will need the [.NET Core SDK](https://dot.net) 5.0.202 or higher (as defined in the repository root `global.json` file).
+To start contributing to the [Spectre.Console](https://github.com/spectreconsole/spectre.console) documentation, you will need the [.NET Core SDK](https://dot.net) 7.0.100 or higher (as defined in the repository root `global.json` file).
 
 ## Running Preview Site
 

docs/global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "2.2.200",
-    "rollForward": "latestMajor"
+    "version": "7.0.100",
+    "rollForward": "latestFeature"
   }
-}
+}

docs/input/_layout.cshtml

@@ -17,7 +17,7 @@
 
     @{
         string title = Document.ContainsKey(Keys.Title) ? $"Spectre.Console - {Document.GetString(Keys.Title)}" : "Spectre.Console";
-        string description = Document.ContainsKey(Constants.Description) ? Document.GetString(Constants.Description) : "Spectre.Console is a .NET Standard 2.0 library that makes it easier to create beautiful console applications";
+        string description = Document.ContainsKey(Constants.Description) ? Document.GetString(Constants.Description) : "Spectre.Console is a .NET library that makes it easier to create beautiful console applications";
         var card = Context.FindCard(Model.Id);
         var urlBase = $"https://{Document.GetString(Keys.Host)}/";
     }
@@ -254,6 +254,7 @@ c-9 -4 -271 61 -315 78 -29 11 -28 12 79 55 59 24 111 46 114 49 3 3 33 -36
         <div class="flex flex-row">
             <span>© @DateTime.Today.Year Patrik Svensson, Phil Scott, Nils Andresen</span>
             <span class="ml-auto">Powered by <a href="https://www.netlify.com/">Netlify</a></span>
+            <span class="ml-auto">Supported by the <a href="https://dotnetfoundation.org">.NET Foundation</a></span>
             <span class="ml-auto">@VersionUtilities.GetVersion()</span>
         </div>
     </div>

docs/input/appendix/styles.md

@@ -4,7 +4,8 @@ Description: "*Spectre.Console* makes it easy to write text with different style
 Highlights:
     - Bold, Italic, Underline, strikethrough
     - Dim, Invert
-    - Conceal, slowblink, rapidblink
+    - Conceal, slowblink, rapidblink
+    - Links
 ---
 
 Note that what styles that can be used is defined by the system or your terminal software, and may not appear as they should.
@@ -45,5 +46,9 @@ Note that what styles that can be used is defined by the system or your terminal
     <tr>
         <td><code>strikethrough</code></td>
         <td>Shows text with a horizontal line through the center</td>
+    </tr>
+    <tr>
+        <td><code>link</link></td>
+        <td>Creates a clickable link within text</td>
     </tr>
 </table>

docs/input/assets/casts/breakdown-chart-plain.cast

@@ -0,0 +1,3 @@
+{"version": 2, "width": 122, "height": 5, "title": "breakdown-chart (plain)", "env": {"TERM": "Spectre.Console"}}
+[0, "o", "\u001B[31m\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u001B[0m\u001B[34m\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u001B[0m\u001B[32m\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u001B[0m\u001B[37m\u2588\u2588\u001B[0m\u001B[37m\u2588\u2588\u001B[0m\r\n\u001B[31m\u25A0\u001B[0m SCSS \u001B[37m80\u001B[0m    \u001B[34m\u25A0\u001B[0m HTML \u001B[37m28.3\u001B[0m     \u001B[32m\u25A0\u001B[0m C# \u001B[37m22.6\u001B[0m    \u001B[37m\u25A0\u001B[0m JavaScript \u001B[37m6\u001B[0m    \r\n\u001B[37m\u25A0\u001B[0m Ruby \u001B[37m6\u001B[0m     \u001B[36m\u25A0\u001B[0m Shell \u001B[37m0.1\u001B[0m                                    \r\n"]
+

docs/input/assets/casts/breakdown-chart-rich.cast

@@ -0,0 +1,3 @@
+{"version": 2, "width": 122, "height": 5, "title": "breakdown-chart (rich)", "env": {"TERM": "Spectre.Console"}}
+[0, "o", "\u001B[38;5;9m\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u001B[0m\u001B[38;5;12m\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u001B[0m\u001B[38;5;2m\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u001B[0m\u001B[38;5;11m\u2588\u2588\u001B[0m\u001B[38;5;119m\u2588\u2588\u001B[0m\r\n\u001B[38;5;9m\u25A0\u001B[0m SCSS \u001B[38;5;8m80\u001B[0m    \u001B[38;5;12m\u25A0\u001B[0m HTML \u001B[38;5;8m28.3\u001B[0m     \u001B[38;5;2m\u25A0\u001B[0m C# \u001B[38;5;8m22.6\u001B[0m    \u001B[38;5;11m\u25A0\u001B[0m JavaScript \u001B[38;5;8m6\u001B[0m    \r\n\u001B[38;5;119m\u25A0\u001B[0m Ruby \u001B[38;5;8m6\u001B[0m     \u001B[38;5;14m\u25A0\u001B[0m Shell \u001B[38;5;8m0.1\u001B[0m                                    \r\n"]
+

docs/input/assets/casts/grid-rich.cast

@@ -0,0 +1,2 @@
+{"version": 2, "width": 40, "height": 3, "timestamp": 1667342769, "env": {"SHELL": "/bin/bash", "TERM": "xterm-256color"}}
+[0.0, "o", "\u001b[38;5;9;48;5;0mHeader 1\u001b[0m  \u001b[38;5;2;48;5;0mHeader 2\u001b[0m  \u001b[38;5;12;48;5;0mHeader 3\u001b[0m\r\nRow 1      Row 2       Row 3\r\n"]

docs/input/assets/casts/json-plain.cast

@@ -0,0 +1,3 @@
+{"version": 2, "width": 62, "height": 20, "title": "json (plain)", "env": {"TERM": "Spectre.Console"}}
+[0, "o", "\u001B[37m\u250C\u2500Some JSON in a panel\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510\u001B[0m\r\n\u001B[37m\u2502\u001B[0m \u001B[37m{\u001B[0m                             \u001B[37m\u2502\u001B[0m\r\n\u001B[37m\u2502\u001B[0m    \u001B[34m\u0022hello\u0022\u001B[0m\u001B[37m:\u001B[0m \u001B[32m32\u001B[0m\u001B[37m,\u001B[0m               \u001B[37m\u2502\u001B[0m\r\n\u001B[37m\u2502\u001B[0m    \u001B[34m\u0022world\u0022\u001B[0m\u001B[37m:\u001B[0m \u001B[37m{\u001B[0m                 \u001B[37m\u2502\u001B[0m\r\n\u001B[37m\u2502\u001B[0m       \u001B[34m\u0022foo\u0022\u001B[0m\u001B[37m:\u001B[0m \u001B[32m21\u001B[0m\u001B[37m,\u001B[0m              \u001B[37m\u2502\u001B[0m\r\n\u001B[37m\u2502\u001B[0m       \u001B[34m\u0022bar\u0022\u001B[0m\u001B[37m:\u001B[0m \u001B[32m255\u001B[0m\u001B[37m,\u001B[0m             \u001B[37m\u2502\u001B[0m\r\n\u001B[37m\u2502\u001B[0m       \u001B[34m\u0022baz\u0022\u001B[0m\u001B[37m:\u001B[0m \u001B[37m[\u001B[0m                \u001B[37m\u2502\u001B[0m\r\n\u001B[37m\u2502\u001B[0m          \u001B[32m0.32\u001B[0m\u001B[37m,\u001B[0m                \u001B[37m\u2502\u001B[0m\r\n\u001B[37m\u2502\u001B[0m          \u001B[32m0.33e-32\u001B[0m\u001B[37m,\u001B[0m            \u001B[37m\u2502\u001B[0m\r\n\u001B[37m\u2502\u001B[0m          \u001B[32m0.42e32\u001B[0m\u001B[37m,\u001B[0m             \u001B[37m\u2502\u001B[0m\r\n\u001B[37m\u2502\u001B[0m          \u001B[32m0.55e\u002B32\u001B[0m\u001B[37m,\u001B[0m            \u001B[37m\u2502\u001B[0m\r\n\u001B[37m\u2502\u001B[0m          \u001B[37m{\u001B[0m                    \u001B[37m\u2502\u001B[0m\r\n\u001B[37m\u2502\u001B[0m             \u001B[34m\u0022hello\u0022\u001B[0m\u001B[37m:\u001B[0m \u001B[31m\u0022world\u0022\u001B[0m\u001B[37m,\u001B[0m \u001B[37m\u2502\u001B[0m\r\n\u001B[37m\u2502\u001B[0m             \u001B[34m\u0022lol\u0022\u001B[0m\u001B[37m:\u001B[0m \u001B[37mnull\u001B[0m       \u001B[37m\u2502\u001B[0m\r\n\u001B[37m\u2502\u001B[0m          \u001B[37m}\u001B[0m                    \u001B[37m\u2502\u001B[0m\r\n\u001B[37m\u2502\u001B[0m       \u001B[37m]\u001B[0m                       \u001B[37m\u2502\u001B[0m\r\n\u001B[37m\u2502\u001B[0m    \u001B[37m}\u001B[0m                          \u001B[37m\u2502\u001B[0m\r\n\u001B[37m\u2502\u001B[0m \u001B[37m}\u001B[0m                             \u001B[37m\u2502\u001B[0m\r\n\u001B[37m\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518\u001B[0m\r\n"]
+

docs/input/assets/casts/json-rich.cast

@@ -0,0 +1,3 @@
+{"version": 2, "width": 62, "height": 20, "title": "json (rich)", "env": {"TERM": "Spectre.Console"}}
+[0, "o", "\u001B[38;5;11m\u256D\u2500Some JSON in a panel\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256E\u001B[0m\r\n\u001B[38;5;11m\u2502\u001B[0m \u001B[38;5;8m{\u001B[0m                             \u001B[38;5;11m\u2502\u001B[0m\r\n\u001B[38;5;11m\u2502\u001B[0m    \u001B[38;5;12m\u0022hello\u0022\u001B[0m\u001B[38;5;11m:\u001B[0m \u001B[38;5;2m32\u001B[0m\u001B[38;5;8m,\u001B[0m               \u001B[38;5;11m\u2502\u001B[0m\r\n\u001B[38;5;11m\u2502\u001B[0m    \u001B[38;5;12m\u0022world\u0022\u001B[0m\u001B[38;5;11m:\u001B[0m \u001B[38;5;8m{\u001B[0m                 \u001B[38;5;11m\u2502\u001B[0m\r\n\u001B[38;5;11m\u2502\u001B[0m       \u001B[38;5;12m\u0022foo\u0022\u001B[0m\u001B[38;5;11m:\u001B[0m \u001B[38;5;2m21\u001B[0m\u001B[38;5;8m,\u001B[0m              \u001B[38;5;11m\u2502\u001B[0m\r\n\u001B[38;5;11m\u2502\u001B[0m       \u001B[38;5;12m\u0022bar\u0022\u001B[0m\u001B[38;5;11m:\u001B[0m \u001B[38;5;2m255\u001B[0m\u001B[38;5;8m,\u001B[0m             \u001B[38;5;11m\u2502\u001B[0m\r\n\u001B[38;5;11m\u2502\u001B[0m       \u001B[38;5;12m\u0022baz\u0022\u001B[0m\u001B[38;5;11m:\u001B[0m \u001B[38;5;8m[\u001B[0m                \u001B[38;5;11m\u2502\u001B[0m\r\n\u001B[38;5;11m\u2502\u001B[0m          \u001B[38;5;2m0.32\u001B[0m\u001B[38;5;8m,\u001B[0m                \u001B[38;5;11m\u2502\u001B[0m\r\n\u001B[38;5;11m\u2502\u001B[0m          \u001B[38;5;2m0.33e-32\u001B[0m\u001B[38;5;8m,\u001B[0m            \u001B[38;5;11m\u2502\u001B[0m\r\n\u001B[38;5;11m\u2502\u001B[0m          \u001B[38;5;2m0.42e32\u001B[0m\u001B[38;5;8m,\u001B[0m             \u001B[38;5;11m\u2502\u001B[0m\r\n\u001B[38;5;11m\u2502\u001B[0m          \u001B[38;5;2m0.55e\u002B32\u001B[0m\u001B[38;5;8m,\u001B[0m            \u001B[38;5;11m\u2502\u001B[0m\r\n\u001B[38;5;11m\u2502\u001B[0m          \u001B[38;5;8m{\u001B[0m                    \u001B[38;5;11m\u2502\u001B[0m\r\n\u001B[38;5;11m\u2502\u001B[0m             \u001B[38;5;12m\u0022hello\u0022\u001B[0m\u001B[38;5;11m:\u001B[0m \u001B[38;5;9m\u0022world\u0022\u001B[0m\u001B[38;5;8m,\u001B[0m \u001B[38;5;11m\u2502\u001B[0m\r\n\u001B[38;5;11m\u2502\u001B[0m             \u001B[38;5;12m\u0022lol\u0022\u001B[0m\u001B[38;5;11m:\u001B[0m \u001B[38;5;8mnull\u001B[0m       \u001B[38;5;11m\u2502\u001B[0m\r\n\u001B[38;5;11m\u2502\u001B[0m          \u001B[38;5;8m}\u001B[0m                    \u001B[38;5;11m\u2502\u001B[0m\r\n\u001B[38;5;11m\u2502\u001B[0m       \u001B[38;5;8m]\u001B[0m                       \u001B[38;5;11m\u2502\u001B[0m\r\n\u001B[38;5;11m\u2502\u001B[0m    \u001B[38;5;8m}\u001B[0m                          \u001B[38;5;11m\u2502\u001B[0m\r\n\u001B[38;5;11m\u2502\u001B[0m \u001B[38;5;8m}\u001B[0m                             \u001B[38;5;11m\u2502\u001B[0m\r\n\u001B[38;5;11m\u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F\u001B[0m\r\n"]
+

docs/input/assets/casts/layout-plain.cast

@@ -0,0 +1,3 @@
+{"version": 2, "width": 82, "height": 24, "title": "layout (plain)", "env": {"TERM": "Spectre.Console"}}
+[0, "o", "\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510\u250C\u2500Top (40 x 12)\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502             Placeholder              \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502             Hello \u001B[34mWorld!\u001B[0m             \u2502\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518\r\n\u2502                                      \u2502\u250C\u2500Bottom (40 x 12)\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502             Placeholder              \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518"]
+

docs/input/assets/casts/layout-rich.cast

@@ -0,0 +1,3 @@
+{"version": 2, "width": 82, "height": 24, "title": "layout (rich)", "env": {"TERM": "Spectre.Console"}}
+[0, "o", "\u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510\u256D\u2500Top (40 x 12)\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256E\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502             Placeholder              \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502             Hello \u001B[38;5;12mWorld!\u001B[0m             \u2502\u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F\r\n\u2502                                      \u2502\u256D\u2500Bottom (40 x 12)\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256E\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502             Placeholder              \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2502                                      \u2502\u2502                                      \u2502\r\n\u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518\u2570\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u256F"]
+

docs/input/assets/casts/padder-rich.cast

@@ -0,0 +1,2 @@
+{"version": 2, "width": 40, "height": 6, "timestamp": 1667448519, "env": {"SHELL": "/bin/bash", "TERM": "xterm-256color"}}
+[0.0, "o", "                                           \r\n     \u001b[38;5;9;48;5;0mPadded Text I\u001b[0m      \u001b[38;5;12;48;5;0mPadded Text II\u001b[0m     \r\n                                           \r\n"]

docs/input/assets/casts/panel-plain.cast

@@ -0,0 +1,3 @@
+{"version": 2, "width": 122, "height": 24, "title": "panel (plain)", "env": {"TERM": "Spectre.Console"}}
+[0, "o", "\u2554\u2550\u2550\u001B[4mPasta Menu\u001B[0m\u2550\u2550\u2557\r\n\u2551              \u2551\r\n\u2551              \u2551\r\n\u2551  \u001B[31mSpaghetti\u001B[0m   \u2551\r\n\u2551  \u001B[31mLinguini\u001B[0m    \u2551\r\n\u2551  \u001B[31mFettucine\u001B[0m   \u2551\r\n\u2551  \u001B[31mTortellini\u001B[0m  \u2551\r\n\u2551  \u001B[31mCapellini\u001B[0m   \u2551\r\n\u2551  \u001B[31mLasagna\u001B[0m     \u2551\r\n\u2551              \u2551\r\n\u2551              \u2551\r\n\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D\r\n"]
+

docs/input/assets/casts/panel-rich.cast

@@ -0,0 +1,3 @@
+{"version": 2, "width": 122, "height": 24, "title": "panel (rich)", "env": {"TERM": "Spectre.Console"}}
+[0, "o", "\u2554\u2550\u2550\u001B[4mPasta Menu\u001B[0m\u2550\u2550\u2557\r\n\u2551              \u2551\r\n\u2551              \u2551\r\n\u2551  \u001B[38;5;9mSpaghetti\u001B[0m   \u2551\r\n\u2551  \u001B[38;5;9mLinguini\u001B[0m    \u2551\r\n\u2551  \u001B[38;5;9mFettucine\u001B[0m   \u2551\r\n\u2551  \u001B[38;5;9mTortellini\u001B[0m  \u2551\r\n\u2551  \u001B[38;5;9mCapellini\u001B[0m   \u2551\r\n\u2551  \u001B[38;5;9mLasagna\u001B[0m     \u2551\r\n\u2551              \u2551\r\n\u2551              \u2551\r\n\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D\r\n"]
+

docs/input/assets/casts/rows-rich.cast

@@ -0,0 +1,2 @@
+{"version": 2, "width": 50, "height": 5, "timestamp": 1667278514, "env": {"SHELL": "/bin/bash", "TERM": "xterm-256color"}}
+[0, "o", "\u001b[38;5;9;48;5;0mItem 1\u001b[0m\r\n\u001b[38;5;2;48;5;0mItem 2\u001b[0m\r\n\u001b[38;5;12;48;5;0mItem 3\u001b[0m\r\n"]

docs/input/blog/posts/2021-07-11-hello-world.md

@@ -1,6 +1,6 @@
 Title: Hello, World
 Description: To help track new releases, updates and planning for Spectre.Console, we've added a new blog to the documentation.
-Published: 20210711
+Published: 2021-07-11
 Category: News
 ---
 

docs/input/blog/posts/2021-07-19-spectre-console-0.41-released.md

@@ -1,6 +1,6 @@
 Title: Spectre.Console 0.41 released!
 Description: In this release we (mostly Phil) have been focusing on getting the new fancy Roslyn Analyzers out the door...
-Published: 20210719
+Published: 2021-07-19
 Category: Release Notes
 Excluded: false
 ---

docs/input/blog/posts/2021-12-16-spectre-console-0.43-released.md

@@ -1,6 +1,6 @@
 Title: Spectre.Console 0.43 released!
 Description: Now with .NET 6 support... and more!
-Published: 20211216
+Published: 2021-12-16
 Category: Release Notes
 Excluded: false
 ---

docs/input/blog/posts/2022-03-27-spectre-console-0.44-released.md

@@ -0,0 +1,63 @@
+Title: Spectre.Console 0.44 released!
+Description: Alternate screen buffers, better exception rendering... and more!
+Published: 2022-03-27
+Category: Release Notes
+Excluded: false
+---
+
+Version 0.44 of Spectre.Console has been released!
+
+There are a lot of fixes and improvements in this release, but the most noteworthy 
+additions are better exception rendering, support for alternate screen buffers, 
+and a new widget called [TextPath](xref:T:Spectre.Console.TextPath), which makes 
+it easy to render paths in the console.
+
+Check out the two new examples in our GitHub repository:
+
+* [./examples/Console/AlternateScreen](https://github.com/spectreconsole/spectre.console/blob/main/examples/Console/AlternateScreen/Program.cs)
+* [./examples/Console/Paths](https://github.com/spectreconsole/spectre.console/blob/main/examples/Console/Paths/Program.cs)
+
+## New Contributors
+
+* [@twaalewijn](https://github.com/twaalewijn) made their first contribution in [#642](https://github.com/spectreconsole/spectre.console/pull/642)
+* [@zmrfzn](https://github.com/zmrfzn) made their first contribution in [#652](https://github.com/spectreconsole/spectre.console/pull/652)
+* [@jouniheikniemi](https://github.com/jouniheikniemi) made their first contribution in [#689](https://github.com/spectreconsole/spectre.console/pull/689)
+* [@Sir-Baconn](https://github.com/Sir-Baconn) made their first contribution in [#682](https://github.com/spectreconsole/spectre.console/pull/682)
+* [@seclerp](https://github.com/seclerp) made their first contribution in [#665](https://github.com/spectreconsole/spectre.console/pull/665)
+* [@Arcodiant](https://github.com/Arcodiant) made their first contribution in [#748](https://github.com/spectreconsole/spectre.console/pull/748)
+* [@ap0llo](https://github.com/ap0llo) made their first contribution in [#681](https://github.com/spectreconsole/spectre.console/pull/681)
+
+## What's Changed
+
+* Added the ability to hide CommandOptions. by [@twaalewijn](https://github.com/twaalewijn) in [#642](https://github.com/spectreconsole/spectre.console/pull/642)
+* Add support for alternate screen buffers by [@patriksvensson](https://github.com/patriksvensson) in [#647](https://github.com/spectreconsole/spectre.console/pull/647)
+* Updates asciinema update by [@phil-scott-78](https://github.com/phil-scott-78) in [#648](https://github.com/spectreconsole/spectre.console/pull/648)
+* Update Roslynator.Analyzers to version 3.3 by [@phil-scott-78](https://github.com/phil-scott-78) in [#650](https://github.com/spectreconsole/spectre.console/pull/650)
+* Ordered CommandArguments by position by [@nils-a](https://github.com/nils-a) in [#646](https://github.com/spectreconsole/spectre.console/pull/646)
+* Table title's first letter is getting capitalized by default by [@zmrfzn](https://github.com/zmrfzn) in [#652](https://github.com/spectreconsole/spectre.console/pull/652)
+* Simplify stack frame parsing by [@0xced](https://github.com/0xced) in [#637](https://github.com/spectreconsole/spectre.console/pull/637)
+* Trying to rework dotnet tools for docs and playwright by [@phil-scott-78](https://github.com/phil-scott-78) in [#667](https://github.com/spectreconsole/spectre.console/pull/667)
+* Add release notes for 0.43.0 by [@patriksvensson](https://github.com/patriksvensson) in [#663](https://github.com/spectreconsole/spectre.console/pull/663)
+* Use file scoped namespace declarations by [@patriksvensson](https://github.com/patriksvensson) in [#666](https://github.com/spectreconsole/spectre.console/pull/666)
+* Add global usings by [@patriksvensson](https://github.com/patriksvensson) in [#668](https://github.com/spectreconsole/spectre.console/pull/668)
+* Changed TypeResolver in Cli/logging by [@nils-a](https://github.com/nils-a) in [#675](https://github.com/spectreconsole/spectre.console/pull/675)
+* Invalid WithExample call on the CommandApp doc page by [@jouniheikniemi](https://github.com/jouniheikniemi) in [#689](https://github.com/spectreconsole/spectre.console/pull/689)
+* Add overload with params array for AddChoiceGroup() by [@Sir-Baconn](https://github.com/Sir-Baconn) in [#682](https://github.com/spectreconsole/spectre.console/pull/682)
+* Simplify exception formatting by [@0xced](https://github.com/0xced) in [#695](https://github.com/spectreconsole/spectre.console/pull/695)
+* Improves exception rendering for async methods in .NET 6 by [@phil-scott-78](https://github.com/phil-scott-78) in [#718](https://github.com/spectreconsole/spectre.console/pull/718)
+* Adding better type names for return types and parameters by [@phil-scott-78](https://github.com/phil-scott-78) in [#719](https://github.com/spectreconsole/spectre.console/pull/719)
+* Docs redesign by [@phil-scott-78](https://github.com/phil-scott-78) in [#728](https://github.com/spectreconsole/spectre.console/pull/728)
+* Configures deployment to netlify by [@phil-scott-78](https://github.com/phil-scott-78) in [#729](https://github.com/spectreconsole/spectre.console/pull/729)
+* Tweaking font-size and line-height for smaller screens by [@phil-scott-78](https://github.com/phil-scott-78) in [#730](https://github.com/spectreconsole/spectre.console/pull/730)
+* Adding a best practices guide. by [@phil-scott-78](https://github.com/phil-scott-78) in [#744](https://github.com/spectreconsole/spectre.console/pull/744)
+* Adds widget for displaying (pretty) paths by [@patriksvensson](https://github.com/patriksvensson) in [#734](https://github.com/spectreconsole/spectre.console/pull/734)
+* Add missing inheritance and nullable types in settings.md by [@seclerp](https://github.com/seclerp) in [#665](https://github.com/spectreconsole/spectre.console/pull/665)
+* Optimizing build by [@phil-scott-78](https://github.com/phil-scott-78) in [#747](https://github.com/spectreconsole/spectre.console/pull/747)
+* Update SixLabors.ImageSharp reference by [@Arcodiant](https://github.com/Arcodiant) in [#748](https://github.com/spectreconsole/spectre.console/pull/748)
+* Add support for styling and aligning paths by [@patriksvensson](https://github.com/patriksvensson) in [#746](https://github.com/spectreconsole/spectre.console/pull/746)
+* Add documentation for `TextPath` widget by [@patriksvensson](https://github.com/patriksvensson) in [#757](https://github.com/spectreconsole/spectre.console/pull/757)
+* Fix path and description for TextPath docs by [@patriksvensson](https://github.com/patriksvensson) in [#758](https://github.com/spectreconsole/spectre.console/pull/758)
+* Adding a short template file for new documentation by [@phil-scott-78](https://github.com/phil-scott-78) in [#763](https://github.com/spectreconsole/spectre.console/pull/763)
+* Introduce MarkupInterpolated and MarkupLineInterpolated extensions by [@phil-scott-78](https://github.com/phil-scott-78) in [#761](https://github.com/spectreconsole/spectre.console/pull/761)
+* Obsolete the AnsiConsoleFactory class by [@0xced](https://github.com/0xced) in [#585](https://github.com/spectreconsole/spectre.console/pull/585)
+* Add option to configure the style of the choices list and the default value in TextPrompt by [@ap0llo](https://github.com/ap0llo) in [#681](https://github.com/spectreconsole/spectre.console/pull/681)

docs/input/blog/posts/2022-09-10-spectre-console-0.45-released.md

@@ -0,0 +1,55 @@
+Title: Spectre.Console 0.45 released!
+Description: .NET 5 dropped, Spectre.Console.Cli moved to separate NuGet package
+Published: 2022-09-10
+Category: Release Notes
+Excluded: false
+---
+
+Version 0.45 of Spectre.Console has been released!
+
+There are some big changes with this release, which you can 
+read all about below.
+
+## Spectre.Console.Cli Moved
+
+All CLI parsing-related functionality has been moved to its own NuGet 
+package: [Spectre.Console.Cli](https://www.nuget.org/packages/spectre.console.cli).
+
+The reasoning for this is that we want to play better with other CLI parsing libraries 
+without the confusion of having two libraries for CLI handling intermixed.
+
+We're sorry for breaking things like this, but we're sure it's the best
+decision moving forward.
+
+## .NET5 Support Dropped
+
+This version has dropped `.NET5` support, which has reached EOL.  
+
+## New Contributors
+
+* [@drewnoakes](https://github.com/drewnoakes) made their first contribution in [#781](https://github.com/spectreconsole/spectre.console/pull/781)
+* [@renovate](https://github.com/renovate) made their first contribution in [#785](https://github.com/spectreconsole/spectre.console/pull/785)
+* [@leo](https://github.com/leo)-costa made their first contribution in [#782](https://github.com/spectreconsole/spectre.console/pull/782)
+* [@wanglong126](https://github.com/wanglong126) made their first contribution in [#819](https://github.com/spectreconsole/spectre.console/pull/819)
+* [@ivml](https://github.com/ivml) made their first contribution in [#834](https://github.com/spectreconsole/spectre.console/pull/834)
+* [@dependabot](https://github.com/dependabot) made their first contribution in [#849](https://github.com/spectreconsole/spectre.console/pull/849)
+* [@danielchalmers](https://github.com/danielchalmers) made their first contribution in [#850](https://github.com/spectreconsole/spectre.console/pull/850)
+* [@nkochnev](https://github.com/nkochnev) made their first contribution in [#920](https://github.com/spectreconsole/spectre.console/pull/920)
+* [@lonix1](https://github.com/lonix1) made their first contribution in [#938](https://github.com/spectreconsole/spectre.console/pull/938)
+
+## What's Changed
+
+* Move `Spectre.Console.Cli` to its own package by [@patriksvensson](https://github.com/patriksvensson) in [#827](https://github.com/spectreconsole/spectre.console/pull/827)
+* Remove the 'net50' TFM by [@patriksvensson](https://github.com/patriksvensson) in [#877](https://github.com/spectreconsole/spectre.console/pull/877)
+* Corrected section heading in `Status` by [@drewnoakes](https://github.com/drewnoakes) in [#781](https://github.com/spectreconsole/spectre.console/pull/781)
+* Upgrade dotnet example tool to `1.6.0` by [@leo](https://github.com/leo)-costa in [#782](https://github.com/spectreconsole/spectre.console/pull/782)
+* Fix documentation workflow by [@patriksvensson](https://github.com/patriksvensson) in [#799](https://github.com/spectreconsole/spectre.console/pull/799)
+* Fix missing API reference pages for `Spectre.Console.Cli` by [@ivml](https://github.com/ivml) in [#834](https://github.com/spectreconsole/spectre.console/pull/834)
+* Fix the "Escaping Interpolated Strings" documentation by [@0xced](https://github.com/0xced) in [#837](https://github.com/spectreconsole/spectre.console/pull/837)
+* Check for null in `TextPrompt` by [@danielchalmers](https://github.com/danielchalmers) in [#850](https://github.com/spectreconsole/spectre.console/pull/850)
+* Fix `ArgumentNullException` on .NET Framework by [@nils](https://github.com/nils)-a in [#923](https://github.com/spectreconsole/spectre.console/pull/923)
+* Add command description to command help message by [@nkochnev](https://github.com/nkochnev) in [#920](https://github.com/spectreconsole/spectre.console/pull/920)
+* Fix missing call to `Validate` when using `CommandConstructorBinde` by [@nils](https://github.com/nils)-a in [#924](https://github.com/spectreconsole/spectre.console/pull/924)
+* Modified `MarkupTokenizer`, so that escaped markup inside markup is valid by [@nils](https://github.com/nils)-a in [#911](https://github.com/spectreconsole/spectre.console/pull/911)
+* Detect non-interactive console via `Console.IsInputRedirected` instead of `Environment.UserInteractive` by [@bastianeicher](https://github.com/bastianeicher) in [#824](https://github.com/spectreconsole/spectre.console/pull/824)
+* Set the `DevelopmentDependency` flag on the `Spectre.Console.Analyzer` project by [@0xced](https://github.com/0xced) in [#950](https://github.com/spectreconsole/spectre.console/pull/950)

docs/input/blog/posts/2023-01-10-spectre-console-0.46-released.md

@@ -0,0 +1,81 @@
+Title: Spectre.Console 0.46 released!
+Description: .NET 7 support, Layout Widget, JSON rendering
+Published: 2023-01-10
+Category: Release Notes
+Excluded: false
+---
+
+Happy new year! 🎉  
+Version 0.46 of Spectre.Console has been released!
+
+A lot has happened since the last release, but the most notable additions 
+and changes are support for [.NET 7](https://devblogs.microsoft.com/dotnet/announcing-dotnet-7/), 
+the new [Layout](https://spectreconsole.net/widgets/layout) widget, and 
+[rendering of JSON](https://spectreconsole.net/widgets/json). There has also been a lot of long overdue work
+on the command line argument parser.
+
+## New Contributors
+* [@GaryMcD](https://github.com/GaryMcD) made their first contribution in [#961](https://github.com/spectreconsole/spectre.console/pull/961)
+* [@eduherminio](https://github.com/eduherminio) made their first contribution in [#964](https://github.com/spectreconsole/spectre.console/pull/964)
+* [@Saalvage](https://github.com/Saalvage) made their first contribution in [#976](https://github.com/spectreconsole/spectre.console/pull/976)
+* [@BenjaminMichaelis](https://github.com/BenjaminMichaelis) made their first contribution in [#1000](https://github.com/spectreconsole/spectre.console/pull/1000)
+* [@nilaoda](https://github.com/nilaoda) made their first contribution in [#1012](https://github.com/spectreconsole/spectre.console/pull/1012)
+* [@picture](https://github.com/picture)-vision made their first contribution in [#1013](https://github.com/spectreconsole/spectre.console/pull/1013)
+* [@patrickfreilinger](https://github.com/patrickfreilinger) made their first contribution in [#1016](https://github.com/spectreconsole/spectre.console/pull/1016)
+* [@sowa](https://github.com/sowa)705 made their first contribution in [#1014](https://github.com/spectreconsole/spectre.console/pull/1014)
+* [@ardalis](https://github.com/ardalis) made their first contribution in [#1021](https://github.com/spectreconsole/spectre.console/pull/1021)
+* [@Elisha](https://github.com/Elisha)-Aguilera made their first contribution in [#1038](https://github.com/spectreconsole/spectre.console/pull/1038)
+* [@wguner](https://github.com/wguner) made their first contribution in [#1044](https://github.com/spectreconsole/spectre.console/pull/1044)
+* [@bcwood](https://github.com/bcwood) made their first contribution in [#1068](https://github.com/spectreconsole/spectre.console/pull/1068)
+* [@FrankRay](https://github.com/FrankRay)78 made their first contribution in [#1073](https://github.com/spectreconsole/spectre.console/pull/1073)
+* [@tomkerkhove](https://github.com/tomkerkhove) made their first contribution in [#1089](https://github.com/spectreconsole/spectre.console/pull/1089)
+* [@ArveSystad](https://github.com/ArveSystad) made their first contribution in [#1090](https://github.com/spectreconsole/spectre.console/pull/1090)
+* [@maije](https://github.com/maije) made their first contribution in [#1096](https://github.com/spectreconsole/spectre.console/pull/1096)
+* [@krisrok](https://github.com/krisrok) made their first contribution in [#953](https://github.com/spectreconsole/spectre.console/pull/953)
+
+## What's changed?
+* Add support for .NET 7.0 by [@patriksvensson](https://github.com/patriksvensson) in [#1056](https://github.com/spectreconsole/spectre.console/pull/1056)
+* Add `Layout` widget by [@patriksvensson](https://github.com/patriksvensson) in [#1041](https://github.com/spectreconsole/spectre.console/pull/1041)
+* Add JSON text renderer by [@patriksvensson](https://github.com/patriksvensson) in [#1086](https://github.com/spectreconsole/spectre.console/pull/1086)
+* Backward direction of text prompt autocomplete by [@nkochnev](https://github.com/nkochnev) in [#921](https://github.com/spectreconsole/spectre.console/pull/921)
+* Custom mask for secret by [@GaryMcD](https://github.com/GaryMcD) in [#970](https://github.com/spectreconsole/spectre.console/pull/970)
+* Allow selections to wrap around by [@Saalvage](https://github.com/Saalvage) in [#976](https://github.com/spectreconsole/spectre.console/pull/976)
+* Join .NET Foundation by [@patriksvensson](https://github.com/patriksvensson) in [#978](https://github.com/spectreconsole/spectre.console/pull/978)
+* Adding value: a single semi-colon! by [@johanlindfors](https://github.com/johanlindfors) in [#986](https://github.com/spectreconsole/spectre.console/pull/986)
+* Fix `@` being used in Figlet font by [@Saalvage](https://github.com/Saalvage) in [#972](https://github.com/spectreconsole/spectre.console/pull/972)
+* Add new and transferred issues to backlog project by [@patriksvensson](https://github.com/patriksvensson) in [#995](https://github.com/spectreconsole/spectre.console/pull/995)
+* Pin SDK due to a bug in .NET 6.0.401 by [@patriksvensson](https://github.com/patriksvensson) in [#1011](https://github.com/spectreconsole/spectre.console/pull/1011)
+* Remove period trimming by [@BenjaminMichaelis](https://github.com/BenjaminMichaelis) in [#1008](https://github.com/spectreconsole/spectre.console/pull/1008)
+* Allow `PACKET` key on MultiSelectionPrompt by [@nilaoda](https://github.com/nilaoda) in [#1012](https://github.com/spectreconsole/spectre.console/pull/1012)
+* Added Suckless Simple Terminal to list of ANSI terminals by [@picture](https://github.com/picture)-vision in [#1013](https://github.com/spectreconsole/spectre.console/pull/1013)
+* Add culture option to `TypeConverterHelper`, `TextPrompt` and `AnsiConsole` by [@sowa](https://github.com/sowa)705 in [#1014](https://github.com/spectreconsole/spectre.console/pull/1014)
+* Minor typo fixes by [@ardalis](https://github.com/ardalis) in [#1021](https://github.com/spectreconsole/spectre.console/pull/1021)
+* Alignment fixes by [@patriksvensson](https://github.com/patriksvensson) in [#1066](https://github.com/spectreconsole/spectre.console/pull/1066)
+* `IndexOf` replaced by Count at Add method - Performance issue #975 fixed by [@maije](https://github.com/maije) in [#1096](https://github.com/spectreconsole/spectre.console/pull/1096)
+* Modified tokenizer not to break on on `]]]` at the end of a style by [@nils](https://github.com/nils)-a in [#1027](https://github.com/spectreconsole/spectre.console/pull/1027)
+* Command line argument parsing improvements by [@FrankRay](https://github.com/FrankRay)78 in [#1048](https://github.com/spectreconsole/spectre.console/pull/1048)
+* Show help for default command by [@krisrok](https://github.com/krisrok) in [#953](https://github.com/spectreconsole/spectre.console/pull/953)
+* Automatically display default values of options in the help page by @0xced in [#1032](https://github.com/spectreconsole/spectre.console/pull/1032)
+
+## Documentation updates
+* Add link to documentation in README by [@ardalis](https://github.com/ardalis) in [#1030](https://github.com/spectreconsole/spectre.console/pull/1030)
+* Update `.NET 5` references in docs by [@eduherminio](https://github.com/eduherminio) in [#964](https://github.com/spectreconsole/spectre.console/pull/964)
+* Blog date fix by [@phil](https://github.com/phil)-scott-78 in [#963](https://github.com/spectreconsole/spectre.console/pull/963)
+* Update sponsors by [@tomkerkhove](https://github.com/tomkerkhove) in [#1089](https://github.com/spectreconsole/spectre.console/pull/1089)
+* Inline `CommandArgument` required/optional style in template parameter docs by [@ArveSystad](https://github.com/ArveSystad) in [#1090](https://github.com/spectreconsole/spectre.console/pull/1090)
+* Add documentation for `BreakdownChart` by [@BenjaminMichaelis](https://github.com/BenjaminMichaelis) in [#1000](https://github.com/spectreconsole/spectre.console/pull/1000)
+* Create `Panel` documentation by [@patrickfreilinger](https://github.com/patrickfreilinger) in [#1016](https://github.com/spectreconsole/spectre.console/pull/1016)
+* Added details for using links within markup. by [@GaryMcD](https://github.com/GaryMcD) in [#961](https://github.com/spectreconsole/spectre.console/pull/961)
+* Added documentation for `Rows` widget by [@Elisha](https://github.com/Elisha)-Aguilera in [#1038](https://github.com/spectreconsole/spectre.console/pull/1038)
+* Added documentation guide for `Grid` widget  by [@Elisha](https://github.com/Elisha)-Aguilera in [#1043](https://github.com/spectreconsole/spectre.console/pull/1043)
+* Added documentation guide for the `Padder` widget by [@Elisha](https://github.com/Elisha)-Aguilera in [#1046](https://github.com/spectreconsole/spectre.console/pull/1046)
+* Created a `Columns` widget documentation by [@wguner](https://github.com/wguner) in [#1044](https://github.com/spectreconsole/spectre.console/pull/1044)
+* Fixed typo in `Panel` documentation [@bcwood](https://github.com/bcwood) in [#1068](https://github.com/spectreconsole/spectre.console/pull/1068)
+* Clarified the license for `SixLabors.ImageSharp` by [@FrankRay](https://github.com/FrankRay)78 in [#1073](https://github.com/spectreconsole/spectre.console/pull/1073)
+* Add documentation for `Layout` by [@patriksvensson](https://github.com/patriksvensson) in [#1127](https://github.com/spectreconsole/spectre.console/pull/1127)
+
+## Dependencies
+* Update dependency `Wcwidth.Sources` to `v1` by [@renovate](https://github.com/renovate) in [#969](https://github.com/spectreconsole/spectre.console/pull/969)
+* Update `actions/setup-dotnet` action to `v3` by [@renovate](https://github.com/renovate) in [#982](https://github.com/spectreconsole/spectre.console/pull/982)
+* Update dependency `Microsoft.NET.Test.Sdk` to `v17.3.2` by [@renovate](https://github.com/renovate) in [#977](https://github.com/spectreconsole/spectre.console/pull/977)
+* Update dependency `cake.tool` to `v2.3.0` by [@renovate](https://github.com/renovate) in [#1015](https://github.com/spectreconsole/spectre.console/pull/1015)

docs/input/blog/posts/BLOG_TEMPLATE.md

@@ -1,6 +1,6 @@
 Title: Short title, less than 50 characters
 Description: Longer description, with optional *bold* and **italic** characters. Shouldn't be TOO long but can span multiple lines.
-Published: 20210710
+Published: 2021-07-10
 Category: Release Notes | News | or whatever
 Excluded: true
 ---

docs/input/cli/commands.md

@@ -37,8 +37,8 @@ app.Configure(config =>
     config.AddCommand<HelloCommand>("hello")
         .WithAlias("hola")
         .WithDescription("Say hello")
-        .WithExample(new []{"hello", "Phil"})
-        .WithExample(new []{"hello", "Phil", "--count", "4"});
+        .WithExample("hello", "Phil")
+        .WithExample("hello", "Phil", "--count", "4");
 });
 ```
 

docs/input/index.md

@@ -1,9 +1,9 @@
 Title: Welcome!
-Description: Spectre.Console is a .NET Standard 2.0 library that makes it easier to create beautiful console applications.
+Description: Spectre.Console is a .NET library that makes it easier to create beautiful console applications.
 Order: 0
 ---
 
-Spectre.Console is a `.NET Standard 2.0` library that makes it easier 
+Spectre.Console is a `.NET` library that makes it easier 
 to create beautiful console applications. 
 
 ## Spectre.Console.AnsiConsole Features

docs/input/live/status.md

@@ -46,7 +46,7 @@ AnsiConsole.Status()
     });
 ```
 
-## Asynchronous progress
+## Asynchronous status
 
 If you prefer to use async/await, you can use `StartAsync` instead of `Start`.
 

docs/input/markup.md

@@ -1,110 +1,119 @@
-Title: Markup
-Order: 30
-Description: The Markup class allows you to output rich text to the console.
-Highlights:
- - Easily add *color*.
- - Add hyperlinks to for supported terminals.
- - Emoji 🚀 parsing.
-Reference:
- - M:Spectre.Console.AnsiConsole.Markup(System.String)
- - M:Spectre.Console.AnsiConsole.MarkupLine(System.String)
- - T:Spectre.Console.Markup
----
-
-The `Markup` class allows you to output rich text to the console.
-
-## Syntax
-
-Console markup uses a syntax inspired by bbcode. If you write the style (see [Styles](xref:styles)) 
-in square brackets, e.g. `[bold red]`, that style will apply until it is closed with a `[/]`.
-
-```csharp
-AnsiConsole.Write(new Markup("[bold yellow]Hello[/] [red]World![/]"));
-```
-
-The `Markup` class implements `IRenderable` which means that you 
-can use this in tables, grids, and panels. Most classes that support
-rendering of `IRenderable` also have overloads for rendering rich text.
-
-```csharp
-var table = new Table();
-table.AddColumn(new TableColumn(new Markup("[yellow]Foo[/]")));
-table.AddColumn(new TableColumn("[blue]Bar[/]"));
-AnsiConsole.Write(table);
-```
-
-## Convenience methods
-
-There is also convenience methods on `AnsiConsole` that can be used
-to write markup text to the console without instantiating a new `Markup`
-instance.
-
-```csharp
-AnsiConsole.Markup("[underline green]Hello[/] ");
-AnsiConsole.MarkupLine("[bold]World[/]");
-```
-
-## Escaping format characters
-
-To output a `[` you use `[[`, and to output a `]` you use `]]`.
-
-```csharp
-AnsiConsole.Markup("[[Hello]] "); // [Hello]
-AnsiConsole.Markup("[red][[World]][/]"); // [World]
-```
-
-You can also use the `EscapeMarkup` extension method.
-
-```csharp
-AnsiConsole.Markup("[red]{0}[/]", "Hello [World]".EscapeMarkup());
-```
-You can also use the `Markup.Escape` method.
-
-```csharp
-AnsiConsole.Markup("[red]{0}[/]", Markup.Escape("Hello [World]"));
-```
-
-## Escaping Interpolated Strings
-
-When working with interpolated string, you can use the `MarkupInterpolated` and `MarkupInterpolatedLine` methods to automatically escape the values in the interpolated string holes.
-
-```csharp
-AnsiConsole.MarkupInterpolated("[red]{0}[/]", "Hello [World]");
-```
-
-## Setting background color
-
-You can set the background color in markup by prefixing the color with
-`on`.
-
-```csharp
-AnsiConsole.Markup("[bold yellow on blue]Hello[/]");
-AnsiConsole.Markup("[default on blue]World[/]");
-```
-
-## Rendering emojis
-
-To output an emoji as part of markup, you can use emoji shortcodes.
-
-```csharp
-AnsiConsole.Markup("Hello :globe_showing_europe_africa:!");
-```
-
-For a list of emoji, see the [Emojis](xref:emojis) appendix section.
-
-## Colors
-
-In the examples above, all colors were referenced by their name,
-but you can also use the hex or rgb representation for colors in markdown.
-
-```csharp
-AnsiConsole.Markup("[red]Foo[/] ");
-AnsiConsole.Markup("[#ff0000]Bar[/] ");
-AnsiConsole.Markup("[rgb(255,0,0)]Baz[/] ");
-```
-
-For a list of colors, see the [Colors](xref:colors) appendix section.
-
-## Styles
-
-For a list of styles, see the [Styles](xref:styles) appendix section.
+Title: Markup
+Order: 30
+Description: The Markup class allows you to output rich text to the console.
+Highlights:
+ - Easily add *color*.
+ - Add hyperlinks to for supported terminals.
+ - Emoji 🚀 parsing.
+Reference:
+ - M:Spectre.Console.AnsiConsole.Markup(System.String)
+ - M:Spectre.Console.AnsiConsole.MarkupLine(System.String)
+ - T:Spectre.Console.Markup
+---
+
+The `Markup` class allows you to output rich text to the console.
+
+## Syntax
+
+Console markup uses a syntax inspired by bbcode. If you write the style (see [Styles](xref:styles)) 
+in square brackets, e.g. `[bold red]`, that style will apply until it is closed with a `[/]`.
+
+```csharp
+AnsiConsole.Write(new Markup("[bold yellow]Hello[/] [red]World![/]"));
+```
+
+The `Markup` class implements `IRenderable` which means that you 
+can use this in tables, grids, and panels. Most classes that support
+rendering of `IRenderable` also have overloads for rendering rich text.
+
+```csharp
+var table = new Table();
+table.AddColumn(new TableColumn(new Markup("[yellow]Foo[/]")));
+table.AddColumn(new TableColumn("[blue]Bar[/]"));
+AnsiConsole.Write(table);
+```
+
+## Convenience methods
+
+There are also convenience methods on `AnsiConsole` that can be used
+to write markup text to the console without instantiating a new `Markup`
+instance.
+
+```csharp
+AnsiConsole.Markup("[underline green]Hello[/] ");
+AnsiConsole.MarkupLine("[bold]World[/]");
+```
+
+## Escaping format characters
+
+To output a `[` you use `[[`, and to output a `]` you use `]]`.
+
+```csharp
+AnsiConsole.Markup("[[Hello]] "); // [Hello]
+AnsiConsole.Markup("[red][[World]][/]"); // [World]
+```
+
+You can also use the `EscapeMarkup` extension method.
+
+```csharp
+AnsiConsole.Markup("[red]{0}[/]", "Hello [World]".EscapeMarkup());
+```
+You can also use the `Markup.Escape` method.
+
+```csharp
+AnsiConsole.Markup("[red]{0}[/]", Markup.Escape("Hello [World]"));
+```
+
+## Escaping Interpolated Strings
+
+When working with interpolated strings, you can use the `MarkupInterpolated` and `MarkupLineInterpolated` methods to automatically escape the values in the interpolated string "holes".
+
+```csharp
+string hello = "Hello [World]";
+AnsiConsole.MarkupInterpolated($"[red]{hello}[/]");
+```
+
+## Setting background color
+
+You can set the background color in markup by prefixing the color with `on`.
+
+```csharp
+AnsiConsole.Markup("[bold yellow on blue]Hello[/]");
+AnsiConsole.Markup("[default on blue]World[/]");
+```
+
+## Rendering emojis
+
+To output an emoji as part of markup, you can use emoji shortcodes.
+
+```csharp
+AnsiConsole.Markup("Hello :globe_showing_europe_africa:!");
+```
+
+For a list of emoji, see the [Emojis](xref:emojis) appendix section.
+
+## Colors
+
+In the examples above, all colors were referenced by their name,
+but you can also use the hex or rgb representation for colors in markdown.
+
+```csharp
+AnsiConsole.Markup("[red]Foo[/] ");
+AnsiConsole.Markup("[#ff0000]Bar[/] ");
+AnsiConsole.Markup("[rgb(255,0,0)]Baz[/] ");
+```
+
+For a list of colors, see the [Colors](xref:colors) appendix section.
+
+## Links
+
+To output a clickable link, you can use the `[link]` style.
+
+```csharp
+AnsiConsole.Markup("[link]https://spectreconsole.net[/]");
+AnsiConsole.Markup("[link=https://spectreconsole.net]Spectre Console Documentation[/]");
+```
+
+## Styles
+
+For a list of styles, see the [Styles](xref:styles) appendix section.

docs/input/prompts/multiselection.md

@@ -29,13 +29,13 @@ var fruits = AnsiConsole.Prompt(
             "[grey](Press [blue]<space>[/] to toggle a fruit, " + 
             "[green]<enter>[/] to accept)[/]")
         .AddChoices(new[] {
-            "Apple", "Apricot", "Avocado", 
+            "Apple", "Apricot", "Avocado",
             "Banana", "Blackcurrant", "Blueberry",
-            "Cherry", "Cloudberry", "Cocunut",
+            "Cherry", "Cloudberry", "Coconut",
         }));
 
 // Write the selected fruits to the terminal
-foreach (string fruit in fruits) 
+foreach (string fruit in fruits)
 {
     AnsiConsole.WriteLine(fruit);
 }

docs/input/prompts/text.md

@@ -63,6 +63,23 @@ What's the secret number? _
 
 ```text
 Enter password: ************_
+```
+
+## Masks
+
+<?# Example symbol="M:Prompt.Program.AskPasswordWithCustomMask" project="Prompt" /?>
+
+
+```text
+Enter password: ------------_
+```
+
+You can utilize a null character to completely hide input.
+
+<?# Example symbol="M:Prompt.Program.AskPasswordWithNullMask" project="Prompt" /?>
+
+```text
+Enter password: _
 ```
 
 ## Optional

docs/input/quick-start.md

@@ -14,7 +14,7 @@ After that you will need to reference the `Spectre.Console` namespace.
 Once that is done, you can start using all the available features.
 
 ```csharp
-using Spectre.Console
+using Spectre.Console;
 
 public static class Program
 {

docs/input/widgets/barchart.md

@@ -6,14 +6,13 @@ Highlights:
     - Labels
     - Use your own data with a converter.
 Reference: T:Spectre.Console.BarChart
-    
+
 ---
 
 Use `BarChart` to render bar charts to the console.
 
 <?# AsciiCast cast="bar-chart" /?>
 
-
 ## Usage
 
 ### Basic usage

docs/input/widgets/breakdownchart.md

@@ -0,0 +1,134 @@
+Title: Breakdown Chart
+Order: 25
+Description: "Use **BreakdownChart** to render breakdown charts to the console."
+Highlights:
+    - Custom colors
+    - Labels
+    - Use your own data with a converter.
+Reference: T:Spectre.Console.BreakdownChart
+
+---
+
+Use `BreakdownChart` to render breakdown charts to the console.
+
+<?# AsciiCast cast="breakdown-chart" /?>
+
+## Usage
+
+### Basic usage
+
+```csharp
+AnsiConsole.Write(new BreakdownChart()
+    .Width(60)
+    // Add item is in the order of label, value, then color.
+    .AddItem("SCSS", 80, 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));
+```
+
+### Additional Styling
+
+```csharp
+// Render chart at full width of console.
+AnsiConsole.Write(new BreakdownChart()
+    .FullSize()
+    .AddItem("SCSS", 80, 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));
+```
+
+```csharp
+// Show percentage signs after the values in the chart.
+AnsiConsole.Write(new BreakdownChart()
+    .ShowPercentage()
+    .AddItem("SCSS", 80, 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));
+```
+
+```csharp
+// Hide tags displaying in the chart altogether.
+AnsiConsole.Write(new BreakdownChart()
+    .HideTag()
+    .AddItem("SCSS", 80, 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));
+```
+
+```csharp
+// Hide the values next to the tag from displaying in the chart.
+AnsiConsole.Write(new BreakdownChart()
+    .HideTagValues()
+    .AddItem("SCSS", 80, 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));
+```
+
+### Additional Functionality
+
+#### Add items with converter
+
+```csharp
+// Create a list of fruits with their colors
+var items = new List<(string Label, double Value, Color color)>
+{
+    ("Apple", 12, Color.Green),
+    ("Orange", 54, Color.Orange1),
+    ("Banana", 33, Color.Yellow),
+};
+
+// Render the chart
+AnsiConsole.Write(new BreakdownChart()
+    .FullSize()
+    .ShowPercentage()
+    .AddItems(items, (item) => new BreakdownChartItem(
+        item.Label, item.Value, item.color)));
+```
+
+#### Add items implementing IBreakdownChartItem
+
+```csharp
+// Declare Fruit that implements IBreakdownChartItem
+public sealed class Fruit : IBreakdownChartItem
+{
+    public string Label { get; set; }
+    public double Value { get; set; }
+    public Color Color { get; set; }
+
+    public Fruit(string label, double value, Color color)
+    {
+        Label = label;
+        Value = value;
+        Color = color;
+    }
+}
+
+// Create a list of fruits
+var items = new List<Fruit>
+{
+    new Fruit("Apple", 12, Color.Green),
+    new Fruit("Orange", 54, Color.Orange1),
+    new Fruit("Banana", 33, Color.Yellow),
+}
+
+// Render chart
+AnsiConsole.Write(new BreakdownChart()
+.Width(60)
+.AddItem(new Fruit("Mango", 3, Color.Orange4))
+.AddItems(items));
+```

docs/input/widgets/columns.md

@@ -0,0 +1,54 @@
+Title: Columns
+Description: "Use **Columns** to render widgets in vertical columns to the console."
+Highlights:
+    - Custom colors
+    - Labels
+    - Use your own data with a converter.
+Reference: T:Spectre.Console.Columns
+
+---
+
+Use `Columns` to render widgets in vertical columns to the console.
+
+<?# AsciiCast cast="columns" /?>
+
+## Usage
+
+### Basic usage
+
+```csharp
+// Render two items on separate columns to Console
+AnsiConsole.Write(new Columns(
+            new Text("Item 1"),
+            new Text("Item 2")
+        ));
+```
+
+### Add items from an IEnumerable
+
+```csharp
+// Create a list of Items
+var columns = new List<Text>(){
+        new Text("Item 1"),
+        new Text("Item 2"),
+        new Text("Item 3")
+    };
+
+// Render each item in list on separate line
+AnsiConsole.Write(new Columns(columns));
+```
+
+### Apply custom styles to each column
+
+```csharp
+// Create a list of Items, apply separate styles to each
+var columns = new List<Text>(){
+    new Text("Item 1", new Style(Color.Red, Color.Black)),
+    new Text("Item 2", new Style(Color.Green, Color.Black)),
+    new Text("Item 3", new Style(Color.Blue, Color.Black))
+};
+
+// Renders each item with own style
+AnsiConsole.Write(new Columns(columns));
+```
+

docs/input/widgets/figlet.md

@@ -12,7 +12,7 @@ Spectre.Console can render [FIGlet](http://www.figlet.org/) text by using the `F
 ```csharp
 AnsiConsole.Write(
     new FigletText("Hello")
-        .LeftAligned()
+        .LeftJustified()
         .Color(Color.Red));
 ```
 
@@ -26,6 +26,6 @@ var font = FigletFont.Load("starwars.flf");
 
 AnsiConsole.Write(
     new FigletText(font, "Hello")
-        .LeftAligned()
+        .LeftJustified()
         .Color(Color.Red));
 ```

docs/input/widgets/grid.md

@@ -0,0 +1,98 @@
+Title: Grid
+Order: 45
+Description: "Use **Grid** to render items in a grid pattern."
+Highlights:
+    - Custom colors
+    - Labels
+    - Use your own data with a converter.
+Reference: T:Spectre.Console.Grid
+
+---
+
+Use `Grid` to render items in a grid pattern.
+
+<?# AsciiCast cast="grid" /?>
+
+## Usage
+
+### Basic usage
+
+```csharp
+var grid = new Grid();
+        
+// Add columns 
+grid.AddColumn();
+grid.AddColumn();
+grid.AddColumn();
+
+// Add header row 
+grid.AddRow(new string[]{"Header 1", "Header 2", "Header 3"});
+grid.AddRow(new string[]{"Row 1", "Row 2", "Row 3"});
+
+// Write to Console
+AnsiConsole.Write(grid);
+```
+
+### Align and style items within cells
+
+```csharp
+var grid = new Grid();
+        
+// Add columns 
+grid.AddColumn();
+grid.AddColumn();
+grid.AddColumn();
+
+// Add header row 
+grid.AddRow(new Text[]{
+    new Text("Header 1", new Style(Color.Red, Color.Black)).LeftJustified(),
+    new Text("Header 2", new Style(Color.Green, Color.Black)).Centered(),
+    new Text("Header 3", new Style(Color.Blue, Color.Black)).RightJustified()
+});
+
+// Add content row 
+grid.AddRow(new Text[]{
+    new Text("Row 1").LeftJustified(),
+    new Text("Row 2").Centered(),
+    new Text("Row 3").RightJustified()
+});
+
+// Write centered cell grid contents to Console
+AnsiConsole.Write(grid);
+```
+
+### Embed a grid within a grid
+
+```csharp
+var grid = new Grid();
+        
+// Add columns 
+grid.AddColumn();
+grid.AddColumn();
+grid.AddColumn();
+
+// Add header row 
+grid.AddRow(new Text[]{
+    new Text("Header 1", new Style(Color.Red, Color.Black)).LeftJustified(),
+    new Text("Header 2", new Style(Color.Green, Color.Black)).Centered(),
+    new Text("Header 3", new Style(Color.Blue, Color.Black)).RightJustified()
+});
+
+var embedded = new Grid();
+
+embedded.AddColumn();
+embedded.AddColumn();
+
+embedded.AddRow(new Text("Embedded I"), new Text("Embedded II"));
+embedded.AddRow(new Text("Embedded III"), new Text("Embedded IV"));
+
+// Add content row 
+grid.AddRow(
+    new Text("Row 1").LeftJustified(),
+    new Text("Row 2").Centered(),
+    embedded
+);
+
+// Write centered cell grid contents to Console
+AnsiConsole.Write(grid);
+```

docs/input/widgets/json.md

@@ -0,0 +1,69 @@
+Title: JSON
+Order: 70
+Description: "Use *ImageSharp* to parse images and render them as Ascii art to the console."
+Reference: T:Spectre.Console.Json.JsonText
+---
+
+To add JSON superpowers to 
+your console application to render JSON text, you will need to install 
+the [Spectre.Console.Json](https://www.nuget.org/packages/Spectre.Console.Json) NuGet package.
+
+```text
+> dotnet add package Spectre.Console.Json
+```
+
+## Rendering JSON
+
+Once you've added the `Spectre.Console.Json` NuGet package, 
+you can start rendering JSON to the console.
+
+```csharp
+using Spectre.Console.Json;
+
+var json = new JsonText(
+    """
+    { 
+        "hello": 32, 
+        "world": { 
+            "foo": 21, 
+            "bar": 255,
+            "baz": [
+                0.32, 0.33e-32,
+                0.42e32, 0.55e+32,
+                {
+                    "hello": "world",
+                    "lol": null
+                }
+            ]
+        } 
+    }
+    """);
+
+AnsiConsole.Write(
+    new Panel(json)
+        .Header("Some JSON in a panel")
+        .Collapse()
+        .RoundedBorder()
+        .BorderColor(Color.Yellow));
+```
+
+### Result
+
+<?# AsciiCast cast="json" /?>
+
+## Styling
+
+All the different JSON parts can be customized to have unique styles.
+
+```csharp
+AnsiConsole.Write(
+    new JsonText(json)
+        .BracesColor(Color.Red)
+        .BracketColor(Color.Green)
+        .ColonColor(Color.Blue)
+        .CommaColor(Color.Red)
+        .StringColor(Color.Green)
+        .NumberColor(Color.Blue)
+        .BooleanColor(Color.Red)
+        .NullColor(Color.Green));
+```

docs/input/widgets/layout.md

@@ -0,0 +1,64 @@
+Title: Layout
+Order: 45
+Description: "Use **Layout** to layout widgets in the terminal."
+Reference: T:Spectre.Console.Layout
+
+---
+
+Use `Layout` to layout widgets in the terminal.
+
+<?# AsciiCast cast="layout" /?>
+
+## Usage
+
+```csharp
+// Create the layout
+var layout = new Layout("Root")
+    .SplitColumns(
+        new Layout("Left"),
+        new Layout("Right")
+            .SplitRows(
+                new Layout("Top"),
+                new Layout("Bottom")));
+
+// Update the left column
+layout["Left"].Update(
+    new Panel(
+        Align.Center(
+            new Markup("Hello [blue]World![/]"),
+            VerticalAlignment.Middle))
+        .Expand());
+
+// Render the layout
+AnsiConsole.Write(layout);
+```
+
+## Setting minimum size
+
+```csharp
+layout["Left"].MinimumSize(10);
+```
+
+## Setting ratio
+
+```csharp
+layout["Left"].Ratio(2);
+```
+
+## Settings explicit size
+
+```csharp
+layout["Left"].Size(32);
+```
+
+## Hide layout
+
+```csharp
+layout["Left"].Invisible();
+```
+
+## Show layout
+
+```csharp
+layout["Left"].Visible();
+```

docs/input/widgets/padder.md

@@ -0,0 +1,68 @@
+Title: Padder
+Order: 55
+Description: "Use **Padder** to add padding around a Widget."
+Highlights:
+    - Custom colors
+    - Labels
+    - Use your own data with a converter.
+Reference: T:Spectre.Console.Padder
+
+---
+
+Use `Padder` to add padding around a Widget.
+
+<?# AsciiCast cast="padder" /?>
+
+## Usage
+
+### Basic usage
+
+```csharp
+// Create three text elements
+var paddedText_I = new Text("Padded Text I", new Style(Color.Red, Color.Black));
+var paddedText_II = new Text("Padded Text II", new Style(Color.Green, Color.Black));
+var paddedText_III = new Text("Padded Text III", new Style(Color.Blue, Color.Black));
+
+// Apply padding to the three text elements
+var pad_I = new Padder(paddedText_I).PadRight(16).PadBottom(0).PadTop(4);
+var pad_II = new Padder(paddedText_II).PadBottom(0).PadTop(2);
+var pad_III = new Padder(paddedText_III).PadLeft(16).PadBottom(0).PadTop(0);
+
+// Insert padded elements within single-row grid
+var grid = new Grid();
+
+grid.AddColumn();
+grid.AddColumn();
+grid.AddColumn();
+
+grid.AddRow(pad_I, pad_II, pad_III);
+
+// Write grid and it's padded contents to the Console
+AnsiConsole.Write(grid);
+```
+
+### Padding element within a padded element
+
+```csharp
+// Create two text elements
+var paddedText_I = new Text("Padded Text I", new Style(Color.Red, Color.Black));
+var paddedText_II = new Text("Padded Text II", new Style(Color.Blue, Color.Black));
+
+// Create, apply padding on text elements
+var pad_I = new Padder(paddedText_I).PadRight(2).PadBottom(0).PadTop(0);
+var pad_II = new Padder(paddedText_II).PadLeft(2).PadBottom(0).PadTop(0);
+
+// Insert the text elements into a single row grid
+var grid = new Grid();
+
+grid.AddColumn();
+grid.AddColumn();
+
+grid.AddRow(pad_I, pad_II);
+
+// Apply horizontal and vertical padding on the grid
+var paddedGrid = new Padder(grid).Padding(4,1);
+
+// Write the padded grid to the Console
+AnsiConsole.Write(paddedGrid);
+```

docs/input/widgets/panel.md

@@ -0,0 +1,61 @@
+Title: Panel
+Order: 0
+RedirectFrom: panels
+Description: "The **Panel** widget can be used to organize text into a rendered box."
+Reference: T:Spectre.Console.Panel
+
+---
+
+The `Panel` widget can be used to organize text into a rendered box.
+
+<?# AsciiCast cast="panel" /?>
+
+## Usage
+
+To render a panel, create a `Panel` instance, passing a string to its constructor to assign the contents.
+
+```csharp
+var panel = new Panel("Hello World");
+```
+
+## Appearance
+
+# Headers
+
+```csharp
+// Sets the header
+panel.Header = new PanelHeader("Some text");
+```
+
+# Borders
+
+For a list of borders, see the [Borders](xref:borders) appendix section.
+
+```csharp
+// Sets the border
+panel.Border = BoxBorder.Ascii;
+panel.Border = BoxBorder.Square;
+panel.Border = BoxBorder.Rounded;
+panel.Border = BoxBorder.Heavy;
+panel.Border = BoxBorder.Double;
+panel.Border = BoxBorder.None;
+```
+
+# Padding
+
+```csharp
+// Sets the padding
+panel.Padding = new Padding(2, 2, 2, 2);
+```
+
+# Expand
+
+Enabling the Expand property will cause the Panel to be as wide as the console. 
+Otherwise, the Panel width will be automatically calculated based on its content.
+Note that this auto-calculation is not based on the Panel Header, so a Header that
+is long in length may get truncated with certain content.
+
+```csharp
+// Sets the expand property
+panel.Expand = true;
+```

docs/input/widgets/rows.md

@@ -0,0 +1,54 @@
+Title: Rows
+Order: 20
+Description: "Use **Rows** to render widgets in horiztonal rows to the console."
+Highlights:
+    - Custom colors
+    - Labels
+    - Use your own data with a converter.
+Reference: T:Spectre.Console.Rows
+
+---
+
+Use `Rows` to render widgets in horizontal rows to the console.
+
+<?# AsciiCast cast="rows" /?>
+
+## Usage
+
+### Basic usage
+
+```csharp
+// Render two items on separate rows to Console
+AnsiConsole.Write(new Rows(
+            new Text("Item 1"),
+            new Text("Item 2")
+        ));
+```
+
+### Add items from an IEnumerable
+
+```csharp
+// Create a list of Items
+var rows = new List<Text>(){
+        new Text("Item 1"),
+        new Text("Item 2"),
+        new Text("Item 3")
+    };
+
+// Render each item in list on separate line
+AnsiConsole.Write(new Rows(rows));
+```
+
+### Apply custom styles to each row
+
+```csharp
+// Create a list of Items, apply separate styles to each
+var rows = new List<Text>(){
+    new Text("Item 1", new Style(Color.Red, Color.Black)),
+    new Text("Item 2", new Style(Color.Green, Color.Black)),
+    new Text("Item 3", new Style(Color.Blue, Color.Black))
+};
+
+// Renders each item with own style
+AnsiConsole.Write(new Rows(rows));
+```

docs/input/widgets/rule.md

@@ -53,7 +53,7 @@ You can also specify it via an extension method:
 
 ```csharp
 var rule = new Rule("[red]Hello[/]");
-rule.LeftAligned();
+rule.LeftJustified();
 AnsiConsole.Write(rule);
 ```
 

docs/input/widgets/text-path.md

@@ -34,7 +34,7 @@ You can also specify styles via extension methods:
 
 ```csharp
 var path = new TextPath("C:/This/Path/Is/Too/Long/To/Fit/In/The/Area.txt")
-    .RightAligned();
+    .RightJustified();
 ```
 
 ## Styling

docs/input/widgets/tree.md

@@ -43,7 +43,7 @@ AnsiConsole.Write(root);
 ## Collapsing nodes
 
 ```csharp
-root.AddNode("Label").Collapsed();
+root.AddNode("Label").Collapse();
 ```
 
 ## Appearance

docs/package-lock.json

@@ -5,6 +5,7 @@
   "requires": true,
   "packages": {
     "": {
+      "name": "docs",
       "version": "1.0.0",
       "license": "MIT",
       "devDependencies": {

docs/src/SocialCards/index.cshtml

@@ -15,7 +15,7 @@
 
   <div id="container">
     <div id="console">
-        <div class="line"><span style="color:var(--brightBlack)">╭─</span><span style="color:var(--folder)">&#xe0b2;</span><span style="background-color:var(--folder);color:var(--black)"> ~/spectre.console</span><span style="color:var(--folder);background-color:var(--dotnet)">&#xe0b0;</span><span style="background-color:var(--blue)"> .NET 5.0 </span><span style="color:var(--dotnet);background-color:var(--git)">&#xe0b0;</span><span style="background-color:var(--git);color:var(--background)"> &#xe0a0; main </span><span style="color:var(--git)">&#xe0b4;</span></div>
+        <div class="line"><span style="color:var(--brightBlack)">╭─</span><span style="color:var(--folder)">&#xe0b2;</span><span style="background-color:var(--folder);color:var(--black)"> ~/spectre.console</span><span style="color:var(--folder);background-color:var(--dotnet)">&#xe0b0;</span><span style="background-color:var(--blue)"> .NET 7.0 </span><span style="color:var(--dotnet);background-color:var(--git)">&#xe0b0;</span><span style="background-color:var(--git);color:var(--background)"> &#xe0a0; main </span><span style="color:var(--git)">&#xe0b4;</span></div>
         <div class="line"><span style="color:var(--brightBlack)">╰─</span> dotnet run</div>
         <div class="line"></div>
         <div class="line">╭────────────────────────────────────────────────────────╮</div>

dotnet-tools.json

@@ -3,19 +3,19 @@
   "isRoot": true,
   "tools": {
     "cake.tool": {
-      "version": "2.0.0-rc0001",
+      "version": "3.0.0",
       "commands": [
         "dotnet-cake"
       ]
     },
     "gpr": {
-      "version": "0.1.224",
+      "version": "0.1.281",
       "commands": [
         "gpr"
       ]
     },
     "dotnet-example": {
-      "version": "1.5.0",
+      "version": "2.0.0",
       "commands": [
         "dotnet-example"
       ]

examples/Cli/Delegates/Delegates.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <ExampleName>Delegates</ExampleName>
     <ExampleDescription>Demonstrates how to specify commands as delegates.</ExampleDescription>

examples/Cli/Demo/Demo.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <ExampleName>Demo</ExampleName>
     <ExampleDescription>Demonstrates the most common use cases of Spectre.Cli.</ExampleDescription>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Spectre.Console\Spectre.Console.csproj" />
+    <ProjectReference Include="..\..\..\src\Spectre.Console.Cli\Spectre.Console.Cli.csproj" />
   </ItemGroup>
 
 </Project>

examples/Cli/Dynamic/Dynamic.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <ExampleName>Dynamic</ExampleName>
     <ExampleDescription>Demonstrates how to define dynamic commands.</ExampleDescription>

examples/Cli/Injection/Injection.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <ExampleName>Injection</ExampleName>
     <ExampleDescription>Demonstrates how to use dependency injection with Spectre.Cli.</ExampleDescription>
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

examples/Cli/Logging/Logging.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <ExampleName>Logging</ExampleName>
     <ExampleDescription>Demonstrates how to dynamically configure Serilog for logging using parameters from a command.</ExampleDescription>
@@ -12,10 +12,10 @@
   </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="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+    <PackageReference Include="Serilog" Version="2.11.0" />
+    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
+    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Map" Version="1.0.2" />
   </ItemGroup>
 

examples/Console/AlternateScreen/AlternateScreen.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Screens</ExampleTitle>
     <ExampleDescription>Demonstrates how to use alternate screens.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

examples/Console/Borders/Borders.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Borders</ExampleTitle>
     <ExampleDescription>Demonstrates the different kind of borders.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

examples/Console/Borders/Program.cs

@@ -84,7 +84,7 @@ public static class Program
     private static void HorizontalRule(string title)
     {
         AnsiConsole.WriteLine();
-        AnsiConsole.Write(new Rule($"[white bold]{title}[/]").RuleStyle("grey").LeftAligned());
+        AnsiConsole.Write(new Rule($"[white bold]{title}[/]").RuleStyle("grey").LeftJustified());
         AnsiConsole.WriteLine();
     }
 }

examples/Console/Calendars/Calendars.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Calendars</ExampleTitle>
     <ExampleDescription>Demonstrates how to render calendars.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

examples/Console/Canvas/Canvas.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Canvas</ExampleTitle>
     <ExampleDescription>Demonstrates how to render pixels and images.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

examples/Console/Canvas/Program.cs

@@ -40,7 +40,7 @@ public static class Program
     private static void Render(IRenderable canvas, string title)
     {
         AnsiConsole.WriteLine();
-        AnsiConsole.Write(new Rule($"[yellow]{title}[/]").LeftAligned().RuleStyle("grey"));
+        AnsiConsole.Write(new Rule($"[yellow]{title}[/]").LeftJustified().RuleStyle("grey"));
         AnsiConsole.WriteLine();
         AnsiConsole.Write(canvas);
     }

examples/Console/Charts/Charts.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Charts</ExampleTitle>
     <ExampleDescription>Demonstrates how to render charts in a console.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

examples/Console/Colors/Colors.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Colors</ExampleTitle>
     <ExampleDescription>Demonstrates how to use [yellow]c[/][red]o[/][green]l[/][blue]o[/][aqua]r[/][lime]s[/] in the console.</ExampleDescription>
     <ExampleGroup>Misc</ExampleGroup>

examples/Console/Colors/Program.cs

@@ -23,7 +23,7 @@ public static class Program
         {
             AnsiConsole.ResetColors();
             AnsiConsole.WriteLine();
-            AnsiConsole.Write(new Rule("[yellow bold underline]3-bit Colors[/]").RuleStyle("grey").LeftAligned());
+            AnsiConsole.Write(new Rule("[yellow bold underline]3-bit Colors[/]").RuleStyle("grey").LeftJustified());
             AnsiConsole.WriteLine();
 
             for (var i = 0; i < 8; i++)
@@ -46,7 +46,7 @@ public static class Program
         {
             AnsiConsole.ResetColors();
             AnsiConsole.WriteLine();
-            AnsiConsole.Write(new Rule("[yellow bold underline]4-bit Colors[/]").RuleStyle("grey").LeftAligned());
+            AnsiConsole.Write(new Rule("[yellow bold underline]4-bit Colors[/]").RuleStyle("grey").LeftJustified());
             AnsiConsole.WriteLine();
 
             for (var i = 0; i < 16; i++)
@@ -69,7 +69,7 @@ public static class Program
         {
             AnsiConsole.ResetColors();
             AnsiConsole.WriteLine();
-            AnsiConsole.Write(new Rule("[yellow bold underline]8-bit Colors[/]").RuleStyle("grey").LeftAligned());
+            AnsiConsole.Write(new Rule("[yellow bold underline]8-bit Colors[/]").RuleStyle("grey").LeftJustified());
             AnsiConsole.WriteLine();
 
             for (var i = 0; i < 16; i++)
@@ -96,7 +96,7 @@ public static class Program
         {
             AnsiConsole.ResetColors();
             AnsiConsole.WriteLine();
-            AnsiConsole.Write(new Rule("[yellow bold underline]24-bit Colors[/]").RuleStyle("grey").LeftAligned());
+            AnsiConsole.Write(new Rule("[yellow bold underline]24-bit Colors[/]").RuleStyle("grey").LeftJustified());
             AnsiConsole.WriteLine();
 
             AnsiConsole.Write(new ColorBox(width: 80, height: 15));

examples/Console/Columns/Columns.csproj

@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Columns</ExampleTitle>
     <ExampleDescription>Demonstrates how to render data into columns.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>

examples/Console/Cursor/Cursor.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Cursor</ExampleTitle>
     <ExampleDescription>Demonstrates how to move the cursor.</ExampleDescription>
     <ExampleGroup>Misc</ExampleGroup>

examples/Console/Emojis/Emojis.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Emojis</ExampleTitle>
     <ExampleDescription>Demonstrates how to render emojis.</ExampleDescription>
     <ExampleGroup>Misc</ExampleGroup>

examples/Console/Exceptions/Exceptions.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Exceptions</ExampleTitle>
     <ExampleDescription>Demonstrates how to render formatted exceptions.</ExampleDescription>
     <ExampleGroup>Misc</ExampleGroup>

examples/Console/Exceptions/Program.cs

@@ -19,17 +19,17 @@ public static class Program
         catch (Exception ex)
         {
             AnsiConsole.WriteLine();
-            AnsiConsole.Write(new Rule("Default").LeftAligned());
+            AnsiConsole.Write(new Rule("Default").LeftJustified());
             AnsiConsole.WriteLine();
             AnsiConsole.WriteException(ex);
 
             AnsiConsole.WriteLine();
-            AnsiConsole.Write(new Rule("Compact").LeftAligned());
+            AnsiConsole.Write(new Rule("Compact").LeftJustified());
             AnsiConsole.WriteLine();
             AnsiConsole.WriteException(ex, ExceptionFormats.ShortenEverything | ExceptionFormats.ShowLinks);
 
             AnsiConsole.WriteLine();
-            AnsiConsole.Write(new Rule("Compact + Custom colors").LeftAligned());
+            AnsiConsole.Write(new Rule("Compact + Custom colors").LeftJustified());
             AnsiConsole.WriteLine();
             AnsiConsole.WriteException(ex, new ExceptionSettings
             {
@@ -56,7 +56,7 @@ public static class Program
         catch (Exception ex)
         {
             AnsiConsole.WriteLine();
-            AnsiConsole.Write(new Rule("Async").LeftAligned());
+            AnsiConsole.Write(new Rule("Async").LeftJustified());
             AnsiConsole.WriteLine();
             AnsiConsole.WriteException(ex, ExceptionFormats.ShortenPaths);
         }

examples/Console/Figlet/Figlet.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Figlet</ExampleTitle>
     <ExampleDescription>Demonstrates how to render FIGlet text.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

examples/Console/Figlet/Program.cs

@@ -6,8 +6,8 @@ public static class Program
 {
     public static void Main(string[] args)
     {
-        AnsiConsole.Write(new FigletText("Left aligned").LeftAligned().Color(Color.Red));
+        AnsiConsole.Write(new FigletText("Left aligned").LeftJustified().Color(Color.Red));
         AnsiConsole.Write(new FigletText("Centered").Centered().Color(Color.Green));
-        AnsiConsole.Write(new FigletText("Right aligned").RightAligned().Color(Color.Blue));
+        AnsiConsole.Write(new FigletText("Right aligned").RightJustified().Color(Color.Blue));
     }
 }

examples/Console/Grids/Grids.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Grids</ExampleTitle>
     <ExampleDescription>Demonstrates how to render grids in a console.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

examples/Console/Info/Info.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Info</ExampleTitle>
     <ExampleDescription>Displays the capabilities of the current console.</ExampleDescription>
     <ExampleGroup>Misc</ExampleGroup>

examples/Console/Json/Json.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net7.0</TargetFramework>
+    <ExampleTitle>Json</ExampleTitle>
+    <ExampleDescription>Demonstrates how to print syntax highlighted JSON.</ExampleDescription>
+    <ExampleGroup>Widgets</ExampleGroup>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
+    <ProjectReference Include="..\..\..\src\Spectre.Console.Json\Spectre.Console.Json.csproj" />
+  </ItemGroup>
+
+</Project>

examples/Console/Json/Program.cs

@@ -0,0 +1,36 @@
+using Spectre.Console;
+using Spectre.Console.Json;
+
+namespace Json;
+
+public static class Program
+{
+    public static void Main()
+    {
+        var json = new JsonText(
+            """
+            { 
+                "hello": 32, 
+                "world": { 
+                    "foo": 21, 
+                    "bar": 255,
+                    "baz": [
+                        0.32, 0.33e-32,
+                        0.42e32, 0.55e+32,
+                        {
+                            "hello": "world",
+                            "lol": null
+                        }
+                    ]
+                } 
+            }
+            """);
+
+        AnsiConsole.Write(
+            new Panel(json)
+                .Header("Some JSON in a panel")
+                .Collapse()
+                .RoundedBorder()
+                .BorderColor(Color.Yellow));
+    }
+}

examples/Console/Layout/Layout.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net7.0</TargetFramework>
+    <ExampleTitle>Layout</ExampleTitle>
+    <ExampleDescription>Demonstrates how to use layouts.</ExampleDescription>
+    <ExampleGroup>Widgets</ExampleGroup>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
+  </ItemGroup>
+
+</Project>

examples/Console/Layout/Program.cs

@@ -0,0 +1,60 @@
+using System;
+using Spectre.Console;
+
+namespace Layouts;
+
+public static class Program
+{
+    public static void Main()
+    {
+        var layout = CreateLayout();
+        AnsiConsole.Write(layout);
+
+        Console.ReadKey(true);
+    }
+
+    private static Layout CreateLayout()
+    {
+        var layout = new Layout();
+
+        layout.SplitRows(
+            new Layout("Top")
+                .SplitColumns(
+                    new Layout("Left")
+                        .SplitRows(
+                            new Layout("LeftTop"),
+                            new Layout("LeftBottom")),
+                    new Layout("Right").Ratio(2),
+                    new Layout("RightRight").Size(3)),
+            new Layout("Bottom"));
+
+        layout["LeftBottom"].Update(
+            new Panel("[blink]PRESS ANY KEY TO QUIT[/]")
+                .Expand()
+                .BorderColor(Color.Yellow)
+                .Padding(0, 0));
+
+        layout["Right"].Update(
+            new Panel(
+                new Table()
+                    .AddColumns("[blue]Qux[/]", "[green]Corgi[/]")
+                    .AddRow("9", "8")
+                    .AddRow("7", "6")
+                    .Expand())
+            .Header("A [yellow]Table[/] in a [blue]Panel[/] (Ratio=2)")
+            .Expand());
+
+        layout["RightRight"].Update(
+            new Panel("Explicit-size-is-[yellow]3[/]")
+                .BorderColor(Color.Yellow)
+                .Padding(0, 0));
+
+        layout["Bottom"].Update(
+        new Panel(
+                new FigletText("Hello World"))
+            .Header("Some [green]Figlet[/] text")
+            .Expand());
+
+        return layout;
+    }
+}

examples/Console/Links/Links.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Links</ExampleTitle>
     <ExampleDescription>Demonstrates how to render links in a console.</ExampleDescription>
     <ExampleGroup>Misc</ExampleGroup>

examples/Console/Live/Live.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Live</ExampleTitle>
     <ExampleDescription>Demonstrates how to do live updates.</ExampleDescription>
     <ExampleGroup>Live</ExampleGroup>

examples/Console/LiveTable/LiveTable.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>LiveTable</ExampleTitle>
     <ExampleDescription>Demonstrates how to do live updates in a table.</ExampleDescription>
     <ExampleGroup>Live</ExampleGroup>

examples/Console/Minimal/Minimal.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <ExampleTitle>Minimal</ExampleTitle>
     <ExampleDescription>Demonstrates a minimal console application.</ExampleDescription>

examples/Console/Panels/Panels.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Panels</ExampleTitle>
     <ExampleDescription>Demonstrates how to render items in panels.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

examples/Console/Panels/Program.cs

@@ -17,7 +17,7 @@ public static class Program
 
         // Left adjusted panel with text
         AnsiConsole.Write(
-            new Panel(new Text("Left adjusted\nLeft").LeftAligned())
+            new Panel(new Text("Left adjusted\nLeft").LeftJustified())
                 .Expand()
                 .SquareBorder()
                 .Header("[red]Left[/]"));
@@ -32,7 +32,7 @@ public static class Program
 
         // Right adjusted, rounded panel with text
         AnsiConsole.Write(
-            new Panel(new Text("Right adjusted\nRight").RightAligned())
+            new Panel(new Text("Right adjusted\nRight").RightJustified())
                 .Expand()
                 .RoundedBorder()
                 .Header("[blue]Right[/]")

examples/Console/Paths/Paths.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Paths</ExampleTitle>
     <ExampleDescription>Demonstrates how to render paths.</ExampleDescription>
     <ExampleGroup>Widgets</ExampleGroup>

examples/Console/Paths/Program.cs

@@ -58,9 +58,9 @@ public static class Program
         var table = new Table().BorderColor(Color.Grey).Title("Aligned").RoundedBorder();
         table.AddColumns("[grey]Alignment[/]", "[grey]Path[/]");
 
-        table.AddRow(new Text("Left"), new TextPath(path).LeftAligned());
+        table.AddRow(new Text("Left"), new TextPath(path).LeftJustified());
         table.AddRow(new Text("Center"), new TextPath(path).Centered());
-        table.AddRow(new Text("Right"), new TextPath(path).RightAligned());
+        table.AddRow(new Text("Right"), new TextPath(path).RightJustified());
 
         AnsiConsole.Write(table);
     }

examples/Console/Progress/Progress.csproj

@@ -2,14 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ExampleTitle>Progress</ExampleTitle>
     <ExampleDescription>Demonstrates how to show progress bars.</ExampleDescription>
     <ExampleGroup>Status</ExampleGroup>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>

examples/Console/Prompt/Program.cs

@@ -33,14 +33,20 @@ namespace Prompt
             var age = AskAge();
 
             WriteDivider("Secrets");
-            var password = AskPassword();
+            var password = AskPassword();
+
+            WriteDivider("Mask");
+            var mask = AskPasswordWithCustomMask();
+
+            WriteDivider("Null Mask");
+            var nullMask = AskPasswordWithNullMask();
 
             WriteDivider("Optional");
             var color = AskColor();
 
             // Summary
             AnsiConsole.WriteLine();
-            AnsiConsole.Write(new Rule("[yellow]Results[/]").RuleStyle("grey").LeftAligned());
+            AnsiConsole.Write(new Rule("[yellow]Results[/]").RuleStyle("grey").LeftJustified());
             AnsiConsole.Write(new Table().AddColumns("[grey]Question[/]", "[grey]Answer[/]")
                 .RoundedBorder()
                 .BorderColor(Color.Grey)
@@ -48,14 +54,16 @@ namespace Prompt
                 .AddRow("[grey]Favorite fruit[/]", fruit)
                 .AddRow("[grey]Favorite sport[/]", sport)
                 .AddRow("[grey]Age[/]", age.ToString())
-                .AddRow("[grey]Password[/]", password)
+                .AddRow("[grey]Password[/]", password)
+                .AddRow("[grey]Mask[/]", mask)
+                .AddRow("[grey]Null Mask[/]", nullMask)
                 .AddRow("[grey]Favorite color[/]", string.IsNullOrEmpty(color) ? "Unknown" : color));
         }
 
         private static void WriteDivider(string text)
         {
             AnsiConsole.WriteLine();
-            AnsiConsole.Write(new Rule($"[yellow]{text}[/]").RuleStyle("grey").LeftAligned());
+            AnsiConsole.Write(new Rule($"[yellow]{text}[/]").RuleStyle("grey").LeftJustified());
         }
 
         public static bool AskConfirmation()
@@ -107,7 +115,7 @@ namespace Prompt
                         .AddChoices(favorites));
             }
 
-            AnsiConsole.MarkupLine("Your selected: [yellow]{0}[/]", fruit);
+            AnsiConsole.MarkupLine("You selected: [yellow]{0}[/]", fruit);
             return fruit;
         }
 
@@ -145,6 +153,22 @@ namespace Prompt
                 new TextPrompt<string>("Enter [green]password[/]?")
                     .PromptStyle("red")
                     .Secret());
+        }
+
+        public static string AskPasswordWithCustomMask()
+        {
+            return AnsiConsole.Prompt(
+                new TextPrompt<string>("Enter [green]password[/]?")
+                    .PromptStyle("red")
+                    .Secret('-'));
+        }
+
+        public static string AskPasswordWithNullMask()
+        {
+            return AnsiConsole.Prompt(
+                new TextPrompt<string>("Enter [green]password[/]?")
+                    .PromptStyle("red")
+                    .Secret(null));
         }
 
         public static string AskColor()

examples/Console/Prompt/Prompt.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <LangVersion>9</LangVersion>
     <ExampleTitle>Prompt</ExampleTitle>
     <ExampleDescription>Demonstrates how to get input from a user.</ExampleDescription>