aboutsummaryrefslogtreecommitdiff
path: root/src/setup/wix-cli
diff options
context:
space:
mode:
Diffstat (limited to 'src/setup/wix-cli')
-rw-r--r--src/setup/wix-cli/Package.wxs6
-rw-r--r--src/setup/wix-cli/wix-cli.wixproj4
2 files changed, 9 insertions, 1 deletions
diff --git a/src/setup/wix-cli/Package.wxs b/src/setup/wix-cli/Package.wxs
index 48d544e0..c3a66973 100644
--- a/src/setup/wix-cli/Package.wxs
+++ b/src/setup/wix-cli/Package.wxs
@@ -1,5 +1,6 @@
1<!-- 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. --> 1<!-- 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. -->
2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 2<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
3 xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
3 <Package Id="WixToolset.CommandLineTools$(SetupMajorVersion).Package" Name="WiX Toolset Command-Line Tools" Manufacturer="WiX Toolset" Version="!(bind.fileVersion.WixExe)"> 4 <Package Id="WixToolset.CommandLineTools$(SetupMajorVersion).Package" Name="WiX Toolset Command-Line Tools" Manufacturer="WiX Toolset" Version="!(bind.fileVersion.WixExe)">
4 <MediaTemplate EmbedCab="yes" /> 5 <MediaTemplate EmbedCab="yes" />
5 6
@@ -9,6 +10,9 @@
9 <Property Id="ARPURLINFOABOUT" Value="https://wixtoolset.org/" /> 10 <Property Id="ARPURLINFOABOUT" Value="https://wixtoolset.org/" />
10 <Property Id="ARPHELPLINK" Value="https://wixtoolset.org/docs/gethelp/" /> 11 <Property Id="ARPHELPLINK" Value="https://wixtoolset.org/docs/gethelp/" />
11 <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" /> 12 <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />
13
14 <ui:WixUI Id="WixUI_Minimal" />
15 <WixVariable Id="WixUILicenseRtf" Value="..\OSMFEULA.rtf" />
12 </Package> 16 </Package>
13 17
14 <Fragment> 18 <Fragment>
diff --git a/src/setup/wix-cli/wix-cli.wixproj b/src/setup/wix-cli/wix-cli.wixproj
index 35457460..5a5e2a93 100644
--- a/src/setup/wix-cli/wix-cli.wixproj
+++ b/src/setup/wix-cli/wix-cli.wixproj
@@ -28,6 +28,10 @@
28 <BindPath Include="$(RootBuildFolder)VisualStudio.wixext\$(Configuration)\netstandard2.0\" /> 28 <BindPath Include="$(RootBuildFolder)VisualStudio.wixext\$(Configuration)\netstandard2.0\" />
29 </ItemGroup> 29 </ItemGroup>
30 30
31 <ItemGroup>
32 <PackageReference Include="WixToolset.UI.wixext" />
33 </ItemGroup>
34
31 <UsingTask TaskName="GenerateMetadata" AssemblyFile="$(BaseOutputPath)$(Configuration)\net472\MetadataTask.dll" /> 35 <UsingTask TaskName="GenerateMetadata" AssemblyFile="$(BaseOutputPath)$(Configuration)\net472\MetadataTask.dll" />
32 36
33 <Target Name="GenerateMetadata" AfterTargets="AfterBuild"> 37 <Target Name="GenerateMetadata" AfterTargets="AfterBuild">