From 53744d4f6a2a1d718a3a33e1dd15ca93d2dfe498 Mon Sep 17 00:00:00 2001
From: Jorrit Salverda <jorrit.salverda@gmail.com>
Date: Mon, 18 Mar 2013 11:09:02 +0100
Subject: [PATCH] updated mspec and opencover

possible to pass parameters AllowIncompatiblePlatform,
GenerateSmartDefaults and BlockOnPossibleDataLoss to SqlPackage
---
 Build/Scripts/properties-convention-based.msbuild | 9 +++++++--
 Build/Scripts/targets.msbuild                     | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Build/Scripts/properties-convention-based.msbuild b/Build/Scripts/properties-convention-based.msbuild
index f13a2c6..752e5ee 100644
--- a/Build/Scripts/properties-convention-based.msbuild
+++ b/Build/Scripts/properties-convention-based.msbuild
@@ -26,7 +26,7 @@
 		
 		<!-- tool paths -->
 		<NUnitToolPath>$(BuildToolsDirectory)NUnit-2.6.0.12051\</NUnitToolPath>
-		<MSpecRunnerPath>$(BuildToolsDirectory)Machine.Specifications.0.5.7\tools\mspec-clr4.exe</MSpecRunnerPath>
+		<MSpecRunnerPath>$(BuildToolsDirectory)Machine.Specifications.0.5.11\tools\mspec-clr4.exe</MSpecRunnerPath>
 		<MSpecToJUnitXsltPath>$(BuildToolsDirectory)MSpecToJunitXslt\MSpecToJUnit.xslt</MSpecToJUnitXsltPath>
 		<MSTestRunnerPath>$(BuildToolsDirectory)MSTest.v11.0.50727.1\MSTest.exe</MSTestRunnerPath>
 		<MSBuildCommunityTasksDirectory>$(BuildToolsDirectory)MSBuildTasks.1.4.0.45\</MSBuildCommunityTasksDirectory>
@@ -52,7 +52,7 @@
 		<VisualStudioSqlServerDataToolsDir>$(VSToolsPath)SSDT\</VisualStudioSqlServerDataToolsDir>
 		<WebPublishingPath>$(VSToolsPath)Web\Microsoft.Web.Publishing.Tasks.dll</WebPublishingPath>
 		<SqlServerRedistPath>$(BuildToolsDirectory)SqlServerRedistPath</SqlServerRedistPath>
-		<OpenCoverPath>$(BuildToolsDirectory)OpenCover.4.0.804\</OpenCoverPath>
+		<OpenCoverPath>$(BuildToolsDirectory)OpenCover.4.0.1107\</OpenCoverPath>
 		<OpenCoverMSBuildTasksPath>$(OpenCoverPath)MSBuild\</OpenCoverMSBuildTasksPath>
 		<ReportGeneratorPath>$(BuildToolsDirectory)ReportGenerator.v1.6.1.0\</ReportGeneratorPath>		
 		<BuildVersionFilePath>$(ScriptsDirectory)buildversion.txt</BuildVersionFilePath>
@@ -94,6 +94,11 @@
 		<DeploySkipFilePattern></DeploySkipFilePattern>
 		<DeployDirectory></DeployDirectory>
 		
+		<!-- deploy dac properties -->
+		<DacDeployAllowIncompatiblePlatform>True</DacDeployAllowIncompatiblePlatform>
+		<DacDeployGenerateSmartDefaults>True</DacDeployGenerateSmartDefaults>
+		<DacDeployBlockOnPossibleDataLoss>True</DacDeployBlockOnPossibleDataLoss>
+		
 		<!-- deploy azure properties -->
 		<AzureSubscriptionID></AzureSubscriptionID>
 		<AzureCertificateFilename Condition=" '$(AzureCertificateFilename)' == '' ">AzureManagementCertificate.pfx</AzureCertificateFilename>
diff --git a/Build/Scripts/targets.msbuild b/Build/Scripts/targets.msbuild
index 1a3128e..6e03817 100644
--- a/Build/Scripts/targets.msbuild
+++ b/Build/Scripts/targets.msbuild
@@ -1077,7 +1077,7 @@
 		</PropertyGroup>
 
 		<!-- deploy data-tier application project (http://msdn.microsoft.com/en-us/library/hh550080(v=vs.103).aspx) -->
-		<Exec WorkingDirectory="$(MSBuildProjectDirectory)" Command="&quot;$(SqlServerRedistPath)\SqlPackage.exe&quot; /Action:Publish /SourceFile:&quot;$(DacPacPath)&quot; /TargetServerName:&quot;$(DeployServer)&quot; /TargetPassword:&quot;$(DeployPassword)&quot; /TargetUser:&quot;$(DeployUsername)&quot; /TargetDatabaseName:&quot;$(DeployTargetName)&quot; /p:AllowIncompatiblePlatform=True /p:GenerateSmartDefaults=True" Condition=" Exists('$(DacPacPath)') " />
+		<Exec WorkingDirectory="$(MSBuildProjectDirectory)" Command="&quot;$(SqlServerRedistPath)\SqlPackage.exe&quot; /Action:Publish /SourceFile:&quot;$(DacPacPath)&quot; /TargetServerName:&quot;$(DeployServer)&quot; /TargetPassword:&quot;$(DeployPassword)&quot; /TargetUser:&quot;$(DeployUsername)&quot; /TargetDatabaseName:&quot;$(DeployTargetName)&quot; /p:AllowIncompatiblePlatform=$(DacDeployAllowIncompatiblePlatform) /p:GenerateSmartDefaults=$(DacDeployGenerateSmartDefaults) /p:BlockOnPossibleDataLoss=$(DacDeployBlockOnPossibleDataLoss)" Condition=" Exists('$(DacPacPath)') " />
 		
 	</Target>