Merge pull request #2817 from vhatsura/version-alignment

use NuGetVersion as a value for Version attribute in project file

Author: asbjornu

docs/input/docs/usage/msbuild.md

@@ -189,10 +189,10 @@ have the ability to create NuGet packages directly by using the `pack` target:
 `msbuild /t:pack`. The version is controlled 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.
+GitVersionTask generates SemVer 2.0 compliant NuGet package versions by default.
+You can disable it by setting `UseFullSemVerForNuGet` to false in your project.
+Older NuGet clients do not support SemVer 2.0 package versions, but most of the
+modern hosts support it.
 
 #### Accessing variables in MSBuild
 

src/GitVersion.Core/VersionConverters/AssemblyInfo/ProjectFileUpdater.cs

@@ -42,7 +42,7 @@ public void Execute(VersionVariables variables, AssemblyInfoContext context)
             var assemblyVersion = variables.AssemblySemVer;
             var assemblyInfoVersion = variables.InformationalVersion;
             var assemblyFileVersion = variables.AssemblySemFileVer;
-            var packageVersion = variables.NuGetVersionV2;
+            var packageVersion = variables.NuGetVersion;
 
             foreach (var projectFile in projectFilesToUpdate)
             {

src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets

@@ -52,7 +52,7 @@
         </GetVersion>
 
         <PropertyGroup Condition=" '$(UpdateVersionProperties)' == 'true' ">
-            <Version>$(GitVersion_FullSemVer)</Version>
+            <Version>$(GitVersion_NuGetVersion)</Version>
             <VersionPrefix>$(GitVersion_MajorMinorPatch)</VersionPrefix>
             <VersionSuffix Condition=" '$(UseFullSemVerForNuGet)' == 'false' ">$(GitVersion_NuGetPreReleaseTag)</VersionSuffix>
             <VersionSuffix Condition=" '$(UseFullSemVerForNuGet)' == 'true' ">$(GitVersion_PreReleaseTag)</VersionSuffix>