Created new configuration-option assembly-file-versioning-scheme:

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/git-branching-strategies/gitflow-examples.md

@@ -10,7 +10,7 @@ Feature branches will take the feature branch name and use that as the pre-relea
 
 Notice after the feature branch is merged, the version on `develop` is `1.3.0-alpha.3`. This is due to `develop` running in *continuous deployment* mode. If you configured `develop` to use *continuous delivery* the version would still be `1.3.0-alpha.1` and you would have to use release tags to increment the `alpha.1`.
 
-You can see the different on the feature branch itself, notice the version is the same before and after the commit on the feature branch? Only the metadata has changed. If you released the feature branch artifacts then tagged the commit, the following commit would increase to `-beta.2`.
+You can see the difference on the feature branch itself, notice the version is the same before and after the commit on the feature branch? Only the metadata has changed. If you released the feature branch artifacts then tagged the commit, the following commit would increase to `-beta.2`.
 
 ## Pull Request
 Because feature branches are most likely pushed to a fork, we are showing the

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",

docs/usage/msbuild-task.md

@@ -4,6 +4,8 @@ The MSBuild Task for GitVersion — **GitVersionTask** — is a simple solution
 you want to version your assemblies without writing any command line scripts or
 modifying your build process.
 
+It currently works with desktop `MSBuild`. Support for CoreCLR with `dotnet build` is coming soon.
+
 ## TL;DR
 
 ### Install the MSTask targets
@@ -16,6 +18,14 @@ From the Package Manager Console:
 Install-Package GitVersionTask
 ```
 
+If you're using `PackageReference` style NuGet dependencies (VS 2017+), add `<PrivateAssets>all</PrivateAssets>` to prevent the task from becoming a dependency of your package:
+
+``` xml
+<PackageReference Include="GitVersionTask" Version="4.0.0-beta*">
+  <PrivateAssets>All</PrivateAssets>
+</PackageReference>
+```
+
 ### Remove AssemblyInfo attributes
 
 The next thing you need to do is to remove the `Assembly*Version` attributes from
@@ -115,6 +125,17 @@ However at MSBuild time these properties are mapped to MSBuild properties that
 are prefixed with `GitVersion_`. This prevents conflicts with other properties
 in the pipeline.
 
+In addition, the following MSBuild properties are set when `UpdateVersionProperties` is true (the default):
+`Version`, `VersionPrefix`, `VersionSuffix`, `PackageVersion`, `InformationalVersion`, `AssemblyVersion` and `FileVersion`. These are used by the built-in tasks for generating AssemblyInfo's and NuGet package versions.
+
+
+### NuGet packages
+The new SDK-style projects available for .NET Standard libraries (and multi-targeting), have the ability
+to create NuGet packages directly by using the `pack` target: `msbuild /t:pack`. The version is controled by the MSBuild properties described above. 
+
+GitVersionTask has the option to generate SemVer 2.0 compliant NuGet package versions by setting `UseFullSemVerForNuGet` to true in your project (this is off by default for compatibility). Some hosts, like MyGet, support SemVer 2.0 package versions but older NuGet clients and nuget.org do not.
+
+
 #### Accessing variables in MSBuild
 
 Once `GitVersionTask.GetVersion` has been executed, the MSBuild properties can be
@@ -136,7 +157,7 @@ Build Server log in a format that the current Build Server can consume. See
 
 ## Conditional control tasks
 
-Properties `WriteVersionInfoToBuildLog`, `UpdateAssemblyInfo` and `GetVersion`
+Properties `WriteVersionInfoToBuildLog`, `UpdateAssemblyInfo`, `UseFullSemVerForNuGet`, `UpdateVersionProperties` and `GetVersion`
 are checked before running these tasks.
 
 You can disable `GitVersionTask.UpdateAssemblyInfo` by setting
@@ -150,6 +171,7 @@ this:
   ...
 </PropertyGroup>
 ```
+For SDK-style projects, `UpdateVersionProperties` controls setting the default variables: `Version`, `VersionPrefix`, `VersionSuffix`, `PackageVersion`, `InformationalVersion`, `AssemblyVersion` and `FileVersion`.
 
 ## My Git repository requires authentication. What should I do?
 

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":"",

src/GitVersionCore.Tests/AssemblyFileVersionTests.cs

@@ -0,0 +1,29 @@
+using GitVersion;
+using NUnit.Framework;
+
+namespace GitVersionCore.Tests
+{
+    using Shouldly;
+
+    [TestFixture]
+    public class AssemblyFileVersionTests
+    {
+        [TestCase(AssemblyFileVersioningScheme.None, 1, 2, 3, 4, null)]
+        [TestCase(AssemblyFileVersioningScheme.Major, 1, 2, 3, 4, "1.0.0.0")]
+        [TestCase(AssemblyFileVersioningScheme.MajorMinor, 1, 2, 3, 4, "1.2.0.0")]
+        [TestCase(AssemblyFileVersioningScheme.MajorMinorPatch, 1, 2, 3, 4, "1.2.3.0")]
+        [TestCase(AssemblyFileVersioningScheme.MajorMinorPatchTag, 1, 2, 3, 4, "1.2.3.4")]
+        public void ValidateAssemblyFileVersionBuilder(AssemblyFileVersioningScheme assemblyFileVersioningScheme, int major, int minor, int patch,
+        int tag, string versionString)
+        {
+            var semVer = new SemanticVersion(major, minor, patch)
+                         {
+                             PreReleaseTag = new SemanticVersionPreReleaseTag("Test", tag)
+                         };
+
+            var assemblyFileVersion = semVer.GetAssemblyFileVersion(assemblyFileVersioningScheme);
+
+            assemblyFileVersion.ShouldBe(versionString);
+        }
+    }
+}

src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt

@@ -1,4 +1,5 @@
 assembly-versioning-scheme: MajorMinorPatch
+assembly-file-versioning-scheme: MajorMinorPatch
 mode: ContinuousDelivery
 tag-prefix: '[vV]'
 continuous-delivery-fallback-tag: ci

src/GitVersionCore.Tests/ConfigProviderTests.cs

@@ -165,12 +165,14 @@ public void CanUpdateAssemblyInformationalVersioningScheme()
     {
         const string text = @"
 assembly-versioning-scheme: MajorMinor
+assembly-file-versioning-scheme: MajorMinorPatch
 assembly-informational-format: '{NugetVersion}'";
 
         SetupConfigFileContent(text);
 
         var config = ConfigurationProvider.Provide(repoPath, fileSystem);
         config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinor);
+        config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
         config.AssemblyInformationalFormat.ShouldBe("{NugetVersion}");
     }
 
@@ -179,12 +181,14 @@ public void CanUpdateAssemblyInformationalVersioningSchemeWithMultipleVariables(
     {
         const string text = @"
 assembly-versioning-scheme: MajorMinor
+assembly-file-versioning-scheme: MajorMinorPatch
 assembly-informational-format: '{Major}.{Minor}.{Patch}'";
 
         SetupConfigFileContent(text);
 
         var config = ConfigurationProvider.Provide(repoPath, fileSystem);
         config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinor);
+        config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
         config.AssemblyInformationalFormat.ShouldBe("{Major}.{Minor}.{Patch}");
     }
 
@@ -193,6 +197,7 @@ public void CanUpdateAssemblyInformationalVersioningSchemeWithMultipleVariables(
     public void CanUpdateAssemblyInformationalVersioningSchemeWithFullSemVer()
     {
         const string text = @"assembly-versioning-scheme: MajorMinorPatch
+assembly-file-versioning-scheme: MajorMinorPatch
 assembly-informational-format: '{FullSemVer}'
 mode: ContinuousDelivery
 next-version: 5.3.0
@@ -202,6 +207,7 @@ public void CanUpdateAssemblyInformationalVersioningSchemeWithFullSemVer()
 
         var config = ConfigurationProvider.Provide(repoPath, fileSystem);
         config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
+        config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
         config.AssemblyInformationalFormat.ShouldBe("{FullSemVer}");
     }
 
@@ -212,6 +218,7 @@ public void CanReadDefaultDocument()
         SetupConfigFileContent(text);
         var config = ConfigurationProvider.Provide(repoPath, fileSystem);
         config.AssemblyVersioningScheme.ShouldBe(AssemblyVersioningScheme.MajorMinorPatch);
+        config.AssemblyFileVersioningScheme.ShouldBe(AssemblyFileVersioningScheme.MajorMinorPatch);
         config.AssemblyInformationalFormat.ShouldBe(null);
         config.Branches["develop"].Tag.ShouldBe("alpha");
         config.Branches["release"].Tag.ShouldBe("beta");

src/GitVersionCore.Tests/DynamicRepositoryTests.cs

@@ -0,0 +1,50 @@
+using System.IO;
+using GitVersion;
+using NUnit.Framework;
+
+[TestFixture]
+public class DynamicRepositoryTests
+{
+    string workDirectory;
+
+
+    [SetUp]
+    public void CreateTemporaryRepository()
+    {
+        // Note: we can't use guid because paths will be too long
+        workDirectory = Path.Combine(Path.GetTempPath(), "DynRepoTests");
+    }
+
+
+    //[TearDown]
+    //public void Cleanup()
+    //{
+    //    Directory.Delete(workDirectory, true);
+    //}
+
+    [Ignore("These tests are slow and fail on the second run in Test Explorer and need to be re-written")]
+    [TestCase("GV_master_1", "https://github.com/GitTools/GitVersion", "master", "4783d325521463cd6cf1b61074352da84451f25d", "4.0.0+1126")]
+    [TestCase("GV_master_2", "https://github.com/GitTools/GitVersion", "master", "3bdcd899530b4e9b37d13639f317da04a749e728", "4.0.0+1132")]
+    public void FindsVersionInDynamicRepo(string name, string url, string targetBranch, string commitId, string expectedFullSemVer)
+    {
+        var root = Path.Combine(workDirectory, name);
+        var dynamicDirectory = Path.Combine(root, "dynamic");
+        var workingDirectory = Path.Combine(root, "working");
+
+        // Clear upfront
+        if (Directory.Exists(root))
+        {
+            Directory.Delete(root, true);
+        }
+
+        Directory.CreateDirectory(dynamicDirectory);
+        Directory.CreateDirectory(workingDirectory);
+
+        var executeCore = new ExecuteCore(new TestFileSystem());
+
+        var versionVariables = executeCore.ExecuteGitVersion(url, dynamicDirectory, null, targetBranch,
+            false, workingDirectory, commitId);
+
+        Assert.AreEqual(expectedFullSemVer, versionVariables.FullSemVer);
+    }
+}

src/GitVersionCore.Tests/ExecuteCoreTests.cs

@@ -56,6 +56,7 @@ public void CacheFileExistsOnDisk()
 LegacySemVer: 4.10.3-test19
 LegacySemVerPadded: 4.10.3-test0019
 AssemblySemVer: 4.10.3.0
+AssemblySemFileVer: 4.10.3.0
 FullSemVer: 4.10.3-test.19
 InformationalVersion: 4.10.3-test.19+Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
 BranchName: feature/test
@@ -101,6 +102,7 @@ public void CacheFileExistsOnDiskWhenOverrideConfigIsSpecifiedVersionShouldBeDyn
 LegacySemVer: 4.10.3-test19
 LegacySemVerPadded: 4.10.3-test0019
 AssemblySemVer: 4.10.3.0
+AssemblySemFileVer: 4.10.3.0
 FullSemVer: 4.10.3-test.19
 InformationalVersion: 4.10.3-test.19+Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
 BranchName: feature/test
@@ -163,6 +165,7 @@ public void ConfigChangeInvalidatesCache()
 LegacySemVer: 4.10.3-test19
 LegacySemVerPadded: 4.10.3-test0019
 AssemblySemVer: 4.10.3.0
+AssemblySemFileVer: 4.10.3.0
 FullSemVer: 4.10.3-test.19
 InformationalVersion: 4.10.3-test.19+Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
 BranchName: feature/test
@@ -211,6 +214,7 @@ public void NoCacheBypassesCache()
 LegacySemVer: 4.10.3-test19
 LegacySemVerPadded: 4.10.3-test0019
 AssemblySemVer: 4.10.3.0
+AssemblySemFileVer: 4.10.3.0
 FullSemVer: 4.10.3-test.19
 InformationalVersion: 4.10.3-test.19+Branch.feature/test.Sha.dd2a29aff0c948e1bdf3dabbe13e1576e70d5f9f
 BranchName: feature/test