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

Merge pull request #1479 from aspnet/brecon/merge 

Merge release/2.2 to master
This commit is contained in:
BrennanConroy 2018-10-10 10:28:49 -07:00 committed by GitHub
parent 11bbe0d0f8 26eecf5d92
commit 4769c6019c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/dependencies.props
View File

@ -125,7 +125,7 @@
<mod_spatialitePackageVersion>4.3.0.1</mod_spatialitePackageVersion> <mod_spatialitePackageVersion>4.3.0.1</mod_spatialitePackageVersion>
<MonoAddinsPackageVersion>1.3.8</MonoAddinsPackageVersion> <MonoAddinsPackageVersion>1.3.8</MonoAddinsPackageVersion>
<MonoDevelopSdkPackageVersion>1.0.1</MonoDevelopSdkPackageVersion> <MonoDevelopSdkPackageVersion>1.0.1</MonoDevelopSdkPackageVersion>
<MoqPackageVersion>4.9.0</MoqPackageVersion> <MoqPackageVersion>4.10.0</MoqPackageVersion>
<NETStandard16PackageVersion>1.6.1</NETStandard16PackageVersion> <NETStandard16PackageVersion>1.6.1</NETStandard16PackageVersion>
<NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion> <NETStandardLibrary20PackageVersion>2.0.3</NETStandardLibrary20PackageVersion>
<NetTopologySuiteCorePackageVersion>1.15.1</NetTopologySuiteCorePackageVersion> <NetTopologySuiteCorePackageVersion>1.15.1</NetTopologySuiteCorePackageVersion>
@ -147,6 +147,7 @@
<SQLitePCLRawBundleSqlcipherPackageVersion>1.1.11</SQLitePCLRawBundleSqlcipherPackageVersion> <SQLitePCLRawBundleSqlcipherPackageVersion>1.1.11</SQLitePCLRawBundleSqlcipherPackageVersion>
<SQLitePCLRawCorePackageVersion>1.1.11</SQLitePCLRawCorePackageVersion> <SQLitePCLRawCorePackageVersion>1.1.11</SQLitePCLRawCorePackageVersion>
<StackExchangeRedisStrongNamePackageVersion>1.2.6</StackExchangeRedisStrongNamePackageVersion> <StackExchangeRedisStrongNamePackageVersion>1.2.6</StackExchangeRedisStrongNamePackageVersion>
<StackExchangeRedisPackageVersion>2.0.513</StackExchangeRedisPackageVersion>
<StreamJsonRpcPackageVersion>1.3.23</StreamJsonRpcPackageVersion> <StreamJsonRpcPackageVersion>1.3.23</StreamJsonRpcPackageVersion>
<StyleCopAnalyzersPackageVersion>1.0.0</StyleCopAnalyzersPackageVersion> <StyleCopAnalyzersPackageVersion>1.0.0</StyleCopAnalyzersPackageVersion>
<SystemIdentityModelTokensJwtPackageVersion>5.2.0</SystemIdentityModelTokensJwtPackageVersion> <SystemIdentityModelTokensJwtPackageVersion>5.2.0</SystemIdentityModelTokensJwtPackageVersion>

2
scripts/UpdateRepos.ps1
View File

@ -110,7 +110,7 @@ try {
Invoke-Block { & git @gitConfigArgs push origin HEAD:$newBranch} Invoke-Block { & git @gitConfigArgs push origin HEAD:$newBranch}
} }
catch { catch {
Write-Warning "Error in pushing $newBranch: $_" Write-Warning "Error in pushing $($newBranch): $_"
$build_errors += @{ $build_errors += @{
Repo = $submodule.module Repo = $submodule.module
Message = $_ Message = $_