Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

fixed issue with installer not uninstalling start menu items during u…

…ninstall.
  • Loading branch information...
commit 6d8a38d92ba0556a7b5c886491822a4cf4c071d8 1 parent 97bb292
@craiggwilson craiggwilson authored
View
2  Installer/CSharpDriverInstaller.wixproj
@@ -25,7 +25,7 @@
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
- <DefineConstants>$(Configuration);Version=$(Version);SemVersion=$(SemVersion);SourceBase=$(SourceBase);ReleaseNotes=$(ReleaseNotes);License=$(License);Documentation=$(Documentation)</DefineConstants>
+ <DefineConstants>$(Configuration);Version=$(Version);SemVersion=$(SemVersion);SourceBase=$(SourceBase);ReleaseNotes=$(ReleaseNotes);License=$(License);Documentation=$(Documentation);ProductId=$(ProductId);UpgradeCode=$(UpgradeCode)</DefineConstants>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
View
12 Installer/Frameworks.wxs
@@ -2,27 +2,27 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Fragment>
<DirectoryRef Id="INSTALLDIR">
- <Component Id="c_net35BsonDll" Guid="13DA8DD9-1AD1-46BF-971A-78FA499F281D">
+ <Component Id="c_net35BsonDll" Guid="*">
<File Id="f_net35BsonDll" Name="MongoDB.Bson.dll" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Bson.dll"
DiskId ="1" KeyPath="yes" />
</Component>
- <Component Id="c_net35BsonPdb" Guid="AC6CE1A0-1584-42E6-B9FB-765F34A44745">
+ <Component Id="c_net35BsonPdb" Guid="*">
<File Id="f_net35BsonPdb" Name="MongoDB.Bson.pdb" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Bson.pdb"
DiskId ="1" KeyPath="yes" />
</Component>
- <Component Id="c_net35BsonXml" Guid="ED71DBCD-5A02-4AC0-88E4-C793F5FBEDA8">
+ <Component Id="c_net35BsonXml" Guid="*">
<File Id="f_net35BsonXml" Name="MongoDB.Bson.xml" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Bson.XML"
DiskId ="1" KeyPath="yes" />
</Component>
- <Component Id="c_net35DriverDll" Guid="0A94BBE0-6281-422D-BEE2-5831B06F2D55">
+ <Component Id="c_net35DriverDll" Guid="*">
<File Id="f_net35DriverDll" Name="MongoDB.Driver.dll" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Driver.dll"
DiskId ="1" KeyPath="yes" />
</Component>
- <Component Id="c_net35DriverPdb" Guid="C580837A-9EE9-4C86-97EE-0A8DCBB4794E">
+ <Component Id="c_net35DriverPdb" Guid="*">
<File Id="f_net35DriverPdb" Name="MongoDB.Driver.pdb" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Driver.pdb"
DiskId ="1" KeyPath="yes" />
</Component>
- <Component Id="c_net35DriverXml" Guid="9EBD61C3-5365-416F-B345-517B053D9784">
+ <Component Id="c_net35DriverXml" Guid="*">
<File Id="f_net35DriverXml" Name="MongoDB.Driver.XML" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Driver.XML"
DiskId ="1" KeyPath="yes" />
</Component>
View
24 Installer/Product.wxs
@@ -31,42 +31,46 @@
<Directory Id="ProgramMenuFolder">
<Directory Id="MongoDBProgramsFolder" Name="MongoDB">
<Directory Id="CSharpDriverProgramsFolder" Name="!(wix.ProductShortName)" />
- </Directory>
+ </Directory>
</Directory>
</Directory>
<DirectoryRef Id="CSharpDriverProgramsFolder">
- <Component Id="c_ReleaseNotesShortCut" Guid="0D00A9A7-03C4-466F-A3B8-C1CC8456ACC6">
+ <Component Id="c_ReleaseNotesShortCut" Guid="*">
+ <CreateFolder Directory="MongoDBProgramsFolder" />
+ <CreateFolder Directory="CSharpDriverProgramsFolder" />
+
<Shortcut Id="f_ReleaseNotesShortCut"
Name="Release Notes"
Description="Release notes for MongoDB CSharp Driver"
Target="[INSTALLDIR]Release Notes.txt"
WorkingDirectory="INSTALLDIR"
Directory="CSharpDriverProgramsFolder"/>
- <RemoveFolder Id="CSharpDriverProgramsFolder" Directory="CSharpDriverProgramsFolder" On="uninstall" />
- <RemoveFolder Id="MongoDBProgramsFolder" Directory="MongoDBProgramsFolder" On="uninstall" />
- <RegistryValue Root="HKCU" Key="Software\MongoDB" Name="releasenotesinstalled" Type="integer" Value="1" KeyPath="yes"/>
+
+ <RemoveFolder Id="RemoveCSharpDriverProgramsFolder" Directory="CSharpDriverProgramsFolder" On="uninstall" />
+ <RemoveFolder Id="RemoveMongoDBProgramsFolder" Directory="MongoDBProgramsFolder" On="uninstall" />
+ <RegistryValue Root="HKCU" Key="Software\MongoDB\CSharpDriver\$(var.SemVersion)" Name="StartMenuReleaseNotesShortcutInstalled" Type="integer" Value="1" KeyPath="yes"/>
</Component>
- <Component Id="c_HelpShortCut" Guid="B256E367-EA97-48C5-A546-49F4A0803682">
+ <Component Id="c_HelpShortCut" Guid="*">
<Shortcut Id="f_HelpShortCut"
Name="CSharpDriverDocs"
Description="Help for !(WixProductName)"
Target="[INSTALLDIR]CSharpDriverDocs.chm"
WorkingDirectory="INSTALLDIR"/>
- <RegistryValue Root="HKCU" Key="Software\MongoDB" Name="helpinstalled" Type="integer" Value="1" KeyPath="yes"/>
+ <RegistryValue Root="HKCU" Key="Software\MongoDB\CSharpDriver\$(var.SemVersion)" Name="StartMenuHelpShortCutInstalled" Type="integer" Value="1" KeyPath="yes"/>
</Component>
</DirectoryRef>
<DirectoryRef Id="INSTALLDIR">
- <Component Id="c_License" Guid="7901999A-6026-4321-8584-ECB67D424221">
+ <Component Id="c_License" Guid="*">
<File Id="f_License" Name="License.rtf" Source="$(var.SourceBase)\$(var.License)"
DiskId ="1" KeyPath="yes" />
</Component>
- <Component Id="c_ReleaseNotes" Guid="115F1B08-8A38-435A-BBB0-0C0DED5ACB31">
+ <Component Id="c_ReleaseNotes" Guid="*">
<File Id="f_ReleaseNotes" Name="Release Notes.txt" Source="$(var.SourceBase)\$(var.ReleaseNotes)"
DiskId ="1" KeyPath="yes" />
</Component>
- <Component Id="c_Help" Guid="CC3F9A2F-1C43-48CA-B998-D03C15181DD3">
+ <Component Id="c_Help" Guid="*">
<File Id="f_Help" Name="CSharpDriverDocs.chm" Source="$(var.SourceBase)\$(var.Documentation)"
DiskId ="1" KeyPath="yes" />
</Component>
View
2  Release Notes/Release Notes v1.8.1.md
@@ -0,0 +1,2 @@
+C# Driver Version 1.8.1 Release Notes
+=====================================
Please sign in to comment.
Something went wrong with that request. Please try again.