diff --git a/src/Tools/MicroBuild/Build.proj b/src/Tools/MicroBuild/Build.proj
index 080b7cf562c739f8f82d2a5170811fef81f551ad..03ee85d0030d970753052573398ab5fff6fd244b 100644
--- a/src/Tools/MicroBuild/Build.proj
+++ b/src/Tools/MicroBuild/Build.proj
@@ -7,12 +7,14 @@
Debug
-release
- -branch $(BUILD_SOURCEBRANCH)
- -nugetApiKey $(RoslynNuGetApiKey)
+ $(ScriptArgs) -branch $(BUILD_SOURCEBRANCH)
+ $(ScriptArgs) -nugetApiKey $(RoslynNuGetApiKey)
+ $(ScriptArgs) -testDesktop
+ $(ScriptArgs) -publish
-
+
diff --git a/src/Tools/MicroBuild/cibuild.cmd b/src/Tools/MicroBuild/cibuild.cmd
index 1a0f72a0e07f00f7d227d079d1a672d2bcc74435..183a31ba17a9889d8eb026dc048d6b5ee9fd7daa 100644
--- a/src/Tools/MicroBuild/cibuild.cmd
+++ b/src/Tools/MicroBuild/cibuild.cmd
@@ -1 +1 @@
-powershell -noprofile -executionPolicy RemoteSigned -file "%~dp0\microbuild.ps1" -restore -cibuild
+powershell -noprofile -executionPolicy RemoteSigned -file "%~dp0\microbuild.ps1" -restore -cibuild -release
diff --git a/src/Tools/MicroBuild/microbuild.ps1 b/src/Tools/MicroBuild/microbuild.ps1
index 9cef20d24439c45b31c9e3645e7ca9e964a3d8fd..e4c7a674ad56bed05064702eb609369f39a4d5de 100644
--- a/src/Tools/MicroBuild/microbuild.ps1
+++ b/src/Tools/MicroBuild/microbuild.ps1
@@ -45,6 +45,10 @@ function Run-MSBuild([string]$buildArgs = "", [string]$logFile = "", [switch]$pa
$args += " /filelogger /fileloggerparameters:Verbosity=normal;logFile=$logFile";
}
+ if ($release) {
+ $args += " /p:Configuration=Release"
+ }
+
$args += " $buildArgs"
Exec-Console $msbuild $args
}
@@ -53,7 +57,7 @@ function Run-SignTool() {
Push-Location $repoDir
try {
$signTool = Join-Path (Get-PackageDir "RoslynTools.Microsoft.SignTool") "tools\SignTool.exe"
- $signToolArgs = "-msbuildPath $msbuild"
+ $signToolArgs = "-msbuildPath `"$msbuild`""
if (-not $official) {
$signToolArgs += " -test"
}
@@ -180,7 +184,7 @@ try {
# The desktop tests need to run after signing so that tests run against fully signed
# assemblies.
if ($testDesktop) {
- Exec-Block { & (Join-Path $scriptDir "build.ps1") -testDesktop -test32 }
+ Exec-Block { & (Join-Path $scriptDir "build.ps1") -testDesktop -test32 -release:$release }
}
Exec-Block { & (Join-Path $scriptDir "check-toolset-insertion.ps1") -sourcePath $repoDir -binariesPath $configDir }
@@ -191,7 +195,11 @@ try {
New-Item -Force $sentinelFile -type file
Get-Process vbcscompiler -ErrorAction SilentlyContinue | Stop-Process
- Exec-Block { & .\publish-assets.ps1 -binariesPath $configDir -branchName $branchName -apiKey $nugetApiKey -test:$(-not $official) }
+
+ if ($publish) {
+ Exec-Block { & .\publish-assets.ps1 -binariesPath $configDir -branchName $branchName -apiKey $nugetApiKey -test:$(-not $official) }
+ }
+
Exec-Block { & .\copy-insertion-items.ps1 -binariesPath $configDir -test:$(-not $official) }
exit 0