release:2.6.2.0 更新webview2

GiantappMan · Aug 6, 2024 · c722248 · c722248
1 parent 1d820f6
commit c722248
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/LiveWallpaper.App/LiveWallpaper.App.wapproj b/LiveWallpaper.App/LiveWallpaper.App.wapproj
@@ -39,6 +39,7 @@
     <AppxBundlePlatforms>x64</AppxBundlePlatforms>
     <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
     <AppxBundle>Always</AppxBundle>

diff --git a/LiveWallpaper.App/Package.appxmanifest b/LiveWallpaper.App/Package.appxmanifest
@@ -8,7 +8,7 @@
   xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
   xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
   IgnorableNamespaces="uap mp rescap com desktop">
-  <Identity Name="24765mscoder.107453A6A4A17" Publisher="CN=49BC8659-1B4C-4520-B1FB-ED98CFA366C4" Version="2.6.1.0" />
+  <Identity Name="24765mscoder.107453A6A4A17" Publisher="CN=49BC8659-1B4C-4520-B1FB-ED98CFA366C4" Version="2.6.2.0" />
   <Properties>
     <DisplayName>ms-resource:Resources/PackageDisplayName</DisplayName>
     <PublisherDisplayName>Giantapp Studio</PublisherDisplayName>

diff --git a/LiveWallpaper.LocalServer/Controllers/AssetsController.cs b/LiveWallpaper.LocalServer/Controllers/AssetsController.cs
@@ -31,9 +31,7 @@ public static bool IsFileReady(string filename)
         {
             try
             {
-                using (Stream stream = new FileStream(filename, FileMode.Open))
-                {
-                }
+                using Stream stream = new FileStream(filename, FileMode.Open);
                 return true;
             }
             catch

diff --git a/LiveWallpaper.Shell/LiveWallpaper.Shell.csproj b/LiveWallpaper.Shell/LiveWallpaper.Shell.csproj
@@ -6,7 +6,7 @@
 		<UseWPF>true</UseWPF>
 		<SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
 		<AssemblyName>LiveWallpaper2</AssemblyName>
-		<Version>2.6.1.0</Version>
+		<Version>2.6.2.0</Version>
 		<Platforms>x86;x64</Platforms>
 		<ApplicationIcon>Assets\logo128.ico</ApplicationIcon>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
@@ -24,7 +24,7 @@
 	<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
 		<PackageReference Include="HandyControl" Version="3.3.0" />
-		<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1264.42" />
+		<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2592.51" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/LiveWallpaper.Shell/wwwroot/MicrosoftEdgeWebview2Setup.exe b/LiveWallpaper.Shell/wwwroot/MicrosoftEdgeWebview2Setup.exe
diff --git a/setup/compile.ps1 b/setup/compile.ps1
@@ -28,3 +28,10 @@ DeletePath -path $buildDist
 # build sln
 # Invoke-MsBuild -Path $sln -MsBuildParameters "-t:restore /target:Clean;Build /property:Configuration=Release;OutputPath=$buildDist" -ShowBuildOutputInNewWindow -PromptForInputBeforeClosing -AutoLaunchBuildLogOnFailure
 Invoke-MsBuild -Path $sln -MsBuildParameters "-t:restore /target:Clean;Publish /p:PublishProfile=./FolderProfile.pubxml" -ShowBuildOutputInNewWindow -PromptForInputBeforeClosing -AutoLaunchBuildLogOnFailure
+
+# inno setup 打包
+$innoSetup = "C:\Program Files (x86)\Inno Setup 6\ISCC.exe"
+$innoSetupScript = "$PSScriptRoot\installer.iss"
+$innoSetupOutput = "$PSScriptRoot\dist"
+DeletePath -path $innoSetupOutput
+& $innoSetup $innoSetupScript
diff --git a/setup/installer.iss b/setup/installer.iss
@@ -1,14 +1,14 @@
 ; Script generated by the Inno Setup Script Wizard.
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
-#define MyAppVersion GetFileVersion(".\publish\LiveWallpaper2.exe")
+#define MyAppVersion GetVersionNumbersString(".\publish\LiveWallpaper2.exe")
 #define ProductName "LiveWallpaper"
 #define ProductVersionName "LiveWallpaper2"
 #define MyAppPublisher "Giantapp Studio"
 #define MyAppURL "https://www.giantapp.cn"
 #define MyAppExeName "LiveWallpaper2.exe"
 #define ProductNameEn="Live Wallpaper 2"
-#define ProductNameZh="巨应壁纸2"
+#define ProductNameZh="¾ÞÓ¦±ÚÖ½2"
 #define OutputDir=".\dist"
 
 [Setup]
-Original file line number
+Diff line change
@@ Expand Up / @@ -31,9 +31,7 @@ public static bool IsFileReady(string filename) @@
             {
                 try
                 {
-                    using (Stream stream = new FileStream(filename, FileMode.Open))
-                    {
-                    }
+                    using Stream stream = new FileStream(filename, FileMode.Open);
                     return true;
                 }
                 catch
@@ Expand Down @@