Skip to content

Commit 8bb91f6

Browse files
committed
resolved #176
1 parent 1c884f6 commit 8bb91f6

File tree

4 files changed

+26
-5
lines changed

4 files changed

+26
-5
lines changed

src/CatLib.Core.Tests/CatLib/ApplicationTests.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111

1212
using System;
1313
using System.Collections;
14+
using System.Diagnostics;
15+
using System.Reflection;
1416
using Microsoft.VisualStudio.TestTools.UnitTesting;
1517

1618
namespace CatLib.Tests
@@ -76,6 +78,13 @@ public override IEnumerator CoroutineInit()
7678
}
7779
}
7880

81+
[TestMethod]
82+
public void TestGetFileVersion()
83+
{
84+
Assert.AreEqual(FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileVersion,
85+
Application.Version);
86+
}
87+
7988
[TestMethod]
8089
public void TestYieldProviderTest()
8190
{

src/CatLib.Core.Tests/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@
2626
[assembly: Guid("3c9f4024-910c-4881-a04d-34a6c3a09019")]
2727

2828
[assembly: AssemblyVersion("1.3.0.0")]
29-
[assembly: AssemblyFileVersion("1.3.1.0")]
29+
[assembly: AssemblyFileVersion("1.3.2")]

src/CatLib.Core/CatLib/Application.cs

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
using System;
1313
using IEnumerator = System.Collections.IEnumerator;
1414
using System.Collections.Generic;
15+
using System.Diagnostics;
16+
using System.Reflection;
1517
using System.Threading;
1618

1719
namespace CatLib
@@ -24,7 +26,17 @@ public class Application : Container, IApplication, IOriginalDispatcher
2426
/// <summary>
2527
/// 版本号
2628
/// </summary>
27-
private static readonly Version version = new Version("1.3.1");
29+
private static Version version;
30+
31+
/// <summary>
32+
/// 获取版本号
33+
/// </summary>
34+
/// <returns></returns>
35+
private static Version GetVersion()
36+
{
37+
return version ?? (version = new Version(FileVersionInfo
38+
.GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileVersion));
39+
}
2840

2941
/// <summary>
3042
/// 框架启动流程
@@ -502,7 +514,7 @@ public void Off(object target)
502514
/// CatLib版本(遵循semver)
503515
/// </summary>
504516
[ExcludeFromCodeCoverage]
505-
public static string Version => version.ToString();
517+
public static string Version => GetVersion().ToString();
506518

507519
/// <summary>
508520
/// 比较CatLib版本(遵循semver)
@@ -531,7 +543,7 @@ public static int Compare(int major, int minor, int revised)
531543
[ExcludeFromCodeCoverage]
532544
public static int Compare(string comparison)
533545
{
534-
return version.Compare(comparison);
546+
return GetVersion().Compare(comparison);
535547
}
536548

537549
/// <summary>

src/CatLib.Core/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
[assembly: Guid("4204658e-81fd-4106-a347-890cd369c8a4")]
2828

2929
[assembly: AssemblyVersion("1.3.0.0")]
30-
[assembly: AssemblyFileVersion("1.3.1.0")]
30+
[assembly: AssemblyFileVersion("1.3.2")]
3131

3232
[assembly: InternalsVisibleTo("Assembly-CSharp-Editor"),
3333
InternalsVisibleTo("Assembly-CSharp-Editor-firstpass"),

0 commit comments

Comments
 (0)