Skip to content

Commit

Permalink
main branch rename
Browse files Browse the repository at this point in the history
  • Loading branch information
adamralph committed Jan 24, 2021
1 parent 7d6baba commit 1ec79c7
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
on:
push:
branches: [master, release-*]
branches: [main, release-*]
tags: ["*.*.*"]
pull_request:
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
on:
push:
branches: [master, release-*]
branches: [main, release-*]
pull_request:
jobs:
analyse:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
on:
push:
branches: [master]
branches: [main]
pull_request:
jobs:
lint:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/spell-check.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
on:
push:
branches: [master, release-*]
branches: [main, release-*]
pull_request:
jobs:
spell-check:
Expand Down
2 changes: 1 addition & 1 deletion MinVer/MinVer.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PackageIcon>minver.png</PackageIcon>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/adamralph/minver</PackageProjectUrl>
<PackageReleaseNotes>https://github.com/adamralph/minver/blob/master/CHANGELOG.md</PackageReleaseNotes>
<PackageReleaseNotes>https://github.com/adamralph/minver/blob/main/CHANGELOG.md</PackageReleaseNotes>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<RollForward>major</RollForward>
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ Also, Nerdbank.GitVersioning uses the git height for the patch version, which is

### Can I bump the major or minor version?

Yes! You probably want to do this because at a point in time, on a given branch, you are working on a specific `MAJOR.MINOR` range, e.g. `1.0`, `1.1`, or `2.0`. The branch could be `master`, `develop`, a special release branch, a support branch, or anything else.
Yes! You probably want to do this because at a point in time, on a given branch, you are working on a specific `MAJOR.MINOR` range, e.g. `1.0`, `1.1`, or `2.0`. The branch could be `main`, `develop`, a special release branch, a support branch, or anything else.

Before you create the first version tag on your branch, interim builds will use the latest version tag found in the commit history, which may not match the `MAJOR.MINOR` range you are working on. Or if no version tag is found in the commit history, interim builds will have the default version `0.0.0-alpha.0`. If you prefer those interim builds to have a version in the range you are working on, you have two options:

Expand Down
2 changes: 1 addition & 1 deletion minver-cli/minver-cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageIcon>minver.png</PackageIcon>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/adamralph/minver</PackageProjectUrl>
<PackageReleaseNotes>https://github.com/adamralph/minver/blob/master/CHANGELOG.md</PackageReleaseNotes>
<PackageReleaseNotes>https://github.com/adamralph/minver/blob/main/CHANGELOG.md</PackageReleaseNotes>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<RollForward>major</RollForward>
<TargetFramework>netcoreapp2.1</TargetFramework>
Expand Down

0 comments on commit 1ec79c7

Please sign in to comment.