pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix #58771/Fix a bug of updating VCRedist 2013 package

Browse Source
This commit is contained in:
Eugene Kozyrev
2022-10-11 12:45:55 +03:00
committed by GitHub
parent b19bc3fb11
commit 55b1342f5d
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
win-linux/package/windows/DesktopEditors.aip
View File

@ -1071,23 +1071,23 @@
<COMPONENT cid="caphyon.advinst.msicomp.PreReqComponent">
<ROW PrereqKey="MicrosoftVisualC" DisplayName="Microsoft Visual C++ 2015-2022 Redistributable (x64)" VersionMin="14.32" SetupFileUrl="data\vcredist\vcredist_2022_x64.exe" Location="0" ExactSize="0" Operator="0" ComLine="/q /norestart" BasicUiComLine="/q /norestart" NoUiComLine="/q /norestart" Options="px" TargetName="Microsoft Visual C++ 2015-2022 Redistributable (x64)\vcredist_2022_x64.exe" Feature="MicrosoftVisualC"/>
<ROW PrereqKey="MicrosoftVisualC_1" DisplayName="Microsoft Visual C++ 2015-2022 Redistributable (x86)" VersionMin="14.32" SetupFileUrl="data\vcredist\vcredist_2022_x86.exe" Location="0" ExactSize="0" Operator="0" ComLine="/q /norestart" BasicUiComLine="/q /norestart" NoUiComLine="/q /norestart" Options="p" TargetName="Microsoft Visual C++ 2015-2022 Redistributable (x86)\vcredist_2022_x86.exe" Feature="MicrosoftVisualC_1"/>
<ROW PrereqKey="MicrosoftVisualC_2" DisplayName="Microsoft Visual C++ 2013 Redistributable (x86)" VersionMin="12.0.30501.0" SetupFileUrl="data\vcredist\vcredist_2013_x86.exe" Location="0" ExactSize="0" Operator="0" ComLine="/q /norestart" BasicUiComLine="/q /norestart" NoUiComLine="/q /norestart" Options="p" TargetName="Microsoft Visual C++ 2013 Redistributable (x86)\vcredist_2013_x86.exe" Feature="MicrosoftVisualC_2"/>
<ROW PrereqKey="MicrosoftVisualC_3" DisplayName="Microsoft Visual C++ 2013 Redistributable (x64)" VersionMin="12.0.30501.0" SetupFileUrl="data\vcredist\vcredist_2013_x64.exe" Location="0" ExactSize="0" Operator="0" ComLine="/q /norestart" BasicUiComLine="/q /norestart" NoUiComLine="/q /norestart" Options="px" TargetName="Microsoft Visual C++ 2013 Redistributable (x64)\vcredist_2013_x64.exe" Feature="MicrosoftVisualC_3"/>
<ROW PrereqKey="MicrosoftVisualC_2" DisplayName="Microsoft Visual C++ 2013 Redistributable (x86)" VersionMin="12.0.21005" SetupFileUrl="data\vcredist\vcredist_2013_x86.exe" Location="0" ExactSize="0" Operator="0" ComLine="/q /norestart" BasicUiComLine="/q /norestart" NoUiComLine="/q /norestart" Options="p" TargetName="Microsoft Visual C++ 2013 Redistributable (x86)\vcredist_2013_x86.exe" Feature="MicrosoftVisualC_2"/>
<ROW PrereqKey="MicrosoftVisualC_3" DisplayName="Microsoft Visual C++ 2013 Redistributable (x64)" VersionMin="12.0.21005" SetupFileUrl="data\vcredist\vcredist_2013_x64.exe" Location="0" ExactSize="0" Operator="0" ComLine="/q /norestart" BasicUiComLine="/q /norestart" NoUiComLine="/q /norestart" Options="px" TargetName="Microsoft Visual C++ 2013 Redistributable (x64)\vcredist_2013_x64.exe" Feature="MicrosoftVisualC_3"/>
<ATTRIBUTE name="PrereqsOrder" value="MicrosoftVisualC_2 MicrosoftVisualC_3 MicrosoftVisualC_1 MicrosoftVisualC"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.PreReqSearchComponent">
<ROW SearchKey="SystemFoldermsvcp120.dll" Prereq="MicrosoftVisualC_2" SearchType="0" SearchString="[SystemFolder]msvcp120.dll" VerMin="12.0.30501.0" Order="2" Property="PreReqSearch_5"/>
<ROW SearchKey="SystemFoldermsvcp120.dll_1" Prereq="MicrosoftVisualC_3" SearchType="0" SearchString="[SystemFolder]msvcp120.dll" VerMin="12.0.30501.0" Order="2" Property="PreReqSearch_10"/>
<ROW SearchKey="SystemFoldermsvcp120.dll" Prereq="MicrosoftVisualC_2" SearchType="0" SearchString="[SystemFolder]msvcp120.dll" VerMin="12.0.21005" Order="2" Property="PreReqSearch_5"/>
<ROW SearchKey="SystemFoldermsvcp120.dll_1" Prereq="MicrosoftVisualC_3" SearchType="0" SearchString="[SystemFolder]msvcp120.dll" VerMin="12.0.21005" Order="2" Property="PreReqSearch_10"/>
<ROW SearchKey="SystemFoldermsvcp140.dll" Prereq="MicrosoftVisualC" SearchType="0" SearchString="[SystemFolder]msvcp140.dll" VerMin="14.32.31332.0" Order="2" Property="PreReqSearch_8"/>
<ROW SearchKey="SystemFoldermsvcr120.dll" Prereq="MicrosoftVisualC_2" SearchType="0" SearchString="[SystemFolder]msvcr120.dll" VerMin="12.0.30501.0" Order="3" Property="PreReqSearch_6"/>
<ROW SearchKey="SystemFoldermsvcr120.dll_1" Prereq="MicrosoftVisualC_3" SearchType="0" SearchString="[SystemFolder]msvcr120.dll" VerMin="12.0.30501.0" Order="3" Property="PreReqSearch_11"/>
<ROW SearchKey="SystemFoldermsvcr120.dll" Prereq="MicrosoftVisualC_2" SearchType="0" SearchString="[SystemFolder]msvcr120.dll" VerMin="12.0.21005" Order="3" Property="PreReqSearch_6"/>
<ROW SearchKey="SystemFoldermsvcr120.dll_1" Prereq="MicrosoftVisualC_3" SearchType="0" SearchString="[SystemFolder]msvcr120.dll" VerMin="12.0.21005" Order="3" Property="PreReqSearch_11"/>
<ROW SearchKey="SystemFoldervcruntime140.dll" Prereq="MicrosoftVisualC_1" SearchType="0" SearchString="[SystemFolder]msvcp140.dll" VerMin="14.32.31332.0" Order="1" Property="PreReqSearch_1"/>
<ROW SearchKey="SystemFoldervcruntime140.dll_1" Prereq="MicrosoftVisualC_1" SearchType="0" SearchString="[SystemFolder]vcruntime140.dll" VerMin="14.32.31332.0" Order="3" Property="PreReqSearch_7"/>
<ROW SearchKey="SystemFoldervcruntime140.dll_2" Prereq="MicrosoftVisualC" SearchType="0" SearchString="[SystemFolder]vcruntime140.dll" VerMin="14.32.31332.0" Order="3" Property="PreReqSearch_9"/>
<ROW SearchKey="Version" Prereq="MicrosoftVisualC_1" SearchType="4" SearchString="{65E5BD06-6392-3027-8C26-853107D3CF1A}" VerMin="14.32.31332.0" Order="0" Property="PreReqSearch_2"/>
<ROW SearchKey="Version_1" Prereq="MicrosoftVisualC" SearchType="4" SearchString="{36F68A90-239C-34DF-B58C-64B30153CE35}" VerMin="14.32.31332.0" Order="2" Property="PreReqSearch_3"/>
<ROW SearchKey="Version_2" Prereq="MicrosoftVisualC_2" SearchType="4" SearchString="{B59F5BF1-67C8-3802-8E59-2CE551A39FC5}" VerMin="12.0.30501.0" Order="1" Property="PreReqSearch"/>
<ROW SearchKey="Version_3" Prereq="MicrosoftVisualC_3" SearchType="4" SearchString="{20400CF0-DE7C-327E-9AE4-F0F38D9085F8}" VerMin="12.0.30501.0" Order="1" Property="PreReqSearch_4"/>
<ROW SearchKey="Version_2" Prereq="MicrosoftVisualC_2" SearchType="4" SearchString="{B59F5BF1-67C8-3802-8E59-2CE551A39FC5}" VerMin="12.0.21005" Order="1" Property="PreReqSearch"/>
<ROW SearchKey="Version_3" Prereq="MicrosoftVisualC_3" SearchType="4" SearchString="{20400CF0-DE7C-327E-9AE4-F0F38D9085F8}" VerMin="12.0.21005" Order="1" Property="PreReqSearch_4"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.TxtUpdateComponent">
<ROW Name="ReplacePackage" TxtUpdateSet="package.config" FindPattern="package=.*" ReplacePattern="package=msi" Options="3" Order="0" FileEncoding="-1"/>

2
win-linux/package/windows/utils.iss
View File

@ -89,7 +89,7 @@ begin
else
upgradecode := '{B59F5BF1-67C8-3802-8E59-2CE551A39FC5}'; //x86
Result := msiproductupgrade(upgradecode, '12.0.30501.0');
Result := msiproductupgrade(upgradecode, '12.0.21005');
end;
function checkVCRedist2022(): Boolean;