Skip to content

Commit 6becdc6

Browse files
committed
move setup project to WiX
1 parent f09b07a commit 6becdc6

File tree

6 files changed

+202
-757
lines changed

6 files changed

+202
-757
lines changed

FixSurfaceKeyboard.sln

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,26 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26730.16
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29009.5
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FixSurfaceKeyboard", "FixSurfaceKeyboard\FixSurfaceKeyboard.vcxproj", "{45C7DD15-52B0-449E-A0A9-1D5FC87B98CB}"
77
EndProject
8-
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "Setup\Setup.vdproj", "{46BC4703-C57A-49C2-954E-8605A7BCD4D8}"
8+
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup", "Setup\Setup.wixproj", "{8A7CDFFF-60A5-4640-BDB1-487BE3EA887C}"
99
EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12+
All|x64 = All|x64
13+
All|x86 = All|x86
1214
Debug|x64 = Debug|x64
1315
Debug|x86 = Debug|x86
1416
Release|x64 = Release|x64
1517
Release|x86 = Release|x86
1618
EndGlobalSection
1719
GlobalSection(ProjectConfigurationPlatforms) = postSolution
20+
{45C7DD15-52B0-449E-A0A9-1D5FC87B98CB}.All|x64.ActiveCfg = Release|x64
21+
{45C7DD15-52B0-449E-A0A9-1D5FC87B98CB}.All|x64.Build.0 = Release|x64
22+
{45C7DD15-52B0-449E-A0A9-1D5FC87B98CB}.All|x86.ActiveCfg = Release|Win32
23+
{45C7DD15-52B0-449E-A0A9-1D5FC87B98CB}.All|x86.Build.0 = Release|Win32
1824
{45C7DD15-52B0-449E-A0A9-1D5FC87B98CB}.Debug|x64.ActiveCfg = Debug|x64
1925
{45C7DD15-52B0-449E-A0A9-1D5FC87B98CB}.Debug|x64.Build.0 = Debug|x64
2026
{45C7DD15-52B0-449E-A0A9-1D5FC87B98CB}.Debug|x86.ActiveCfg = Debug|Win32
@@ -23,10 +29,16 @@ Global
2329
{45C7DD15-52B0-449E-A0A9-1D5FC87B98CB}.Release|x64.Build.0 = Release|x64
2430
{45C7DD15-52B0-449E-A0A9-1D5FC87B98CB}.Release|x86.ActiveCfg = Release|Win32
2531
{45C7DD15-52B0-449E-A0A9-1D5FC87B98CB}.Release|x86.Build.0 = Release|Win32
26-
{46BC4703-C57A-49C2-954E-8605A7BCD4D8}.Debug|x64.ActiveCfg = Debug
27-
{46BC4703-C57A-49C2-954E-8605A7BCD4D8}.Debug|x86.ActiveCfg = Debug
28-
{46BC4703-C57A-49C2-954E-8605A7BCD4D8}.Release|x64.ActiveCfg = Release
29-
{46BC4703-C57A-49C2-954E-8605A7BCD4D8}.Release|x86.ActiveCfg = Release
32+
{8A7CDFFF-60A5-4640-BDB1-487BE3EA887C}.All|x64.ActiveCfg = Release|x86
33+
{8A7CDFFF-60A5-4640-BDB1-487BE3EA887C}.All|x64.Build.0 = Release|x86
34+
{8A7CDFFF-60A5-4640-BDB1-487BE3EA887C}.All|x86.ActiveCfg = Release|x86
35+
{8A7CDFFF-60A5-4640-BDB1-487BE3EA887C}.All|x86.Build.0 = Release|x86
36+
{8A7CDFFF-60A5-4640-BDB1-487BE3EA887C}.Debug|x64.ActiveCfg = Debug|x86
37+
{8A7CDFFF-60A5-4640-BDB1-487BE3EA887C}.Debug|x86.ActiveCfg = Debug|x86
38+
{8A7CDFFF-60A5-4640-BDB1-487BE3EA887C}.Debug|x86.Build.0 = Debug|x86
39+
{8A7CDFFF-60A5-4640-BDB1-487BE3EA887C}.Release|x64.ActiveCfg = Release|x86
40+
{8A7CDFFF-60A5-4640-BDB1-487BE3EA887C}.Release|x86.ActiveCfg = Release|x86
41+
{8A7CDFFF-60A5-4640-BDB1-487BE3EA887C}.Release|x86.Build.0 = Release|x86
3042
EndGlobalSection
3143
GlobalSection(SolutionProperties) = preSolution
3244
HideSolutionNode = FALSE

FixSurfaceKeyboard_x64.xml

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<iasettings>
3+
<projectproperties>
4+
<manufacturer>stroy</manufacturer>
5+
<productname>FixSurfaceKeyboard</productname>
6+
<productversion>1.0.0</productversion>
7+
<productcode>{a8b85f7b-1600-408e-a3e8-a6451a365349}</productcode>
8+
<upgradecode>{59fa5683-4a1a-45ef-aed6-25b73e14911c}</upgradecode>
9+
<language>0</language>
10+
<languagename>English</languagename>
11+
</projectproperties>
12+
<summary>
13+
<title>FixSurfaceKeyboard</title>
14+
<subject>FixSurfaceKeyboard</subject>
15+
<author>stroy</author>
16+
<summarycomments>FixSurfaceKeyboard</summarycomments>
17+
<revisioncode>{6fb15e53-0741-4145-af58-f49fe1195b41}</revisioncode>
18+
<uacelevation>highestAvailable</uacelevation>
19+
</summary>
20+
<addremove>
21+
<publishername>stroy</publishername>
22+
<contactname>stroy</contactname>
23+
<helplink>http://www.mywebsite.com</helplink>
24+
<productupdatelink>http://www.mywebsite.com</productupdatelink>
25+
<addremovecomments>All Rights Reserved</addremovecomments>
26+
<iconfile />
27+
</addremove>
28+
<codegen>
29+
<generateincludefiles>0</generateincludefiles>
30+
<generatefeatures>1</generatefeatures>
31+
<refreshscript>0</refreshscript>
32+
</codegen>
33+
<compilervariables>
34+
<variables />
35+
</compilervariables>
36+
<build>
37+
<buildtype>1</buildtype>
38+
<buildasmsi>True</buildasmsi>
39+
<cachesources>1</cachesources>
40+
</build>
41+
<targetfolders />
42+
<files>
43+
<filedetails filename="C:\Users\stroy\Projekte\FixSurfaceKeyboard\x64\Debug\FixSurfaceKeyboard.exe" targetlocation="$TARGETDIR$" type="1" generatenativeimage="0" registerassembly="0" runinstallerclass="0" createshortcut="1" runprogram="0" installfilecommand="1" />
44+
</files>
45+
<dependencies />
46+
<registry />
47+
<dialogtheme>
48+
<themename>Official</themename>
49+
</dialogtheme>
50+
<authenticode>
51+
<sign>0</sign>
52+
<mode>0</mode>
53+
<certificatefile />
54+
<keyfile />
55+
<pfxfile />
56+
<productinfourl />
57+
<authpassword />
58+
<timestampurl />
59+
<signall>0</signall>
60+
</authenticode>
61+
<compression>
62+
<compressiontype>8</compressiontype>
63+
<encrypt>0</encrypt>
64+
<compressionpassword />
65+
</compression>
66+
<output>
67+
<outputtype>0</outputtype>
68+
<location />
69+
<filename />
70+
<calculatefilehash>0</calculatefilehash>
71+
<refreshrevisioncode>1</refreshrevisioncode>
72+
</output>
73+
</iasettings>

Setup/Product.wxs

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"><?define FixSurfaceKeyboard_TargetDir=$(var.FixSurfaceKeyboard.TargetDir)?>
3+
<Product Id="*" Name="FixSurfaceKeyboard" Language="1033" Version="1.0.5.0" Manufacturer="Stephan Troyer" UpgradeCode="A4331800-4547-429D-B43B-EC66D61535F5">
4+
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="x64" Manufacturer="Stephan Troyer" InstallPrivileges="elevated" />
5+
6+
<Property Id='ARPURLINFOABOUT'>https://github.com/stephtr/FixSurfaceKeyboard</Property>
7+
<Property Id='ARPHELPLINK'>https://github.com/stephtr/FixSurfaceKeyboard/issues</Property>
8+
<Property Id='ARPNOMODIFY'>1</Property>
9+
<Property Id='ARPNOREPAIR'>1</Property>
10+
11+
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" />
12+
<MediaTemplate EmbedCab="yes" />
13+
14+
<Feature Id="ProductFeature" Title="Setup" Level="1">
15+
<ComponentGroupRef Id="ProductComponents" />
16+
</Feature>
17+
18+
<CustomAction Id='InstallTask' FileKey='MainExecutable' ExeCommand='/install' Execute='deferred' Impersonate='no' />
19+
<CustomAction Id='UninstallTask' FileKey='MainExecutable' ExeCommand='/uninstall' Execute='deferred' Impersonate='no' Return='ignore' />
20+
21+
<InstallExecuteSequence>
22+
<Custom Action='InstallTask' After='InstallFiles'>(NOT Installed) AND (NOT REMOVE)</Custom>
23+
<Custom Action='UninstallTask' After='InstallInitialize'>REMOVE="ALL"</Custom>
24+
</InstallExecuteSequence>
25+
</Product>
26+
27+
<Fragment>
28+
<Directory Id="TARGETDIR" Name="SourceDir">
29+
<Directory Id="ProgramFiles64Folder">
30+
<Directory Id="INSTALLFOLDER" Name="FixSurfaceKeyboard" />
31+
</Directory>
32+
</Directory>
33+
</Fragment>
34+
35+
<Fragment>
36+
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
37+
<Component Id="FixSurfaceKeyboard.exe" Guid="df33cd53-d8df-49a2-b692-6ec1e942661d" Win64="yes">
38+
<File Id="MainExecutable" Name="FixSurfaceKeyboard.exe" Source="$(var.FixSurfaceKeyboard_TargetDir)FixSurfaceKeyboard.exe" />
39+
</Component>
40+
</ComponentGroup>
41+
</Fragment>
42+
</Wix>

0 commit comments

Comments
 (0)