Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI

on:
pull_request:
branches: [master, dev]
branches: [main, development]
workflow_dispatch:

permissions:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Release: on every push to master, builds Release and pushes the
# Release: on every push to main, builds Release and pushes the
# DSoft.WizardControl.* packages to nuget.org as 3.1.yyMM.<run number>, then tags the
# commit and creates a GitHub release with the packages attached.
# RELEASE_SUFFIX is empty for a stable version; set it to a suffix such as
Expand All @@ -8,7 +8,7 @@ name: Release

on:
push:
branches: [master]
branches: [main]
paths-ignore:
- '**.md'
- '.github/workflows/**'
Expand Down
4 changes: 2 additions & 2 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ Applies to all projects: documentation XML generation, `GeneratePackageOnBuild`,

## Versioning & CI

- GitHub Actions (`.github/workflows/`) on `windows-latest` with the .NET 10 and .NET 11 SDKs. `ci.yml` builds Release for pull requests into `master` and `dev` and publishes nothing. `release.yml` runs on every push to `master`, builds Release as `3.1.<yyMM>.<run number>`, pushes the `DSoft.*` packages to nuget.org with Trusted Publishing (OIDC, `NUGET_USER` secret, `nuget` environment), then tags the commit and creates a GitHub release.
- GitHub Actions (`.github/workflows/`) on `windows-latest` with the .NET 10 and .NET 11 SDKs. `ci.yml` builds Release for pull requests into `main` and `development` and publishes nothing. `release.yml` runs on every push to `main`, builds Release as `3.1.<yyMM>.<run number>`, pushes the `DSoft.*` packages to nuget.org with Trusted Publishing (OIDC, `NUGET_USER` secret, `nuget` environment), then tags the commit and creates a GitHub release.
- Package versions are set per-project in the `.csproj` (`<Version>`); CI overrides via `/p:Version=`.

## Git

`master` is the release/PR target; active work happens on `dev`.
`main` is the release branch; active work happens on `development`.