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.wxs11
-rw-r--r--src/setup/wix-cli/wix-cli.wixproj6
2 files changed, 10 insertions, 7 deletions
diff --git a/src/setup/wix-cli/Package.wxs b/src/setup/wix-cli/Package.wxs
index c777f356..cbf28115 100644
--- a/src/setup/wix-cli/Package.wxs
+++ b/src/setup/wix-cli/Package.wxs
@@ -1,6 +1,7 @@
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 <Package Id="WixToolset.CommandLineTools.Package" Name="WiX Toolset Command-Line Tools" Manufacturer="WiX Toolset" Version="!(bind.fileVersion.WixExe)"> 3 xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
4 <Package Id="WixToolset.CommandLineTools$(SetupMajorVersion).Package" Name="WiX Toolset Command-Line Tools" Manufacturer="$(Company)" Version="!(bind.fileVersion.WixExe)">
4 <MediaTemplate EmbedCab="yes" /> 5 <MediaTemplate EmbedCab="yes" />
5 6
6 <ComponentGroupRef Id="BinaryFiles" /> 7 <ComponentGroupRef Id="BinaryFiles" />
@@ -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>
@@ -26,9 +30,6 @@
26 <Exclude Files="!(bindpath.Files)\**\*.xml" /> 30 <Exclude Files="!(bindpath.Files)\**\*.xml" />
27 <Exclude Files="!(bindpath.Files)\**\*.targets" /> 31 <Exclude Files="!(bindpath.Files)\**\*.targets" />
28 </Files> 32 </Files>
29
30 <Files Include="!(bindpath.Heat_x64)\**" Subdirectory="x64" />
31 <Files Include="!(bindpath.Heat_x86)\**" Subdirectory="x86" />
32 </ComponentGroup> 33 </ComponentGroup>
33 </Fragment> 34 </Fragment>
34 35
diff --git a/src/setup/wix-cli/wix-cli.wixproj b/src/setup/wix-cli/wix-cli.wixproj
index 35457460..7eb9acd0 100644
--- a/src/setup/wix-cli/wix-cli.wixproj
+++ b/src/setup/wix-cli/wix-cli.wixproj
@@ -9,8 +9,6 @@
9 9
10 <ItemGroup> 10 <ItemGroup>
11 <BindPath BindName="Files" Include="$(RootBuildFolder)wix\$(Configuration)\net472\win-$(Platform)" /> 11 <BindPath BindName="Files" Include="$(RootBuildFolder)wix\$(Configuration)\net472\win-$(Platform)" />
12 <BindPath BindName="Heat_x64" Include="$(RootBuildFolder)tools\$(Configuration)\net472\win-x64\" />
13 <BindPath BindName="Heat_x86" Include="$(RootBuildFolder)tools\$(Configuration)\net472\win-x86\" />
14 12
15 <BindPath Include="$(RootBuildFolder)Bal.wixext\$(Configuration)\netstandard2.0\" /> 13 <BindPath Include="$(RootBuildFolder)Bal.wixext\$(Configuration)\netstandard2.0\" />
16 <BindPath Include="$(RootBuildFolder)ComPlus.wixext\$(Configuration)\netstandard2.0\" /> 14 <BindPath Include="$(RootBuildFolder)ComPlus.wixext\$(Configuration)\netstandard2.0\" />
@@ -28,6 +26,10 @@
28 <BindPath Include="$(RootBuildFolder)VisualStudio.wixext\$(Configuration)\netstandard2.0\" /> 26 <BindPath Include="$(RootBuildFolder)VisualStudio.wixext\$(Configuration)\netstandard2.0\" />
29 </ItemGroup> 27 </ItemGroup>
30 28
29 <ItemGroup>
30 <PackageReference Include="WixToolset.UI.wixext" />
31 </ItemGroup>
32
31 <UsingTask TaskName="GenerateMetadata" AssemblyFile="$(BaseOutputPath)$(Configuration)\net472\MetadataTask.dll" /> 33 <UsingTask TaskName="GenerateMetadata" AssemblyFile="$(BaseOutputPath)$(Configuration)\net472\MetadataTask.dll" />
32 34
33 <Target Name="GenerateMetadata" AfterTargets="AfterBuild"> 35 <Target Name="GenerateMetadata" AfterTargets="AfterBuild">