Pārlūkot izejas kodu

Fixed release builds 4

Tig 3 mēneši atpakaļ
vecāks
revīzija
ba4503a2b0

+ 1 - 1
NoSamples.slnf

@@ -3,7 +3,7 @@
     "path": "Terminal.sln",
     "path": "Terminal.sln",
     "projects": [
     "projects": [
       "Terminal.Gui\\Terminal.Gui.csproj",
       "Terminal.Gui\\Terminal.Gui.csproj",
-      "UICatalog\\UICatalog.csproj",
+      "Examples\\UICatalog\\UICatalog.csproj",
       "Tests\\UnitTests\\UnitTests.csproj",
       "Tests\\UnitTests\\UnitTests.csproj",
       "Tests\\UnitTestsParallelizable\\UnitTests.Parallelizable.csproj",
       "Tests\\UnitTestsParallelizable\\UnitTests.Parallelizable.csproj",
       "Tests\\IntegrationTests\\IntegrationTests.csproj",
       "Tests\\IntegrationTests\\IntegrationTests.csproj",

+ 38 - 34
README.md

@@ -1,4 +1,3 @@
-![Terminal.Gui](https://socialify.git.ci/gui-cs/Terminal.Gui/image?description=1&descriptionEditable=Cross%20Platform%20Terminal%20UI%20Toolkit&font=KoHo&forks=1&logo=https%3A%2F%2Fgithub.com%2Fgui-cs%2FTerminal.Gui%2Fblob%2Fv2_develop%2Fdocfx%2Fimages%2Flogo.png%3Fraw%3Dtrue&pattern=Circuit%20Board&stargazers=1&theme=Dark)
 ![.NET Core](https://github.com/gui-cs/Terminal.Gui/workflows/.NET%20Core/badge.svg?branch=develop)
 ![.NET Core](https://github.com/gui-cs/Terminal.Gui/workflows/.NET%20Core/badge.svg?branch=develop)
 [![Version](https://img.shields.io/nuget/v/Terminal.Gui.svg)](https://www.nuget.org/packages/Terminal.Gui)
 [![Version](https://img.shields.io/nuget/v/Terminal.Gui.svg)](https://www.nuget.org/packages/Terminal.Gui)
 ![Code Coverage](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/migueldeicaza/90ef67a684cb71db1817921a970f8d27/raw/code-coverage.json)
 ![Code Coverage](https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/migueldeicaza/90ef67a684cb71db1817921a970f8d27/raw/code-coverage.json)
@@ -6,16 +5,25 @@
 [![License](https://img.shields.io/github/license/gui-cs/gui.cs.svg)](LICENSE)
 [![License](https://img.shields.io/github/license/gui-cs/gui.cs.svg)](LICENSE)
 ![Bugs](https://img.shields.io/github/issues/gui-cs/gui.cs/bug)
 ![Bugs](https://img.shields.io/github/issues/gui-cs/gui.cs/bug)
 
 
+# Terminal.Gui
+
+The premier toolkit for building rich console apps for Windows, the Mac, and Linux/Unix.
+
+![logo](docfx/images/logo.png)
+
 * The current, stable, release of Terminal.Gui v1 is [![Version](https://img.shields.io/nuget/v/Terminal.Gui.svg)](https://www.nuget.org/packages/Terminal.Gui).
 * The current, stable, release of Terminal.Gui v1 is [![Version](https://img.shields.io/nuget/v/Terminal.Gui.svg)](https://www.nuget.org/packages/Terminal.Gui).
-* The current `prealpha` release of Terminal.Gui v2 can be found on [Nuget](https://www.nuget.org/packages/Terminal.Gui).
-* Developers starting new TUI projects are encouraged to target `v2`. The API is significantly changed, and significantly improved. There will be breaking changes in the API before Beta, but the core API is stable.
-* `v1` is in maintenance mode and we will only accept PRs for issues impacting existing functionality.
- 
-**Terminal.Gui**: A toolkit for building rich console apps for Windows, the Mac, and Linux/Unix.
+
+> :warning: **Note:**  
+> `v1` is in maintenance mode and we will only accept PRs for issues impacting existing functionality.
+
+* The current `prealpha` release of Terminal.Gui v2 is ![NuGet Version](https://img.shields.io/nuget/vpre/Terminal.Gui)
+
+> :warning: **Note:**  
+> Developers starting new TUI projects are encouraged to target `v2`. The API is significantly changed, and significantly improved. There will be breaking changes in the API before Beta, but the core API is stable.
 
 
 ![Sample app](docfx/images/sample.gif)
 ![Sample app](docfx/images/sample.gif)
 
 
-## Quick Start
+# Quick Start
 
 
 Paste these commands into your favorite terminal on Windows, Mac, or Linux. This will install the [Terminal.Gui.Templates](https://github.com/gui-cs/Terminal.Gui.templates), create a new "Hello World" TUI app, and run it.
 Paste these commands into your favorite terminal on Windows, Mac, or Linux. This will install the [Terminal.Gui.Templates](https://github.com/gui-cs/Terminal.Gui.templates), create a new "Hello World" TUI app, and run it.
 
 
@@ -36,43 +44,39 @@ dotnet run --project Examples/UICatalog/UICatalog.csproj
 
 
 There is also a [visual designer](https://github.com/gui-cs/TerminalGuiDesigner) (uses Terminal.Gui itself).
 There is also a [visual designer](https://github.com/gui-cs/TerminalGuiDesigner) (uses Terminal.Gui itself).
 
 
-## Documentation 
-
-* [Getting Started](https://gui-cs.github.io/Terminal.GuiV2Docs/docs/getting-started.html)
-* [What's new in v2](https://gui-cs.github.io/Terminal.GuiV2Docs/docs/newinv2.html)
-* [API Documentation](https://gui-cs.github.io/Terminal.GuiV2Docs/api/Terminal.Gui.html)
-* [Documentation Home](https://gui-cs.github.io/Terminal.GuiV2Docs)
+# Documentation 
 
 
-The above documentation matches the most recent Nuget release from the `v2_develop` branch. Get the [v1 documentation here](https://gui-cs.github.io/Terminal.Gui/api/Terminal.Gui.html).
+The full developer documentation for Terminal.Gui is available at [gui-cs.github.io/Terminal.GuiV2Docs](https://gui-cs.github.io/Terminal.GuiV2Docs/).
 
 
-See the [`Terminal.Gui/`README](https://github.com/gui-cs/Terminal.Gui/tree/master/Terminal.Gui) for an overview of how the library is structured. 
+## Getting Started
 
 
-## Showcase & Examples
+- [Getting Started](https://gui-cs.github.io/Terminal.GuiV2Docs/docs/getting-started.md) - Quick start guide to create your first Terminal.Gui application
+- [Migrating from v1 to v2](https://gui-cs.github.io/Terminal.GuiV2Docs/docs/migratingfromv1.md) - Complete guide for upgrading existing applications
+- [What's New in v2](https://gui-cs.github.io/Terminal.GuiV2Docs/docs/newinv2.md) - Overview of new features and improvements
 
 
-* The [./Examples/UICatalog](./Examples/UICatalog) project is a showcase of all the controls and features of the toolkit. There are more examples in the [./Examples](./Examples) folder.
+## API Reference
 
 
-* [Showcase](https://github.com/gui-cs/Terminal.Gui/blob/develop/Showcase.md) is a place where you can find all kind of projects from simple examples to advanced real world apps that fully utilize capabilities of the toolkit. The team is looking forward to seeing new amazing projects made by the community to be added there!
+For detailed API documentation, see the [API Reference](https://gui-cs.github.io/Terminal.GuiV2Docs/api/Terminal.Gui.App.html).
 
 
-## Sample Usage in C#
+# Installing
 
 
-The following example shows a basic Terminal.Gui application in C#:  
-[Example (source)](./Examples/Example/Example.cs)
+Use NuGet to install the `Terminal.Gui` NuGet package: 
 
 
-When run the application looks as follows:
+## v2 Pre-Alpha 
 
 
-![Simple Usage app](./docfx/images/Example.png)
-
-## Sample usage in F#  
-
-An F# example is located [here](./Examples/FSharpExample/Program.fs).
-
-## Installing
+(Infrequently updated, but stable enough for production use)
+```
+dotnet add package Terminal.Gui --version "2.0.0-prealpha.*"
+```
 
 
-Use NuGet to install the `Terminal.Gui` NuGet package: https://www.nuget.org/packages/Terminal.Gui
+## v2 Develop
 
 
-### Installation in .NET Core Projects
+(Frequently updated, but may have breaking changes)
+```
+dotnet add package Terminal.Gui --version "2.0.0-develop.*"
+```
 
 
-To install Terminal.Gui into a .NET Core project, use the `dotnet` CLI tool with this command.
+## Legacy v1
 
 
 ```
 ```
 dotnet add package Terminal.Gui
 dotnet add package Terminal.Gui
@@ -80,12 +84,12 @@ dotnet add package Terminal.Gui
 
 
 Or, you can use the [Terminal.Gui.Templates](https://github.com/gui-cs/Terminal.Gui.templates).
 Or, you can use the [Terminal.Gui.Templates](https://github.com/gui-cs/Terminal.Gui.templates).
 
 
-## Contributing
+# Contributing
 
 
 See [CONTRIBUTING.md](./CONTRIBUTING.md).
 See [CONTRIBUTING.md](./CONTRIBUTING.md).
 
 
 Debates on architecture and design can be found in Issues tagged with [design](https://github.com/gui-cs/Terminal.Gui/issues?q=is%3Aopen+is%3Aissue+label%3Av2+label%3Adesign).
 Debates on architecture and design can be found in Issues tagged with [design](https://github.com/gui-cs/Terminal.Gui/issues?q=is%3Aopen+is%3Aissue+label%3Av2+label%3Adesign).
 
 
-## History
+# History
 
 
 See [gui-cs](https://github.com/gui-cs/) for how this project came to be.
 See [gui-cs](https://github.com/gui-cs/) for how this project came to be.

+ 1 - 1
Release.slnf

@@ -3,7 +3,7 @@
     "path": "Terminal.sln",
     "path": "Terminal.sln",
     "projects": [
     "projects": [
       "Terminal.Gui\\Terminal.Gui.csproj",
       "Terminal.Gui\\Terminal.Gui.csproj",
-      "UICatalog\\UICatalog.csproj",
+      "Examples\\UICatalog\\UICatalog.csproj",
       "Tests\\UnitTests\\UnitTests.csproj",
       "Tests\\UnitTests\\UnitTests.csproj",
       "Tests\\UnitTestsParallelizable\\UnitTests.Parallelizable.csproj",
       "Tests\\UnitTestsParallelizable\\UnitTests.Parallelizable.csproj",
       "Tests\\IntegrationTests\\IntegrationTests.csproj",
       "Tests\\IntegrationTests\\IntegrationTests.csproj",

BIN
local_packages/Terminal.Gui.2.0.0.nupkg


BIN
local_packages/Terminal.Gui.2.0.0.snupkg


+ 1 - 1
nuget.config

@@ -8,8 +8,8 @@
 
 
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <!--To inherit the global NuGet package sources remove the <clear/> line below -->
     <clear />
     <clear />
-    <add key="nuget" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
     <add key="LocalPackages" value="./local_packages" />
     <add key="LocalPackages" value="./local_packages" />
+    <add key="nuget" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
   </packageSources>
   </packageSources>
   <packageSourceMapping>
   <packageSourceMapping>
     <packageSource key="nuget">
     <packageSource key="nuget">