diff --git a/.claude/tasks/clean-code-review.md b/.claude/tasks/clean-code-review.md index 30ded9e58e..7aee227d0a 100644 --- a/.claude/tasks/clean-code-review.md +++ b/.claude/tasks/clean-code-review.md @@ -6,10 +6,10 @@ Reimplement the current branch on a new branch with a clean, narrative-quality g 1. **Validate the source branch** - Ensure the current branch has no merge conflicts, uncommitted changes, or other issues. - - Confirm it is up to date with `v2_develop`. + - Confirm it is up to date with `develop`. 2. **Analyze the diff** - - Study all changes between the current branch and `v2_develop`. + - Study all changes between the current branch and `develop`. - Form a clear understanding of the final intended state. 3. **Create the clean branch** @@ -33,7 +33,7 @@ Reimplement the current branch on a new branch with a clean, narrative-quality g - Use `--no-verify` only when necessary (e.g., to bypass known issues). Individual commits do not need to pass tests, but this should be rare. 7. **Open a pull request** - - Create a PR from the clean branch to `v2_develop`. + - Create a PR from the clean branch to `develop`. - Follow Terminal.Gui PR guidelines (see CONTRIBUTING.md). - Include a link to the original branch in the PR description. diff --git a/.claude/workflows/pr-workflow.md b/.claude/workflows/pr-workflow.md index 26f5b9b593..7c8a958693 100644 --- a/.claude/workflows/pr-workflow.md +++ b/.claude/workflows/pr-workflow.md @@ -116,9 +116,9 @@ git diff 1. **Monitor CI/CD pipelines** - Ensure all checks pass 2. **Address review feedback** promptly -3. **Keep PR updated** with `v2_develop` if needed: +3. **Keep PR updated** with `develop` if needed: ```bash git fetch origin - git rebase origin/v2_develop + git rebase origin/develop git push --force-with-lease ``` diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 86483386e5..26b97612c1 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -8,7 +8,7 @@ The repository uses multiple GitHub Actions workflows. What runs and when: ### 1) Build Validation (`.github/workflows/build-validation.yml`) -- **Triggers**: push and pull_request to `v2_release`, `v2_develop` (ignores `**.md`) +- **Triggers**: push and pull_request to `main`, `develop` (ignores `**.md`) - **Runner/timeout**: `ubuntu-latest`, 10 minutes - **Steps**: - Checkout and setup .NET 10.x GA @@ -22,7 +22,7 @@ The repository uses multiple GitHub Actions workflows. What runs and when: ### 2) Build & Run Unit Tests (`.github/workflows/unit-tests.yml`) -- **Triggers**: push and pull_request to `v2_release`, `v2_develop` (ignores `**.md`) +- **Triggers**: push and pull_request to `main`, `develop` (ignores `**.md`) - **Matrix**: Ubuntu/Windows/macOS - **Timeout**: 15 minutes (non-parallel), 60 minutes (parallel) - **Process**: @@ -39,7 +39,7 @@ The repository uses multiple GitHub Actions workflows. What runs and when: ### 3) Build & Run Integration Tests (`.github/workflows/integration-tests.yml`) -- **Triggers**: push and pull_request to `v2_release`, `v2_develop` (ignores `**.md`) +- **Triggers**: push and pull_request to `main`, `develop` (ignores `**.md`) - **Matrix**: Ubuntu/Windows/macOS - **Timeout**: 15 minutes - **Process**: @@ -56,7 +56,7 @@ The repository uses multiple GitHub Actions workflows. What runs and when: - `release_type`: Choose from `prealpha`, `alpha`, `beta`, `rc`, or `stable` - `version_override`: (Optional) Specify exact version number, otherwise GitVersion calculates it - **Process**: - 1. Checks out `v2_release` branch + 1. Checks out `main` branch 2. Determines version using GitVersion or override 3. Creates annotated git tag (e.g., `v2.0.0-prealpha` or `v2.0.0`) 4. Creates release commit with message @@ -67,10 +67,10 @@ The repository uses multiple GitHub Actions workflows. What runs and when: ### 5) Publish to NuGet (`.github/workflows/publish.yml`) -- **Triggers**: push to `v2_release`, `v2_develop`, and tags `v*`(ignores `**.md`) +- **Triggers**: push to `main`, `develop`, and tags `v*`(ignores `**.md`) - Uses GitVersion to compute SemVer, builds Release, packs with symbols, and pushes to NuGet.org using `NUGET_API_KEY` - **Automatically triggered** by the Create Release workflow when a new tag is pushed -- **Additional actions on v2_release branch**: +- **Additional actions on main branch**: - Delists old NuGet packages to keep package list clean: - Keeps only the most recent `2.0.0-develop.*` package - Keeps only the just-published `2.0.0-alpha.*` or `2.0.0-beta.*` package @@ -78,8 +78,8 @@ The repository uses multiple GitHub Actions workflows. What runs and when: ### 6) Build and publish API docs (`.github/workflows/api-docs.yml`) -- **Triggers**: push to `v1_release` and `v2_develop` -- Builds DocFX site on Windows and deploys to GitHub Pages when `ref_name` is `v2_release` or `v2_develop` +- **Triggers**: push to `v1_release` and `develop` +- Builds DocFX site on Windows and deploys to GitHub Pages when `ref_name` is `main` or `develop` ### Replicating CI Locally diff --git a/.github/workflows/api-docs.yml b/.github/workflows/api-docs.yml index 5cbcea3076..ea9c4f71e6 100644 --- a/.github/workflows/api-docs.yml +++ b/.github/workflows/api-docs.yml @@ -2,7 +2,7 @@ name: Build and publish v2 API docs on: push: - branches: [v2_develop] + branches: [develop] permissions: id-token: write diff --git a/.github/workflows/build-validation.yml b/.github/workflows/build-validation.yml index d44781d0f1..1c69cfa6a5 100644 --- a/.github/workflows/build-validation.yml +++ b/.github/workflows/build-validation.yml @@ -2,11 +2,11 @@ name: Build Validation on: push: - branches: [ v2_release, v2_develop ] + branches: [ main, develop ] paths-ignore: - '**.md' pull_request: - branches: [ v2_release, v2_develop ] + branches: [ main, develop ] paths-ignore: - '**.md' diff --git a/.github/workflows/check-duplicates.yml b/.github/workflows/check-duplicates.yml index f325d3f959..638978c335 100644 --- a/.github/workflows/check-duplicates.yml +++ b/.github/workflows/check-duplicates.yml @@ -1,9 +1,9 @@ name: Check for Duplicate UnitTests on: push: - branches: [ v2_release, v2_develop ] + branches: [ main, develop ] pull_request: - branches: [ v2_release, v2_develop ] + branches: [ main, develop ] workflow_dispatch: jobs: check-duplicates: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index de87f35c10..e7d4453149 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -4,7 +4,7 @@ name: "Code scanning" on: push: - branches: [main, v2_release] + branches: [main] paths-ignore: - '**/*.md' - '**/*.txt' @@ -12,7 +12,7 @@ on: - docs - docfx pull_request: - branches: [main, v2_release] + branches: [main] paths-ignore: - '**/*.md' - '**/*.txt' diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index b78293b9ca..2a4a3d90cd 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -1,11 +1,11 @@ name: Build & Run Integration Tests on: push: - branches: [ v2_release, v2_develop ] + branches: [ main, develop ] paths-ignore: - '**.md' pull_request: - branches: [ v2_release, v2_develop ] + branches: [ main, develop ] paths-ignore: - '**.md' diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index df62aabcbd..02f14961b7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -2,7 +2,7 @@ name: Publish Terminal.Gui to Nuget on: push: - branches: [ v2_release, v2_develop ] + branches: [ main, develop ] tags: - v* paths-ignore: @@ -69,7 +69,7 @@ jobs: run: dotnet nuget push Terminal.Gui/bin/Release/Terminal.Gui.${{ steps.gitversion.outputs.SemVer }}.nupkg --skip-duplicate --api-key ${{ secrets.NUGET_API_KEY }} # - name: Delist old NuGet packages - # if: github.ref == 'refs/heads/v2_release' + # if: github.ref == 'refs/heads/main' # shell: pwsh # run: | # $version = "${{ steps.gitversion.outputs.SemVer }}" @@ -77,13 +77,13 @@ jobs: # ./Scripts/delist-nuget.ps1 -ApiKey "${{ secrets.NUGET_API_KEY }}" -JustPublishedVersion "$version" - name: Prepare payload for template dispatch - if: github.ref == 'refs/heads/v2_release' + if: github.ref == 'refs/heads/main' id: payload run: | echo "json={\"version\":\"${{ steps.gitversion.outputs.SemVer }}\"}" >> $GITHUB_OUTPUT - name: Trigger Terminal.Gui.templates update - if: github.ref == 'refs/heads/v2_release' + if: github.ref == 'refs/heads/main' uses: peter-evans/repository-dispatch@v3 with: token: ${{ secrets.TEMPLATE_REPO_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b127cbccdb..a6e5a68920 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -27,10 +27,10 @@ jobs: contents: write steps: - - name: Checkout v2_release + - name: Checkout main uses: actions/checkout@v4 with: - ref: v2_release + ref: main fetch-depth: 0 token: ${{ secrets.GITHUB_TOKEN }} @@ -99,7 +99,7 @@ jobs: - name: Push Changes run: | - git push origin v2_release + git push origin main git push origin "${{ steps.prepare.outputs.tag }}" echo "Pushed branch and tag to origin" diff --git a/.github/workflows/stress-tests.yml b/.github/workflows/stress-tests.yml index 033f5c43d5..029b9ba2a9 100644 --- a/.github/workflows/stress-tests.yml +++ b/.github/workflows/stress-tests.yml @@ -4,7 +4,7 @@ on: schedule: - cron: '0 0 * * *' # Runs every day at midnight UTC push: - branches: [ v2_release, v2_develop ] + branches: [ main, develop ] paths-ignore: - '**.md' diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index ee36a3263c..85f4edbba9 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -2,11 +2,11 @@ name: Build & Run Unit Tests on: push: - branches: [ v2_release, v2_develop ] + branches: [ main, develop ] paths-ignore: - '**.md' pull_request: - branches: [ v2_release, v2_develop ] + branches: [ main, develop ] paths-ignore: - '**.md' diff --git a/CLAUDE.md b/CLAUDE.md index 4aa05ffdbf..7ee12777ae 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -73,7 +73,7 @@ When in planning mode: **Terminal.Gui** - Cross-platform .NET console UI toolkit - **Language**: C# (net8.0) -- **Branch**: `v2_develop` +- **Branch**: `develop` - **Version**: v2 (Alpha) ## Build & Test diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b6eb3c587d..9c9a265bd8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,7 +27,7 @@ Welcome! This guide provides everything you need to know to contribute effective - **Platform**: Cross-platform (Windows, macOS, Linux) - **Architecture**: Console UI toolkit with driver-based architecture - **Version**: v2 (Beta), v1 (maintenance mode) -- **Branching**: GitFlow model (v2_develop is default/active development) +- **Branching**: GitFlow model (develop is default/active development) ## Key Architecture Concepts @@ -334,8 +334,8 @@ foreach (Rune rune in text.EnumerateRunes ()) ### GitFlow Model -- `v2_develop` - Default branch, active development -- `v2_release` - Stable releases, matches NuGet +- `develop` - Default branch, active development +- `main` - Stable releases, matches NuGet - `v1_develop`, `v1_release` - Legacy v1 (maintenance only) ## Release Process @@ -348,14 +348,14 @@ Releases are now automated using GitHub Actions to prevent manual errors. To cre 2. **Select "Create Release" workflow** from the left sidebar 3. **Click "Run workflow"** button 4. **Configure release parameters:** - - **Branch:** Ensure `v2_release` is selected + - **Branch:** Ensure `main` is selected - **Release type:** Choose from `prealpha`, `alpha`, `beta`, `rc`, or `stable` - **Version override:** (Optional) Specify exact version (e.g., `2.0.0`), otherwise GitVersion calculates it automatically 5. **Click "Run workflow"** to start the automated release process The workflow will: - Create an annotated git tag (e.g., `v2.0.0-prealpha` or `v2.0.0`) -- Create a release commit on `v2_release` +- Create a release commit on `main` - Push the tag and commit to the repository - Create a GitHub Release - Automatically trigger the publish workflow to push the package to NuGet.org diff --git a/GitVersion.yml b/GitVersion.yml index c168684ae0..ddfe73b07c 100644 --- a/GitVersion.yml +++ b/GitVersion.yml @@ -3,26 +3,26 @@ # Terminal.Gui uses the GitFlow branching strategy. # https://gitversion.net/docs/learn/branching-strategies/gitflow/ # -# - We have two main branches: `v2_release` and `v2_develop`. -# - `v2_release` is the main branch for V2 releases and matches the latest NuGet release package (e.g., 2.0.0); +# - We have two main branches: `main` and `develop`. +# - `main` is the main branch for V2 releases and matches the latest NuGet release package (e.g., 2.0.0); # prior to release, it uses pre-release labels (e.g., 2.0.0-prealpha.1). -# - `v2_develop` is the development branch for V2 and always carries a pre-release label (e.g., 2.1.0-develop.1). -# - Development happens on feature branches off `v2_develop`. -# - For releases, we merge feature branches into `v2_develop`, then `v2_develop` into `v2_release`. -# - The ./.github/workflows/publish.yml builds and publishes on pushes to `v2_develop` and `v2_release`. +# - `develop` is the development branch for V2 and always carries a pre-release label (e.g., 2.1.0-develop.1). +# - Development happens on feature branches off `develop`. +# - For releases, we merge feature branches into `develop`, then `develop` into `main`. +# - The ./.github/workflows/publish.yml builds and publishes on pushes to `develop` and `main`. # # Branches: # - v1_release: Main branch for V1 (historical) # - v1_develop: Develop branch for V1 (historical) -# - v2_release: Main branch for V2 -# - v2_develop: Develop branch for V2 +# - main: Main branch for V2 +# - develop: Develop branch for V2 # # Package Naming: -# - from v2_develop: 2.1.0-develop.1 (minor version increments) -# - from v2_release (pre-release): 2.0.0-prealpha.1 or 2.0.0-beta.1 -# - from v2_release (release): 2.0.0 (patch version increments) +# - from develop: 2.1.0-develop.1 (minor version increments) +# - from main (pre-release): 2.0.0-prealpha.1 or 2.0.0-beta.1 +# - from main (release): 2.0.0 (patch version increments) # -mode: ContinuousDelivery # GitVersion 6.x uses Mainline mode for GitFlow, focusing on main branch releases +mode: ContinuousDelivery # GitVersion 6.x is configured here to use ContinuousDelivery mode for this GitFlow-style setup # We prefix our tags with 'v' or 'V' (e.g., v1.0.0) tag-prefix: '[vV]' @@ -31,19 +31,19 @@ branches: # V2 Release Branch main: - # Matches the v2_release branch - regex: ^v2_release$ + # Matches the main branch + regex: ^main$ # Uses 'alpha' as pre-release label before `beta` label: beta # Increments patch version (x.y.z+1) on commits increment: Patch - # Specifies v2_develop as the source branch + # Specifies develop as the source branch source-branches: ['develop'] # V2 Development Branch develop: - # Matches the v2_develop branch - regex: v2_develop + # Matches the develop branch + regex: develop # Adds 'develop' as pre-release label (e.g., 2.1.0-develop.1) label: develop # Increments minor version (x.y+1.z) on commits diff --git a/README.md b/README.md index 2dbb71508e..8686efee81 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![v2 Beta Status](https://img.shields.io/github/milestones/progress-percent/gui-cs/Terminal.Gui/9) +![v2 Release Status](https://img.shields.io/github/milestones/progress-percent/gui-cs/Terminal.Gui/7) ![NuGet Version](https://img.shields.io/nuget/vpre/Terminal.Gui) ![Bugs](https://img.shields.io/github/issues/gui-cs/Terminal.Gui) [![codecov](https://codecov.io/gh/gui-cs/Terminal.Gui/graph/badge.svg?token=1Ac9gyGtrj)](https://codecov.io/gh/gui-cs/Terminal.Gui) @@ -16,7 +16,7 @@ Cross-platform UI toolkit for building sophisticated terminal UI (TUI) applicati > **Important:** > - **v1** is in maintenance mode - only critical bug fixes accepted -> - **v2 Beta** is recommended for new projects - API is stable with comprehensive features +> - **v2 Beta** is recommended for new projects - The team is 100% Focused on v2.0.0 RELEASE! > - Breaking changes possible before Beta, but core architecture is solid ![Sample app](docfx/images/sample.gif) diff --git a/Scripts/README.md b/Scripts/README.md index 045868e5ad..dda9d42a90 100644 --- a/Scripts/README.md +++ b/Scripts/README.md @@ -60,7 +60,7 @@ PowerShell script to delist old NuGet packages, keeping only the most recent ver - **Alpha packages** (`2.0.0-alpha.*`): Keeps only the just-published version (or most recent if not specified) - **Beta packages** (`2.0.0-beta.*`): Keeps only the just-published version (or most recent if not specified) -This script is automatically run by the `publish.yml` workflow when publishing from the `v2_release` branch. +This script is currently intended to be run manually when old NuGet packages need to be delisted; it is not currently run automatically by `publish.yml`. ### LICENSE MIT License diff --git a/Scripts/Terminal.Gui.PowerShell.Build.psd1 b/Scripts/Terminal.Gui.PowerShell.Build.psd1 index 97395c3a82..eebbbd889a 100644 --- a/Scripts/Terminal.Gui.PowerShell.Build.psd1 +++ b/Scripts/Terminal.Gui.PowerShell.Build.psd1 @@ -97,7 +97,7 @@ PrivateData = @{ # Tags = @() # A URL to the license for this module. - LicenseUri = 'https://github.com/gui-cs/Terminal.Gui/tree/v2_develop/Scripts/COPYRIGHT' + LicenseUri = 'https://github.com/gui-cs/Terminal.Gui/tree/develop/Scripts/COPYRIGHT' # A URL to the main website for this project. ProjectUri = 'https://github.com/gui-cs/Terminal.Gui' diff --git a/Scripts/Terminal.Gui.PowerShell.Core.psd1 b/Scripts/Terminal.Gui.PowerShell.Core.psd1 index 541265ee80..2c447c43d0 100644 --- a/Scripts/Terminal.Gui.PowerShell.Core.psd1 +++ b/Scripts/Terminal.Gui.PowerShell.Core.psd1 @@ -104,7 +104,7 @@ PrivateData = @{ # Tags = @() # A URL to the license for this module. - LicenseUri = 'https://github.com/gui-cs/Terminal.Gui/tree/v2_develop/Scripts/COPYRIGHT' + LicenseUri = 'https://github.com/gui-cs/Terminal.Gui/tree/develop/Scripts/COPYRIGHT' # A URL to the main website for this project. ProjectUri = 'https://github.com/gui-cs/Terminal.Gui' diff --git a/Scripts/Terminal.Gui.PowerShell.psd1 b/Scripts/Terminal.Gui.PowerShell.psd1 index 3d190a4ac0..48ab16bc4e 100644 --- a/Scripts/Terminal.Gui.PowerShell.psd1 +++ b/Scripts/Terminal.Gui.PowerShell.psd1 @@ -116,7 +116,7 @@ PrivateData = @{ # Tags = @() # A URL to the license for this module. - LicenseUri = 'https://github.com/gui-cs/Terminal.Gui/tree/v2_develop/Scripts/COPYRIGHT' + LicenseUri = 'https://github.com/gui-cs/Terminal.Gui/tree/develop/Scripts/COPYRIGHT' # A URL to the main website for this project. ProjectUri = 'https://github.com/gui-cs/Terminal.Gui' diff --git a/Terminal.Gui/README.md b/Terminal.Gui/README.md index 6937392f88..fbc18bafd8 100644 --- a/Terminal.Gui/README.md +++ b/Terminal.Gui/README.md @@ -51,15 +51,15 @@ To release a new version, follow these steps based on [Semantic Versioning](http ### Steps for Release: -1. **Verify the `v2_develop` branch is ready for release**: - - Ensure all changes are committed and pushed to the `v2_develop` branch. - - Ensure your local `v2_develop` branch is up-to-date with `upstream/v2_develop`. +1. **Verify the `develop` branch is ready for release**: + - Ensure all changes are committed and pushed to the `develop` branch. + - Ensure your local `develop` branch is up-to-date with `upstream/develop`. -2. **Create a pull request for the release in the `v2_develop` branch**: +2. **Create a pull request for the release in the `develop` branch**: - Title the PR as "Release vX.Y.Z". ```powershell - git checkout v2_develop - git pull upstream v2_develop + git checkout develop + git pull upstream develop git checkout -b vX_Y_Z git add . git commit -m "Release vX.Y.Z" @@ -69,28 +69,28 @@ To release a new version, follow these steps based on [Semantic Versioning](http 3. **On github.com, verify the build action worked on your fork, then merge the PR**. -4. **Pull the merged `v2_develop` from `upstream`**: +4. **Pull the merged `develop` from `upstream`**: ```powershell - git checkout v2_develop - git pull upstream v2_develop + git checkout develop + git pull upstream develop ``` -5. **Merge `v2_develop` into `v2_release`**: +5. **Merge `develop` into `main`**: ```powershell - git checkout v2_release - git pull upstream v2_release - git merge v2_develop + git checkout main + git pull upstream main + git merge develop ``` - Fix any merge errors. -6. **Create a new annotated tag for the release on `v2_release`**: +6. **Create a new annotated tag for the release on `main`**: ```powershell git tag vX.Y.Z -a -m "Release vX.Y.Z" ``` -7. **Push the new tag to `v2_release` on `upstream`**: +7. **Push the new tag to `main` on `upstream`**: ```powershell - git push --atomic upstream v2_release vX.Y.Z + git push --atomic upstream main vX.Y.Z ``` 8. **Monitor Github Actions to ensure the NuGet publishing worked**: @@ -102,17 +102,17 @@ To release a new version, follow these steps based on [Semantic Versioning](http 10. **Add a new Release in Github**: - Go to [GitHub Releases](https://github.com/gui-cs/Terminal.Gui/releases) and generate release notes with the list of PRs since the last release. -11. **Update the `v2_develop` branch with the new version**: +11. **Update the `develop` branch with the new version**: ```powershell - git checkout v2_develop - git pull upstream v2_develop - git merge v2_release - git push upstream v2_develop + git checkout develop + git pull upstream develop + git merge main + git push upstream develop ``` ## NuGet -The official NuGet package for Terminal.Gui is available at [https://www.nuget.org/packages/Terminal.Gui](https://www.nuget.org/packages/Terminal.Gui). When a new version tag is defined and merged into `v2_release`, a NuGet package is automatically generated by a GitHub Action. Pre-release versions (e.g., `2.0.0-beta.5`) are tagged as pre-release on NuGet. +The official NuGet package for Terminal.Gui is available at [https://www.nuget.org/packages/Terminal.Gui](https://www.nuget.org/packages/Terminal.Gui). When a new version tag is defined and merged into `main`, a NuGet package is automatically generated by a GitHub Action. Pre-release versions (e.g., `2.0.0-beta.5`) are tagged as pre-release on NuGet. ## Contributing diff --git a/codecov.yml b/codecov.yml index b71daa0052..4a319a063e 100644 --- a/codecov.yml +++ b/codecov.yml @@ -13,14 +13,14 @@ coverage: default: target: 75% # Minimum target coverage threshold: 1% # Allow 1% decrease without failing - base: auto # Compare against base branch (v2_develop) + base: auto # Compare against base branch (develop) if_ci_failed: error # Fail if CI fails # Only measure Terminal.Gui library paths: - "Terminal.Gui/" branches: - - v2_develop - - v2_release + - develop + - main # Per-patch (PR) coverage patch: diff --git a/docfx/README.md b/docfx/README.md index 225b688418..c414cf4807 100644 --- a/docfx/README.md +++ b/docfx/README.md @@ -17,7 +17,7 @@ The API documentation is generated via a GitHub Action (`.github/workflows/api-d ## API Documentation Overview -The API documentation for Terminal.Gui is a critical resource for developers, providing detailed information on classes, methods, properties, and events within the library. This documentation is hosted at [gui-cs.github.io/Terminal.Gui](https://gui-cs.github.io/Terminal.Gui) and includes both auto-generated API references and conceptual guides. For a broader overview of the Terminal.Gui project, including project structure and contribution guidelines, refer to the main [Terminal.Gui README](https://github.com/gui-cs/Terminal.Gui/blob/v2_develop/README.md). +The API documentation for Terminal.Gui is a critical resource for developers, providing detailed information on classes, methods, properties, and events within the library. This documentation is hosted at [gui-cs.github.io/Terminal.Gui](https://gui-cs.github.io/Terminal.Gui) and includes both auto-generated API references and conceptual guides. For a broader overview of the Terminal.Gui project, including project structure and contribution guidelines, refer to the main [Terminal.Gui README](https://github.com/gui-cs/Terminal.Gui/blob/develop/README.md). ### Scripts for Documentation Generation diff --git a/docfx/docfx.json b/docfx/docfx.json index 17edba792c..75a87f6b9b 100644 --- a/docfx/docfx.json +++ b/docfx/docfx.json @@ -69,7 +69,7 @@ "_disableBreadcrumb": false, "_gitContribute": { "repo": "https://github.com/gui-cs/Terminal.Gui", - "branch": "v2_develop", + "branch": "develop", "apiSpecFolder": "docfx/overrides" }, "_gitUrlPattern": "github" diff --git a/docfx/docs/config.md b/docfx/docs/config.md index 9205c2cb3a..32b874b3cf 100644 --- a/docfx/docs/config.md +++ b/docfx/docs/config.md @@ -1026,7 +1026,7 @@ ConfigurationManager.Enable(ConfigLocations.Runtime); - **[Drawing Deep Dive](drawing.md)** - Color and attribute system - **[View Deep Dive](View.md)** - View configuration properties - **[Theme Schema](https://gui-cs.github.io/Terminal.Gui/schemas/tui-config-schema.json)** - JSON schema for validation -- **[Default Config](https://raw.githubusercontent.com/gui-cs/Terminal.Gui/v2_develop/Terminal.Gui/Resources/config.json)** - Complete default configuration +- **[Default Config](https://raw.githubusercontent.com/gui-cs/Terminal.Gui/develop/Terminal.Gui/Resources/config.json)** - Complete default configuration ### UICatalog Examples diff --git a/docfx/includes/home-content.md b/docfx/includes/home-content.md index f1779a96d3..ca96374751 100644 --- a/docfx/includes/home-content.md +++ b/docfx/includes/home-content.md @@ -35,7 +35,7 @@ window.Add (label); app.Run (window); ``` -See the [Examples](https://github.com/gui-cs/Terminal.Gui/tree/v2_develop/Examples) directory for more. +See the [Examples](https://github.com/gui-cs/Terminal.Gui/tree/develop/Examples) directory for more. ## Build Powerful Terminal Applications diff --git a/docfx/index.md b/docfx/index.md index 0afcc16a6c..f9a76b3595 100644 --- a/docfx/index.md +++ b/docfx/index.md @@ -13,7 +13,7 @@ ## Contributing -Contributions welcome! See [CONTRIBUTING.md](https://github.com/gui-cs/Terminal.Gui/blob/v2_develop/CONTRIBUTING.md). +Contributions welcome! See [CONTRIBUTING.md](https://github.com/gui-cs/Terminal.Gui/blob/develop/CONTRIBUTING.md). ## History diff --git a/docfx/scripts/build.ps1 b/docfx/scripts/build.ps1 index 4cecf38994..25bf4c00ef 100644 --- a/docfx/scripts/build.ps1 +++ b/docfx/scripts/build.ps1 @@ -21,7 +21,7 @@ try { # Force delete generated _site Remove-Item ./_site -Recurse -Force -ErrorAction SilentlyContinue - $env:DOCFX_SOURCE_BRANCH_NAME="v2_develop" + $env:DOCFX_SOURCE_BRANCH_NAME="develop" docfx --serve }