Skip to content

Commit b2f6cff

Browse files
JabenJaben
committed
Merge branch 'release/6.2.0' into master
2 parents bad5eb3 + 0eeba9b commit b2f6cff

File tree

11 files changed

+317
-311
lines changed

11 files changed

+317
-311
lines changed

‎build/build.cake‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
#tool "nuget:?package=MarkdownSharp&version=1.13.0"
2-
#tool "nuget:?package=MimekitLite&version=2.13.0 "
3-
#tool "nuget:?package=NUnit.ConsoleRunner&version=3.9.0"
4-
#tool "nuget:?package=OpenCover&version=4.6.519"
5-
#tool "nuget:?package=GitVersion.CommandLine&version=5.7.0"
1+
#tool "nuget:?package=MarkdownSharp&version=2.0.5"
2+
#tool "nuget:?package=MimekitLite&version=3.0.0"
3+
#tool "nuget:?package=NUnit.ConsoleRunner&version=3.13.0"
4+
#tool "nuget:?package=OpenCover&version=4.7.1221"
5+
#tool "nuget:?package=GitVersion.CommandLine&version=5.8.1"
66

77
#addin "nuget:?package=Cake.FileHelpers&version=4.0.1"
88
#addin "nuget:?package=Cake.Incubator&version=6.0.0"
99

10-
#reference "tools/MarkdownSharp.1.13.0.0/lib/35/MarkdownSharp.dll"
11-
#reference "tools/MimeKitLite.2.13.0/lib/net45/MimeKitLite.dll"
10+
#reference "tools/MarkdownSharp.2.0.5/lib/net40/MarkdownSharp.dll"
11+
#reference "tools/MimeKitLite.3.0.0/lib/net452/MimeKitLite.dll"
1212

1313
#load "./BuildInformation.cake"
1414
#load "./ReleaseNotes.cake"

‎src/Papercut.Bootstrapper/Bundle.wxs‎

Lines changed: 33 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,49 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
4+
xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
45
xmlns:net="http://schemas.microsoft.com/wix/NetFxExtension"
56
xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
67

7-
<?include PapercutVars.wxi ?>
8-
9-
<Bundle Name="$(var.ProductName)"
10-
Version="!(bind.packageVersion.PapercutMsi)"
11-
Manufacturer="!(bind.packageManufacturer.PapercutMsi)"
12-
UpgradeCode="$(var.UpgradeCode)"
13-
AboutUrl="https://github.com/ChangemakerStudios/Papercut"
14-
Copyright="Copyright (c) 2021 by Changemaker Studios"
15-
HelpUrl="https://github.com/ChangemakerStudios/Papercut"
16-
IconSourceFile="Resources\App.ico">
17-
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense">
18-
<bal:WixStandardBootstrapperApplication LicenseUrl=""
19-
ShowVersion="yes"
20-
LogoFile="Resources\Papercut-Logo.png"
8+
<?include PapercutVars.wxi ?>
9+
10+
<Bundle Name="$(var.ProductName)"
11+
Version="!(bind.packageVersion.PapercutMsi)"
12+
Manufacturer="!(bind.packageManufacturer.PapercutMsi)"
13+
UpgradeCode="$(var.UpgradeCode)"
14+
AboutUrl="https://github.com/ChangemakerStudios/Papercut"
15+
Copyright="Copyright (c) 2021 by Changemaker Studios"
16+
HelpUrl="https://github.com/ChangemakerStudios/Papercut"
17+
IconSourceFile="Resources\App.ico">
18+
<BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.HyperlinkSidebarLicense">
19+
<bal:WixStandardBootstrapperApplication LicenseUrl=""
20+
ShowVersion="yes"
21+
LogoFile="Resources\Papercut-Logo.png"
2122
LogoSideFile="Resources\Papercut-Sidelogo.png" />
22-
</BootstrapperApplicationRef>
23+
</BootstrapperApplicationRef>
24+
25+
<Variable Name="InstallFolder" Type="string" Value="[ProgramFiles6432Folder]!(bind.packageManufacturer.PapercutMsi)\Papercut SMTP"/>
26+
<Variable Name="CommonDataFolder" Type="string" Value="[CommonAppDataFolder]!(bind.packageManufacturer.PapercutMsi)\Papercut SMTP"/>
27+
<util:RegistrySearch Root="HKLM" Key="$(var.EdgeRegistryKeyOne)" Variable="WVRTInstalledCheckOne" Result="exists" />
28+
<util:RegistrySearch Root="HKCU" Key="$(var.EdgeRegistryKeyTwo)" Variable="WVRTInstalledCheckTwo" Result="exists" />
2329

24-
<Variable Name="InstallFolder" Type="string" Value="[ProgramFiles6432Folder]!(bind.packageManufacturer.PapercutMsi)\Papercut SMTP"/>
25-
<Variable Name="CommonDataFolder" Type="string" Value="[CommonAppDataFolder]!(bind.packageManufacturer.PapercutMsi)\Papercut SMTP"/>
30+
<Chain>
31+
<PackageGroupRef Id="NetFx48Web" />
2632

27-
<Chain>
28-
<PackageGroupRef Id="NetFx472Web" />
33+
<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)">
34+
<RemotePayload CertificatePublicKey="236F73B837007769A26657E02FEB5869EB09D01A" CertificateThumbprint="C9CAEDC2CECF953E812C6446D41927B9864BB880" Description="Microsoft Edge Update Setup" Hash="AD5692106BD6DA50BEECA1908504AE90FC36CE93" ProductName="Microsoft Edge Update" Size="1812256" Version="1.3.153.55" />
35+
</ExePackage>
2936

30-
<RollbackBoundary />
37+
<RollbackBoundary />
3138

32-
<MsiPackage Id="PapercutMsi"
39+
<MsiPackage Id="PapercutMsi"
3340
SourceFile="$(var.Papercut.Installer.TargetPath)"
3441
Compressed="yes"
3542
DisplayInternalUI="yes"
3643
Vital="yes">
37-
<MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" />
38-
<MsiProperty Name="COMMONDATAFOLDER" Value="[CommonDataFolder]" />
39-
</MsiPackage>
40-
</Chain>
41-
</Bundle>
44+
<MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" />
45+
<MsiProperty Name="COMMONDATAFOLDER" Value="[CommonDataFolder]" />
46+
</MsiPackage>
47+
</Chain>
48+
</Bundle>
4249
</Wix>

‎src/Papercut.Bootstrapper/NetFx472.wxs‎

Lines changed: 0 additions & 100 deletions
This file was deleted.

‎src/Papercut.Bootstrapper/NetFx48.wxs‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- 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. -->
3+
4+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
5+
6+
<!--
7+
.NET Framework installation state properties
8+
Official documentation can be found at the following location:
9+
.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
10+
-->
11+
12+
<?define NetFx48MinRelease = 528040 ?>
13+
<?define NetFx48WebLink = https://go.microsoft.com/fwlink/?LinkId=2085155 ?>
14+
<?define NetFx48RedistLink = https://go.microsoft.com/fwlink/?linkid=2088631 ?>
15+
<?define NetFx48EulaLink = https://referencesource.microsoft.com/license.html ?>
16+
17+
<Fragment>
18+
<PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />
19+
<Property Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Secure="yes" />
20+
<SetProperty Id="WIX_IS_NETFRAMEWORK_48_OR_LATER_INSTALLED" Value="1" After="AppSearch">
21+
WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx48MinRelease)"
22+
</SetProperty>
23+
</Fragment>
24+
25+
<Fragment>
26+
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
27+
28+
<WixVariable Id="WixMbaPrereqPackageId" Value="NetFx48Web" />
29+
<WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx48EulaLink)" Overridable="yes" />
30+
<WixVariable Id="NetFx48WebDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx48MinRelease)" Overridable="yes" />
31+
<WixVariable Id="NetFx48WebInstallCondition" Value="" Overridable="yes" />
32+
<WixVariable Id="NetFx48WebPackageDirectory" Value="redist\" Overridable="yes" />
33+
34+
<PackageGroup Id="NetFx48Web">
35+
<ExePackage
36+
InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
37+
RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
38+
UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
39+
PerMachine="yes"
40+
DetectCondition="!(wix.NetFx48WebDetectCondition)"
41+
InstallCondition="!(wix.NetFx48WebInstallCondition)"
42+
Id="NetFx48Web"
43+
Vital="yes"
44+
Permanent="yes"
45+
Protocol="netfx4"
46+
DownloadUrl="$(var.NetFx48WebLink)"
47+
LogPathVariable="NetFx48FullLog"
48+
Compressed="no"
49+
Name="!(wix.NetFx48WebPackageDirectory)ndp48-web.exe">
50+
<RemotePayload
51+
CertificatePublicKey="F49F9B33E25E33CCA0BFB15A62B7C29FFAB3880B"
52+
CertificateThumbprint="ABDCA79AF9DD48A0EA702AD45260B3C03093FB4B"
53+
Description="Microsoft .NET Framework 4.8 Setup"
54+
Hash="4181398AA1FD5190155AC3A388434E5F7EA0B667"
55+
ProductName="Microsoft .NET Framework 4.8"
56+
Size="1439328"
57+
Version="4.8.4115.0" />
58+
</ExePackage>
59+
</PackageGroup>
60+
</Fragment>
61+
62+
<Fragment>
63+
<util:RegistrySearchRef Id="NETFRAMEWORK45"/>
64+
65+
<WixVariable Id="WixMbaPrereqPackageId" Value="NetFx48Redist" />
66+
<WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx48EulaLink)" Overridable="yes" />
67+
<WixVariable Id="NetFx48RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx48MinRelease)" Overridable="yes" />
68+
<WixVariable Id="NetFx48RedistInstallCondition" Value="" Overridable="yes" />
69+
<WixVariable Id="NetFx48RedistPackageDirectory" Value="redist\" Overridable="yes" />
70+
71+
<PackageGroup Id="NetFx48Redist">
72+
<ExePackage
73+
InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
74+
RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
75+
UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx48FullLog].html&quot;"
76+
PerMachine="yes"
77+
DetectCondition="!(wix.NetFx48RedistDetectCondition)"
78+
InstallCondition="!(wix.NetFx48RedistInstallCondition)"
79+
Id="NetFx48Redist"
80+
Vital="yes"
81+
Permanent="yes"
82+
Protocol="netfx4"
83+
DownloadUrl="$(var.NetFx48RedistLink)"
84+
LogPathVariable="NetFx48FullLog"
85+
Compressed="no"
86+
Name="!(wix.NetFx48RedistPackageDirectory)ndp48-x86-x64-allos-enu.exe">
87+
<RemotePayload
88+
CertificatePublicKey="F49F9B33E25E33CCA0BFB15A62B7C29FFAB3880B"
89+
CertificateThumbprint="ABDCA79AF9DD48A0EA702AD45260B3C03093FB4B"
90+
Description="Microsoft .NET Framework 4.8 Setup"
91+
Hash="E322E2E0FB4C86172C38A97DC6C71982134F0570"
92+
ProductName="Microsoft .NET Framework 4.8"
93+
Size="121307088"
94+
Version="4.8.4115.0" />
95+
</ExePackage>
96+
</PackageGroup>
97+
</Fragment>
98+
</Wix>

‎src/Papercut.Bootstrapper/Papercut.Bootstrapper.wixproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
</PropertyGroup>
3030
<ItemGroup>
3131
<Compile Include="Bundle.wxs" />
32-
<Compile Include="NetFx472.wxs" />
3332
</ItemGroup>
3433
<ItemGroup>
3534
<WixExtension Include="WixUtilExtension">
@@ -59,6 +58,7 @@
5958
<Folder Include="Resources" />
6059
</ItemGroup>
6160
<ItemGroup>
61+
<Compile Include="NetFx48.wxs" />
6262
<Content Include="PapercutVars.wxi" />
6363
<Content Include="Resources\App.ico" />
6464
<Content Include="Resources\Papercut-Logo.png" />

0 commit comments

Comments
 (0)