Skip to content

Commit 6d8a38d

Browse files
craiggwilsoncraiggwilson
committed
fixed issue with installer not uninstalling start menu items during uninstall.
1 parent 97bb292 commit 6d8a38d

File tree

4 files changed

+23
-17
lines changed

4 files changed

+23
-17
lines changed

‎Installer/CSharpDriverInstaller.wixproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</PropertyGroup>
2626
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
2727
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
28-
<DefineConstants>$(Configuration);Version=$(Version);SemVersion=$(SemVersion);SourceBase=$(SourceBase);ReleaseNotes=$(ReleaseNotes);License=$(License);Documentation=$(Documentation)</DefineConstants>
28+
<DefineConstants>$(Configuration);Version=$(Version);SemVersion=$(SemVersion);SourceBase=$(SourceBase);ReleaseNotes=$(ReleaseNotes);License=$(License);Documentation=$(Documentation);ProductId=$(ProductId);UpgradeCode=$(UpgradeCode)</DefineConstants>
2929
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
3030
</PropertyGroup>
3131
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">

‎Installer/Frameworks.wxs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
33
<Fragment>
44
<DirectoryRef Id="INSTALLDIR">
5-
<Component Id="c_net35BsonDll" Guid="13DA8DD9-1AD1-46BF-971A-78FA499F281D">
5+
<Component Id="c_net35BsonDll" Guid="*">
66
<File Id="f_net35BsonDll" Name="MongoDB.Bson.dll" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Bson.dll"
77
DiskId ="1" KeyPath="yes" />
88
</Component>
9-
<Component Id="c_net35BsonPdb" Guid="AC6CE1A0-1584-42E6-B9FB-765F34A44745">
9+
<Component Id="c_net35BsonPdb" Guid="*">
1010
<File Id="f_net35BsonPdb" Name="MongoDB.Bson.pdb" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Bson.pdb"
1111
DiskId ="1" KeyPath="yes" />
1212
</Component>
13-
<Component Id="c_net35BsonXml" Guid="ED71DBCD-5A02-4AC0-88E4-C793F5FBEDA8">
13+
<Component Id="c_net35BsonXml" Guid="*">
1414
<File Id="f_net35BsonXml" Name="MongoDB.Bson.xml" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Bson.XML"
1515
DiskId ="1" KeyPath="yes" />
1616
</Component>
17-
<Component Id="c_net35DriverDll" Guid="0A94BBE0-6281-422D-BEE2-5831B06F2D55">
17+
<Component Id="c_net35DriverDll" Guid="*">
1818
<File Id="f_net35DriverDll" Name="MongoDB.Driver.dll" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Driver.dll"
1919
DiskId ="1" KeyPath="yes" />
2020
</Component>
21-
<Component Id="c_net35DriverPdb" Guid="C580837A-9EE9-4C86-97EE-0A8DCBB4794E">
21+
<Component Id="c_net35DriverPdb" Guid="*">
2222
<File Id="f_net35DriverPdb" Name="MongoDB.Driver.pdb" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Driver.pdb"
2323
DiskId ="1" KeyPath="yes" />
2424
</Component>
25-
<Component Id="c_net35DriverXml" Guid="9EBD61C3-5365-416F-B345-517B053D9784">
25+
<Component Id="c_net35DriverXml" Guid="*">
2626
<File Id="f_net35DriverXml" Name="MongoDB.Driver.XML" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Driver.XML"
2727
DiskId ="1" KeyPath="yes" />
2828
</Component>

‎Installer/Product.wxs

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,42 +31,46 @@
3131
<Directory Id="ProgramMenuFolder">
3232
<Directory Id="MongoDBProgramsFolder" Name="MongoDB">
3333
<Directory Id="CSharpDriverProgramsFolder" Name="!(wix.ProductShortName)" />
34-
</Directory>
34+
</Directory>
3535
</Directory>
3636
</Directory>
3737

3838
<DirectoryRef Id="CSharpDriverProgramsFolder">
39-
<Component Id="c_ReleaseNotesShortCut" Guid="0D00A9A7-03C4-466F-A3B8-C1CC8456ACC6">
39+
<Component Id="c_ReleaseNotesShortCut" Guid="*">
40+
<CreateFolder Directory="MongoDBProgramsFolder" />
41+
<CreateFolder Directory="CSharpDriverProgramsFolder" />
42+
4043
<Shortcut Id="f_ReleaseNotesShortCut"
4144
Name="Release Notes"
4245
Description="Release notes for MongoDB CSharp Driver"
4346
Target="[INSTALLDIR]Release Notes.txt"
4447
WorkingDirectory="INSTALLDIR"
4548
Directory="CSharpDriverProgramsFolder"/>
46-
<RemoveFolder Id="CSharpDriverProgramsFolder" Directory="CSharpDriverProgramsFolder" On="uninstall" />
47-
<RemoveFolder Id="MongoDBProgramsFolder" Directory="MongoDBProgramsFolder" On="uninstall" />
48-
<RegistryValue Root="HKCU" Key="Software\MongoDB" Name="releasenotesinstalled" Type="integer" Value="1" KeyPath="yes"/>
49+
50+
<RemoveFolder Id="RemoveCSharpDriverProgramsFolder" Directory="CSharpDriverProgramsFolder" On="uninstall" />
51+
<RemoveFolder Id="RemoveMongoDBProgramsFolder" Directory="MongoDBProgramsFolder" On="uninstall" />
52+
<RegistryValue Root="HKCU" Key="Software\MongoDB\CSharpDriver\$(var.SemVersion)" Name="StartMenuReleaseNotesShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
4953
</Component>
50-
<Component Id="c_HelpShortCut" Guid="B256E367-EA97-48C5-A546-49F4A0803682">
54+
<Component Id="c_HelpShortCut" Guid="*">
5155
<Shortcut Id="f_HelpShortCut"
5256
Name="CSharpDriverDocs"
5357
Description="Help for !(WixProductName)"
5458
Target="[INSTALLDIR]CSharpDriverDocs.chm"
5559
WorkingDirectory="INSTALLDIR"/>
56-
<RegistryValue Root="HKCU" Key="Software\MongoDB" Name="helpinstalled" Type="integer" Value="1" KeyPath="yes"/>
60+
<RegistryValue Root="HKCU" Key="Software\MongoDB\CSharpDriver\$(var.SemVersion)" Name="StartMenuHelpShortCutInstalled" Type="integer" Value="1" KeyPath="yes"/>
5761
</Component>
5862
</DirectoryRef>
5963

6064
<DirectoryRef Id="INSTALLDIR">
61-
<Component Id="c_License" Guid="7901999A-6026-4321-8584-ECB67D424221">
65+
<Component Id="c_License" Guid="*">
6266
<File Id="f_License" Name="License.rtf" Source="$(var.SourceBase)\$(var.License)"
6367
DiskId ="1" KeyPath="yes" />
6468
</Component>
65-
<Component Id="c_ReleaseNotes" Guid="115F1B08-8A38-435A-BBB0-0C0DED5ACB31">
69+
<Component Id="c_ReleaseNotes" Guid="*">
6670
<File Id="f_ReleaseNotes" Name="Release Notes.txt" Source="$(var.SourceBase)\$(var.ReleaseNotes)"
6771
DiskId ="1" KeyPath="yes" />
6872
</Component>
69-
<Component Id="c_Help" Guid="CC3F9A2F-1C43-48CA-B998-D03C15181DD3">
73+
<Component Id="c_Help" Guid="*">
7074
<File Id="f_Help" Name="CSharpDriverDocs.chm" Source="$(var.SourceBase)\$(var.Documentation)"
7175
DiskId ="1" KeyPath="yes" />
7276
</Component>

‎Release Notes/Release Notes v1.8.1.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
C# Driver Version 1.8.1 Release Notes
2+
=====================================

0 commit comments

Comments
 (0)