Merge pull request #20767 from jaredpar/fix-official

Need to quote the MSBuild path

src/Tools/MicroBuild/Build.proj

@@ -7,12 +7,14 @@
     <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
     <ScriptArgs></ScriptArgs>
     <ScriptArgs Condition="'$(Configuration)' == 'Release'">-release</ScriptArgs>
-    <ScriptArgs Condition="'$(BUILD_SOURCEBRANCH)' != ''">-branch $(BUILD_SOURCEBRANCH)</ScriptArgs>
-    <ScriptArgs Condition="'$(RoslynNuGetApiKey)' != ''">-nugetApiKey $(RoslynNuGetApiKey)</ScriptArgs>
+    <ScriptArgs Condition="'$(BUILD_SOURCEBRANCH)' != ''">$(ScriptArgs) -branch $(BUILD_SOURCEBRANCH)</ScriptArgs>
+    <ScriptArgs Condition="'$(RoslynNuGetApiKey)' != ''">$(ScriptArgs) -nugetApiKey $(RoslynNuGetApiKey)</ScriptArgs>
+    <ScriptArgs Condition="'$(SkipTest)' != 'true'">$(ScriptArgs) -testDesktop</ScriptArgs>
+    <ScriptArgs Condition="'$(SkipPublish)' != 'true'">$(ScriptArgs) -publish</ScriptArgs>
   </PropertyGroup>
 
   <Target Name="Build">
-    <Exec Command="powershell -noprofile -executionPolicy ByPass -file $(MSBuildThisFileDirectory)microbuild.ps1 -restore -official -testDesktop -publish -assemblyVersion $(AssemblyVersion) -msbuildDir &quot;$(MSBuildBinPath)&quot; $(ScriptArgs) " />
+    <Exec Command="powershell -noprofile -executionPolicy ByPass -file $(MSBuildThisFileDirectory)microbuild.ps1 -restore -official -assemblyVersion $(AssemblyVersion) -msbuildDir &quot;$(MSBuildBinPath)&quot; $(ScriptArgs) " />
   </Target>
 
 </Project>

src/Tools/MicroBuild/cibuild.cmd

-powershell -noprofile -executionPolicy RemoteSigned -file "%~dp0\microbuild.ps1" -restore -cibuild
+powershell -noprofile -executionPolicy RemoteSigned -file "%~dp0\microbuild.ps1" -restore -cibuild -release

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