mirror of
https://github.com/iterate-ch/cyberduck.git
synced 2026-05-26 19:10:49 +00:00
Install .NET 4.7.2 if not installed
This commit is contained in:
Jöran Malek
@@ -24,7 +24,7 @@
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Cyberduck Bootstrapper.wxs" />
|
||||
<Compile Include="NetFx47Web.wxs" />
|
||||
<Compile Include="NetFx47.wxs" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<WixExtension Include="WixNetFxExtension">
|
||||
@@ -84,4 +84,4 @@
|
||||
<Target Name="AfterBuild">
|
||||
</Target>
|
||||
-->
|
||||
</Project>
|
||||
</Project>
|
||||
+36
-36
@@ -1,42 +1,42 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
|
||||
<Bundle Name="Cyberduck" Version="!(bind.packageVersion.Setup)" Manufacturer="iterate GmbH"
|
||||
UpgradeCode="69C1D059-4B45-4220-A82C-DAE80C9CD8E0" IconSourceFile="cyberduck-application.ico">
|
||||
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense">
|
||||
<bal:WixStandardBootstrapperApplication LicenseUrl=""
|
||||
LogoFile="setup\wix\banner.png"
|
||||
LogoSideFile="setup\wix\welcome.bmp"/>
|
||||
</BootstrapperApplicationRef>
|
||||
<Variable Name="InstallFolder" Type="string" Value="[ProgramFilesFolder]Cyberduck"/>
|
||||
<util:RegistrySearch Id="PreviousInstallFolderSearch" Root="HKLM" Key="Software\[WixBundleManufacturer]\[WixBundleName]" Value="InstallDir" Variable="PreviousInstallFolder" />
|
||||
<util:RegistrySearch Id="CurrentBuild" Variable="CBNumber" Result="value" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Value="CurrentBuildNumber"/>
|
||||
<util:DirectorySearch Path="[PreviousInstallFolder]" Variable="InstallFolder" After="PreviousInstallFolderSearch" Condition="PreviousInstallFolder" />
|
||||
<Variable Name="Autostart" bal:Overridable="yes" Type="numeric" Value="0" />
|
||||
<Bundle Name="Cyberduck" Version="!(bind.packageVersion.Setup)" Manufacturer="iterate GmbH"
|
||||
UpgradeCode="69C1D059-4B45-4220-A82C-DAE80C9CD8E0" IconSourceFile="cyberduck-application.ico">
|
||||
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense">
|
||||
<bal:WixStandardBootstrapperApplication LicenseUrl=""
|
||||
LogoFile="setup\wix\banner.png"
|
||||
LogoSideFile="setup\wix\welcome.bmp"/>
|
||||
</BootstrapperApplicationRef>
|
||||
<Variable Name="InstallFolder" Type="string" Value="[ProgramFilesFolder]Cyberduck"/>
|
||||
<util:RegistrySearch Id="PreviousInstallFolderSearch" Root="HKLM" Key="Software\[WixBundleManufacturer]\[WixBundleName]" Value="InstallDir" Variable="PreviousInstallFolder" />
|
||||
<util:RegistrySearch Id="CurrentBuild" Variable="CBNumber" Result="value" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Value="CurrentBuildNumber"/>
|
||||
<util:DirectorySearch Path="[PreviousInstallFolder]" Variable="InstallFolder" After="PreviousInstallFolderSearch" Condition="PreviousInstallFolder" />
|
||||
<Variable Name="Autostart" bal:Overridable="yes" Type="numeric" Value="0" />
|
||||
|
||||
<bal:Condition Message="Windows 7 SP1, Windows Server 2008 R2 or later is required to run this application.">
|
||||
<![CDATA[VersionNT >= v6.1 AND (VersionNT <> v6.1 OR ServicePackLevel >= 1 OR MsiNTProductType <> 1)]]>
|
||||
</bal:Condition>
|
||||
<bal:Condition Message="Installation on Windows 8 is not supported.">
|
||||
<![CDATA[VersionNT <> v6.2 OR MsiNTProductType <> 1]]>
|
||||
</bal:Condition>
|
||||
<bal:Condition Message="Windows 10 Anniversary Update (14393) or later is required to run this application.">
|
||||
<![CDATA[VersionNT < v10.0 OR CBNumber >= 14393]]>
|
||||
</bal:Condition>
|
||||
<bal:Condition Message="Windows 7 SP1, Windows Server 2008 R2 or later is required to run this application.">
|
||||
<![CDATA[VersionNT >= v6.1 AND (VersionNT <> v6.1 OR ServicePackLevel >= 1 OR MsiNTProductType <> 1)]]>
|
||||
</bal:Condition>
|
||||
<bal:Condition Message="Installation on Windows 8 is not supported.">
|
||||
<![CDATA[VersionNT <> v6.2 OR MsiNTProductType <> 1]]>
|
||||
</bal:Condition>
|
||||
<bal:Condition Message="Windows 10 Anniversary Update (14393) or later is required to run this application.">
|
||||
<![CDATA[VersionNT < v10.0 OR CBNumber >= 14393]]>
|
||||
</bal:Condition>
|
||||
|
||||
<Chain>
|
||||
<PackageGroupRef Id="NetFx47Web"/>
|
||||
<RollbackBoundary/>
|
||||
<MsiPackage
|
||||
Id="Setup"
|
||||
Compressed="yes"
|
||||
SourceFile="$(var.cyberduck-installer-msi.TargetPath)"
|
||||
Vital="yes">
|
||||
<MsiProperty Name="INSTALLLOCATION" Value="[InstallFolder]"/>
|
||||
<MsiProperty Name="AUTOSTART" Value="0"/>
|
||||
</MsiPackage>
|
||||
<MsiPackage SourceFile="setup\wix\Bonjour.msi" Compressed="yes" Vital="no" InstallCondition="NOT VersionNT64"/>
|
||||
<MsiPackage SourceFile="setup\wix\Bonjour64.msi" Compressed="yes" Vital="no" InstallCondition="VersionNT64"/>
|
||||
</Chain>
|
||||
</Bundle>
|
||||
<Chain>
|
||||
<PackageGroupRef Id="NetFx472Web" />
|
||||
<RollbackBoundary/>
|
||||
<MsiPackage
|
||||
Id="Setup"
|
||||
Compressed="yes"
|
||||
SourceFile="$(var.cyberduck-installer-msi.TargetPath)"
|
||||
Vital="yes">
|
||||
<MsiProperty Name="INSTALLLOCATION" Value="[InstallFolder]"/>
|
||||
<MsiProperty Name="AUTOSTART" Value="0"/>
|
||||
</MsiPackage>
|
||||
<MsiPackage SourceFile="setup\wix\Bonjour.msi" Compressed="yes" Vital="no" InstallCondition="NOT VersionNT64"/>
|
||||
<MsiPackage SourceFile="setup\wix\Bonjour64.msi" Compressed="yes" Vital="no" InstallCondition="VersionNT64"/>
|
||||
</Chain>
|
||||
</Bundle>
|
||||
</Wix>
|
||||
|
||||
+100
@@ -0,0 +1,100 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
|
||||
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
|
||||
|
||||
<!--
|
||||
.NET Framework installation state properties
|
||||
|
||||
Official documentation can be found at the following location:
|
||||
|
||||
.NET Framework 4.5/4.5.1/4.5.2/4.6/4.6.1/4.6.2/4.7 - http://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx
|
||||
-->
|
||||
|
||||
<?define NetFx47MinRelease = 460798 ?>
|
||||
<?define NetFx472WebLink = http://go.microsoft.com/fwlink/?LinkId=863262 ?>
|
||||
<?define NetFx472RedistLink = http://go.microsoft.com/fwlink/?LinkId=863265 ?>
|
||||
<?define NetFx472EulaLink = http://referencesource.microsoft.com/license.html ?>
|
||||
|
||||
<Fragment>
|
||||
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
|
||||
<Property Id="WIX_IS_NETFRAMEWORK_47_OR_LATER_INSTALLED" Secure="yes" />
|
||||
<SetProperty Id="WIX_IS_NETFRAMEWORK_47_OR_LATER_INSTALLED" Value="1" After="AppSearch">
|
||||
WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx47MinRelease)"
|
||||
</SetProperty>
|
||||
</Fragment>
|
||||
|
||||
<Fragment>
|
||||
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
|
||||
|
||||
<WixVariable Id="WixMbaPrereqPackageId" Value="NetFx472Web" />
|
||||
<WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx472EulaLink)" Overridable="yes" />
|
||||
<WixVariable Id="NetFx472WebDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx47MinRelease)" Overridable="yes" />
|
||||
<WixVariable Id="NetFx472WebInstallCondition" Value="" Overridable="yes" />
|
||||
<WixVariable Id="NetFx472WebPackageDirectory" Value="redist\" Overridable="yes" />
|
||||
|
||||
<PackageGroup Id="NetFx472Web">
|
||||
<ExePackage
|
||||
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx472FullLog].html""
|
||||
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx472FullLog].html""
|
||||
UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx472FullLog].html""
|
||||
PerMachine="yes"
|
||||
DetectCondition="!(wix.NetFx472WebDetectCondition)"
|
||||
InstallCondition="!(wix.NetFx472WebInstallCondition)"
|
||||
Id="NetFx472Web"
|
||||
Vital="yes"
|
||||
Permanent="yes"
|
||||
Protocol="netfx4"
|
||||
DownloadUrl="$(var.NetFx472WebLink)"
|
||||
LogPathVariable="NetFx472FullLog"
|
||||
Compressed="no"
|
||||
Name="!(wix.NetFx472WebPackageDirectory)NDP472-KB4054531-Web.exe">
|
||||
<RemotePayload
|
||||
CertificatePublicKey="C090C1A2CAFA9B967D9C87C7FE02F7C01FBDE4F2"
|
||||
CertificateThumbprint="5EAD300DC7E4D637948ECB0ED829A072BD152E17"
|
||||
Description="Microsoft .NET Framework 4.7.2 Setup"
|
||||
Hash="507ECDADC23A27C2283BA130A2AA51650E6BC05B"
|
||||
ProductName="Microsoft .NET Framework 4.7.2"
|
||||
Size="1447320"
|
||||
Version="4.7.3062.0" />
|
||||
</ExePackage>
|
||||
</PackageGroup>
|
||||
</Fragment>
|
||||
|
||||
<Fragment>
|
||||
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
|
||||
|
||||
<WixVariable Id="WixMbaPrereqPackageId" Value="NetFx472Redist" />
|
||||
<WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx472EulaLink)" Overridable="yes" />
|
||||
<WixVariable Id="NetFx472RedistDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx47MinRelease)" Overridable="yes" />
|
||||
<WixVariable Id="NetFx472RedistInstallCondition" Value="" Overridable="yes" />
|
||||
<WixVariable Id="NetFx472RedistPackageDirectory" Value="redist\" Overridable="yes" />
|
||||
|
||||
<PackageGroup Id="NetFx472Redist">
|
||||
<ExePackage
|
||||
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx472FullLog].html""
|
||||
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx472FullLog].html""
|
||||
UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx472FullLog].html""
|
||||
PerMachine="yes"
|
||||
DetectCondition="!(wix.NetFx472RedistDetectCondition)"
|
||||
InstallCondition="!(wix.NetFx472RedistInstallCondition)"
|
||||
Id="NetFx472Redist"
|
||||
Vital="yes"
|
||||
Permanent="yes"
|
||||
Protocol="netfx4"
|
||||
DownloadUrl="$(var.NetFx472RedistLink)"
|
||||
LogPathVariable="NetFx472FullLog"
|
||||
Compressed="no"
|
||||
Name="!(wix.NetFx472RedistPackageDirectory)NDP472-KB4054530-x86-x64-AllOS-ENU.exe">
|
||||
<RemotePayload
|
||||
CertificatePublicKey="C090C1A2CAFA9B967D9C87C7FE02F7C01FBDE4F2"
|
||||
CertificateThumbprint="5EAD300DC7E4D637948ECB0ED829A072BD152E17"
|
||||
Description="Microsoft .NET Framework 4.7.2 Setup"
|
||||
Hash="D3A416DC5FC75758D41B4C0158ACA69270D2A904"
|
||||
ProductName="Microsoft .NET Framework 4.7.2"
|
||||
Size="71607232"
|
||||
Version="4.7.3062.0" />
|
||||
</ExePackage>
|
||||
</PackageGroup>
|
||||
</Fragment>
|
||||
</Wix>
|
||||
-100
@@ -1,100 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
|
||||
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
|
||||
|
||||
<!--
|
||||
.NET Framework installation state properties
|
||||
|
||||
Official documentation can be found at the following location:
|
||||
|
||||
.NET Framework 4.5/4.5.1/4.5.2/4.6/4.6.1/4.6.2/4.7 - http://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx
|
||||
-->
|
||||
|
||||
<?define NetFx47MinRelease = 460798 ?>
|
||||
<?define NetFx47WebLink = http://go.microsoft.com/fwlink/?LinkId=825298 ?>
|
||||
<?define NetFx47RedistLink = http://go.microsoft.com/fwlink/?LinkId=825302 ?>
|
||||
<?define NetFx47EulaLink = http://referencesource.microsoft.com/license.html ?>
|
||||
|
||||
<Fragment>
|
||||
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
|
||||
<Property Id="WIX_IS_NETFRAMEWORK_47_OR_LATER_INSTALLED" Secure="yes" />
|
||||
<SetProperty Id="WIX_IS_NETFRAMEWORK_47_OR_LATER_INSTALLED" Value="1" After="AppSearch">
|
||||
WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx47MinRelease)"
|
||||
</SetProperty>
|
||||
</Fragment>
|
||||
|
||||
<Fragment>
|
||||
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
|
||||
|
||||
<WixVariable Id="WixMbaPrereqPackageId" Value="NetFx47Web" />
|
||||
<WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx47EulaLink)" Overridable="yes" />
|
||||
<WixVariable Id="NetFx47WebDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx47MinRelease)" Overridable="yes" />
|
||||
<WixVariable Id="NetFx47WebInstallCondition" Value="" Overridable="yes" />
|
||||
<WixVariable Id="NetFx47WebPackageDirectory" Value="redist\" Overridable="yes" />
|
||||
|
||||
<PackageGroup Id="NetFx47Web">
|
||||
<ExePackage
|
||||
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx47FullLog].html""
|
||||
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx47FullLog].html""
|
||||
UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx47FullLog].html""
|
||||
PerMachine="yes"
|
||||
DetectCondition="!(wix.NetFx47WebDetectCondition)"
|
||||
InstallCondition="!(wix.NetFx47WebInstallCondition)"
|
||||
Id="NetFx47Web"
|
||||
Vital="yes"
|
||||
Permanent="yes"
|
||||
Protocol="netfx4"
|
||||
DownloadUrl="$(var.NetFx47WebLink)"
|
||||
LogPathVariable="NetFx47FullLog"
|
||||
Compressed="no"
|
||||
Name="!(wix.NetFx47WebPackageDirectory)NDP47-KB3186500-Web.exe">
|
||||
<RemotePayload
|
||||
CertificatePublicKey="371DD003A37769487A2A89A5A9DDB3026451B906"
|
||||
CertificateThumbprint="98ED99A67886D020C564923B7DF25E9AC019DF26"
|
||||
Description="Microsoft .NET Framework 4.7 Setup"
|
||||
Hash="B3A24DEB7A8D937FC0B5591CDCC2725BF4E1BDEA"
|
||||
ProductName="Microsoft .NET Framework 4.7"
|
||||
Size="1426720"
|
||||
Version="4.7.2053.0" />
|
||||
</ExePackage>
|
||||
</PackageGroup>
|
||||
</Fragment>
|
||||
|
||||
<Fragment>
|
||||
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
|
||||
|
||||
<WixVariable Id="WixMbaPrereqPackageId" Value="NetFx47Redist" />
|
||||
<WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx47EulaLink)" Overridable="yes" />
|
||||
<WixVariable Id="NetFx47RedistDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx47MinRelease)" Overridable="yes" />
|
||||
<WixVariable Id="NetFx47RedistInstallCondition" Value="" Overridable="yes" />
|
||||
<WixVariable Id="NetFx47RedistPackageDirectory" Value="redist\" Overridable="yes" />
|
||||
|
||||
<PackageGroup Id="NetFx47Redist">
|
||||
<ExePackage
|
||||
InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx47FullLog].html""
|
||||
RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx47FullLog].html""
|
||||
UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx47FullLog].html""
|
||||
PerMachine="yes"
|
||||
DetectCondition="!(wix.NetFx47RedistDetectCondition)"
|
||||
InstallCondition="!(wix.NetFx47RedistInstallCondition)"
|
||||
Id="NetFx47Redist"
|
||||
Vital="yes"
|
||||
Permanent="yes"
|
||||
Protocol="netfx4"
|
||||
DownloadUrl="$(var.NetFx47RedistLink)"
|
||||
LogPathVariable="NetFx47FullLog"
|
||||
Compressed="no"
|
||||
Name="!(wix.NetFx47RedistPackageDirectory)NDP47-KB3186497-x86-x64-AllOS-ENU.exe">
|
||||
<RemotePayload
|
||||
CertificatePublicKey="371DD003A37769487A2A89A5A9DDB3026451B906"
|
||||
CertificateThumbprint="98ED99A67886D020C564923B7DF25E9AC019DF26"
|
||||
Description="Microsoft .NET Framework 4.7 Setup"
|
||||
Hash="76054141A492BA307595250BDA05AD4E0694CDC3"
|
||||
ProductName="Microsoft .NET Framework 4.7"
|
||||
Size="61586744"
|
||||
Version="4.7.2053.0" />
|
||||
</ExePackage>
|
||||
</PackageGroup>
|
||||
</Fragment>
|
||||
</Wix>
|
||||
Reference in New Issue
Block a user