Skip to content

Commit b3e56d7

Browse files
committed
Update assemblyinfo for v0.2.0-beta and tweak version reporting in the Utils.
1 parent 167f9c7 commit b3e56d7

File tree

3 files changed

+34
-13
lines changed

3 files changed

+34
-13
lines changed

Code/TSqlFlex.Core/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
[assembly: AssemblyCopyright("Copyright © 2015 Steve Ognibene")]
1515
[assembly: AssemblyTrademark("")]
1616
[assembly: AssemblyCulture("")]
17-
[assembly: AssemblyVersion("0.1.0.0")]
18-
[assembly: AssemblyFileVersion("0.1.0.0")]
17+
[assembly: AssemblyVersion("0.2.0.0")]
18+
[assembly: AssemblyFileVersion("0.2.0.0")]
1919
[assembly: AssemblySemverPrereleaseTag("beta")]
2020

2121
// Setting ComVisible to false makes the types in this assembly not visible

Code/TSqlFlex.Core/Utils.cs

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,27 +80,48 @@ public static IsolatedStorageFile getIsolatedStorageFile()
8080

8181
public static class Info
8282
{
83+
84+
private static string version = null;
8385
public static string Version() {
8486

85-
string tag = SemverPrereleaseTag();
86-
if (string.IsNullOrEmpty(tag))
87+
if (version != null)
8788
{
88-
return "v" + VersionNumbersOnly();
89+
return version;
8990
}
90-
else
91+
92+
var tag = SemverPrereleaseTag();
93+
94+
version = string.Format("v{0}{1}",
95+
VersionNumbersOnly(),
96+
string.IsNullOrEmpty(tag) ? "" : "-" + tag);
97+
98+
return version;
99+
100+
}
101+
102+
private static string versionNumbersOnly = null;
103+
public static string VersionNumbersOnly()
104+
{
105+
if (versionNumbersOnly != null)
91106
{
92-
return "v" + VersionNumbersOnly() + "-" + tag;
107+
return versionNumbersOnly;
93108
}
94-
109+
110+
var vi = VersionInfo();
111+
versionNumbersOnly = string.Format("{0}.{1}.{2}",
112+
vi.FileMajorPart,
113+
vi.FileMinorPart,
114+
vi.FileBuildPart);
115+
return versionNumbersOnly;
95116
}
96117

97-
public static string VersionNumbersOnly()
118+
public static FileVersionInfo VersionInfo()
98119
{
99120
Assembly assembly = Assembly.GetExecutingAssembly();
100121
FileVersionInfo fvi = FileVersionInfo.GetVersionInfo(assembly.Location);
101-
return fvi.FileVersion;
122+
return fvi;
102123
}
103-
124+
104125
public static string SemverPrereleaseTag()
105126
{
106127
Assembly assembly = Assembly.GetExecutingAssembly();

Code/TSqlFlex/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
[assembly: AssemblyCopyright("Copyright © 2015 Steve Ognibene")]
1515
[assembly: AssemblyTrademark("")]
1616
[assembly: AssemblyCulture("")]
17-
[assembly: AssemblyVersion("0.1.0.0")]
18-
[assembly: AssemblyFileVersion("0.1.0.0")]
17+
[assembly: AssemblyVersion("0.2.0.0")]
18+
[assembly: AssemblyFileVersion("0.2.0.0")]
1919
[assembly: AssemblySemverPrereleaseTag("beta")]
2020

2121
// Setting ComVisible to false makes the types in this assembly not visible

0 commit comments

Comments
 (0)