diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d9e00a439..471d2bc98 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -21,8 +21,8 @@ jobs: # If this run was triggered by a pull request event, then checkout # the head of the pull request instead of the merge commit. - - run: git checkout HEAD^2 - if: ${{ github.event_name == 'pull_request' }} + #- run: git checkout HEAD^2 + # if: ${{ github.event_name == 'pull_request' }} # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL diff --git a/README.md b/README.md index 7102b4f8f..8ae5c175d 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,13 @@ # Terminal.Gui - Terminal GUI toolkit for .NET -A simple toolkit for buiding console GUI apps for .NET, .NET Core, and Mono that works on Windows, the Mac, and Linux/Unix. +A simple toolkit for building console GUI apps for .NET, .NET Core, and Mono that works on Windows, the Mac, and Linux/Unix. ![Sample app](https://raw.githubusercontent.com/migueldeicaza/gui.cs/master/docfx/sample.gif) -The most recent released [Nuget package is version `0.90.x`](https://www.nuget.org/packages/Terminal.Gui) which is the "Stable, Feature Complete" pre-release of 1.0. +The most recent released [Nuget package is version `0.90.x`](https://www.nuget.org/packages/Terminal.Gui) which is the "Stable, Feature Complete" pre-release of 1.0. -Nuget also contains pre-release versions of 1.0; they are identified with `-pre` in the version number (e.g. `1.0.0-pre.1`) +Nuget also contains pre-release versions of 1.0; they are identified with `-pre` or `-beta` in the version number (e.g. `1.0.0-pre.1`) ## Controls & Features diff --git a/Terminal.Gui/README.md b/Terminal.Gui/README.md index e15ea8bd0..1684be15a 100644 --- a/Terminal.Gui/README.md +++ b/Terminal.Gui/README.md @@ -27,7 +27,7 @@ Version info for Terminal.Gui is managed by MinVer (https://github.com/adamralph To release a new version simply tag a commit ```powershell -git tag major.minor.patch.build.height +git tag vmajor.minor.patch.build.height ``` `patch` can indicate pre-release or not @@ -35,13 +35,13 @@ git tag major.minor.patch.build.height e.g: ```powershell -git tag 1.3.4-beta.5 +git tag v1.3.4-beta.5 ``` or ```powershell -git tag 2.3.4.5 +git tag v2.3.4.5 ``` Then rebuild the project and the version info will be updated. @@ -50,7 +50,7 @@ Then rebuild the project and the version info will be updated. https://www.nuget.org/packages/Terminal.Gui -When the `.patch` changes a new nuget package will be generated when the PR is merged to master as part of CI/CD. +When a new version tag is defined, and merged into master, a nuget package will be generated. If the version is pre-release (includes a hyphen, e.g. `1.3.4-beta.5`) the Nuget package will be tagged as pre-release. diff --git a/Terminal.Gui/Terminal.Gui.csproj b/Terminal.Gui/Terminal.Gui.csproj index 935c7e232..b2c8b2177 100644 --- a/Terminal.Gui/Terminal.Gui.csproj +++ b/Terminal.Gui/Terminal.Gui.csproj @@ -17,7 +17,7 @@ Application framework for creating modern console applications using .NET Terminal.Gui is a framework for creating console user interfaces - v1.0.0-beta.1 + v1.0.0-beta.6 * Now using MinVer to generate version numbers from git tags. * Updated publish-to-nuget to work with minver