huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/2.1' into dev

This commit is contained in:
Nate McMaster 2018-05-08 21:52:55 -07:00
parent e5d5f6c2ab 7bd10b41ba
commit 32a80bef78
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/sources.props
View File

@ -21,7 +21,6 @@
https://vside.myget.org/F/vssdk/api/v3/index.json; https://vside.myget.org/F/vssdk/api/v3/index.json;
https://vside.myget.org/F/vsmac/api/v3/index.json; https://vside.myget.org/F/vsmac/api/v3/index.json;
https://www.myget.org/F/xunit/api/v3/index.json; https://www.myget.org/F/xunit/api/v3/index.json;
https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json;
</RestoreSources> </RestoreSources>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

11
scripts/common.psm1
View File

@ -171,7 +171,16 @@ function CommitUpdatedVersions(
$subject = "Updating external dependencies" $subject = "Updating external dependencies"
Invoke-Block { & git commit -m $subject } | Out-Null $gitConfigArgs = @()
if ($env:GITHUB_USER) {
$gitConfigArgs += '-c',"user.name=$env:GITHUB_USER"
}
if ($env:GITHUB_EMAIL) {
$gitConfigArgs += '-c',"user.email=$env:GITHUB_EMAIL"
}
Invoke-Block { & git @gitConfigArgs commit -m $subject } | Out-Null
$body = "$subject`n`n" $body = "$subject`n`n"