-
Notifications
You must be signed in to change notification settings - Fork 273
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/6.2.0' into master
- Loading branch information
Showing
11 changed files
with
317 additions
and
311 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,42 +1,49 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
|
|
||
| <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" | ||
| xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" | ||
| xmlns:net="http://schemas.microsoft.com/wix/NetFxExtension" | ||
| xmlns:bal="http://schemas.microsoft.com/wix/BalExtension"> | ||
|
|
||
| <?include PapercutVars.wxi ?> | ||
|
|
||
| <Bundle Name="$(var.ProductName)" | ||
| Version="!(bind.packageVersion.PapercutMsi)" | ||
| Manufacturer="!(bind.packageManufacturer.PapercutMsi)" | ||
| UpgradeCode="$(var.UpgradeCode)" | ||
| AboutUrl="https://github.com/ChangemakerStudios/Papercut" | ||
| Copyright="Copyright (c) 2021 by Changemaker Studios" | ||
| HelpUrl="https://github.com/ChangemakerStudios/Papercut" | ||
| IconSourceFile="Resources\App.ico"> | ||
| <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense"> | ||
| <bal:WixStandardBootstrapperApplication LicenseUrl="" | ||
| ShowVersion="yes" | ||
| LogoFile="Resources\Papercut-Logo.png" | ||
| <?include PapercutVars.wxi ?> | ||
|
|
||
| <Bundle Name="$(var.ProductName)" | ||
| Version="!(bind.packageVersion.PapercutMsi)" | ||
| Manufacturer="!(bind.packageManufacturer.PapercutMsi)" | ||
| UpgradeCode="$(var.UpgradeCode)" | ||
| AboutUrl="https://github.com/ChangemakerStudios/Papercut" | ||
| Copyright="Copyright (c) 2021 by Changemaker Studios" | ||
| HelpUrl="https://github.com/ChangemakerStudios/Papercut" | ||
| IconSourceFile="Resources\App.ico"> | ||
| <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense"> | ||
| <bal:WixStandardBootstrapperApplication LicenseUrl="" | ||
| ShowVersion="yes" | ||
| LogoFile="Resources\Papercut-Logo.png" | ||
| LogoSideFile="Resources\Papercut-Sidelogo.png" /> | ||
| </BootstrapperApplicationRef> | ||
| </BootstrapperApplicationRef> | ||
|
|
||
| <Variable Name="InstallFolder" Type="string" Value="[ProgramFiles6432Folder]!(bind.packageManufacturer.PapercutMsi)\Papercut SMTP"/> | ||
| <Variable Name="CommonDataFolder" Type="string" Value="[CommonAppDataFolder]!(bind.packageManufacturer.PapercutMsi)\Papercut SMTP"/> | ||
| <util:RegistrySearch Root="HKLM" Key="$(var.EdgeRegistryKeyOne)" Variable="WVRTInstalledCheckOne" Result="exists" /> | ||
| <util:RegistrySearch Root="HKCU" Key="$(var.EdgeRegistryKeyTwo)" Variable="WVRTInstalledCheckTwo" Result="exists" /> | ||
|
|
||
| <Variable Name="InstallFolder" Type="string" Value="[ProgramFiles6432Folder]!(bind.packageManufacturer.PapercutMsi)\Papercut SMTP"/> | ||
| <Variable Name="CommonDataFolder" Type="string" Value="[CommonAppDataFolder]!(bind.packageManufacturer.PapercutMsi)\Papercut SMTP"/> | ||
| <Chain> | ||
| <PackageGroupRef Id="NetFx48Web" /> | ||
|
|
||
| <Chain> | ||
| <PackageGroupRef Id="NetFx472Web" /> | ||
| <ExePackage Id="DownloadAndInvokeBootstrapper" Name="Install WebView2 Runtime" Cache="no" Compressed="no" PerMachine="yes" Vital="yes" DownloadUrl="https://go.microsoft.com/fwlink/p/?LinkId=2124703" InstallCommand=" /install" InstallCondition="NOT (REMOVE OR WVRTInstalledCheckOne OR WVRTInstalledCheckTwo)"> | ||
| <RemotePayload CertificatePublicKey="236F73B837007769A26657E02FEB5869EB09D01A" CertificateThumbprint="C9CAEDC2CECF953E812C6446D41927B9864BB880" Description="Microsoft Edge Update Setup" Hash="AD5692106BD6DA50BEECA1908504AE90FC36CE93" ProductName="Microsoft Edge Update" Size="1812256" Version="1.3.153.55" /> | ||
| </ExePackage> | ||
|
|
||
| <RollbackBoundary /> | ||
| <RollbackBoundary /> | ||
|
|
||
| <MsiPackage Id="PapercutMsi" | ||
| <MsiPackage Id="PapercutMsi" | ||
| SourceFile="$(var.Papercut.Installer.TargetPath)" | ||
| Compressed="yes" | ||
| DisplayInternalUI="yes" | ||
| Vital="yes"> | ||
| <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" /> | ||
| <MsiProperty Name="COMMONDATAFOLDER" Value="[CommonDataFolder]" /> | ||
| </MsiPackage> | ||
| </Chain> | ||
| </Bundle> | ||
| <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" /> | ||
| <MsiProperty Name="COMMONDATAFOLDER" Value="[CommonDataFolder]" /> | ||
| </MsiPackage> | ||
| </Chain> | ||
| </Bundle> | ||
| </Wix> |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| <?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/4.7.1/4.8 - https://msdn.microsoft.com/en-us/library/w0x726c2(v=vs.110).aspx | ||
| --> | ||
|
|
||
| <?define NetFx48MinRelease = 528040 ?> | ||
| <?define NetFx48WebLink = https://go.microsoft.com/fwlink/?LinkId=2085155 ?> | ||
| <?define NetFx48RedistLink = https://go.microsoft.com/fwlink/?linkid=2088631 ?> | ||
| <?define NetFx48EulaLink = https://referencesource.microsoft.com/license.html ?> | ||
|
|
||
| <Fragment> | ||
| <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" /> | ||
| <Property Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Secure="yes" /> | ||
| <SetProperty Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Value="1" After="AppSearch"> | ||
| WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx48MinRelease)" | ||
| </SetProperty> | ||
| </Fragment> | ||
|
|
||
| <Fragment> | ||
| <util:RegistrySearchRef Id="NETFRAMEWORK45"/> | ||
|
|
||
| <WixVariable Id="WixMbaPrereqPackageId" Value="NetFx48Web" /> | ||
| <WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx48EulaLink)" Overridable="yes" /> | ||
| <WixVariable Id="NetFx48WebDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx48MinRelease)" Overridable="yes" /> | ||
| <WixVariable Id="NetFx48WebInstallCondition" Value="" Overridable="yes" /> | ||
| <WixVariable Id="NetFx48WebPackageDirectory" Value="redist\" Overridable="yes" /> | ||
|
|
||
| <PackageGroup Id="NetFx48Web"> | ||
| <ExePackage | ||
| InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx48FullLog].html"" | ||
| RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx48FullLog].html"" | ||
| UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx48FullLog].html"" | ||
| PerMachine="yes" | ||
| DetectCondition="!(wix.NetFx48WebDetectCondition)" | ||
| InstallCondition="!(wix.NetFx48WebInstallCondition)" | ||
| Id="NetFx48Web" | ||
| Vital="yes" | ||
| Permanent="yes" | ||
| Protocol="netfx4" | ||
| DownloadUrl="$(var.NetFx48WebLink)" | ||
| LogPathVariable="NetFx48FullLog" | ||
| Compressed="no" | ||
| Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe"> | ||
| <RemotePayload | ||
| CertificatePublicKey="F49F9B33E25E33CCA0BFB15A62B7C29FFAB3880B" | ||
| CertificateThumbprint="ABDCA79AF9DD48A0EA702AD45260B3C03093FB4B" | ||
| Description="Microsoft .NET Framework 4.8 Setup" | ||
| Hash="4181398AA1FD5190155AC3A388434E5F7EA0B667" | ||
| ProductName="Microsoft .NET Framework 4.8" | ||
| Size="1439328" | ||
| Version="4.8.4115.0" /> | ||
| </ExePackage> | ||
| </PackageGroup> | ||
| </Fragment> | ||
|
|
||
| <Fragment> | ||
| <util:RegistrySearchRef Id="NETFRAMEWORK45"/> | ||
|
|
||
| <WixVariable Id="WixMbaPrereqPackageId" Value="NetFx48Redist" /> | ||
| <WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx48EulaLink)" Overridable="yes" /> | ||
| <WixVariable Id="NetFx48RedistDetectCondition" Value="NETFRAMEWORK45 >= $(var.NetFx48MinRelease)" Overridable="yes" /> | ||
| <WixVariable Id="NetFx48RedistInstallCondition" Value="" Overridable="yes" /> | ||
| <WixVariable Id="NetFx48RedistPackageDirectory" Value="redist\" Overridable="yes" /> | ||
|
|
||
| <PackageGroup Id="NetFx48Redist"> | ||
| <ExePackage | ||
| InstallCommand="/q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx48FullLog].html"" | ||
| RepairCommand="/q /norestart /repair /ChainingPackage "[WixBundleName]" /log "[NetFx48FullLog].html"" | ||
| UninstallCommand="/uninstall /q /norestart /ChainingPackage "[WixBundleName]" /log "[NetFx48FullLog].html"" | ||
| PerMachine="yes" | ||
| DetectCondition="!(wix.NetFx48RedistDetectCondition)" | ||
| InstallCondition="!(wix.NetFx48RedistInstallCondition)" | ||
| Id="NetFx48Redist" | ||
| Vital="yes" | ||
| Permanent="yes" | ||
| Protocol="netfx4" | ||
| DownloadUrl="$(var.NetFx48RedistLink)" | ||
| LogPathVariable="NetFx48FullLog" | ||
| Compressed="no" | ||
| Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe"> | ||
| <RemotePayload | ||
| CertificatePublicKey="F49F9B33E25E33CCA0BFB15A62B7C29FFAB3880B" | ||
| CertificateThumbprint="ABDCA79AF9DD48A0EA702AD45260B3C03093FB4B" | ||
| Description="Microsoft .NET Framework 4.8 Setup" | ||
| Hash="E322E2E0FB4C86172C38A97DC6C71982134F0570" | ||
| ProductName="Microsoft .NET Framework 4.8" | ||
| Size="121307088" | ||
| Version="4.8.4115.0" /> | ||
| </ExePackage> | ||
| </PackageGroup> | ||
| </Fragment> | ||
| </Wix> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.