From 1c5c7de07be457df61cf5b101d8fcacf1dcb351f Mon Sep 17 00:00:00 2001
From: rstam <robert@10gen.com>
Date: Mon, 26 Mar 2012 11:36:48 -0400
Subject: [PATCH] Changing version numbers in preparation for the 1.4 build.
 This is not the final 1.4 commit.

---
 CSharpDriver-2010.sln                         |  2 +-
 CSharpDriverDocs.shfbproj                     |  2 +-
 DriverSetup/DriverSetup.vdproj                | 96 +++++++++----------
 GlobalAssemblyInfo.cs                         |  2 +-
 .../Change Log v1.4-Bson.txt                  |  0
 .../Change Log v1.4-Driver.txt                |  0
 .../Release Notes v0.11.txt                   |  0
 .../Release Notes v0.7.txt                    |  0
 .../Release Notes v0.9.txt                    |  0
 .../Release Notes v1.0.txt                    |  0
 .../Release Notes v1.1.txt                    |  0
 .../Release Notes v1.2.txt                    |  0
 .../Release Notes v1.3.1.txt                  |  0
 .../Release Notes v1.3.txt                    |  0
 Release Notes/Release Notes v1.4.txt          |  3 +
 mongocsharpdriver.nuspec                      |  4 +-
 packages/makepackages.bat                     |  4 +-
 17 files changed, 58 insertions(+), 55 deletions(-)
 rename Change Log v1.4-Bson.txt => Release Notes/Change Log v1.4-Bson.txt (100%)
 rename Change Log v1.4-Driver.txt => Release Notes/Change Log v1.4-Driver.txt (100%)
 rename Release Notes v0.11.txt => Release Notes/Release Notes v0.11.txt (100%)
 rename Release Notes v0.7.txt => Release Notes/Release Notes v0.7.txt (100%)
 rename Release Notes v0.9.txt => Release Notes/Release Notes v0.9.txt (100%)
 rename Release Notes v1.0.txt => Release Notes/Release Notes v1.0.txt (100%)
 rename Release Notes v1.1.txt => Release Notes/Release Notes v1.1.txt (100%)
 rename Release Notes v1.2.txt => Release Notes/Release Notes v1.2.txt (100%)
 rename Release Notes v1.3.1.txt => Release Notes/Release Notes v1.3.1.txt (100%)
 rename Release Notes v1.3.txt => Release Notes/Release Notes v1.3.txt (100%)
 create mode 100644 Release Notes/Release Notes v1.4.txt

diff --git a/CSharpDriver-2010.sln b/CSharpDriver-2010.sln
index cd075a01c6..a70df1ee8a 100644
--- a/CSharpDriver-2010.sln
+++ b/CSharpDriver-2010.sln
@@ -17,7 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		CustomDictionary.xml = CustomDictionary.xml
 		GlobalAssemblyInfo.cs = GlobalAssemblyInfo.cs
 		README.md = README.md
-		Release Notes v1.3.1.txt = Release Notes v1.3.1.txt
+		Release Notes\Release Notes v1.4.txt = Release Notes\Release Notes v1.4.txt
 		uuidhelpers.js = uuidhelpers.js
 	EndProjectSection
 EndProject
diff --git a/CSharpDriverDocs.shfbproj b/CSharpDriverDocs.shfbproj
index d79f9e09ca..4c88ba4db3 100644
--- a/CSharpDriverDocs.shfbproj
+++ b/CSharpDriverDocs.shfbproj
@@ -45,7 +45,7 @@
     <FeedbackEMailAddress>robert%4010gen.com sridhar%4010gen.com</FeedbackEMailAddress>
     <FeedbackEMailLinkText>C# driver API doc</FeedbackEMailLinkText>
     <FrameworkVersion>.NET 3.5</FrameworkVersion>
-    <HelpFileVersion>1.3.1.4349</HelpFileVersion>
+    <HelpFileVersion>1.4.0.4468</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/DriverSetup/DriverSetup.vdproj b/DriverSetup/DriverSetup.vdproj
index 2b517ccbf5..350e64ffa5 100644
--- a/DriverSetup/DriverSetup.vdproj
+++ b/DriverSetup/DriverSetup.vdproj
@@ -27,50 +27,50 @@
         }
         "Entry"
         {
-        "MsmKey" = "8:_2A63140B5953A72E8B4858F3903F2772"
-        "OwnerKey" = "8:_BD76DB2CA357431595A0F671A8188FDD"
+        "MsmKey" = "8:_5ED81B2A1EFD4E9DA129583F00560B33"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_5ED81B2A1EFD4E9DA129583F00560B33"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_797354EBB42E7615C632645CEC92E652"
+        "OwnerKey" = "8:_BD76DB2CA357431595A0F671A8188FDD"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_68791BFCA02EDE379F08E6AC19E7F96F"
-        "OwnerKey" = "8:_5ED81B2A1EFD4E9DA129583F00560B33"
+        "MsmKey" = "8:_7E238670C4D047C8A103FBE7754619DD"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_68791BFCA02EDE379F08E6AC19E7F96F"
-        "OwnerKey" = "8:_7E238670C4D047C8A103FBE7754619DD"
+        "MsmKey" = "8:_B80D9A001D7444C18198B456B82DACA6"
+        "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_7E238670C4D047C8A103FBE7754619DD"
+        "MsmKey" = "8:_BD76DB2CA357431595A0F671A8188FDD"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_B80D9A001D7444C18198B456B82DACA6"
+        "MsmKey" = "8:_DCEF036A5A8349A3BA6A68608085563B"
         "OwnerKey" = "8:_UNDEFINED"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_BD76DB2CA357431595A0F671A8188FDD"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_FC65CD8CF9671135747B373D730FD3A0"
+        "OwnerKey" = "8:_5ED81B2A1EFD4E9DA129583F00560B33"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
-        "MsmKey" = "8:_C1FEA74DAE42457F83AE940CBBEE0E1E"
-        "OwnerKey" = "8:_UNDEFINED"
+        "MsmKey" = "8:_FC65CD8CF9671135747B373D730FD3A0"
+        "OwnerKey" = "8:_7E238670C4D047C8A103FBE7754619DD"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -94,7 +94,7 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_68791BFCA02EDE379F08E6AC19E7F96F"
+        "OwnerKey" = "8:_FC65CD8CF9671135747B373D730FD3A0"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -242,7 +242,7 @@
             "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_2A63140B5953A72E8B4858F3903F2772"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_797354EBB42E7615C632645CEC92E652"
             {
             "SourcePath" = "8:MongoDB.Bson.xml"
             "TargetName" = "8:MongoDB.Bson.xml"
@@ -262,21 +262,10 @@
             "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
-            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_68791BFCA02EDE379F08E6AC19E7F96F"
+            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_DCEF036A5A8349A3BA6A68608085563B"
             {
-            "AssemblyRegister" = "3:1"
-            "AssemblyIsInGAC" = "11:FALSE"
-            "AssemblyAsmDisplayName" = "8:MongoDB.Bson, Version=1.3.1.4349, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL"
-                "ScatterAssemblies"
-                {
-                    "_68791BFCA02EDE379F08E6AC19E7F96F"
-                    {
-                    "Name" = "8:MongoDB.Bson.dll"
-                    "Attributes" = "3:512"
-                    }
-                }
-            "SourcePath" = "8:MongoDB.Bson.dll"
-            "TargetName" = "8:"
+            "SourcePath" = "8:..\\Release Notes\\Release Notes v1.4.txt"
+            "TargetName" = "8:Release Notes v1.4.txt"
             "Tag" = "8:"
             "Folder" = "8:_D4C7539AEF6E411F98A857872FF5F2FC"
             "Condition" = "8:"
@@ -290,13 +279,24 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:FALSE"
-            "IsDependency" = "11:TRUE"
+            "IsDependency" = "11:FALSE"
             "IsolateTo" = "8:"
             }
-            "{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_C1FEA74DAE42457F83AE940CBBEE0E1E"
+            "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_FC65CD8CF9671135747B373D730FD3A0"
             {
-            "SourcePath" = "8:..\\Release Notes v1.3.1.txt"
-            "TargetName" = "8:Release Notes v1.3.1.txt"
+            "AssemblyRegister" = "3:1"
+            "AssemblyIsInGAC" = "11:FALSE"
+            "AssemblyAsmDisplayName" = "8:MongoDB.Bson, Version=1.4.0.4468, Culture=neutral, PublicKeyToken=f686731cfb9cc103, processorArchitecture=MSIL"
+                "ScatterAssemblies"
+                {
+                    "_FC65CD8CF9671135747B373D730FD3A0"
+                    {
+                    "Name" = "8:MongoDB.Bson.dll"
+                    "Attributes" = "3:512"
+                    }
+                }
+            "SourcePath" = "8:MongoDB.Bson.dll"
+            "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_D4C7539AEF6E411F98A857872FF5F2FC"
             "Condition" = "8:"
@@ -310,7 +310,7 @@
             "PackageAs" = "3:1"
             "Register" = "3:1"
             "Exclude" = "11:FALSE"
-            "IsDependency" = "11:FALSE"
+            "IsDependency" = "11:TRUE"
             "IsolateTo" = "8:"
             }
         }
@@ -350,7 +350,7 @@
                         {
                             "{9EF0B969-E518-4E46-987F-47570745A589}:_714AC4AABA3743F280D3824A1345875C"
                             {
-                            "Name" = "8:CSharpDriver 1.3.1"
+                            "Name" = "8:CSharpDriver 1.4"
                             "AlwaysCreate" = "11:FALSE"
                             "Condition" = "8:"
                             "Transitive" = "11:FALSE"
@@ -376,7 +376,7 @@
             }
             "{3C67513D-01DD-4637-8A68-80971EB9504F}:_D4C7539AEF6E411F98A857872FF5F2FC"
             {
-            "DefaultLocation" = "8:[ProgramFilesFolder]\\MongoDB\\CSharpDriver 1.3.1"
+            "DefaultLocation" = "8:[ProgramFilesFolder]\\MongoDB\\CSharpDriver 1.4"
             "Name" = "8:#1925"
             "AlwaysCreate" = "11:FALSE"
             "Condition" = "8:"
@@ -401,16 +401,16 @@
         "Product"
         {
         "Name" = "8:Microsoft Visual Studio"
-        "ProductName" = "8:MongoDB CSharpDriver 1.3.1"
-        "ProductCode" = "8:{EE2CA625-852C-4554-99FD-10DF46F7A49C}"
-        "PackageCode" = "8:{8A7436F2-25AE-4E83-AE0A-D5A4BD7813E3}"
+        "ProductName" = "8:MongoDB CSharpDriver 1.4"
+        "ProductCode" = "8:{9AAE4C34-F47C-4A5B-8379-4A5A16D336CC}"
+        "PackageCode" = "8:{7AD531F4-58FB-4B3D-B245-9550E62684C1}"
         "UpgradeCode" = "8:{B144CF09-09EC-4B64-9981-236E85AC93F7}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:FALSE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:1.3.1"
+        "ProductVersion" = "8:1.4"
         "Manufacturer" = "8:10gen Inc."
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -573,15 +573,15 @@
             "Icon" = "8:"
             "Feature" = "8:"
             }
-            "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_FCF89FFF7CA1494B8DF1870B0730EA03"
+            "{970C0BB2-C7D0-45D7-ABFA-7EC378858BC0}:_ACD294164D2749D59048F56CCBBEF2EF"
             {
-            "Name" = "8:Release Notes v1.3.1.txt"
+            "Name" = "8:Release Notes v1.4.txt"
             "Arguments" = "8:"
             "Description" = "8:"
             "ShowCmd" = "3:1"
             "IconIndex" = "3:0"
             "Transitive" = "11:FALSE"
-            "Target" = "8:_C1FEA74DAE42457F83AE940CBBEE0E1E"
+            "Target" = "8:_DCEF036A5A8349A3BA6A68608085563B"
             "Folder" = "8:_714AC4AABA3743F280D3824A1345875C"
             "WorkingFolder" = "8:_D4C7539AEF6E411F98A857872FF5F2FC"
             "Icon" = "8:"
@@ -1035,7 +1035,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_5ED81B2A1EFD4E9DA129583F00560B33"
             {
-            "SourcePath" = "8:..\\Driver\\obj\\Debug\\MongoDB.Driver.dll"
+            "SourcePath" = "8:..\\Driver\\obj\\Release\\MongoDB.Driver.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_D4C7539AEF6E411F98A857872FF5F2FC"
@@ -1063,7 +1063,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_7E238670C4D047C8A103FBE7754619DD"
             {
-            "SourcePath" = "8:..\\Driver\\obj\\Debug\\MongoDB.Driver.dll"
+            "SourcePath" = "8:..\\Driver\\obj\\Release\\MongoDB.Driver.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_33198C6CA99C47128D98F6D5784D2EF8"
@@ -1091,7 +1091,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B80D9A001D7444C18198B456B82DACA6"
             {
-            "SourcePath" = "8:..\\Bson\\obj\\Debug\\MongoDB.Bson.dll"
+            "SourcePath" = "8:..\\Bson\\obj\\Release\\MongoDB.Bson.dll"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_33198C6CA99C47128D98F6D5784D2EF8"
@@ -1119,7 +1119,7 @@
             }
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_BD76DB2CA357431595A0F671A8188FDD"
             {
-            "SourcePath" = "8:..\\Driver\\bin\\Debug\\MongoDB.Driver.XML"
+            "SourcePath" = "8:..\\Driver\\bin\\Release\\MongoDB.Driver.XML"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_D4C7539AEF6E411F98A857872FF5F2FC"
diff --git a/GlobalAssemblyInfo.cs b/GlobalAssemblyInfo.cs
index b5f3e8a9be..8281dd8ebe 100644
--- a/GlobalAssemblyInfo.cs
+++ b/GlobalAssemblyInfo.cs
@@ -37,4 +37,4 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.*")]
+[assembly: AssemblyVersion("1.4.0.4468")]
diff --git a/Change Log v1.4-Bson.txt b/Release Notes/Change Log v1.4-Bson.txt
similarity index 100%
rename from Change Log v1.4-Bson.txt
rename to Release Notes/Change Log v1.4-Bson.txt
diff --git a/Change Log v1.4-Driver.txt b/Release Notes/Change Log v1.4-Driver.txt
similarity index 100%
rename from Change Log v1.4-Driver.txt
rename to Release Notes/Change Log v1.4-Driver.txt
diff --git a/Release Notes v0.11.txt b/Release Notes/Release Notes v0.11.txt
similarity index 100%
rename from Release Notes v0.11.txt
rename to Release Notes/Release Notes v0.11.txt
diff --git a/Release Notes v0.7.txt b/Release Notes/Release Notes v0.7.txt
similarity index 100%
rename from Release Notes v0.7.txt
rename to Release Notes/Release Notes v0.7.txt
diff --git a/Release Notes v0.9.txt b/Release Notes/Release Notes v0.9.txt
similarity index 100%
rename from Release Notes v0.9.txt
rename to Release Notes/Release Notes v0.9.txt
diff --git a/Release Notes v1.0.txt b/Release Notes/Release Notes v1.0.txt
similarity index 100%
rename from Release Notes v1.0.txt
rename to Release Notes/Release Notes v1.0.txt
diff --git a/Release Notes v1.1.txt b/Release Notes/Release Notes v1.1.txt
similarity index 100%
rename from Release Notes v1.1.txt
rename to Release Notes/Release Notes v1.1.txt
diff --git a/Release Notes v1.2.txt b/Release Notes/Release Notes v1.2.txt
similarity index 100%
rename from Release Notes v1.2.txt
rename to Release Notes/Release Notes v1.2.txt
diff --git a/Release Notes v1.3.1.txt b/Release Notes/Release Notes v1.3.1.txt
similarity index 100%
rename from Release Notes v1.3.1.txt
rename to Release Notes/Release Notes v1.3.1.txt
diff --git a/Release Notes v1.3.txt b/Release Notes/Release Notes v1.3.txt
similarity index 100%
rename from Release Notes v1.3.txt
rename to Release Notes/Release Notes v1.3.txt
diff --git a/Release Notes/Release Notes v1.4.txt b/Release Notes/Release Notes v1.4.txt
new file mode 100644
index 0000000000..e324d18600
--- /dev/null
+++ b/Release Notes/Release Notes v1.4.txt	
@@ -0,0 +1,3 @@
+C# Driver Version 1.4 Release Notes
+===================================
+
diff --git a/mongocsharpdriver.nuspec b/mongocsharpdriver.nuspec
index d666a42d7c..154c331ff7 100755
--- a/mongocsharpdriver.nuspec
+++ b/mongocsharpdriver.nuspec
@@ -2,7 +2,7 @@
 <package>
   <metadata>
     <id>mongocsharpdriver</id>
-    <version>1.3.1</version>
+    <version>1.4</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 v1.3.1.txt" target="" />
+    <file src="Release Notes\Release Notes v1.4.txt" target="" />
     <file src="License.rtf" target ="" />
   </files>
 </package>
\ No newline at end of file
diff --git a/packages/makepackages.bat b/packages/makepackages.bat
index 780a6697f3..a5aa73b182 100644
--- a/packages/makepackages.bat
+++ b/packages/makepackages.bat
@@ -1,4 +1,4 @@
-set VER=1.3.1.4349
+set VER=1.4.0.4468
 set PACKAGES=packages-%VER%
 
 echo Creating %PACKAGES%
@@ -12,7 +12,7 @@ ren %PACKAGES%\CSharpDriver.msi CSharpDriver-%VER%.msi
 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.3.1.txt"
+%ZIPEXE% a %ZIPFILE% "..\Release Notes\Release Notes v1.4.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