Skip to content

Commit d06d7b9

Browse files
authored
Merge pull request #1896 from d2phap/v/9.0.11
V9.0.11.502
2 parents 1026cf0 + e0ceb32 commit d06d7b9

File tree

85 files changed

+4789
-4194
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+4789
-4194
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -170,3 +170,4 @@ BundleArtifacts
170170
BundleArtifactsUpload
171171
node_modules/
172172
launchSettings.json
173+
Setup/Assets/WebView2_Runtime/

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ ImageGlass - A lightweight, versatile image viewer
66
[![GPL Licence](https://img.shields.io/badge/license-GPLv3-green.svg?maxAge=3600)](https://github.com/d2phap/ImageGlass/blob/master/LICENSE)
77
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/imageglass/localized.svg)](https://crowdin.com/project/imageglass)
88

9-
[![Discord](https://img.shields.io/discord/818852544859209748?label=chat&logo=discord&color=%233097B8&style=social)](http://discord.io/imageglass)
9+
[![Discord](https://img.shields.io/discord/818852544859209748?label=chat&logo=discord&color=%233097B8&style=social)](https://discord.gg/tWjbynH2X8)
1010
[![Twitter Follow](https://img.shields.io/twitter/follow/duongdieuphap?style=social)](https://twitter.com/duongdieuphap)
1111

1212

Setup/AdvancedInstaller/ImageGlass_9_x64.aip

+7-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<DOCUMENT Type="Advanced Installer" CreateVersion="16.6.1" version="21.3.1" Modules="express" RootPath="." Language="en" Id="{F94250A5-86CD-4D74-BDB8-560C4CA1354D}">
2+
<DOCUMENT Type="Advanced Installer" CreateVersion="16.6.1" version="21.6.1" Modules="express" RootPath="." Language="en" Id="{F94250A5-86CD-4D74-BDB8-560C4CA1354D}">
33
<COMPONENT cid="caphyon.advinst.msicomp.ProjectOptionsComponent">
44
<ROW Name="HiddenItems" Value="AppXProductDetailsComponent;AppXDependenciesComponent;AppXAppDetailsComponent;AppXVisualAssetsComponent;AppXCapabilitiesComponent;AppXAppDeclarationsComponent;AppXUriRulesComponent;FixupComponent;MsiXDiffComponent;MsixManifestEditorComponent"/>
55
</COMPONENT>
@@ -18,10 +18,10 @@
1818
<ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:3"/>
1919
<ROW Property="Manufacturer" Value="Duong Dieu Phap"/>
2020
<ROW Property="MsiLogging" MultiBuildValue="DefaultBuild:vp"/>
21-
<ROW Property="ProductCode" Value="1033:{35D2E54D-F51D-4BCE-B499-67EB30062C5C} " Type="16"/>
21+
<ROW Property="ProductCode" Value="1033:{70B7AF07-14C9-4D4A-B0FA-9F7466AC6146} " Type="16"/>
2222
<ROW Property="ProductLanguage" Value="1033"/>
2323
<ROW Property="ProductName" Value="ImageGlass"/>
24-
<ROW Property="ProductVersion" Value="9.0.10.201" Options="32"/>
24+
<ROW Property="ProductVersion" Value="9.0.11.502" Options="32"/>
2525
<ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
2626
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
2727
<ROW Property="UpgradeCode" Value="{877DB994-AB03-4025-B99D-41CE565E810B}"/>
@@ -127,6 +127,7 @@
127127
<ROW Component="WebView2Loader.dll_1" ComponentId="{734ED35E-882B-4000-A2C6-ABF3A1951F05}" Directory_="native_Dir" Attributes="256" KeyPath="WebView2Loader.dll_1"/>
128128
<ROW Component="WicNet.dll" ComponentId="{104D60EF-94A4-496E-A344-66859C27FA75}" Directory_="APPDIR" Attributes="256" KeyPath="WicNet.dll"/>
129129
<ROW Component="WinRT.Runtime.dll" ComponentId="{89BE7794-C3D0-415E-BFB9-DC37226F0621}" Directory_="APPDIR" Attributes="0" KeyPath="WinRT.Runtime.dll"/>
130+
<ROW Component="ZString.dll" ComponentId="{09B28A07-B0D9-4474-ADDD-D54AFB135F23}" Directory_="APPDIR" Attributes="256" KeyPath="ZString.dll"/>
130131
<ROW Component="globalHelpers.d.ts" ComponentId="{0A7D65D1-BEEC-462C-B629-43455653A2AD}" Directory_="helpers_Dir" Attributes="0" KeyPath="globalHelpers.d.ts" Type="0"/>
131132
<ROW Component="igcmd.dll" ComponentId="{2BC725DB-D08A-43DC-AFB4-31ECE4564B12}" Directory_="APPDIR" Attributes="256" KeyPath="igcmd.dll"/>
132133
<ROW Component="igcmd.dll.config" ComponentId="{FD6534D7-4727-44E3-9273-3CF6E1FC0141}" Directory_="APPDIR" Attributes="0" KeyPath="ReadMe.rtf" Type="0"/>
@@ -466,6 +467,8 @@
466467
<ROW File="ImageGlass.WebP.pdb" Component_="ImageGlass.WebP.dll" FileName="IMAGEG~7.PDB|ImageGlass.WebP.pdb" Attributes="0" SourcePath="..\..\Source\ImageGlass\bin\Publish\net8.0-windows-x64\ImageGlass.WebP.pdb" SelfReg="false"/>
467468
<ROW File="ImageGlass.WinTouch.pdb" Component_="ImageGlass.WinTouch.dll" FileName="IMAGEG~8.PDB|ImageGlass.WinTouch.pdb" Attributes="0" SourcePath="..\..\Source\ImageGlass\bin\Publish\net8.0-windows-x64\ImageGlass.WinTouch.pdb" SelfReg="false"/>
468469
<ROW File="default.webp" Component_="igcmd.dll.config" FileName="DEFAUL~1.WEB|default.webp" Attributes="0" SourcePath="..\Assets\default.webp" SelfReg="false"/>
470+
<ROW File="Persian.iglang.json" Component_="Vietnamese.iglang.json" FileName="PERSIA~1.JSO|Persian.iglang.json" Attributes="0" SourcePath="..\Assets\Language\Persian.iglang.json" SelfReg="false"/>
471+
<ROW File="ZString.dll" Component_="ZString.dll" FileName="ZString.dll" Attributes="0" SourcePath="..\..\Source\ImageGlass\bin\Publish\net8.0-windows-x64\ZString.dll" SelfReg="false"/>
469472
</COMPONENT>
470473
<COMPONENT cid="caphyon.advinst.msicomp.AiPersistentPropComponent">
471474
<ROW Property="AI_INSTALLPERUSER" Registry="AI_INSTALLPERUSER" HklmSearch="AI_INSTALLPERUSER" HkcuSearch="AI_INSTALLPERUSER_1" Hklm64Search="AI_INSTALLPERUSER_2" Hkcu64Search="AI_INSTALLPERUSER_3"/>
@@ -653,6 +656,7 @@
653656
<ROW Feature_="MainFeatures" Component_="WebView2Loader.dll"/>
654657
<ROW Feature_="MainFeatures" Component_="WicNet.dll"/>
655658
<ROW Feature_="MainFeatures" Component_="WinRT.Runtime.dll"/>
659+
<ROW Feature_="MainFeatures" Component_="ZString.dll"/>
656660
</COMPONENT>
657661
<COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
658662
<ROW Name="SystemFoldermsiexec.exe" SourcePath="&lt;AI_RES&gt;uninstall.ico" Index="0"/>

0 commit comments

Comments
 (0)