winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 68 Activity

Installer/Setup: Update to WiX 7

Browse Source
This commit is contained in:
Lorenz Stechauner
2026-04-08 00:20:01 +02:00
parent ce1a55df86
commit cc6e31a006
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Installer/Installer.wixproj
View File

@@ -1,4 +1,4 @@
<Project Sdk="WixToolset.Sdk/6"> <Project Sdk="WixToolset.Sdk/7">
<PropertyGroup> <PropertyGroup>
<HarvestFileSuppressUniqueIds>false</HarvestFileSuppressUniqueIds> <HarvestFileSuppressUniqueIds>false</HarvestFileSuppressUniqueIds>
<HarvestFileGenerateGuidsNow>true</HarvestFileGenerateGuidsNow> <HarvestFileGenerateGuidsNow>true</HarvestFileGenerateGuidsNow>
@@ -11,6 +11,7 @@
<BuildProjectReferences>False</BuildProjectReferences> <BuildProjectReferences>False</BuildProjectReferences>
<OutputName>Elwig</OutputName> <OutputName>Elwig</OutputName>
<Cultures>de-AT</Cultures> <Cultures>de-AT</Cultures>
<AcceptEula>wix7</AcceptEula>
</PropertyGroup> </PropertyGroup>
<UsingTask TaskName="GetFileVersion" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll"> <UsingTask TaskName="GetFileVersion" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
<ParameterGroup> <ParameterGroup>

7
Setup/Setup.wixproj
View File

@@ -1,8 +1,9 @@
<Project Sdk="WixToolset.Sdk/6"> <Project Sdk="WixToolset.Sdk/7">
<PropertyGroup> <PropertyGroup>
<OutputType>Bundle</OutputType> <OutputType>Bundle</OutputType>
<OutputName>Elwig</OutputName> <OutputName>Elwig</OutputName>
<Cultures>de-AT</Cultures> <Cultures>de-AT</Cultures>
<AcceptEula>wix7</AcceptEula>
</PropertyGroup> </PropertyGroup>
<Target Name="CustomBeforeBuild" BeforeTargets="BeforeBuild"> <Target Name="CustomBeforeBuild" BeforeTargets="BeforeBuild">
<Exec Command="curl --fail -s -L &quot;https://go.microsoft.com/fwlink/p/?LinkId=2124703&quot; -z &quot;$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe&quot; -o &quot;$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe&quot;" /> <Exec Command="curl --fail -s -L &quot;https://go.microsoft.com/fwlink/p/?LinkId=2124703&quot; -z &quot;$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe&quot; -o &quot;$(ProjectDir)\Files\MicrosoftEdgeWebview2Setup.exe&quot;" />
@@ -13,7 +14,7 @@
</Target> </Target>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Installer\Installer.wixproj" /> <ProjectReference Include="..\Installer\Installer.wixproj" />
<PackageReference Include="WixToolset.Bal.wixext" Version="6.0.2" /> <PackageReference Include="WixToolset.Bal.wixext" Version="7.0.0" />
<PackageReference Include="WixToolset.Util.wixext" Version="6.0.2" /> <PackageReference Include="WixToolset.Util.wixext" Version="7.0.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>