FInish task and publish 3.5.209.0 version

1.FInish task and publish 3.5.209.0 version 2.Update Windows Sdk version to 10.0.22621.33
Gaoyifei1011 · Feb 9, 2024 · 5540f8c · 5540f8c
1 parent 792637f
commit 5540f8c
Show file tree

Hide file tree

Showing 17 changed files with 55 additions and 52 deletions.
diff --git a/GetStoreApp/GetStoreApp.csproj b/GetStoreApp/GetStoreApp.csproj
@@ -37,7 +37,7 @@
     <WindowsAppSDKDeploymentManagerInitialize>false</WindowsAppSDKDeploymentManagerInitialize>
     <WindowsAppSDKSelfContained>false</WindowsAppSDKSelfContained>
     <WindowsPackageType>MSIX</WindowsPackageType>
-    <WindowsSdkPackageVersion>10.0.22621.31</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion>10.0.22621.33</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Platform)'=='x86'">

diff --git a/GetStoreApp/GetStoreAppResource.res b/GetStoreApp/GetStoreAppResource.res
diff --git a/GetStoreApp/Helpers/Converters/ValueCheckConverterHelper.cs b/GetStoreApp/Helpers/Converters/ValueCheckConverterHelper.cs
@@ -23,21 +23,6 @@ public static bool FileExistReverseCheck(string path)
             return !File.Exists(path);
         }
 
-        /// <summary>
-        /// 检测文件是否存在，进行文字提示
-        /// </summary>
-        public static string FileExistTextCheck(string path)
-        {
-            if (File.Exists(path))
-            {
-                return ResourceService.GetLocalized("Download/CompleteDownload");
-            }
-            else
-            {
-                return ResourceService.GetLocalized("Download/FileNotExist");
-            }
-        }
-
         /// <summary>
         /// 检测当前页面是否为应用列表页面
         /// </summary>

diff --git a/GetStoreApp/Helpers/Converters/ValueConverterHelper.cs b/GetStoreApp/Helpers/Converters/ValueConverterHelper.cs
@@ -41,5 +41,21 @@ public static Visibility BooleanToVisibilityReverseConvert(bool value)
         {
             return value is false ? Visibility.Visible : Visibility.Collapsed;
         }
+
+        /// <summary>
+        /// 空字符串值与显示值转换
+        /// </summary>
+        public static Visibility StringVisibilityConvert(string value)
+        {
+            return !string.IsNullOrEmpty(value) ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        /// <summary>
+        /// 空字符串值与显示值转换（判断结果相反）
+        /// </summary>
+        public static Visibility StringReverseVisibilityConvert(string value)
+        {
+            return string.IsNullOrEmpty(value) ? Visibility.Visible : Visibility.Collapsed;
+        }
     }
 }
diff --git a/GetStoreApp/Properties/AssemblyInfo.cs b/GetStoreApp/Properties/AssemblyInfo.cs
@@ -7,11 +7,11 @@
 [assembly: AssemblyCompany("高怡飞")]
 [assembly: AssemblyCopyright("Copyright ©2022-2023 高怡飞, All Rights Reserved.")]
 [assembly: AssemblyDescription("获取商店应用")]
-[assembly: AssemblyFileVersion("3.4.208.0")]
-[assembly: AssemblyInformationalVersion("3.4.208.0")]
+[assembly: AssemblyFileVersion("3.5.209.0")]
+[assembly: AssemblyInformationalVersion("3.5.209.0")]
 [assembly: AssemblyProduct("获取商店应用")]
 [assembly: AssemblyTitle("获取商店应用")]
-[assembly: AssemblyVersion("3.4.208.0")]
+[assembly: AssemblyVersion("3.5.209.0")]
 
 // 设置程序集对 COM 组件的访问权限
 [assembly: ComVisible(false)]

diff --git a/GetStoreApp/Strings/en-us/About.resw b/GetStoreApp/Strings/en-us/About.resw
@@ -127,7 +127,7 @@
     <value>Open App settings</value>
   </data>
   <data name="AppVersion" xml:space="preserve">
-    <value>Application Version: {0}</value>
+    <value>Application Version: </value>
   </data>
   <data name="Backdrop" xml:space="preserve">
     <value>Backdrop settings instructions</value>

diff --git a/GetStoreApp/Strings/en-us/Store.resw b/GetStoreApp/Strings/en-us/Store.resw
@@ -232,7 +232,7 @@
     <value>Publisehr:</value>
   </data>
   <data name="QueryedAppType" xml:space="preserve">
-    <value>AppType: {0}</value>
+    <value>AppType: </value>
   </data>
   <data name="QueryLinks" xml:space="preserve">
     <value>Query links</value>

diff --git a/GetStoreApp/Strings/zh-hans/About.resw b/GetStoreApp/Strings/zh-hans/About.resw
@@ -127,7 +127,7 @@
     <value>打开应用设置</value>
   </data>
   <data name="AppVersion" xml:space="preserve">
-    <value>应用版本：{0}</value>
+    <value>应用版本：</value>
   </data>
   <data name="Backdrop" xml:space="preserve">
     <value>背景色设置说明</value>

diff --git a/GetStoreApp/Strings/zh-hans/Store.resw b/GetStoreApp/Strings/zh-hans/Store.resw
@@ -232,7 +232,7 @@
     <value>发布者：</value>
   </data>
   <data name="QueryedAppType" xml:space="preserve">
-    <value>应用类型：{0}</value>
+    <value>应用类型：</value>
   </data>
   <data name="QueryLinks" xml:space="preserve">
     <value>查询链接</value>

diff --git a/GetStoreApp/UI/Controls/Download/CompletedControl.xaml b/GetStoreApp/UI/Controls/Download/CompletedControl.xaml
@@ -300,7 +300,7 @@
                                 VerticalAlignment="Center"
                                 x:Load="{x:Bind io:File.Exists(FilePath)}"
                                 FontSize="14"
-                                Text="{x:Bind converter:ValueCheckConverterHelper.FileExistTextCheck(FilePath)}"
+                                Text="{x:Bind root:ResourceService.GetLocalized('Download/CompleteDownload')}"
                                 TextAlignment="Left" />
 
                             <TextBlock
@@ -310,7 +310,7 @@
                                 x:Load="{x:Bind converter:ValueCheckConverterHelper.FileExistReverseCheck(FilePath)}"
                                 FontSize="14"
                                 Foreground="{ThemeResource InfoBarErrorSeverityIconBackground}"
-                                Text="{x:Bind converter:ValueCheckConverterHelper.FileExistTextCheck(FilePath)}"
+                                Text="{x:Bind root:ResourceService.GetLocalized('Download/FileNotExist')}"
                                 TextAlignment="Left" />
                         </StackPanel>
 

diff --git a/GetStoreApp/UI/Controls/Store/QueryLinksControl.xaml b/GetStoreApp/UI/Controls/Store/QueryLinksControl.xaml
@@ -522,7 +522,25 @@
                 VerticalAlignment="Center"
                 Visibility="{x:Bind converter:ValueConverterHelper.IntToVisibilityConvert(QueryLinksCollection.Count), Mode=OneWay}">
 
-                <TextBlock Text="{x:Bind LocalizeQueryedAppType(AppInfo.CategoryID), Mode=OneWay}" />
+                <Grid>
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="Auto" />
+                    </Grid.ColumnDefinitions>
+
+                    <TextBlock Grid.Column="0" Text="{x:Bind root:ResourceService.GetLocalized('Store/QueryedAppType')}" />
+
+                    <TextBlock
+                        Grid.Column="1"
+                        Text="{x:Bind root:ResourceService.GetLocalized('Store/NonPackagedApp')}"
+                        Visibility="{x:Bind converter:ValueConverterHelper.StringReverseVisibilityConvert(AppInfo.CategoryID), Mode=OneWay}" />
+
+                    <TextBlock
+                        Grid.Column="2"
+                        Text="{x:Bind root:ResourceService.GetLocalized('Store/PackagedApp')}"
+                        Visibility="{x:Bind converter:ValueConverterHelper.StringVisibilityConvert(AppInfo.CategoryID), Mode=OneWay}" />
+                </Grid>
+
                 <TextBlock Text="{x:Bind sys:String.Format(QueryLinksCountInfo, QueryLinksCollection.Count), Mode=OneWay}" />
             </StackPanel>
 

diff --git a/GetStoreApp/UI/Controls/Store/QueryLinksControl.xaml.cs b/GetStoreApp/UI/Controls/Store/QueryLinksControl.xaml.cs
@@ -853,21 +853,6 @@ private void OnPropertyChanged([CallerMemberName] string propertyName = null)
             PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         }
 
-        /// <summary>
-        /// 本地化应用类型字符串
-        /// </summary>
-        private string LocalizeQueryedAppType(string categoryId)
-        {
-            if (string.IsNullOrEmpty(categoryId))
-            {
-                return string.Format(ResourceService.GetLocalized("Store/QueryedAppType"), ResourceService.GetLocalized("Store/NonPackagedApp"));
-            }
-            else
-            {
-                return string.Format(ResourceService.GetLocalized("Store/QueryedAppType"), ResourceService.GetLocalized("Store/PackagedApp"));
-            }
-        }
-
         /// <summary>
         /// 从本地数据存储中加载查询链接历史记录数据
         /// </summary>

diff --git a/GetStoreApp/Views/Pages/AboutPage.xaml b/GetStoreApp/Views/Pages/AboutPage.xaml
@@ -5,6 +5,7 @@
     xmlns:collection="using:System.Collections"
     xmlns:converter="using:GetStoreApp.Helpers.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:helper="using:GetStoreApp.Helpers.Root"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:root="using:GetStoreApp.Services.Root"
     Loaded="{x:Bind OnLoaded}"
@@ -166,10 +167,10 @@
                             FontSize="30"
                             Text="{x:Bind root:ResourceService.GetLocalized('About/AppName')}" />
 
-                        <TextBlock
-                            Margin="0,0,0,10"
-                            FontSize="15"
-                            Text="{x:Bind AppVersion}" />
+                        <StackPanel Margin="0,0,0,10" Orientation="Horizontal">
+                            <TextBlock FontSize="15" Text="{x:Bind root:ResourceService.GetLocalized('About/AppVersion')}" />
+                            <TextBlock FontSize="15" Text="{x:Bind helper:InfoHelper.AppVersion.ToString()}" />
+                        </StackPanel>
 
                         <StackPanel Orientation="Horizontal">
 

diff --git a/GetStoreApp/Views/Pages/AboutPage.xaml.cs b/GetStoreApp/Views/Pages/AboutPage.xaml.cs
@@ -32,8 +32,6 @@ public sealed partial class AboutPage : Page
     {
         private AppNaviagtionArgs aboutNavigationArgs = AppNaviagtionArgs.None;
 
-        private string AppVersion { get; } = string.Format(ResourceService.GetLocalized("About/AppVersion"), InfoHelper.AppVersion.ToString());
-
         //项目引用信息
         private Hashtable ReferenceDict { get; } = new Hashtable()
         {

diff --git a/GetStoreAppPackage/Package.appxmanifest b/GetStoreAppPackage/Package.appxmanifest
@@ -12,7 +12,7 @@
   <Identity
     Name="Gaoyifei1011.GetStoreApp"
     Publisher="CN=高怡飞"
-    Version="3.4.208.0" />
+    Version="3.5.209.0" />
 
   <Properties>
     <DisplayName>ms-resource:PackageDisplayName</DisplayName>

diff --git a/GetStoreAppWebView/Properties/AssemblyInfo.cs b/GetStoreAppWebView/Properties/AssemblyInfo.cs
@@ -6,11 +6,11 @@
 [assembly: AssemblyCompany("高怡飞")]
 [assembly: AssemblyCopyright("Copyright ©2022-2023 高怡飞, All Rights Reserved.")]
 [assembly: AssemblyDescription("网页浏览器")]
-[assembly: AssemblyFileVersion("3.4.208.0")]
-[assembly: AssemblyInformationalVersion("3.4.208.0")]
+[assembly: AssemblyFileVersion("3.5.209.0")]
+[assembly: AssemblyInformationalVersion("3.5.209.0")]
 [assembly: AssemblyProduct("网页浏览器")]
 [assembly: AssemblyTitle("网页浏览器")]
-[assembly: AssemblyVersion("3.4.208.0")]
+[assembly: AssemblyVersion("3.5.209.0")]
 
 // 设置程序集对 COM 组件的访问权限
 [assembly: ComVisible(false)]

diff --git a/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj b/Microsoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj
@@ -10,7 +10,7 @@
     <Platforms>x64;x86;ARM64</Platforms>
     <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.19041.0</TargetPlatformMinVersion>
-    <WindowsSdkPackageVersion>10.0.22621.31</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion>10.0.22621.33</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Platform)'=='x86'">