Merge pull request #2213 from github/build/vsinstaller

Enabling VS Installer packages in CI

Author: shana

appveyor.yml

@@ -1,9 +1,27 @@
 os: Visual Studio 2017
 version: '2.8.0.{build}'
 skip_tags: true
+
+environment:
+  matrix:
+    - BUILD_TYPE: normal
+
 install:
+- choco install --no-progress BCC-MSBuildLog
+- choco install --no-progress BCC-Submission
 - ps: |
     $full_build = Test-Path env:GHFVS_KEY
+    $forVSInstaller = $env:BUILD_TYPE -eq "vsinstaller"
+    $package = $full_build -and ($env:APPVEYOR_PULL_REQUEST_NUMBER -or $env:APPVEYOR_REPO_BRANCH -eq "master" -or $forVSInstaller -or $env:BUILD_TYPE -eq "package")
+
+    $message = "Building "
+    if ($package) { $message += "and packaging "}
+    $message += "version " + $env:APPVEYOR_BUILD_NUMBER + " "
+
+    if ($full_build) { $message += "(full build)" } else { $message += "(partial build)" }
+    if ($forVSInstaller) { $message += " for the VS installer" }
+    Write-Host $message
+
     git submodule init
     git submodule sync
 
@@ -18,19 +36,28 @@ install:
 
     git submodule update --recursive --force
     nuget restore GitHubVS.sln
-- choco install --no-progress BCC-MSBuildLog
-- choco install --no-progress BCC-Submission
+
 build_script:
-- ps: scripts\build.ps1 -AppVeyor -BuildNumber:$env:APPVEYOR_BUILD_NUMBER
+- ps: scripts\build.ps1 -AppVeyor -Package:$package -BuildNumber:$env:APPVEYOR_BUILD_NUMBER -ForVSInstaller:$forVSInstaller
+
 test:
   categories:
     except:
       - Timings
+
 on_success:
 - ps: |
-    if ($full_build) {
-      script\Sign-Package -AppVeyor
+    if ($package) {
+      Write-Host "Signing and packaging"
+      script\Sign-Package -AppVeyor -ForVSInstaller:$forVSInstaller
     }
-on_finish:
-- IF NOT "%BCC_TOKEN%x"=="x" BCCMSBuildLog --cloneRoot "%APPVEYOR_BUILD_FOLDER%" --input output.binlog --output checkrun.json --ownerRepo %APPVEYOR_REPO_NAME% --hash %APPVEYOR_REPO_COMMIT%
-- IF NOT "%BCC_TOKEN%x"=="x" BCCSubmission -h %APPVEYOR_REPO_COMMIT% -i checkrun.json -t %BCC_TOKEN%
+
+for:
+-
+  branches:
+    only:
+      - /releases/.*-vsinstaller/
+  environment:
+    matrix:
+      - BUILD_TYPE: vsinstaller
+      - BUILD_TYPE: package

scripts/build.ps1

@@ -38,6 +38,10 @@ Param(
     ,
     [switch]
     $Trace = $false
+    ,
+    [switch]
+    $ForVSInstaller = $false
+
 )
 
 Set-StrictMode -Version Latest
@@ -53,6 +57,10 @@ Vsix | out-null
 
 Push-Location $rootDirectory
 
+if ($Package -and $BuildNumber -gt -1) {
+    $BumpVersion = $true
+}
+
 if ($UpdateSubmodules) {
     Update-Submodules
 }
@@ -61,13 +69,6 @@ if ($Clean) {
 	Clean-WorkingTree
 }
 
-$fullBuild = Test-Path env:GHFVS_KEY
-$publishable = $fullBuild -and $AppVeyor -and ($env:APPVEYOR_PULL_REQUEST_NUMBER -or $env:APPVEYOR_REPO_BRANCH -eq "master")
-if ($publishable) { #forcing a deploy flag for CI
-    $Package = $true
-    $BumpVersion = $true
-}
-
 if ($BumpVersion) {
     Write-Output "Bumping the version"
     Bump-Version -BumpBuild -BuildNumber:$BuildNumber
@@ -79,6 +80,6 @@ if ($Package) {
     Write-Output "Building GitHub for Visual Studio"
 }
 
-Build-Solution GitHubVs.sln "Build" $config -Deploy:$Package
+Build-Solution GitHubVs.sln "Build" $config -Deploy:$Package -ForVSInstaller:$ForVSInstaller
 
 Pop-Location

scripts/modules.ps1

@@ -114,7 +114,7 @@ New-Module -ScriptBlock {
         $msbuild
     }
 
-    function Build-Solution([string]$solution, [string]$target, [string]$configuration, [switch]$ForVSInstaller, [bool]$Deploy = $false) {
+    function Build-Solution([string]$solution, [string]$target, [string]$configuration, [switch]$ForVSInstaller = $false, [bool]$Deploy = $false) {
         $msbuild = Find-MSBuild
 
         Run-Command -Fatal { & $nuget restore $solution -NonInteractive -Verbosity detailed -MSBuildPath (Split-Path -parent $msbuild) }