🎨 Misc

TonnyLau · Jul 31, 2023 · f7eea06 · f7eea06
1 parent 50d2376
commit f7eea06
Show file tree

Hide file tree

Showing 29 changed files with 44 additions and 8 deletions.
diff --git a/res/windows/makepri/BadgeLogo.scale-200.png b/res/windows/makepri/BadgeLogo.scale-200.png
diff --git a/res/windows/makepri/LargeTile.scale-200.png b/res/windows/makepri/LargeTile.scale-200.png
diff --git a/res/windows/makepri/SmallTile.scale-200.png b/res/windows/makepri/SmallTile.scale-200.png
diff --git a/res/windows/makepri/SplashScreen.scale-200.png b/res/windows/makepri/SplashScreen.scale-200.png
diff --git a/res/windows/makepri/Square150x150Logo.scale-200.png b/res/windows/makepri/Square150x150Logo.scale-200.png
diff --git a/res/windows/makepri/Square44x44Logo.altform-lightunplated_targetsize-16.png b/res/windows/makepri/Square44x44Logo.altform-lightunplated_targetsize-16.png
diff --git a/res/windows/makepri/Square44x44Logo.altform-lightunplated_targetsize-24.png b/res/windows/makepri/Square44x44Logo.altform-lightunplated_targetsize-24.png
diff --git a/res/windows/makepri/Square44x44Logo.altform-lightunplated_targetsize-256.png b/res/windows/makepri/Square44x44Logo.altform-lightunplated_targetsize-256.png
diff --git a/res/windows/makepri/Square44x44Logo.altform-lightunplated_targetsize-32.png b/res/windows/makepri/Square44x44Logo.altform-lightunplated_targetsize-32.png
diff --git a/res/windows/makepri/Square44x44Logo.altform-lightunplated_targetsize-48.png b/res/windows/makepri/Square44x44Logo.altform-lightunplated_targetsize-48.png
diff --git a/res/windows/makepri/Square44x44Logo.altform-unplated_targetsize-16.png b/res/windows/makepri/Square44x44Logo.altform-unplated_targetsize-16.png
diff --git a/res/windows/makepri/Square44x44Logo.altform-unplated_targetsize-256.png b/res/windows/makepri/Square44x44Logo.altform-unplated_targetsize-256.png
diff --git a/res/windows/makepri/Square44x44Logo.altform-unplated_targetsize-32.png b/res/windows/makepri/Square44x44Logo.altform-unplated_targetsize-32.png
diff --git a/res/windows/makepri/Square44x44Logo.altform-unplated_targetsize-48.png b/res/windows/makepri/Square44x44Logo.altform-unplated_targetsize-48.png
diff --git a/res/windows/makepri/Square44x44Logo.scale-200.png b/res/windows/makepri/Square44x44Logo.scale-200.png
diff --git a/res/windows/makepri/Square44x44Logo.targetsize-16.png b/res/windows/makepri/Square44x44Logo.targetsize-16.png
diff --git a/res/windows/makepri/Square44x44Logo.targetsize-24.png b/res/windows/makepri/Square44x44Logo.targetsize-24.png
diff --git a/res/windows/makepri/Square44x44Logo.targetsize-24_altform-unplated.png b/res/windows/makepri/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/res/windows/makepri/Square44x44Logo.targetsize-256.png b/res/windows/makepri/Square44x44Logo.targetsize-256.png
diff --git a/res/windows/makepri/Square44x44Logo.targetsize-32.png b/res/windows/makepri/Square44x44Logo.targetsize-32.png
diff --git a/res/windows/makepri/Square44x44Logo.targetsize-48.png b/res/windows/makepri/Square44x44Logo.targetsize-48.png
diff --git a/res/windows/makepri/StoreLogo.scale-200.png b/res/windows/makepri/StoreLogo.scale-200.png
diff --git a/res/windows/makepri/Wide310x150Logo.scale-200.png b/res/windows/makepri/Wide310x150Logo.scale-200.png
diff --git a/src/AssemblyInfo.Constants.cs b/src/AssemblyInfo.Constants.cs
@@ -6,10 +6,27 @@ namespace BD.WTTS;
 public static partial class AssemblyInfo
 {
     /// <summary>
-    /// 与应用程序关联的产品名称。
+    /// 语义化应用程序版本
+    /// https://semver.org/lang/zh-CN/
     /// </summary>
     public const string Version = "3.0.0";
 
+    /// <summary>
+    /// 预览版本号，范围 1~9
+    /// </summary>
+    const string ver_for_preview = "1";
+
+    /// <summary>
+    /// RC 版本号，范围 0~9
+    /// </summary>
+    const string ver_for_rc = "0";
+
+    public const string FileVersion = $"{Version}.{ver_for_rc}0{ver_for_preview}";
+
+    //public const string InformationalVersion = Version;
+    public const string InformationalVersion = $"{Version}-preview.{ver_for_preview}";
+    //public const string InformationalVersion = $"{Version}-rc.{ver_for_rc}";
+
     /// <summary>
     /// 与应用程序关联的产品名称。
     /// </summary>

diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs
@@ -34,7 +34,7 @@
 [assembly: AssemblyCopyright(AssemblyInfo.Copyright)]
 [assembly: AssemblyCompany(AssemblyInfo.Company)]
 [assembly: AssemblyVersion(AssemblyInfo.Version)]
-[assembly: AssemblyFileVersion(AssemblyInfo.Version)]
-[assembly: AssemblyInformationalVersion(AssemblyInfo.Version)]
+[assembly: AssemblyFileVersion(AssemblyInfo.FileVersion)]
+[assembly: AssemblyInformationalVersion(AssemblyInfo.InformationalVersion)]
 [assembly: NeutralResourcesLanguage(AssemblyInfo.CultureName_SimplifiedChinese)]
 #endif
diff --git a/src/BD.WTTS.Client.Tools.Publish/Helpers/MSIXHelper.cs b/src/BD.WTTS.Client.Tools.Publish/Helpers/MSIXHelper.cs
@@ -55,7 +55,7 @@ public static void Start(string rootPublicPath)
                 WorkingDirectory = rootPublicPath,
             };
             DotNetCLIHelper.StartProcessAndWaitForExit(psi);
-            var prPath = $@"{ProjectUtils.ProjPath}\build\windows\makepri";
+            var prPath = $@"{ProjectUtils.ProjPath}\res\windows\makepri";
             CopyDirectory(prPath, rootPublicPath, true);
             psi = new ProcessStartInfo
             {

diff --git a/src/BD.WTTS.Client/Plugins/Abstractions/PluginBase.Properties.cs b/src/BD.WTTS.Client/Plugins/Abstractions/PluginBase.Properties.cs
@@ -23,7 +23,7 @@ partial class PluginBase
 
     public virtual Type? SettingsPageViewType { get; }
 
-    const string OfficialAuthor = "Steam++ 官方";
+    const string OfficialAuthor = $"{AssemblyInfo.Trademark} 官方";
     const string IllegalAuthor = "存在非法字符";
     const string UnknownAuthor = "未知";
 
@@ -221,6 +221,15 @@ partial class PluginBase<TPlugin>
 
     public static IPlugin InterfaceInstance => Instance;
 
+    static readonly Lazy<string> mFileVersion = new(() =>
+    {
+        var assembly = typeof(TPlugin).Assembly;
+        string? version = assembly.GetCustomAttribute<AssemblyFileVersionAttribute>()?.Version;
+        return version ?? string.Empty;
+    });
+
+    public static string FileVersion => mFileVersion.Value;
+
     readonly Lazy<string> mVersion = new(() =>
     {
         var assembly = typeof(TPlugin).Assembly;

diff --git a/src/BD.WTTS.Client/UI/ViewModels/Pages/AboutPageViewModel.cs b/src/BD.WTTS.Client/UI/ViewModels/Pages/AboutPageViewModel.cs
@@ -16,8 +16,18 @@ public sealed partial class AboutPageViewModel : TabItemViewModel
     public string FormerAppName => string.Format(Title_2_, Strings.About_FormerName);
 
     [IgnoreDataMember, MPIgnore, MP2Ignore, N_JsonIgnore, S_JsonIgnore]
-    public string Copyright => AssemblyInfo.Copyright;
+    public string Copyright
+    {
+        get
+        {
+            // https://www.w3cschool.cn/html/html-copyright.html
+            int startYear = 2020, thisYear = 2023;
+            var nowYear = DateTime.Now.Year;
+            if (nowYear < thisYear) nowYear = thisYear;
+            return $"© {startYear}{(nowYear == startYear ? startYear : "-" + nowYear)} {AssemblyInfo.Company}. All Rights Reserved.";
+        }
+    }
 
     [IgnoreDataMember, MPIgnore, MP2Ignore, N_JsonIgnore, S_JsonIgnore]
-    public string VersionDisplay => $"{AssemblyInfo.Version} for {DeviceInfo2.OSName()} ({RuntimeInformation.ProcessArchitecture.ToString().ToLower()})";
+    public string VersionDisplay => $"{AssemblyInfo.InformationalVersion} for {DeviceInfo2.OSName()} ({RuntimeInformation.ProcessArchitecture.ToString().ToLower()})";
 }
diff --git a/src/BD.WTTS.Client/UI/ViewModels/Windows/Main/MainWindowViewModel.cs b/src/BD.WTTS.Client/UI/ViewModels/Windows/Main/MainWindowViewModel.cs
@@ -22,7 +22,7 @@ public MainWindowViewModel(IEnumerable<TabItemViewModel> tabItems, ImmutableArra
         {
             var platformService = IPlatformService.Instance;
             var adminTag = platformService.IsAdministrator ? (OperatingSystem.IsWindows() ? " (Administrator)" : " (Root)") : string.Empty;
-            var title = $"{AssemblyInfo.Trademark} {RuntimeInformation.ProcessArchitecture.ToString().ToLowerInvariant()} v{AssemblyInfo.Version} for {DeviceInfo2.OSName()}{adminTag}";
+            var title = $"{AssemblyInfo.Trademark} {RuntimeInformation.ProcessArchitecture.ToString().ToLowerInvariant()} v{AssemblyInfo.InformationalVersion} for {DeviceInfo2.OSName()}{adminTag}";
 #if DEBUG
             title = $"[Debug] {title}";
 #endif