use NuGetVersion as a value for Version attribute in project file

vhatsura · vhatsura · commit ebe28a79dee2 · 2021-09-23T11:57:55.000+02:00
diff --git a/src/GitVersion.Core/VersionConverters/AssemblyInfo/ProjectFileUpdater.cs b/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)
             {
diff --git a/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets b/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>

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public void Execute(VersionVariables variables, AssemblyInfoContext context)`
`42`	`42`	`var assemblyVersion = variables.AssemblySemVer;`
`43`	`43`	`var assemblyInfoVersion = variables.InformationalVersion;`
`44`	`44`	`var assemblyFileVersion = variables.AssemblySemFileVer;`
`45`		`- var packageVersion = variables.NuGetVersionV2;`
	`45`	`+ var packageVersion = variables.NuGetVersion;`
`46`	`46`
`47`	`47`	`foreach (var projectFile in projectFilesToUpdate)`
`48`	`48`	`{`