Skip to content

Commit 6021bd7

Browse files
authored
Merge origin/develop and resolve View.Text conflict
2 parents af4b5df + 342955e commit 6021bd7

131 files changed

Lines changed: 7453 additions & 812 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.claude/tasks/build-app.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,9 @@ view.BorderStyle = LineStyle.None; // No border
253253
### Colors (via Themes)
254254
```csharp
255255
// Set theme at startup
256-
ConfigurationManager.RuntimeConfig = """{ "Theme": "Dark" }""";
257-
ConfigurationManager.Enable (ConfigLocations.All);
256+
TuiConfigurationBuilder config = new ();
257+
config.RuntimeConfig = """{ "Theme": "Dark" }""";
258+
config.ApplyToStaticFacades ();
258259
```
259260

260261
Available themes: `Default`, `Dark`, `Light`, `Amber Phosphor`, `Green Phosphor`, `Blue Phosphor`

.github/workflows/README.md

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -48,33 +48,17 @@ The repository uses multiple GitHub Actions workflows. What runs and when:
4848
3. Runs IntegrationTests with diagnostic output
4949
4. Uploads logs per-OS
5050

51-
### 4) Create Release (`.github/workflows/release.yml`)
52-
53-
- **Triggers**: `workflow_dispatch` (manual trigger from GitHub Actions UI)
54-
- **Inputs**:
55-
- `release_type`: Choose from `beta`, `rc`, or `stable`
56-
- `version_override`: (Optional) Specify exact version number, otherwise GitVersion calculates it
57-
- **Process**:
58-
1. Checks out `main` branch
59-
2. Determines version using GitVersion or override
60-
3. Creates annotated git tag (e.g., `v2.0.1-rc.1` or `v2.1.0`)
61-
4. Creates release commit with message
62-
5. Pushes tag and commit to repository
63-
6. Creates GitHub Release (marked as pre-release if not stable)
64-
7. Automatically triggers publish workflow (see below)
65-
- **Purpose**: Automates the release process to prevent manual errors
66-
67-
### 5) Publish to NuGet (`.github/workflows/publish.yml`)
51+
### 4) Publish to NuGet (`.github/workflows/publish.yml`)
6852

6953
- **Triggers**: push to `develop` and tags `v*` (ignores `**.md`)
7054
- Uses GitVersion to compute SemVer, builds Release, packs Terminal.Gui and Terminal.Gui.Interop.Spectre with symbols, and pushes both to NuGet.org using `NUGET_API_KEY`
71-
- **Automatically triggered** by the Create Release workflow when a new tag is pushed
55+
- **Automatically triggered** when a `v*` tag is pushed — typically by the **Finalize Release** workflow after a release PR (from **Prepare Release**) is merged into `main`
7256
- **Additional actions on tag push** (`v*`):
7357
- Triggers Terminal.Gui.templates repository update via repository_dispatch (requires `TEMPLATE_REPO_TOKEN` secret)
7458

75-
### 6) Build and publish API docs (`.github/workflows/api-docs.yml`)
59+
### 5) Build and publish API docs (`.github/workflows/api-docs.yml`)
7660

77-
- **Triggers**: push to `main`
61+
- **Triggers**: push to `develop`, and `workflow_dispatch`
7862
- Builds DocFX site on Windows and deploys to GitHub Pages
7963

8064

.github/workflows/analyze-hang-dump.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
uses: actions/checkout@v7
4040

4141
- name: Setup .NET
42-
uses: actions/setup-dotnet@v5
42+
uses: actions/setup-dotnet@v6
4343
with:
4444
dotnet-version: |
4545
8.0.x

.github/workflows/api-docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
fetch-depth: 0
2727

2828
- name: Setup .NET Core
29-
uses: actions/setup-dotnet@v5
29+
uses: actions/setup-dotnet@v6
3030
with:
3131
dotnet-version: 10.x
3232
dotnet-quality: 'ga'
@@ -71,7 +71,7 @@ jobs:
7171
7272
- name: Setup Go
7373
if: steps.view-docs.outputs.should_generate == 'true'
74-
uses: actions/setup-go@v6
74+
uses: actions/setup-go@v7
7575
with:
7676
go-version: stable
7777

.github/workflows/build-validation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
fetch-depth: 0 # GitVersion.MsBuild needs full history
3232

3333
- name: Setup .NET Core
34-
uses: actions/setup-dotnet@v5
34+
uses: actions/setup-dotnet@v6
3535
with:
3636
dotnet-version: 10.x
3737
dotnet-quality: 'ga'

.github/workflows/integration-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
fetch-depth: 0 # GitVersion.MsBuild needs full history
2929

3030
- name: Setup .NET Core
31-
uses: actions/setup-dotnet@v5
31+
uses: actions/setup-dotnet@v6
3232
with:
3333
dotnet-version: 10.x
3434
dotnet-quality: ga

.github/workflows/perf-gate.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
fetch-depth: 0 # GitVersion needs full history
3131

3232
- name: Setup .NET
33-
uses: actions/setup-dotnet@v5
33+
uses: actions/setup-dotnet@v6
3434
with:
3535
dotnet-version: 10.x
3636
dotnet-quality: 'ga'
@@ -78,7 +78,7 @@ jobs:
7878
fetch-depth: 0
7979

8080
- name: Setup .NET
81-
uses: actions/setup-dotnet@v5
81+
uses: actions/setup-dotnet@v6
8282
with:
8383
dotnet-version: 10.x
8484
dotnet-quality: 'ga'

.github/workflows/prepare-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ jobs:
4848
git config user.email "github-actions[bot]@users.noreply.github.com"
4949
5050
- name: Install GitVersion
51-
uses: gittools/actions/gitversion/setup@v4.5.0
51+
uses: gittools/actions/gitversion/setup@v4.7.0
5252
with:
5353
versionSpec: '6.x'
5454

5555
- name: Determine Version
56-
uses: gittools/actions/gitversion/execute@v4.5.0
56+
uses: gittools/actions/gitversion/execute@v4.7.0
5757
with:
5858
useConfigFile: true
5959
id: gitversion

.github/workflows/publish.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,18 @@ jobs:
3232
# from git history + GitVersion.yml during build. We still run the CLI here to
3333
# capture the SemVer for use in subsequent steps (push, template dispatch).
3434
- name: Install GitVersion
35-
uses: gittools/actions/gitversion/setup@v4.5.0
35+
uses: gittools/actions/gitversion/setup@v4.7.0
3636
with:
3737
versionSpec: '6.x'
3838

3939
- name: Determine Version
40-
uses: gittools/actions/gitversion/execute@v4.5.0
40+
uses: gittools/actions/gitversion/execute@v4.7.0
4141
with:
4242
useConfigFile: true
4343
id: gitversion # step id used as reference for output values
4444

4545
- name: Setup dotnet
46-
uses: actions/setup-dotnet@v5
46+
uses: actions/setup-dotnet@v6
4747
with:
4848
dotnet-version: 10.x
4949
dotnet-quality: 'ga'

.github/workflows/quick-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/checkout@v7
2222

2323
- name: Setup .NET Core
24-
uses: actions/setup-dotnet@v5
24+
uses: actions/setup-dotnet@v6
2525
with:
2626
dotnet-version: 10.x
2727
dotnet-quality: 'ga'

0 commit comments

Comments
 (0)