Merge branch 'release/2.1' into release/2.1-msrc

This commit is contained in:
Nate McMaster 2018-04-24 09:07:54 -07:00
commit 9edc836e48
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 7 additions and 6 deletions

@ -1 +1 @@
Subproject commit 8075ae5344b652a704a1f7eebe63328d8eaf8e1d
Subproject commit 0d047d64f36e13d2000cfe934ddaf2bd72108dd4

View File

@ -1,10 +1,11 @@
[CmdletBinding()]
param(
[string]$GitHubEmail,
[string]$GitHubUsername,
[string]$GitHubPassword
[string]$GithubEmail,
[string]$GithubUsername,
[string]$GithubToken
)
# This script only works against dev/master at the moment because only master prod-con builds allow you to access their results before the entire chain is finished.
$ErrorActionPreference = 'Stop'
Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1"
@ -28,7 +29,7 @@ Invoke-WebRequest -OutFile $localCoreSetupVersions -Uri $coreSetupVersions
$msNetCoreAppPackageVersion = $null
$msNetCoreAppPackageName = "Microsoft.NETCore.App"
Set-GitHubInfo $GitHubPassword $GitHubUsername $GitHubEmail
Set-GitHubInfo $GithubToken $GithubUsername $GithubEmail
$variables = @{}
@ -114,7 +115,7 @@ try {
$body = CommitUpdatedVersions $updatedVars $dependencies $depsPath
if ($body) {
CreatePR $baseBranch $destinationBranch $body $GitHubPassword
CreatePR $baseBranch $destinationBranch $body $GithubToken
}
}
finally {