Skip to content

Commit 7ea6e0c

Browse files
authored
Merge pull request #4040 from arturcic/fix/markdown
fix markdown files
2 parents 0452c2e + 97a2f91 commit 7ea6e0c

35 files changed

+416
-406
lines changed

.markdownlint.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
{
2-
"MD026": false
2+
"MD026": false,
3+
"MD041": false
34
}

BREAKING_CHANGES.md

Lines changed: 74 additions & 67 deletions
Large diffs are not rendered by default.

CONTRIBUTING.md

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
We love contributions to get started contributing you might need:
44

5-
* [Get started with git](https://rogerdudler.github.io/git-guide)
6-
* [How to create a pull request](https://help.github.com/articles/using-pull-requests)
7-
* [An issue to work on](https://github.com/GitTools/GitVersion/labels/up-for-grabs) - We are on [Up for grabs](https://up-for-grabs.net/), our up for grabs issues are tagged `up-for-grabs`
8-
* An understanding of our [architecture](https://gitversion.net/docs/learn/how-it-works#architecture) and how [we write tests](#writing-tests)
5+
* [Get started with git](https://rogerdudler.github.io/git-guide)
6+
* [How to create a pull request](https://help.github.com/articles/using-pull-requests)
7+
* [An issue to work on](https://github.com/GitTools/GitVersion/labels/up-for-grabs) - We are on [Up for grabs](https://up-for-grabs.net/), our up for grabs issues are tagged `up-for-grabs`
8+
* An understanding of our [architecture](https://gitversion.net/docs/learn/how-it-works#architecture) and how [we write tests](#writing-tests)
99

1010
Once you know how to create a pull request and have an issue to work on, just post a comment saying you will work on it.
1111
If you end up not being able to complete the task, please post another comment so others can pick it up.
@@ -14,9 +14,9 @@ Issues are also welcome, [failing tests](#writing-tests) are even more welcome.
1414

1515
## Contribution Guidelines
1616

17-
* Try to use feature branches rather than developing on main.
18-
* Please include tests covering the change.
19-
* The documentation is stored in the repository under the [`docs`](docs) folder.
17+
* Try to use feature branches rather than developing on main.
18+
* Please include tests covering the change.
19+
* The documentation is stored in the repository under the [`docs`](docs) folder.
2020
Have a look at the [documentation readme file](docs/readme.md) for guidance
2121
on how to improve the documentation and please include documentation updates
2222
with your PR.
@@ -50,6 +50,7 @@ var configurationBuilder = GitFlowConfigurationBuilder.New;
5050
We can then customize the configuration by chaining methods of the builder. At the end we build the configuration.
5151

5252
For example:
53+
5354
```csharp
5455
var configuration = configurationBuilder
5556
.WithDeploymentMode(DeploymentMode.ContinuousDeployment)
@@ -61,9 +62,9 @@ var configuration = configurationBuilder
6162

6263
We have a few fixtures for different scenarios.
6364

64-
* `EmptyRepositoryFixture` - Gives you an empty git repo to start with
65-
* `RemoteRepositoryFixture` - A local repo tracking a test remote repository. The remote repo is available through the `Repository` property, the local is accessible via `LocalRepository`
66-
* `BaseGitFlowRepositoryFixture` - A repo setup for GitFlow (has a develop branch checked out ready to go)
65+
* `EmptyRepositoryFixture` - Gives you an empty git repo to start with
66+
* `RemoteRepositoryFixture` - A local repo tracking a test remote repository. The remote repo is available through the `Repository` property, the local is accessible via `LocalRepository`
67+
* `BaseGitFlowRepositoryFixture` - A repo setup for GitFlow (has a develop branch checked out ready to go)
6768

6869
You can use a fixture by just `using` it. Like this
6970

@@ -97,18 +98,18 @@ Even better include the fix, but a failing test is a great start
9798

9899
We use Cake for our build and deployment process. The way the release process is setup is:
99100

100-
1. We build releasable artifacts with GitHub Actions
101-
2. We create a milestone for the release if it's not already created. Our milestones are named using the semver.
101+
1. We build releasable artifacts with GitHub Actions
102+
2. We create a milestone for the release if it's not already created. Our milestones are named using the semver.
102103
For example `5.12.0` or `6.0.0-beta.2`
103-
3. We move all the closed issues and closed pull requests that are going to be included in the release to the milestone.
104-
4. We check that all the issues and pull requests that are going to be included in the release have a label assigned,
104+
3. We move all the closed issues and closed pull requests that are going to be included in the release to the milestone.
105+
4. We check that all the issues and pull requests that are going to be included in the release have a label assigned,
105106
otherwise it will fail the release.
106-
5. We create a release in the GitHub UI, and create a tag and name it using the milestone name. For example `5.12.0` or `6.0.0-beta.2`
107-
6. We specify if the release is a pre-release or latest release in the GitHub UI.
108-
7. We publish the release.
109-
8. The GitHub Actions will create a GitHub release and publish the artifacts to NuGet, Chocolatey, Docker, Homebrew
107+
5. We create a release in the GitHub UI, and create a tag and name it using the milestone name. For example `5.12.0` or `6.0.0-beta.2`
108+
6. We specify if the release is a pre-release or latest release in the GitHub UI.
109+
7. We publish the release.
110+
8. The GitHub Actions will create a GitHub release and publish the artifacts to NuGet, Chocolatey, Docker, Homebrew
110111
and other distribution channels.
111-
9. The issues and pull requests will get updated with message specifying in which release it was included.
112+
9. The issues and pull requests will get updated with message specifying in which release it was included.
112113

113114
## Code Style
114115

README.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![GitVersion – From git log to SemVer in no time][banner]
1+
# ![GitVersion – From git log to SemVer in no time][banner]
22

33
Versioning when using Git, solved. GitVersion looks at your git history and
44
works out the [Semantic Version][semver] of the commit being built.
@@ -27,22 +27,22 @@ GitVersion works on Windows, Linux, and Mac.
2727

2828
## Quick Links
2929

30-
* [Documentation][docs]
31-
* [Contributing][contribute]
32-
* [Why GitVersion][why]
33-
* [Usage][usage]
34-
* [How it works][how]
35-
* [FAQ][faq]
36-
* [Who is using GitVersion][who]
30+
* [Documentation][docs]
31+
* [Contributing][contribute]
32+
* [Why GitVersion][why]
33+
* [Usage][usage]
34+
* [How it works][how]
35+
* [FAQ][faq]
36+
* [Who is using GitVersion][who]
3737

3838
## GitVersion in action!
3939

4040
![README][gv-in-action]
4141

4242
You are seeing:
4343

44-
* Pull requests being built as pre-release builds
45-
* A branch called `release-1.0.0` producing beta v1 packages
44+
* Pull requests being built as pre-release builds
45+
* A branch called `release-1.0.0` producing beta v1 packages
4646

4747
## Icon
4848

SECURITY.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ You should receive a response within 24 hours. If for some reason you do not, pl
1717

1818
Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
1919

20-
* Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
21-
* Full paths of source file(s) related to the manifestation of the issue
22-
* The location of the affected source code (tag/branch/commit or direct URL)
23-
* Any special configuration required to reproduce the issue
24-
* Step-by-step instructions to reproduce the issue
25-
* Proof-of-concept or exploit code (if possible)
26-
* Impact of the issue, including how an attacker might exploit the issue
20+
* Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
21+
* Full paths of source file(s) related to the manifestation of the issue
22+
* The location of the affected source code (tag/branch/commit or direct URL)
23+
* Any special configuration required to reproduce the issue
24+
* Step-by-step instructions to reproduce the issue
25+
* Proof-of-concept or exploit code (if possible)
26+
* Impact of the issue, including how an attacker might exploit the issue
2727

2828
This information will help us triage your report more quickly.
2929

build/nuspec/README.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@ GitVersion works on Windows, Linux, and Mac.
1616

1717
## Quick Links
1818

19-
* [Documentation][docs]
20-
* [Contributing][contribute]
21-
* [Why GitVersion][why]
22-
* [Usage][usage]
23-
* [How it works][how]
24-
* [FAQ][faq]
25-
* [Who is using GitVersion][who]
19+
* [Documentation][docs]
20+
* [Contributing][contribute]
21+
* [Why GitVersion][why]
22+
* [Usage][usage]
23+
* [How it works][how]
24+
* [FAQ][faq]
25+
* [Who is using GitVersion][who]
2626

2727
## GitVersion in action!
2828

2929
![README][gv-in-action]
3030

3131
You are seeing:
3232

33-
* Pull requests being built as pre-release builds
34-
* A branch called `release-1.0.0` producing beta v1 packages
33+
* Pull requests being built as pre-release builds
34+
* A branch called `release-1.0.0` producing beta v1 packages
3535

3636
## Icon
3737

@@ -46,8 +46,6 @@ from The Noun Project.
4646
[gvt]: https://www.nuget.org/packages/GitVersion.MsBuild
4747
[gvt-badge]: https://img.shields.io/nuget/v/GitVersion.MsBuild.svg?logo=nuget
4848
[gitversiontask]: https://www.nuget.org/packages/GitVersionTask/
49-
[gvcl]: https://www.nuget.org/packages/GitVersion.CommandLine
50-
[gvcl-badge]: https://img.shields.io/nuget/v/GitVersion.CommandLine.svg?logo=nuget
5149
[gvgt]: https://www.nuget.org/packages/GitVersion.Tool
5250
[gvgt-badge]: https://img.shields.io/nuget/v/GitVersion.Tool.svg?logo=nuget
5351
[contribute]: https://github.com/GitTools/GitVersion/blob/main/CONTRIBUTING.md

docs/input/docs/learn/branching-strategies/contribute-examples.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ The examples are generated by GitVersion tests, there are a number of services
99
which will then turn the sequence diagram text into an image to use in the docs.
1010
Here are some links which could be useful
1111

12-
* [PlantUML Sequence Diagrams](https://www.plantuml.com/sequence.html)
13-
* [PlantText Online editor](https://www.planttext.com)
12+
* [PlantUML Sequence Diagrams](https://www.plantuml.com/sequence.html)
13+
* [PlantText Online editor](https://www.planttext.com)
1414

1515
The tests are quite simple. Using the methods on the `fixture` itself will
1616
record that action in the sequence diagram. If you do not want the action

docs/input/docs/learn/branching-strategies/gitflow/index.md

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,29 @@ SemVer compatible versions from this structure.
1010

1111
## Assumptions:
1212

13-
* Using [GitFlow branching model](https://nvie.com/git-model/) which always has a
13+
* Using [GitFlow branching model](https://nvie.com/git-model/) which always has a
1414
main and a develop branch
15-
* Following [Semantic Versioning](https://semver.org/)
16-
* Planned releases (bumps in major or minor) are done on release branches
15+
* Following [Semantic Versioning](https://semver.org/)
16+
* Planned releases (bumps in major or minor) are done on release branches
1717
prefixed with release-. Eg: release-4.1 (or release-4.1.0)
18-
* Hotfixes are prefixed with hotfix- Eg. hotfix-4.0.4
19-
* The original [GitFlow model](https://nvie.com/posts/a-successful-git-branching-model/)
18+
* Hotfixes are prefixed with hotfix- Eg. hotfix-4.0.4
19+
* The original [GitFlow model](https://nvie.com/posts/a-successful-git-branching-model/)
2020
specifies branches with a "-" separator while the [git flow extensions](https://github.com/CJ-Systems/gitflow-cjs)
2121
default to a "/" separator. Either work with GitVersion.
22-
* Tags are used on the main branch and reflects the SemVer of each stable
22+
* Tags are used on the main branch and reflects the SemVer of each stable
2323
release eg 3.3.8 , 4.0.0, etc
24-
* Tags can also be used to override versions while we transition repositories
24+
* Tags can also be used to override versions while we transition repositories
2525
over to GitVersion
26-
* Using a build server with multi-branch building enabled eg TeamCity 8
26+
* Using a build server with multi-branch building enabled eg TeamCity 8
2727

2828
## How Branches are handled
2929

3030
The descriptions of how commits and branches are versioned can be considered a
3131
type of pseudopod. With that in mind there are a few common "variables" that we
3232
will refer to:
3333

34-
* `targetBranch` => the branch we are targeting
35-
* `targetCommit` => the commit we are targeting on `targetbranch`
34+
* `targetBranch` => the branch we are targeting
35+
* `targetCommit` => the commit we are targeting on `targetbranch`
3636

3737
### Main branch
3838

@@ -44,15 +44,15 @@ If we try to build from a commit that is no merge and no tag then assume `0.1.0`
4444

4545
`mergeVersion` => the SemVer extracted from `targetCommit.Message`
4646

47-
* major: `mergeVersion.Major`
48-
* minor: `mergeVersion.Minor`
49-
* patch: `mergeVersion.Patch`
50-
* pre-release: 0 (perhaps count ahead commits later)
51-
* stability: final
47+
* major: `mergeVersion.Major`
48+
* minor: `mergeVersion.Minor`
49+
* patch: `mergeVersion.Patch`
50+
* pre-release: 0 (perhaps count ahead commits later)
51+
* stability: final
5252

5353
Optional Tags (only when transitioning existing repository):
5454

55-
* TagOnHeadCommit.Name={semver} => overrides the version to be {semver}
55+
* TagOnHeadCommit.Name={semver} => overrides the version to be {semver}
5656

5757
Long version:
5858

@@ -68,10 +68,10 @@ Long version:
6868
`main` that is older than the `targetCommitDate`
6969
`mainMergeVersion` => the SemVer extracted from `mainVersionCommit.Message`
7070

71-
* major: `mainMergeVersion.Major`
72-
* minor: `mainMergeVersion.Minor + 1` (0 if the override above is used)
73-
* patch: 0
74-
* pre-release: `alpha.{n}` where n = how many commits `develop` is in front of
71+
* major: `mainMergeVersion.Major`
72+
* minor: `mainMergeVersion.Minor + 1` (0 if the override above is used)
73+
* patch: 0
74+
* pre-release: `alpha.{n}` where n = how many commits `develop` is in front of
7575
`mainVersionCommit.Date` ('0' padded to 4 characters)
7676

7777
Long version:
@@ -87,10 +87,10 @@ Named: `hotfix-{versionNumber}` eg `hotfix-1.2`
8787

8888
`branchVersion` => the SemVer extracted from `targetBranch.Name`
8989

90-
* major: `mergeVersion.Major`
91-
* minor: `mergeVersion.Minor`
92-
* patch: `mergeVersion.Patch`
93-
* pre-release: `beta{n}` where n = number of commits on branch ('0' padded to
90+
* major: `mergeVersion.Major`
91+
* minor: `mergeVersion.Minor`
92+
* patch: `mergeVersion.Patch`
93+
* pre-release: `beta{n}` where n = number of commits on branch ('0' padded to
9494
4 characters)
9595

9696
Long version:
@@ -102,20 +102,20 @@ Long version:
102102

103103
### Release branches
104104

105-
* May branch off from: develop
106-
* Must merge back into: develop and main
107-
* Branch naming convention: `release-{n}` eg `release-1.2`
105+
* May branch off from: develop
106+
* Must merge back into: develop and main
107+
* Branch naming convention: `release-{n}` eg `release-1.2`
108108

109109
`releaseVersion` => the SemVer extracted from `targetBranch.Name`
110110
`releaseTag` => the first version tag placed on the branch. Note that at least
111111
one version tag is required on the branch. The recommended initial tag is
112112
`{releaseVersion}.0-alpha1`. So for a branch named `release-1.2` the recommended
113113
tag would be `1.2.0-alpha1`
114114

115-
* major: `mergeVersion.Major`
116-
* minor: `mergeVersion.Minor`
117-
* patch: 0
118-
* pre-release: `{releaseTag.preRelease}.{n}` where n = 1 + the number of commits
115+
* major: `mergeVersion.Major`
116+
* minor: `mergeVersion.Minor`
117+
* patch: 0
118+
* pre-release: `{releaseTag.preRelease}.{n}` where n = 1 + the number of commits
119119
since `releaseTag`.
120120

121121
So on a branch named `release-1.2` with a tag `1.2.0-alpha1` and 4 commits after
@@ -139,10 +139,10 @@ Branch naming convention: anything except `main`, `develop`, `release-{n}`, or
139139
TODO: feature branches cannot start with a SemVer. to stop people from create
140140
branches named like "4.0.3"
141141

142-
* major: `mainMergeVersion.Major`
143-
* minor: `mainMergeVersion.Minor + 1` (0 if the override above is used)
144-
* patch: 0
145-
* pre-release: `alpha.feature-{n}` where n = First 8 characters of the commit
142+
* major: `mainMergeVersion.Major`
143+
* minor: `mainMergeVersion.Minor + 1` (0 if the override above is used)
144+
* patch: 0
145+
* pre-release: `alpha.feature-{n}` where n = First 8 characters of the commit
146146
SHA of the first commit
147147

148148
Long version:
@@ -159,10 +159,10 @@ Must merge back into: `develop`
159159
Branch naming convention: anything except `main`, `develop`, `release-{n}`, or
160160
`hotfix-{n}`. Canonical branch name contains `/pull/`.
161161

162-
* major: `mainMergeVersion.Major`
163-
* minor: `mainMergeVersion.Minor + 1` (0 if the override above is used)
164-
* patch: 0
165-
* pre-release: `alpha.pull{n}` where n = the pull request number ('0' padded to
162+
* major: `mainMergeVersion.Major`
163+
* minor: `mainMergeVersion.Minor + 1` (0 if the override above is used)
164+
* patch: 0
165+
* pre-release: `alpha.pull{n}` where n = the pull request number ('0' padded to
166166
4 characters)
167167

168168
## Nightly Builds

docs/input/docs/learn/branching-strategies/githubflow/index.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ are much better off with a simpler workflow.
1111

1212
GitHubFlow is in a nutshell:
1313

14-
1. Update main to latest [upstream](/docs/learn/git-setup#upstream) code
15-
2. Create a feature branch `git checkout -b myFeatureBranch`
16-
3. Do the feature/work
17-
4. Push feature branch to [origin](/docs/learn/git-setup#origin)
18-
5. Create pull request from origin/<featureBranch> -> upstream/main
19-
6. Review, fix raised comments, merge your PR or even better, get someone else to.
14+
1. Update main to latest [upstream](/docs/learn/git-setup#upstream) code
15+
2. Create a feature branch `git checkout -b myFeatureBranch`
16+
3. Do the feature/work
17+
4. Push feature branch to [origin](/docs/learn/git-setup#origin)
18+
5. Create pull request from origin/<featureBranch> -> upstream/main
19+
6. Review, fix raised comments, merge your PR or even better, get someone else to.
2020

2121
The main rule of GitHub Flow is that main should _always_ be deployable.
2222
GitHub Flow allows and encourages [continuous delivery](/docs/reference/modes/continuous-delivery).
2323

2424
## Resources
2525

26-
* [GitHubFlow guide by GitHub](https://docs.github.com/en/get-started/quickstart/github-flow#introduction)
27-
* [GitHubFlow original blog post](https://scottchacon.com/2011/08/31/github-flow)
28-
* [Phil Haack's (haacked) GitHubFlow aliases](https://haacked.com/archive/2014/07/28/github-flow-aliases/)
29-
* [GitHubFlow vs GitFlow](https://lucamezzalira.com/2014/03/10/git-flow-vs-github-flow/)
26+
* [GitHubFlow guide by GitHub](https://docs.github.com/en/get-started/quickstart/github-flow#introduction)
27+
* [GitHubFlow original blog post](https://scottchacon.com/2011/08/31/github-flow)
28+
* [Phil Haack's (haacked) GitHubFlow aliases](https://haacked.com/archive/2014/07/28/github-flow-aliases/)
29+
* [GitHubFlow vs GitFlow](https://lucamezzalira.com/2014/03/10/git-flow-vs-github-flow/)

0 commit comments

Comments
 (0)