Skip to content

Commit 3228754

Browse files
committed
(doc) Fixing line lengths and settin env variable
This should hopefully allow Wyam to roll forward to using the newest .Net Core which is installed on the machine, rather than looking for a specific one.
1 parent a0e8f65 commit 3228754

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

build/stages/publish.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,4 @@ steps:
2626
ENABLED_PUBLISH_TFS: $(ENABLED_PUBLISH_TFS)
2727
ENABLED_PUBLISH_NUGET: $(ENABLED_PUBLISH_NUGET)
2828
ENABLED_PUBLISH_CHOCOLATEY: $(ENABLED_PUBLISH_CHOCOLATEY)
29+
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX: 2

docs/input/docs/more-info/incrementing-per-commit.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@ Order: 60
33
Title: Incrementing per commit
44
---
55

6-
When using the continuous deployment mode (which will increment the SemVer every commit) all builds *must* have a pre-release tag, except for builds which are explicitly tagged as stable.
7-
Then the build metadata (which is the commit count) is promoted to the pre-release tag. Applying those rules the above commit graph would produce:
6+
When using the continuous deployment mode (which will increment the SemVer every
7+
commit) all builds *must* have a pre-release tag, except for builds which are
8+
explicitly tagged as stable.
9+
10+
Then the build metadata (which is the commit count) is promoted to the
11+
pre-release tag. Applying those rules the above commit graph would produce:
812

913
```
1014
e137e9 -> 1.0.0+0
@@ -17,6 +21,9 @@ d53ab6 -> 2.0.0-rc.2 (If there was another commit on the release branch it wou
1721
b5d142 -> 2.0.0-ci.0 (2.0.0 branch was merged, so master is now at 2.0.0)
1822
```
1923

20-
As you can see the versions now no longer conflict. When you want to create a stable `2.0.0` release you simply `git tag 2.0.0` then build the tag and it will produce a stable 2.0.0 package.
24+
As you can see the versions now no longer conflict. When you want to create a
25+
stable `2.0.0` release you simply `git tag 2.0.0` then build the tag and it will
26+
produce a stable 2.0.0 package.
2127

22-
For more information/background on why we have come to this conclusion read [Xavier Decoster's blog post on the subject](http://www.xavierdecoster.com/semantic-versioning-auto-incremented-nuget-package-versions).
28+
For more information/background on why we have come to this conclusion read
29+
[Xavier Decoster's blog post on the subject](http://www.xavierdecoster.com/semantic-versioning-auto-incremented-nuget-package-versions).

0 commit comments

Comments
 (0)