Updated to v1.6.6

GenshinMatrix · Nov 3, 2022 · 9af0bb6 · 9af0bb6
1 parent 1d92a03
commit 9af0bb6
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 13 deletions.
diff --git a/README.en.md b/README.en.md
@@ -26,5 +26,5 @@ This is an automatic tool to obtain woods in Genshin Impact using gadget named "
 ## FAQs
 
 1. When the setup can't be installed. Please ensure that your system has installed the Microsoft Store. The setup depends on the store architecture (MSIX).
-2. Runtime environment is net6.0-windows10.0.18362.0.
+2. Runtime environment is net6.0-windows10.0.19041.0.
 
diff --git a/README.jp.md b/README.jp.md
@@ -30,5 +30,5 @@
 ## FAQs
 
 1. もしセットアップがインストールできない場合は、システムにアプリストアが実装されているかどうかをご確認ください。セットアップはアプリストアに依存している (MSIX)。
-2. 実行環境はnet6.0-windows10.0.18362.0。
+2. 実行環境はnet6.0-windows10.0.19041.0。
 
diff --git a/README.md b/README.md
@@ -28,4 +28,4 @@
 ## 常见问题
 
 1. 若安装包无法安装，请确保你的系统已安装应用商店，安装包依赖商店架构 (MSIX)。
-2. 运行环境是net6.0-windows10.0.18362.0。
+2. 运行环境是net6.0-windows10.0.19041.0。
diff --git a/build/nsis/setup.nsi b/build/nsis/setup.nsi
@@ -1,5 +1,5 @@
 !define PRODUCT_NAME                     "GenshinWoodmen"
-!define PRODUCT_VERSION                  "1.6.5.0"
+!define PRODUCT_VERSION                  "1.6.6.0"
 !define PRODUCT_PUBLISHER                "GenshinMatrix"
 !define PRODUCT_WEB_SITE                 "https://github.com/genshin-matrix"
 !define PRODUCT_LEGAL                    "Licensed under MIT"

diff --git a/src/GenshinWoodmen/Core/UsageManager.cs b/src/GenshinWoodmen/Core/UsageManager.cs
@@ -1,5 +1,4 @@
 using GenshinWoodmen.Views;
-using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 
@@ -18,10 +17,16 @@ public static bool ShowUsageImage(UsageImageType type = UsageImageType.Normal)
             UsageImageType.Multi => "_multi",
             UsageImageType.Normal or _ => string.Empty,
         } + ".jpg";
+        string title = type switch
+        {
+            UsageImageType.Single => Mui("WoodGuide1"),
+            UsageImageType.Multi => Mui("WoodGuide2"),
+            UsageImageType.Normal or _ => Mui("WoodGuide"),
+        };
 
         try
         {
-            ImageViewWindow win = new();
+            ImageViewWindow win = new() { Title = title };
             win.Load(uriString);
             win.Show();
             return true;

diff --git a/src/GenshinWoodmen/GenshinWoodmen.csproj b/src/GenshinWoodmen/GenshinWoodmen.csproj
@@ -10,9 +10,9 @@
     <ApplicationIcon>Resources\favicon.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <Platforms>x64</Platforms>
-    <AssemblyVersion>1.6.5</AssemblyVersion>
-    <FileVersion>1.6.5</FileVersion>
-    <Version>$(VersionPrefix)1.6.5</Version>
+    <AssemblyVersion>1.6.6</AssemblyVersion>
+    <FileVersion>1.6.6</FileVersion>
+    <Version>$(VersionPrefix)1.6.6</Version>
     <Authors>GenshinMatrix</Authors>
     <Company>GenshinMatrix</Company>
   </PropertyGroup>

diff --git a/src/GenshinWoodmen/Properties/PublishProfiles/FolderProfile.pubxml b/src/GenshinWoodmen/Properties/PublishProfiles/FolderProfile.pubxml
@@ -9,10 +9,11 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishDir>bin\x64\Release\net6.0-windows10.0.18362.0\publish\win-x64\</PublishDir>
     <PublishProtocol>FileSystem</PublishProtocol>
     <_TargetId>Folder</_TargetId>
-    <TargetFramework>net6.0-windows10.0.18362.0</TargetFramework>
+    <TargetFramework>net6.0-windows10.0.19041.0</TargetFramework>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <SelfContained>false</SelfContained>
+    <SelfContained>true</SelfContained>
     <PublishSingleFile>true</PublishSingleFile>
     <PublishReadyToRun>false</PublishReadyToRun>
+    <PublishTrimmed>false</PublishTrimmed>
   </PropertyGroup>
 </Project>
diff --git a/src/GenshinWoodmen/Properties/PublishProfiles/FolderProfile.pubxml.user b/src/GenshinWoodmen/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -4,7 +4,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <History>True|2022-10-27T16:18:38.9125193Z;True|2022-10-28T00:17:13.7946722+08:00;True|2022-10-01T06:51:21.1199082+08:00;True|2022-10-01T06:49:50.2260487+08:00;True|2022-09-27T00:48:36.4543383+08:00;True|2022-09-27T00:45:40.0714849+08:00;True|2022-09-20T01:34:35.4747125+08:00;True|2022-09-20T00:59:45.4472326+08:00;True|2022-09-20T00:53:40.0030455+08:00;True|2022-09-17T22:56:07.6833129+08:00;True|2022-09-17T22:50:22.5255257+08:00;True|2022-09-17T22:50:04.6387586+08:00;True|2022-09-17T22:23:00.6778373+08:00;True|2022-09-17T22:19:12.8040412+08:00;True|2022-09-17T22:10:52.6730553+08:00;True|2022-09-17T21:02:34.6673893+08:00;True|2022-09-17T20:55:40.7716679+08:00;True|2022-09-17T20:53:34.4769834+08:00;True|2022-09-17T19:33:35.2879327+08:00;True|2022-09-17T19:32:52.1931963+08:00;True|2022-09-17T19:09:57.9903567+08:00;False|2022-09-17T19:09:48.4994431+08:00;True|2022-09-17T19:06:55.4469036+08:00;False|2022-09-17T19:06:49.2072619+08:00;True|2022-09-17T19:05:45.0822595+08:00;True|2022-09-16T04:52:33.1022628+08:00;True|2022-09-16T01:54:27.8788086+08:00;True|2022-09-16T01:40:07.0858068+08:00;True|2022-09-16T01:10:48.9408972+08:00;True|2022-09-16T00:45:11.9914517+08:00;</History>
+    <History>True|2022-11-03T18:05:02.5367031Z;True|2022-11-04T02:04:05.6558664+08:00;False|2022-11-04T02:03:27.9560581+08:00;True|2022-10-28T00:18:38.9125193+08:00;True|2022-10-28T00:17:13.7946722+08:00;True|2022-10-01T06:51:21.1199082+08:00;True|2022-10-01T06:49:50.2260487+08:00;True|2022-09-27T00:48:36.4543383+08:00;True|2022-09-27T00:45:40.0714849+08:00;True|2022-09-20T01:34:35.4747125+08:00;True|2022-09-20T00:59:45.4472326+08:00;True|2022-09-20T00:53:40.0030455+08:00;True|2022-09-17T22:56:07.6833129+08:00;True|2022-09-17T22:50:22.5255257+08:00;True|2022-09-17T22:50:04.6387586+08:00;True|2022-09-17T22:23:00.6778373+08:00;True|2022-09-17T22:19:12.8040412+08:00;True|2022-09-17T22:10:52.6730553+08:00;True|2022-09-17T21:02:34.6673893+08:00;True|2022-09-17T20:55:40.7716679+08:00;True|2022-09-17T20:53:34.4769834+08:00;True|2022-09-17T19:33:35.2879327+08:00;True|2022-09-17T19:32:52.1931963+08:00;True|2022-09-17T19:09:57.9903567+08:00;False|2022-09-17T19:09:48.4994431+08:00;True|2022-09-17T19:06:55.4469036+08:00;False|2022-09-17T19:06:49.2072619+08:00;True|2022-09-17T19:05:45.0822595+08:00;True|2022-09-16T04:52:33.1022628+08:00;True|2022-09-16T01:54:27.8788086+08:00;True|2022-09-16T01:40:07.0858068+08:00;True|2022-09-16T01:10:48.9408972+08:00;True|2022-09-16T00:45:11.9914517+08:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>
diff --git a/src/GenshinWoodmenSetup/Package.appxmanifest b/src/GenshinWoodmenSetup/Package.appxmanifest
@@ -9,7 +9,7 @@
   <Identity
     Name="c17bc862-e10e-4618-b717-e47dd2bf65c8"
     Publisher="CN=ema"
-    Version="1.6.5.0" />
+    Version="1.6.6.0" />
 
   <Properties>
     <DisplayName>GenshinWoodmen</DisplayName>