diff --git a/LiveWallpaper.App/LiveWallpaper.App.wapproj b/LiveWallpaper.App/LiveWallpaper.App.wapproj index 46414fc1..01aedcdc 100644 --- a/LiveWallpaper.App/LiveWallpaper.App.wapproj +++ b/LiveWallpaper.App/LiveWallpaper.App.wapproj @@ -39,6 +39,7 @@ x64 True 0 + SHA256 Always diff --git a/LiveWallpaper.App/Package.appxmanifest b/LiveWallpaper.App/Package.appxmanifest index b2a6151f..25307e4a 100644 --- 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"> - + ms-resource:Resources/PackageDisplayName Giantapp Studio diff --git a/LiveWallpaper.LocalServer/Controllers/AssetsController.cs b/LiveWallpaper.LocalServer/Controllers/AssetsController.cs index 3eafc5d5..c03d2c47 100644 --- 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 index bc1221d0..50b1215d 100644 --- a/LiveWallpaper.Shell/LiveWallpaper.Shell.csproj +++ b/LiveWallpaper.Shell/LiveWallpaper.Shell.csproj @@ -6,7 +6,7 @@ true 10.0.17763.0 LiveWallpaper2 - 2.6.1.0 + 2.6.2.0 x86;x64 Assets\logo128.ico app.manifest @@ -24,7 +24,7 @@ - + diff --git a/LiveWallpaper.Shell/wwwroot/MicrosoftEdgeWebview2Setup.exe b/LiveWallpaper.Shell/wwwroot/MicrosoftEdgeWebview2Setup.exe index 57a8033f..fdc4d51d 100644 Binary files a/LiveWallpaper.Shell/wwwroot/MicrosoftEdgeWebview2Setup.exe and b/LiveWallpaper.Shell/wwwroot/MicrosoftEdgeWebview2Setup.exe differ diff --git a/setup/compile.ps1 b/setup/compile.ps1 index acf00fc1..b219f5f0 100644 --- 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 \ No newline at end of file diff --git a/setup/installer.iss b/setup/installer.iss index be50e756..3f496569 100644 --- 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]