Skip to content

Commit 5637b71

Browse files
Consider AssemblyFileVersionAttribute for sdt classes version method. (#273)
Co-authored-by: claudia <cmurialdo@gmail.com> (cherry picked from commit 572165e)
1 parent cc5fb37 commit 5637b71

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

dotnet/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<RevisionFileVersion Condition="'$(COMMIT_NUMBER)'!=''">$(COMMIT_NUMBER)</RevisionFileVersion>
88
<RevisionFileVersion Condition="'$(COMMIT_NUMBER)'==''">0</RevisionFileVersion>
99
<FileVersionWithoutRevision>$(MajorFileVersion).$(MinorFileVersion).$(RevisionFileVersion)</FileVersionWithoutRevision>
10-
<FileVersionWithoutRevision Condition="$(GIT_REF.EndsWith('beta')) Or $(GIT_REF.EndsWith('master'))">$(MajorFileVersion).$(MinorFileVersion).0</FileVersionWithoutRevision>
10+
<FileVersionWithoutRevision Condition="$(GIT_REF.EndsWith('beta')) Or $(GIT_REF.EndsWith('master'))">$(MajorFileVersion).$(MinorFileVersion).1</FileVersionWithoutRevision>
1111
<FileVersion>$(FileVersionWithoutRevision).$(RevisionFileVersion)</FileVersion>
1212
<InformationalVersion>$([System.DateTime]::UtcNow.ToString("yyyyMMddHHmmss")).$(GIT_SHA)</InformationalVersion>
1313
<Company>GeneXus</Company>

dotnet/src/dotnetframework/GxClasses/Core/GXApplication.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1406,13 +1406,12 @@ public string ConfigSection
14061406
}
14071407
static public string StdClassesVersion()
14081408
{
1409-
1410-
object[] customAtts = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyInformationalVersionAttribute), true);
1409+
object[] customAtts = Assembly.GetExecutingAssembly().GetCustomAttributes(typeof(AssemblyFileVersionAttribute), true);
14111410
if (customAtts != null && customAtts.Length > 0)
14121411
{
1413-
AssemblyInformationalVersionAttribute verAtt = customAtts[0] as AssemblyInformationalVersionAttribute;
1412+
AssemblyFileVersionAttribute verAtt = customAtts[0] as AssemblyFileVersionAttribute;
14141413
if (verAtt != null)
1415-
return verAtt.InformationalVersion;
1414+
return verAtt.Version;
14161415
}
14171416
return Assembly.GetAssembly(typeof(GxContext)).GetName().Version.ToString();
14181417
}

0 commit comments

Comments
 (0)