Skip to content

Commit c722248

Browse files
committed
release:2.6.2.0 更新webview2
1 parent 1d820f6 commit c722248

File tree

7 files changed

+14
-8
lines changed

7 files changed

+14
-8
lines changed

LiveWallpaper.App/LiveWallpaper.App.wapproj

+1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
<AppxBundlePlatforms>x64</AppxBundlePlatforms>
4040
<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
4141
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
42+
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
4243
</PropertyGroup>
4344
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
4445
<AppxBundle>Always</AppxBundle>

LiveWallpaper.App/Package.appxmanifest

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
99
xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
1010
IgnorableNamespaces="uap mp rescap com desktop">
11-
<Identity Name="24765mscoder.107453A6A4A17" Publisher="CN=49BC8659-1B4C-4520-B1FB-ED98CFA366C4" Version="2.6.1.0" />
11+
<Identity Name="24765mscoder.107453A6A4A17" Publisher="CN=49BC8659-1B4C-4520-B1FB-ED98CFA366C4" Version="2.6.2.0" />
1212
<Properties>
1313
<DisplayName>ms-resource:Resources/PackageDisplayName</DisplayName>
1414
<PublisherDisplayName>Giantapp Studio</PublisherDisplayName>

LiveWallpaper.LocalServer/Controllers/AssetsController.cs

+1-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ public static bool IsFileReady(string filename)
3131
{
3232
try
3333
{
34-
using (Stream stream = new FileStream(filename, FileMode.Open))
35-
{
36-
}
34+
using Stream stream = new FileStream(filename, FileMode.Open);
3735
return true;
3836
}
3937
catch

LiveWallpaper.Shell/LiveWallpaper.Shell.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<UseWPF>true</UseWPF>
77
<SupportedOSPlatformVersion>10.0.17763.0</SupportedOSPlatformVersion>
88
<AssemblyName>LiveWallpaper2</AssemblyName>
9-
<Version>2.6.1.0</Version>
9+
<Version>2.6.2.0</Version>
1010
<Platforms>x86;x64</Platforms>
1111
<ApplicationIcon>Assets\logo128.ico</ApplicationIcon>
1212
<ApplicationManifest>app.manifest</ApplicationManifest>
@@ -24,7 +24,7 @@
2424
<ItemGroup>
2525
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.0.0" />
2626
<PackageReference Include="HandyControl" Version="3.3.0" />
27-
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1264.42" />
27+
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2592.51" />
2828
</ItemGroup>
2929

3030
<ItemGroup>
Binary file not shown.

setup/compile.ps1

+7
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,10 @@ DeletePath -path $buildDist
2828
# build sln
2929
# Invoke-MsBuild -Path $sln -MsBuildParameters "-t:restore /target:Clean;Build /property:Configuration=Release;OutputPath=$buildDist" -ShowBuildOutputInNewWindow -PromptForInputBeforeClosing -AutoLaunchBuildLogOnFailure
3030
Invoke-MsBuild -Path $sln -MsBuildParameters "-t:restore /target:Clean;Publish /p:PublishProfile=./FolderProfile.pubxml" -ShowBuildOutputInNewWindow -PromptForInputBeforeClosing -AutoLaunchBuildLogOnFailure
31+
32+
# inno setup 打包
33+
$innoSetup = "C:\Program Files (x86)\Inno Setup 6\ISCC.exe"
34+
$innoSetupScript = "$PSScriptRoot\installer.iss"
35+
$innoSetupOutput = "$PSScriptRoot\dist"
36+
DeletePath -path $innoSetupOutput
37+
& $innoSetup $innoSetupScript

setup/installer.iss

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
; Script generated by the Inno Setup Script Wizard.
22
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
33

4-
#define MyAppVersion GetFileVersion(".\publish\LiveWallpaper2.exe")
4+
#define MyAppVersion GetVersionNumbersString(".\publish\LiveWallpaper2.exe")
55
#define ProductName "LiveWallpaper"
66
#define ProductVersionName "LiveWallpaper2"
77
#define MyAppPublisher "Giantapp Studio"
88
#define MyAppURL "https://www.giantapp.cn"
99
#define MyAppExeName "LiveWallpaper2.exe"
1010
#define ProductNameEn="Live Wallpaper 2"
11-
#define ProductNameZh="巨应壁纸2"
11+
#define ProductNameZh="¾ÞÓ¦±ÚÖ½2"
1212
#define OutputDir=".\dist"
1313

1414
[Setup]

0 commit comments

Comments
 (0)