From e76a0eef3bfcf35a9ac0d82e3ed66881a7bca860 Mon Sep 17 00:00:00 2001
From: Craig Wilson <craiggwilson@gmail.com>
Date: Mon, 22 Oct 2012 11:48:23 -0500
Subject: [PATCH] BUMP 1.6.1.4678

---
 CSharpDriverDocs.shfbproj   |  2 +-
 Installer/Product.wxs       |  6 ++----
 Installer/makeinstaller.bat |  4 ++--
 bump.txt                    |  2 +-
 mongocsharpdriver.nuspec    |  4 ++--
 packages/makepackages.bat   | 12 ++++++------
 6 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/CSharpDriverDocs.shfbproj b/CSharpDriverDocs.shfbproj
index de09c67659a..87e6c154130 100644
--- a/CSharpDriverDocs.shfbproj
+++ b/CSharpDriverDocs.shfbproj
@@ -45,7 +45,7 @@
     <FeedbackEMailAddress>craig.wilson%4010gen.com, robert%4010gen.com sridhar%4010gen.com</FeedbackEMailAddress>
     <FeedbackEMailLinkText>CSharp driver API doc</FeedbackEMailLinkText>
     <FrameworkVersion>.NET 3.5</FrameworkVersion>
-    <HelpFileVersion>1.6.0.4624</HelpFileVersion>
+    <HelpFileVersion>1.6.1.4678</HelpFileVersion>
   </PropertyGroup>
   <!-- There are no properties for these groups.  AnyCPU needs to appear in
        order for Visual Studio to perform the build.  The others are optional
diff --git a/Installer/Product.wxs b/Installer/Product.wxs
index c55be7da10e..6149409e2b4 100755
--- a/Installer/Product.wxs
+++ b/Installer/Product.wxs
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="184bee72-2f1b-4800-9d48-1f3dc3c5a607" 
+	<Product Id="f5305d12-8c20-4539-a9a4-823c8fcef67b" 
            Name="!(wix.ProductName)" 
            Language="1033" 
            Version="$(var.DriverVersion)" 
            Manufacturer="10gen Inc." 
-           UpgradeCode="8fcd3593-c858-4a8d-8f8e-031b50530e95">
+           UpgradeCode="58ce7d83-8eb4-448b-b966-236701bb25d3">
     
 		<Package InstallerVersion="200" Compressed="yes" />
 
@@ -137,8 +137,6 @@
         <ComponentRef Id="c_HelpShortCut"/>
       </Feature>
 			
-			<!-- Note: The following ComponentGroupRef is required to pull in generated authoring from project references. -->
-			<ComponentGroupRef Id="Product.Generated" />
 		</Feature>
 
     <UIRef Id="WixUI_Mondo" />
diff --git a/Installer/makeinstaller.bat b/Installer/makeinstaller.bat
index c607fe457f3..e90a3f53b9f 100755
--- a/Installer/makeinstaller.bat
+++ b/Installer/makeinstaller.bat
@@ -1,6 +1,6 @@
 @ECHO OFF
-SET FullVersion=1.6.0.4624
-SET Version=1.6
+SET FullVersion=1.6.1.4678
+SET Version=1.6.1
 SET Configuration=Release
 SET SourceBase=..
 
diff --git a/bump.txt b/bump.txt
index 87c66aa5ef2..f391fd3b0b6 100644
--- a/bump.txt
+++ b/bump.txt
@@ -2,4 +2,4 @@ This file is the last file modified during the release process. Changing the
 version number below provides a changed file that can be used as the basis
 for the BUMP commit.
 
-Current version: 1.6.0.4624
+Current version: 1.6.1.4678
diff --git a/mongocsharpdriver.nuspec b/mongocsharpdriver.nuspec
index ab4a6467299..984e02d4d4a 100755
--- a/mongocsharpdriver.nuspec
+++ b/mongocsharpdriver.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>mongocsharpdriver</id>
-    <version>1.6</version>
+    <version>1.6.1</version>
     <title>Official MongoDB C# driver</title>
     <authors>10gen, Inc.</authors>
     <owners>Sridhar Nanjundeswaran</owners>
@@ -21,7 +21,7 @@
     <file src="Driver\bin\Release\MongoDB.Driver.dll" target="lib\net35" />
     <file src="Driver\bin\Release\MongoDB.Driver.pdb" target="lib\net35" />
     <file src="Driver\bin\Release\MongoDB.Driver.XML" target="lib\net35" />
-    <file src="Release Notes\Release Notes v1.6.txt" target="" />
+    <file src="Release Notes\Release Notes v1.6.1.txt" target="" />
     <file src="License.rtf" target ="" />
   </files>
 </package>
diff --git a/packages/makepackages.bat b/packages/makepackages.bat
index d1bc41d46df..5ecb5ff7401 100644
--- a/packages/makepackages.bat
+++ b/packages/makepackages.bat
@@ -1,4 +1,4 @@
-set VER=1.6.0.4624
+set VER=1.6.1.4678
 set PACKAGES=packages-%VER%
 
 echo Creating %PACKAGES%
@@ -8,14 +8,14 @@ rmdir /s /q %PACKAGES%
 mkdir %PACKAGES%
 xcopy /f /d /y ..\Installer\bin\Release\CSharpDriver-%VER%.msi %PACKAGES%\
 
-del "Release Notes v.1.6.txt"
-xcopy /f /y "..\Release Notes\Release Notes v1.6.md"
-ren "Release Notes v1.6.md" "Release Notes v1.6.txt"
+del "Release Notes v.1.6.1.txt"
+xcopy /f /y "..\Release Notes\Release Notes v1.6.1.md"
+ren "Release Notes v1.6.md" "Release Notes v1.6.1.txt"
 
 set ZIPEXE="C:\Program Files\7-Zip\7z.exe"
 set ZIPFILE=%PACKAGES%\CSharpDriver-%VER%.zip
 %ZIPEXE% a %ZIPFILE% ..\License.txt
-%ZIPEXE% a %ZIPFILE% "Release Notes v1.6.txt"
+%ZIPEXE% a %ZIPFILE% "Release Notes v1.6.1.txt"
 %ZIPEXE% a %ZIPFILE% ..\Driver\bin\Release\MongoDB.Bson.dll
 %ZIPEXE% a %ZIPFILE% ..\Driver\bin\Release\MongoDB.Bson.pdb
 %ZIPEXE% a %ZIPFILE% ..\Driver\bin\Release\MongoDB.Bson.xml
@@ -24,7 +24,7 @@ set ZIPFILE=%PACKAGES%\CSharpDriver-%VER%.zip
 %ZIPEXE% a %ZIPFILE% ..\Driver\bin\Release\MongoDB.Driver.xml
 %ZIPEXE% a %ZIPFILE% ..\Help\CSharpDriverDocs.chm
 
-del "Release Notes v1.6.txt"
+del "Release Notes v1.6.1.txt"
 
 echo Created %PACKAGES%
 pause