Remove revision number from version for HotFixes (#785)

* Remove revision number from version for HotFixes (it is the same as build number)

* Simplify FileVersion (drop Revision number altogether)

* Fix GetFileVersionForPackage target

---------

Co-authored-by: José Echagüe <jechague@genexus.com>
(cherry picked from commit 63fe35e)

Author: claudiamurialdo

dotnet/Directory.Build.props

@@ -4,11 +4,9 @@
 		<MajorFileVersion>1</MajorFileVersion>
 		<MajorFileVersion Condition="$(GIT_REF.EndsWith('beta'))">$([MSBuild]::Add($(MajorFileVersion), 100))</MajorFileVersion>
 		<MinorFileVersion>18</MinorFileVersion>
-		<RevisionFileVersion Condition="'$(COMMIT_NUMBER)'!=''">$(COMMIT_NUMBER)</RevisionFileVersion>
-		<RevisionFileVersion Condition="'$(COMMIT_NUMBER)'==''">0</RevisionFileVersion>
-		<FileVersionWithoutRevision>$(MajorFileVersion).$(MinorFileVersion).$(RevisionFileVersion)</FileVersionWithoutRevision>
-		<FileVersionWithoutRevision Condition="$(GIT_REF.EndsWith('beta')) Or $(GIT_REF.EndsWith('master'))">$(MajorFileVersion).$(MinorFileVersion).0</FileVersionWithoutRevision>
-		<FileVersion>$(FileVersionWithoutRevision).$(RevisionFileVersion)</FileVersion>
+		<PatchFileVersion Condition="'$(COMMIT_NUMBER)'!=''">$(COMMIT_NUMBER)</PatchFileVersion>
+		<PatchFileVersion Condition="'$(COMMIT_NUMBER)'==''">0</PatchFileVersion>
+		<FileVersion>$(MajorFileVersion).$(MinorFileVersion).$(PatchFileVersion)</FileVersion>
 		<InformationalVersion>$([System.DateTime]::UtcNow.ToString("yyyyMMddHHmmss")).$(GIT_SHA)</InformationalVersion>
 		<Company>GeneXus</Company>
 		<AssemblyCulture></AssemblyCulture>
@@ -41,6 +39,6 @@
 	</PropertyGroup>
 
 	<Target Name="GetFileVersionForPackage">
-		<Message Importance="high" Text="FileVersion:$(FileVersionWithoutRevision)"></Message>
+		<Message Importance="high" Text="FileVersion:$(FileVersion)"></Message>
 	</Target>
 </Project>