Skip to content

Commit cc6c9c2

Browse files
author
Jan Wilmans
committed
Rewrote the Wix installer to use 2022 components
1 parent a7d4d60 commit cc6c9c2

9 files changed

+95
-255
lines changed

‎DebugView++Setup/CF_WixUI_FeatureTree.wxs

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

‎DebugView++Setup/DebugView++Setup.user

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

‎DebugView++Setup/DebugView++Setup.wixproj

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

‎DebugView++Setup/Product.wxs

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

‎DebugView++Setup/clean icon cache.bat

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎DebugView++Setup/packages.config

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

‎companions/DebugViewppSetup/DebugViewppSetup.sln

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.4.33205.214
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "DebugViewppSetup", "DebugViewppSetup.wixproj", "{5663D355-17BA-42AE-9EE1-598CE0662341}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|x64 = Debug|x64
11+
Release|x64 = Release|x64
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{5663D355-17BA-42AE-9EE1-598CE0662341}.Debug|x64.ActiveCfg = Release|x64
15+
{5663D355-17BA-42AE-9EE1-598CE0662341}.Debug|x64.Build.0 = Release|x64
16+
{5663D355-17BA-42AE-9EE1-598CE0662341}.Release|x64.ActiveCfg = Release|x64
17+
{5663D355-17BA-42AE-9EE1-598CE0662341}.Release|x64.Build.0 = Release|x64
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {F16638FB-5119-444C-9AEE-90706501F667}
24+
EndGlobalSection
25+
EndGlobal

‎companions/DebugViewppSetup/DebugViewppSetup.wixproj

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
5+
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
6+
<ProductVersion>3.10</ProductVersion>
7+
<ProjectGuid>5663d355-17ba-42ae-9ee1-598ce0662341</ProjectGuid>
8+
<SchemaVersion>2.0</SchemaVersion>
9+
<OutputName>DebugViewppSetup</OutputName>
10+
<OutputType>Package</OutputType>
11+
</PropertyGroup>
12+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
13+
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
14+
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
15+
</PropertyGroup>
16+
<ItemGroup>
17+
<Compile Include="Product.wxs" />
18+
</ItemGroup>
19+
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
20+
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
21+
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
22+
<Error Text="The WiX Toolset v3.11 build tools must be installed to build this project. To download the WiX Toolset, see https://wixtoolset.org/releases/v3.11/stable" />
23+
</Target>
24+
<!--
25+
To modify your build process, add your task inside one of the targets below and uncomment it.
26+
Other similar extension points exist, see Wix.targets.
27+
<Target Name="BeforeBuild">
28+
</Target>
29+
<Target Name="AfterBuild">
30+
</Target>
31+
-->
32+
</Project>

‎companions/DebugViewppSetup/Product.wxs

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3+
<Product Id="*" Name="DebugView++" Language="1033" Version="1.9.22.0" Manufacturer="CobaltFusion" UpgradeCode="dcfff531-3299-4277-b341-d044d431fff6">
4+
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
5+
<Property Id="DiskPrompt" Value="Cobalt Fusion DebugView++ Installation" />
6+
7+
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
8+
<MediaTemplate />
9+
10+
<Feature Id="ProductFeature" Title="DebugViewppSetup" Level="1">
11+
<ComponentGroupRef Id="ProductComponents" />
12+
</Feature>
13+
<Icon Id="DebugViewPP.ico" SourceFile="$(var.SolutionDir)..\..\application\DebugViewpp\res\DebugView++.ico" />
14+
</Product>
15+
16+
<Fragment>
17+
<Directory Id="TARGETDIR" Name="SourceDir">
18+
<Directory Id="DesktopFolder" SourceName="Desktop" />
19+
<Directory Id="ProgramFiles64Folder">
20+
<Directory Id="INSTALLFOLDER" Name="DebugView++" />
21+
</Directory>
22+
</Directory>
23+
</Fragment>
24+
25+
<Fragment>
26+
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
27+
<!-- <Component Id="ProductComponent"> -->
28+
<!-- TODO: Insert files, registry keys, and other resources here. -->
29+
<!-- </Component> -->
30+
<Component Id="ProductComponent" Guid="{0E088845-A2F6-4F45-BA2D-2752ADF4B744}">
31+
<File Id="ProductFile" Name="DebugViewpp.exe" Source="$(var.SolutionDir)..\..\bin\DebugViewpp.exe">
32+
<Shortcut Id="DesktopDebugViewPP" Directory="DesktopFolder" Name="DebugView++" WorkingDirectory="INSTALLDIR" Icon="DebugViewPP.ico" IconIndex="0" Advertise="yes" />
33+
</File>
34+
<File Id="DebugViewPPConsole" Name="DebugViewConsole.exe" Source="$(var.SolutionDir)..\..\bin\DebugViewConsole.exe" />
35+
</Component>
36+
</ComponentGroup>
37+
</Fragment>
38+
</Wix>

0 commit comments

Comments
 (0)