Skip to content

Commit 1ec297a

Browse files
committed
Squashed commit of the following:
commit f76d8b8 Merge: f6d86dc 8c6175c Author: Artur <arturcic@gmail.com> Date: Wed Oct 26 09:05:35 2022 +0200 Merge pull request #3246 from arturcic/feature/markdown-lint Fix docs markdown lint errors commit 8c6175c Author: Artur <arturcic@gmail.com> Date: Wed Oct 26 08:40:13 2022 +0200 #2964 - disable tests for .net48 commit 21c34fb Author: Artur <arturcic@gmail.com> Date: Wed Oct 26 02:07:16 2022 +0200 #2964 - use bash for reporter commit 93f4637 Author: Artur <arturcic@gmail.com> Date: Tue Oct 25 23:50:45 2022 +0200 #2964 fix markdown linting errors commit 18586fe Author: Artur <arturcic@gmail.com> Date: Tue Oct 25 19:21:56 2022 +0200 #2964 fix html-proofer errors commit f6d86dc Author: Artur <arturcic@gmail.com> Date: Tue Oct 25 16:15:45 2022 +0200 (build) fix set-output syntax https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ commit 2cc427c Author: Artur <arturcic@gmail.com> Date: Tue Oct 25 15:25:27 2022 +0200 Revert "(build) fix set-output syntax" This reverts commit b906175. commit b812802 Author: Artur <arturcic@gmail.com> Date: Tue Oct 25 15:49:10 2022 +0200 Revert "(build) fix set-output syntax" This reverts commit b07a8b9. commit b07a8b9 Author: Artur <arturcic@gmail.com> Date: Tue Oct 25 15:49:10 2022 +0200 (build) fix set-output syntax https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ commit b906175 Author: Artur <arturcic@gmail.com> Date: Tue Oct 25 15:25:27 2022 +0200 (build) fix set-output syntax https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ commit 34f9de7 Author: Artur <arturcic@gmail.com> Date: Tue Oct 25 14:08:54 2022 +0200 (build) update the actions/cache@v3.0.11 commit f954025 Author: Artur <arturcic@gmail.com> Date: Tue Oct 25 14:01:52 2022 +0200 (build) update the actions/setup-dotnet@v3.0.2 commit 819f116 Merge: 8cd3a1b cac4eb1 Author: Artur <arturcic@gmail.com> Date: Tue Oct 25 13:26:41 2022 +0200 Merge pull request #3179 from chhh/feature/report-project-file-location Add local project file location to exception when parsing fails commit cac4eb1 Author: Dmitry Avtonomov <dmitry.avtononomov@bertis.com> Date: Fri Aug 26 13:38:47 2022 -0700 Add local project file location to exception when parsing fails Helps in solutions with multiple projects, when one of csproj files becomes corrupt. User knows where to apply fixes. commit 8cd3a1b Merge: 3e5d1e7 1071e1c Author: Asbjørn Ulsberg <asbjorn@ulsberg.no> Date: Tue Oct 25 11:26:26 2022 +0200 Merge pull request #3208 from AlexPykavy/main Don't consider "tag-prefix" as optional if it's explicitly specified commit 1071e1c Author: Alexander Pykavy <aleksandrpykavyj@gmail.com> Date: Mon Sep 26 21:12:26 2022 +0200 Don't consider "tag-prefix" as optional if it's explicitly specified To correctly calculate the next version with the prefix. For example, we develop the main product and some its plugin in the same repository and have the following git tags list: - 0.1.0 - 0.1.1 - 0.2.0 - 0.2.1 - plugin_0.1.0 - plugin_0.1.1 The expected next plugin version is `0.1.2` not `0.2.2` (`plugin_` prefix will be prepended before setting the tag).
1 parent c8febc5 commit 1ec297a

Some content is hidden

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

43 files changed

+634
-575
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,14 @@ jobs:
135135
strategy:
136136
matrix:
137137
os: [windows-latest, ubuntu-latest, macos-latest]
138-
targetFramework: [net7.0, net6.0]
138+
targetFramework: [net48, net5.0, net6.0, netcoreapp3.1]
139+
exclude:
140+
-
141+
os: 'ubuntu-latest'
142+
targetFramework: net48
143+
-
144+
os: 'macos-latest'
145+
targetFramework: net48
139146
fail-fast: false
140147

141148
steps:
@@ -169,12 +176,12 @@ jobs:
169176
shell: pwsh
170177
run: dotnet run/build.dll --target=Test --dotnet_target=${{ matrix.targetFramework }}
171178

172-
-
173-
name: Test Summary
174-
uses: test-summary/action@v2
175-
with:
176-
paths: artifacts/test-results/*.results.xml
177-
if: always()
179+
# -
180+
# name: Test Summary
181+
# uses: test-summary/action@v1
182+
# with:
183+
# paths: artifacts/test-results/*.results.xml
184+
# if: always()
178185

179186
artifacts_windows_test:
180187
name: Test artifacts on windows
@@ -228,8 +235,8 @@ jobs:
228235
runs-on: ubuntu-latest
229236
strategy:
230237
matrix:
231-
targetFramework: [ '7.0', '6.0' ]
232-
distro: [ alpine.3.13, alpine.3.14, centos.7, centos.8, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ]
238+
targetFramework: [ '3.1', '5.0', '6.0' ]
239+
distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04 ]
233240
fail-fast: false
234241

235242
steps:
@@ -293,8 +300,8 @@ jobs:
293300
runs-on: ubuntu-latest
294301
strategy:
295302
matrix:
296-
targetFramework: [ '7.0', '6.0' ]
297-
distro: [ alpine.3.13, alpine.3.14, centos.7, centos.8, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04, ubuntu.22.04 ]
303+
targetFramework: [ '3.1', '5.0', '6.0' ]
304+
distro: [ alpine.3.12, alpine.3.13, alpine.3.14, centos.7, centos.8, debian.9, debian.10, debian.11, fedora.33, ubuntu.18.04, ubuntu.20.04 ]
298305
fail-fast: false
299306

300307
steps:

.github/workflows/docs.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,11 @@ jobs:
5858
key: tools-${{ runner.os }}-${{ hashFiles('./build/**') }}
5959
-
6060
name: Get npm cache directory
61+
shell: bash
6162
id: cache-node-dir
62-
run: echo "::set-output name=dir::$(npm config get cache)"
63+
run: |
64+
cacheDir=$(npm config get cache)
65+
echo "dir=$cacheDir" >> $GITHUB_OUTPUT
6366
-
6467
name: Cache Node Modules
6568
id: cache-node
@@ -118,15 +121,13 @@ jobs:
118121
uses: chabad360/htmlproofer@master
119122
with:
120123
directory: ./artifacts/docs/preview
121-
arguments: --url-ignore /api/ --allow-hash-href --assume-extension --disable-external
124+
arguments: --ignore-urls /api/,/docs/ --allow-hash-href --assume-extension --disable-external
122125
-
123-
name: Reviewdog Reporter
124-
uses: haya14busa/action-cond@v1
126+
name: '[Reviewdog Reporter]'
125127
id: reporter
126-
with:
127-
cond: ${{ github.event_name == 'pull_request' }}
128-
if_true: github-pr-review
129-
if_false: github-check
128+
run: |
129+
value=$([ ${{ github.event_name == 'pull_request' }} ] && echo "github-pr-review" || echo "github-check")
130+
echo "value=$value" >> $GITHUB_OUTPUT
130131
-
131132
name: '[Remark Lint]'
132133
uses: reviewdog/action-remark-lint@v5.6

.remarkrc.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ plugins:
2525
- remark-lint-no-blockquote-without-marker
2626
- remark-lint-no-consecutive-blank-lines
2727
- remark-lint-no-duplicate-definitions
28-
- remark-lint-no-duplicate-headings
28+
- remark-lint-no-duplicate-headings: ["warn"]
2929
- remark-lint-no-emphasis-as-heading
3030
- remark-lint-no-empty-url
3131
- remark-lint-no-file-name-articles
3232
- remark-lint-no-file-name-consecutive-dashes
33-
- remark-lint-no-file-name-irregular-characters
33+
- remark-lint-no-file-name-irregular-characters: ["warn"]
3434
- remark-lint-no-file-name-mixed-case
3535
- remark-lint-no-file-name-outer-dashes
3636
- remark-lint-no-heading-content-indent

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ works out the [Semantic Version][semver] of the commit being built.
1414
| **GitVersion.Portable** | [![Chocolatey][choco-badge]][choco] |
1515
| **GitVersion.Tool** | [![NuGet][gvgt-badge]][gvgt] |
1616
| **GitVersion.CommandLine** | [![NuGet][gvcl-badge]][gvcl] |
17-
| **GitVersion.MsBuild** | [![NuGet][gvt-badge]][gvt] | Known as [GitVersionTask] before v5.6.0 |
17+
| **GitVersion.MsBuild** | [![NuGet][gvt-badge]][gvt] | Known as [GitVersionTask][gitversiontask] before v5.6.0 |
1818
| **Homebrew** | [![homebrew][brew-badge]][brew] |
1919
| **Azure Pipeline Task** | [![Azure Pipeline Task][az-pipeline-task-badge]][az-pipeline-task] |
2020
| **Github Action** | [![Github Action][gh-actions-badge]][gh-actions] |

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: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ works out the [Semantic Version][semver] of the commit being built.
99
| :------------------------- | :----------------------------------------------------------------- | - |
1010
| **GitVersion.Tool** | [![NuGet][gvgt-badge]][gvgt] |
1111
| **GitVersion.CommandLine** | [![NuGet][gvcl-badge]][gvcl] |
12-
| **GitVersion.MsBuild** | [![NuGet][gvt-badge]][gvt] | Known as [GitVersionTask] before v5.6.0 |
12+
| **GitVersion.MsBuild** | [![NuGet][gvt-badge]][gvt] | Known as [GitVersionTask][gitversiontask] before v5.6.0 |
1313

1414
## Compatibility
1515

@@ -44,8 +44,6 @@ from The Noun Project.
4444
[gitter]: https://gitter.im/GitTools/GitVersion?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
4545
[gitter-badge]: https://badges.gitter.im/Join+Chat.svg
4646
[docs]: https://gitversion.net/docs/
47-
[gh-rel]: https://github.com/GitTools/GitVersion/releases/latest
48-
[gh-rel-badge]: https://img.shields.io/github/release/gittools/gitversion.svg?logo=github
4947
[gvt]: https://www.nuget.org/packages/GitVersion.MsBuild
5048
[gvt-badge]: https://img.shields.io/nuget/v/GitVersion.MsBuild.svg?logo=nuget
5149
[gitversiontask]: https://www.nuget.org/packages/GitVersionTask/

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +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](http://www.plantuml.com/sequence.html)
13-
* [CodeUML Online editor](http://www.codeuml.com/)
14-
* [PlantText Online editor](http://www.planttext.com/planttext)
15-
* [PlantUML gist renderer](http://uml.mvnsearch.org)
12+
* [PlantUML Sequence Diagrams](https://www.plantuml.com/sequence.html)
13+
* [PlantText Online editor](https://www.planttext.com)
1614

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

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,6 @@ patch _will not_ automatically bump, meaning you have to use hotfix branches.
8787

8888
See [contributing examples](/docs/learn/branching-strategies/contribute-examples).
8989

90-
## Complete Example
91-
92-
![GitFlow](http://uml.mvnsearch.org/gist/cf053d7f5d336ae9f7bb)
93-
9490
### Source
9591

9692
See `DocumentationSamples.GitFlowExample`. To update, modify then run test.

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

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@ RedirectFrom: docs/git-branching-strategies/gitflow
88
Git Flow allows more structured releases, and GitVersion will derive sensible
99
SemVer compatible versions from this structure.
1010

11-
## Resources
12-
1311
## Assumptions:
1412

15-
* Using [GitFlow branching model](http://nvie.com/git-model/) which always has a
13+
* Using [GitFlow branching model](https://nvie.com/git-model/) which always has a
1614
main and a develop branch
17-
* Following [Semantic Versioning](http://semver.org/)
15+
* Following [Semantic Versioning](https://semver.org/)
1816
* Planned releases (bumps in major or minor) are done on release branches
1917
prefixed with release-. Eg: release-4.1 (or release-4.1.0)
2018
* Hotfixes are prefixed with hotfix- Eg. hotfix-4.0.4
21-
* The original [GitFlow model](http://nvie.com/posts/a-successful-git-branching-model/)
19+
* The original [GitFlow model](https://nvie.com/posts/a-successful-git-branching-model/)
2220
specifies branches with a "-" separator while the [git flow extensions](https://github.com/nvie/gitflow)
2321
default to a "/" separator. Either work with GitVersion.
2422
* Tags are used on the main branch and reflects the SemVer of each stable
@@ -58,7 +56,7 @@ Optional Tags (only when transitioning existing repository):
5856

5957
Long version:
6058

61-
```
59+
```txt
6260
{major}.{minor}.{patch} Sha:'{sha}'
6361
1.2.3 Sha:'a682956dccae752aa24597a0f5cd939f93614509'
6462
```
@@ -78,7 +76,7 @@ Long version:
7876

7977
Long version:
8078

81-
```
79+
```txt
8280
{major}.{minor}.{patch}-{pre-release} Branch:'{branchName}' Sha:'{sha}'
8381
1.2.3-alpha.645 Branch:'develop' Sha:'a682956dccae752aa24597a0f5cd939f93614509'
8482
```
@@ -97,7 +95,7 @@ Named: `hotfix-{versionNumber}` eg `hotfix-1.2`
9795

9896
Long version:
9997

100-
```
98+
```txt
10199
{major}.{minor}.{patch}-{pre-release} Branch:'{branchName}' Sha:'{sha}'
102100
1.2.3-beta645 Branch:'hotfix-foo' Sha:'a682956dccae752aa24597a0f5cd939f93614509'
103101
```
@@ -125,7 +123,7 @@ that tag the version would be `1.2.0-alpha1.4`
125123

126124
Long version:
127125

128-
```
126+
```txt
129127
{major}.{minor}.{patch}-{pre-release} Branch:'{branchName}' Sha:'{sha}'
130128
1.2.3-alpha2.4 Branch:'release-1.2' Sha:'a682956dccae752aa24597a0f5cd939f93614509'
131129
1.2.3-rc2 Branch:'release-1.2' Sha:'a682956dccae752aa24597a0f5cd939f93614509'
@@ -149,7 +147,7 @@ branches named like "4.0.3"
149147

150148
Long version:
151149

152-
```
150+
```txt
153151
{major}.{minor}.{patch}-{pre-release} Branch:'{branchName}' Sha:'{sha}'
154152
1.2.3-alpha.feature-a682956d Branch:'feature1' Sha:'a682956dccae752aa24597a0f5cd939f93614509'
155153
```

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RedirectFrom: docs/git-branching-strategies/githubflow-examples
1515
## Release branch
1616

1717
Release branches can be used in GitHubFlow as well as GitFlow. Sometimes you
18-
want to start on a large feature which may take a while to stabilise so you want
18+
want to start on a large feature which may take a while to stabilize so you want
1919
to keep it off main. In these scenarios you can either create a long lived
2020
feature branch (if you do not know the version number this large feature will go
2121
into, and it's non-breaking) otherwise you can create a release branch for the

0 commit comments

Comments
 (0)