diff --git a/scripts/Build.ps1 b/scripts/Build.ps1
index 1656d970fc..66637253d7 100644
--- a/scripts/Build.ps1
+++ b/scripts/Build.ps1
@@ -22,6 +22,12 @@ Param(
   [Alias("vs")]
   [System.String] $VersionSuffix = "dev",
   
+  [Parameter(Mandatory=$false)]
+  [System.String] $BuildVersionPrefix  = "14.0",
+
+  [Parameter(Mandatory=$false)]
+  [System.String] $BuildVersionSuffix = "9999.99",
+  
   [Parameter(Mandatory=$false)]
   [System.String] $Target = "Build",
   
@@ -74,6 +80,7 @@ $TFB_Configuration = $Configuration
 $TFB_FrameworkVersion = $FrameworkVersion
 $TFB_AdapterVersion = $AdapterVersion
 $TFB_VersionSuffix = $VersionSuffix
+$TFB_BuildVersion = $BuildVersionPrefix + "." + $BuildVersionSuffix
 $TFB_SkipRestore = $SkipRestore
 $TFB_Clean = $Clean
 $TFB_ClearPackageCache = $ClearPackageCache
@@ -249,8 +256,8 @@ function Invoke-Build([string] $solution, $hasVsixExtension = "false")
   $solutionFailureLog = Join-Path -path $solutionDir -childPath "msbuild.err"
 
 	Write-Log "    Building $solution..."
-	Write-Verbose "$msbuild /t:$Target /p:Configuration=$configuration /tv:$msbuildVersion /v:m /flp1:Summary`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionSummaryLog /flp2:WarningsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionWarningLog /flp3:ErrorsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionFailureLog /p:IsLocalizedBuild=$TFB_IsLocalizedBuild /p:UpdateXlf=$TFB_UpdateXlf $solutionPath"
-	& $msbuild /t:$Target /p:Configuration=$configuration /tv:$msbuildVersion /v:m /flp1:Summary`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionSummaryLog /flp2:WarningsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionWarningLog /flp3:ErrorsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionFailureLog /p:IsLocalizedBuild=$TFB_IsLocalizedBuild /p:UpdateXlf=$TFB_UpdateXlf $solutionPath
+	Write-Verbose "$msbuild /t:$Target /p:Configuration=$configuration /tv:$msbuildVersion /v:m /flp1:Summary`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionSummaryLog /flp2:WarningsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionWarningLog /flp3:ErrorsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionFailureLog /p:IsLocalizedBuild=$TFB_IsLocalizedBuild /p:UpdateXlf=$TFB_UpdateXlf /p:BuildVersion=$TFB_BuildVersion $solutionPath"
+	& $msbuild /t:$Target /p:Configuration=$configuration /tv:$msbuildVersion /v:m /flp1:Summary`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionSummaryLog /flp2:WarningsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionWarningLog /flp3:ErrorsOnly`;Verbosity=diagnostic`;Encoding=UTF-8`;LogFile=$solutionFailureLog /p:IsLocalizedBuild=$TFB_IsLocalizedBuild /p:UpdateXlf=$TFB_UpdateXlf /p:BuildVersion=$TFB_BuildVersion $solutionPath
   
 	if ($lastExitCode -ne 0) {
 		throw "Build failed with an exit code of '$lastExitCode'."
diff --git a/scripts/SetBuildNumber.ps1 b/scripts/SetBuildNumber.ps1
index 8b6a0bbd5f..97252bef6f 100644
--- a/scripts/SetBuildNumber.ps1
+++ b/scripts/SetBuildNumber.ps1
@@ -30,7 +30,7 @@ function Set_BuildNumber()
     Write-Verbose("Build number used: " + $buildNumber)
     
     # This sets the build number.
-    Write-Host("##vso[build.updatebuildnumber]$buildNumber")
+    Write-Host("##vso[task.setvariable variable=BuildVersionSuffix]$buildNumber")
 }
 
 Set_BuildNumber
diff --git a/scripts/build/TestFx.targets b/scripts/build/TestFx.targets
index 4849e11a2e..27f2ec02eb 100644
--- a/scripts/build/TestFx.targets
+++ b/scripts/build/TestFx.targets
@@ -86,7 +86,7 @@
     <TFBuildNumber Condition=" '$(TFBuildNumber)' == '' ">0.1</TFBuildNumber>
     <MajorVersion>14.0</MajorVersion>
     <AssemblyVersion>$(MajorVersion).0.0</AssemblyVersion>
-    <BuildVersion>$(MajorVersion).$(TFBuildNumber)</BuildVersion>
+    <BuildVersion Condition=" '$(BuildVersion)' == '' ">$(MajorVersion).$(TFBuildNumber)</BuildVersion>
   </PropertyGroup>
   <ItemGroup>
     <AssemblyVersionAttribute Include="System.Reflection.AssemblyVersionAttribute">