Merge branch 'master' of https://github.com/jensbrand/GitVersion

Author: JakeGinnivan

build.cake

@@ -124,7 +124,7 @@ Task("Create-Release-Notes")
     .WithCriteria(() => IsMainGitVersionRepo && IsMainGitVersionBranch && !IsPullRequest)
     .Does(() =>
 {
-	var githubToken = EnvironmentVariable("GitHubToken");
+    var githubToken = EnvironmentVariable("GitHubToken");
 
     if(!string.IsNullOrWhiteSpace(githubToken))
     {

docs/configuration.md

@@ -30,6 +30,7 @@ The global configuration look like this:
 ```yaml
 next-version: 1.0
 assembly-versioning-scheme: MajorMinorPatch
+assembly-file-versioning-scheme: MajorMinorPatchTag
 assembly-informational-format: '{InformationalVersion}'
 mode: ContinuousDelivery
 increment: Inherit
@@ -61,6 +62,12 @@ Strong Naming. Note: you can use `None` to skip updating the `AssemblyVersion`
 while still updating the `AssemblyFileVersion` and `AssemblyInformationVersion`
 attributes.
 
+### assembly-file-versioning-scheme
+When updating assembly info, `assembly-file-versioning-scheme` tells GitVersion how
+to treat the `AssemblyFileVersion` attribute. Note: you can use `None` to skip updating the `AssemblyFileVersion`
+while still updating the `AssemblyVersion` and `AssemblyInformationVersion`
+attributes.
+
 ### assembly-informational-format
 Set this to any of the available [variables](/more-info/variables) to change the
 value of the `AssemblyInformationalVersion` attribute. Default set to

docs/more-info/variables.md

@@ -19,6 +19,7 @@ For the `release/3.0.0` branch of GitVersion it shows:
   "LegacySemVer":"3.0.0-beta1",
   "LegacySemVerPadded":"3.0.0-beta0001",
   "AssemblySemVer":"3.0.0.0",
+  "AssemblySemFileVer":"3.0.0.0",
   "FullSemVer":"3.0.0-beta.1+1",
   "InformationalVersion":"3.0.0-beta.1+1.Branch.release/3.0.0.Sha.28c853159a46b5a87e6cc9c4f6e940c59d6bc68a",
   "BranchName":"release/3.0.0",

src/GitVersionCore.Tests/Approved/JsonVersionBuilderTests.Json.approved.txt

@@ -1,4 +1,4 @@
-{
+{
   "Major":1,
   "Minor":2,
   "Patch":0,
@@ -14,6 +14,7 @@
   "LegacySemVer":"1.2.0-unstable4",
   "LegacySemVerPadded":"1.2.0-unstable0004",
   "AssemblySemVer":"1.2.0.0",
+  "AssemblySemFileVer":"1.2.0.0",
   "FullSemVer":"1.2.0-unstable.4+5",
   "InformationalVersion":"1.2.0-unstable.4+5.Branch.feature1.Sha.commitSha",
   "BranchName":"feature1",

src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreRelease.approved.txt

@@ -1,4 +1,4 @@
-{
+{
   "Major":1,
   "Minor":2,
   "Patch":3,
@@ -14,6 +14,7 @@
   "LegacySemVer":"1.2.3-unstable4",
   "LegacySemVerPadded":"1.2.3-unstable0004",
   "AssemblySemVer":"1.2.3.0",
+  "AssemblySemFileVer":"1.2.3.0",
   "FullSemVer":"1.2.3-unstable.4+5",
   "InformationalVersion":"1.2.3-unstable.4+5.Branch.develop.Sha.commitSha",
   "BranchName":"develop",

src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForPreReleaseWithPadding.approved.txt

@@ -1,4 +1,4 @@
-{
+{
   "Major":1,
   "Minor":2,
   "Patch":3,
@@ -14,6 +14,7 @@
   "LegacySemVer":"1.2.3-unstable4",
   "LegacySemVerPadded":"1.2.3-unstable00004",
   "AssemblySemVer":"1.2.3.0",
+  "AssemblySemFileVer":"1.2.3.0",
   "FullSemVer":"1.2.3-unstable.4+5",
   "InformationalVersion":"1.2.3-unstable.4+5.Branch.develop.Sha.commitSha",
   "BranchName":"develop",

src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeliveryModeForStable.approved.txt

@@ -1,4 +1,4 @@
-{
+{
   "Major":1,
   "Minor":2,
   "Patch":3,
@@ -14,6 +14,7 @@
   "LegacySemVer":"1.2.3",
   "LegacySemVerPadded":"1.2.3",
   "AssemblySemVer":"1.2.3.0",
+  "AssemblySemFileVer":"1.2.3.0",
   "FullSemVer":"1.2.3+5",
   "InformationalVersion":"1.2.3+5.Branch.develop.Sha.commitSha",
   "BranchName":"develop",

src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForPreRelease.approved.txt

@@ -1,4 +1,4 @@
-{
+{
   "Major":1,
   "Minor":2,
   "Patch":3,
@@ -14,6 +14,7 @@
   "LegacySemVer":"1.2.3-unstable5",
   "LegacySemVerPadded":"1.2.3-unstable0005",
   "AssemblySemVer":"1.2.3.0",
+  "AssemblySemFileVer":"1.2.3.0",
   "FullSemVer":"1.2.3-unstable.5",
   "InformationalVersion":"1.2.3-unstable.5+Branch.develop.Sha.commitSha",
   "BranchName":"develop",

src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStable.approved.txt

@@ -1,4 +1,4 @@
-{
+{
   "Major":1,
   "Minor":2,
   "Patch":3,
@@ -14,6 +14,7 @@
   "LegacySemVer":"1.2.3-ci5",
   "LegacySemVerPadded":"1.2.3-ci0005",
   "AssemblySemVer":"1.2.3.0",
+  "AssemblySemFileVer":"1.2.3.0",
   "FullSemVer":"1.2.3-ci.5",
   "InformationalVersion":"1.2.3-ci.5+Branch.develop.Sha.commitSha",
   "BranchName":"develop",

src/GitVersionCore.Tests/Approved/VariableProviderTests.ProvidesVariablesInContinuousDeploymentModeForStableWhenCurrentCommitIsTagged.approved.txt

@@ -1,4 +1,4 @@
-{
+{
   "Major":1,
   "Minor":2,
   "Patch":3,
@@ -14,6 +14,7 @@
   "LegacySemVer":"1.2.3",
   "LegacySemVerPadded":"1.2.3",
   "AssemblySemVer":"1.2.3.0",
+  "AssemblySemFileVer":"1.2.3.0",
   "FullSemVer":"1.2.3+5",
   "InformationalVersion":"1.2.3+5.Sha.commitSha",
   "BranchName":"",