moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2025-08-16 16:36:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to WiX v5.0.0

Browse Source
This commit is contained in:
Cameron Gutman 2024-05-11 15:08:10 -05:00
parent 4d1acf2e30
commit f9a4498f9b
3 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wix/Moonlight/Moonlight.wixproj
View File

@ -1,4 +1,4 @@
<Project Sdk="WixToolset.Sdk/4.0.4" ToolsVersion="4.0"> <Project Sdk="WixToolset.Sdk/5.0.0" ToolsVersion="5.0">
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<DefineConstants>Debug</DefineConstants> <DefineConstants>Debug</DefineConstants>
</PropertyGroup> </PropertyGroup>
@ -9,17 +9,6 @@
<PropertyGroup> <PropertyGroup>
<DefineConstants>DeployDir=$(DEPLOY_FOLDER);BuildDir=$(BUILD_FOLDER)</DefineConstants> <DefineConstants>DeployDir=$(DEPLOY_FOLDER);BuildDir=$(BUILD_FOLDER)</DefineConstants>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<HarvestDirectory Include="$(DEPLOY_FOLDER)">
<ComponentGroupName>MoonlightDependencies</ComponentGroupName>
<DirectoryRefId>INSTALLFOLDER</DirectoryRefId>
<PreprocessorVariable>DeployDir</PreprocessorVariable>
<SuppressRootDirectory>true</SuppressRootDirectory>
<SuppressCom>true</SuppressCom>
<SuppressRegistry>true</SuppressRegistry>
</HarvestDirectory>
<BindPath Include="$(DEPLOY_FOLDER)" />
</ItemGroup>
<PropertyGroup Condition="$(SIGN)!=''"> <PropertyGroup Condition="$(SIGN)!=''">
<SignOutput>true</SignOutput> <SignOutput>true</SignOutput>
</PropertyGroup> </PropertyGroup>
@ -27,8 +16,8 @@
<Exec Command='signtool.exe $(SIGNTOOL_PARAMS) %(SignMsi.FullPath)' /> <Exec Command='signtool.exe $(SIGNTOOL_PARAMS) %(SignMsi.FullPath)' />
</Target> </Target>
<ItemGroup> <ItemGroup>
<PackageReference Include="WixToolset.Firewall.wixext" Version="4.0.4" /> <PackageReference Include="WixToolset.Firewall.wixext" Version="5.0.0" />
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.4" /> <PackageReference Include="WixToolset.Util.wixext" Version="5.0.0" />
<PackageReference Include="WixToolset.Heat" Version="4.0.4" /> <PackageReference Include="WixToolset.Heat" Version="5.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
wix/Moonlight/Product.wxs
View File

@ -106,6 +106,10 @@
</Component> </Component>
</DirectoryRef> </DirectoryRef>
<ComponentGroup Id="MoonlightDependencies" Directory="INSTALLFOLDER">
<Files Include="$(var.DeployDir)\**" />
</ComponentGroup>
<Feature Id="ProductFeature" Title="Moonlight" Level="1" ConfigurableDirectory="INSTALLFOLDER"> <Feature Id="ProductFeature" Title="Moonlight" Level="1" ConfigurableDirectory="INSTALLFOLDER">
<ComponentRef Id="Moonlight" /> <ComponentRef Id="Moonlight" />
<ComponentRef Id="MoonlightShortcuts" /> <ComponentRef Id="MoonlightShortcuts" />

6
wix/MoonlightSetup/MoonlightSetup.wixproj
View File

@ -1,4 +1,4 @@
<Project Sdk="WixToolset.Sdk/4.0.4"> <Project Sdk="WixToolset.Sdk/5.0.0">
<PropertyGroup> <PropertyGroup>
<OutputType>Bundle</OutputType> <OutputType>Bundle</OutputType>
</PropertyGroup> </PropertyGroup>
@ -19,7 +19,7 @@
<Exec Command='signtool.exe $(SIGNTOOL_PARAMS) %(SignBundle.FullPath)' /> <Exec Command='signtool.exe $(SIGNTOOL_PARAMS) %(SignBundle.FullPath)' />
</Target> </Target>
<ItemGroup> <ItemGroup>
<PackageReference Include="WixToolset.Bal.wixext" Version="4.0.4" /> <PackageReference Include="WixToolset.Bal.wixext" Version="5.0.0" />
<PackageReference Include="WixToolset.Util.wixext" Version="4.0.4" /> <PackageReference Include="WixToolset.Util.wixext" Version="5.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>