CSHARP-712 - Minor changes to allow building from VS

Author: Sridhar Nanjundeswaran

Installer/CSharpDriverInstaller.wixproj

@@ -4,9 +4,10 @@
     <Version Condition=" '$(Version)' == '' ">0.0.0.0</Version>
     <SemVersion Condition=" '$(SemVersion)' == '' ">0.0.0</SemVersion>
     <SourceBase Condition=" '$(SourceBase)' == '' ">..</SourceBase>
-    <ReleaseNotes Condition=" '$(ReleaseNotes)' == '' "></ReleaseNotes>
+    <BinDir Condition=" '$(BinDir)' == '' ">..\MongoDB.Driver\bin\$(Configuration)</BinDir>
+    <ReleaseNotes Condition=" '$(ReleaseNotes)' == '' ">Release Notes\Release Notes v1.8.1.md</ReleaseNotes>
     <License Condition=" '$(License)' == '' ">License.rtf</License>
-    <Documentation Condition=" '$(Documentation)' == '' "></Documentation>
+    <Documentation Condition=" '$(Documentation)' == '' ">Docs\Api\Help\Help.chm</Documentation>
     <ProductId Condition=" '$(ProductId)' == '' ">*</ProductId>
     <UpgradeCode Condition=" '$(UpgradeCode)' == '' ">574a296c-d9df-469f-b205-f93f5da69099</UpgradeCode>
   </PropertyGroup>
@@ -22,15 +23,8 @@
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <OutputPath>bin\$(Configuration)</OutputPath>
-  </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);ProductId=$(ProductId);UpgradeCode=$(UpgradeCode)</DefineConstants>
-    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>$(Configuration);Version=$(Version);SemVersion=$(SemVersion);SourceBase=$(SourceBase);ReleaseNotes=$(ReleaseNotes);License=$(License);Documentation=$(Documentation);ProductId=$(ProductId);UpgradeCode=$(UpgradeCode)</DefineConstants>
+    <DefineConstants>$(Configuration);Version=$(Version);SemVersion=$(SemVersion);SourceBase=$(SourceBase);ReleaseNotes=$(ReleaseNotes);License=$(License);Documentation=$(Documentation);ProductId=$(ProductId);UpgradeCode=$(UpgradeCode);BinDir=$(BinDir)</DefineConstants>
     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>

Installer/Frameworks.wxs

@@ -3,27 +3,27 @@
   <Fragment>
     <DirectoryRef Id="INSTALLDIR">
       <Component Id="c_net35BsonDll" Guid="*">
-        <File Id="f_net35BsonDll" Name="MongoDB.Bson.dll" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Bson.dll"
+        <File Id="f_net35BsonDll" Name="MongoDB.Bson.dll" Source="$(var.BinDir)\MongoDB.Bson.dll"
               DiskId ="1" KeyPath="yes" />
       </Component>
       <Component Id="c_net35BsonPdb" Guid="*">
-        <File Id="f_net35BsonPdb" Name="MongoDB.Bson.pdb" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Bson.pdb"
+        <File Id="f_net35BsonPdb" Name="MongoDB.Bson.pdb" Source="$(var.BinDir)\MongoDB.Bson.pdb"
               DiskId ="1" KeyPath="yes" />
       </Component>
       <Component Id="c_net35BsonXml" Guid="*">
-        <File Id="f_net35BsonXml" Name="MongoDB.Bson.xml" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Bson.XML"
+        <File Id="f_net35BsonXml" Name="MongoDB.Bson.xml" Source="$(var.BinDir)\MongoDB.Bson.XML"
               DiskId ="1" KeyPath="yes" />
       </Component>
       <Component Id="c_net35DriverDll" Guid="*">
-        <File Id="f_net35DriverDll" Name="MongoDB.Driver.dll" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Driver.dll"
+        <File Id="f_net35DriverDll" Name="MongoDB.Driver.dll" Source="$(var.BinDir)\MongoDB.Driver.dll"
               DiskId ="1" KeyPath="yes" />
       </Component>
       <Component Id="c_net35DriverPdb" Guid="*">
-        <File Id="f_net35DriverPdb" Name="MongoDB.Driver.pdb" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Driver.pdb"
+        <File Id="f_net35DriverPdb" Name="MongoDB.Driver.pdb" Source="$(var.BinDir)\MongoDB.Driver.pdb"
               DiskId ="1" KeyPath="yes" />
       </Component>
       <Component Id="c_net35DriverXml" Guid="*">
-        <File Id="f_net35DriverXml" Name="MongoDB.Driver.XML" Source="$(var.SourceBase)\artifacts\net35\build\MongoDB.Driver.XML"
+        <File Id="f_net35DriverXml" Name="MongoDB.Driver.XML" Source="$(var.BinDir)\MongoDB.Driver.XML"
               DiskId ="1" KeyPath="yes" />
       </Component>
     </DirectoryRef>

build.ps1

@@ -141,7 +141,7 @@ Task Installer -precondition { (BuildHasBeenRun) -and (DocsHasBeenRun) } {
 	$release_notes_relative_path = Get-Item $release_notes_file | Resolve-Path -Relative
 	$doc_relative_path = Get-Item $chm_file | Resolve-Path -Relative
 
-	Exec { msbuild "$installer_file" /t:Rebuild /p:Configuration=$config /p:Version=$version /p:SemVersion=$short_version /p:ProductId=$installer_product_id /p:UpgradeCode=$installer_upgrade_code /p:ReleaseNotes=$release_notes_relative_path /p:License="License.rtf" /p:Documentation=$doc_relative_path /p:OutputPath=$artifacts_dir }
+	Exec { msbuild "$installer_file" /t:Rebuild /p:Configuration=$config /p:Version=$version /p:SemVersion=$short_version /p:ProductId=$installer_product_id /p:UpgradeCode=$installer_upgrade_code /p:ReleaseNotes=$release_notes_relative_path /p:License="License.rtf" /p:Documentation=$doc_relative_path /p:OutputPath=$artifacts_dir /p:BinDir=$35_build_dir}
 
 	rm -force $artifacts_dir\*.wixpdb
 }